bill: invoice improvments;
bill: fix duplication bill calc;