tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed invoice payment calculations

Browse source
This commit is contained in:
root 2014-05-01 15:47:55 +00:00
parent 36588f061c
commit 8bb90759fc
4 changed files with 308 additions and 4482 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/invoices/edit.blade.php
View file

@ -1133,7 +1133,7 @@
});
this.totals.rawPaidToDate = ko.computed(function() {
return self.amount() - self.balance();
return accounting.toFixed(self.amount(),2) - accounting.toFixed(self.balance(),2);
});
this.totals.paidToDate = ko.computed(function() {
@ -1142,7 +1142,7 @@
});
this.totals.total = ko.computed(function() {
var total = self.totals.rawSubtotal();
var total = accounting.toFixed(self.totals.rawSubtotal(),2);
var discount = parseFloat(self.discount());
if (discount > 0) {
@ -1517,4 +1517,4 @@
</script>
@stop
@stop

2
public/built.js
View file

@ -36967,7 +36967,7 @@ function calculateAmounts(invoice) {
total = parseFloat(total) + parseFloat(tax);
}
invoice.balance_amount = total - (invoice.amount - invoice.balance);
invoice.balance_amount = total.toFixed(4) - (accounting.toFixed(invoice.amount, 2) - accounting.toFixed(invoice.balance, 2));
invoice.tax_amount = tax;
invoice.discount_amount = discount;
invoice.has_taxes = hasTaxes;

4780
public/built.public.css
View file

File diff suppressed because one or more lines are too long

2
public/js/script.js
View file

@ -1500,7 +1500,7 @@ function calculateAmounts(invoice) {
total = parseFloat(total) + parseFloat(tax);
}
invoice.balance_amount = total - (invoice.amount - invoice.balance);
invoice.balance_amount = total.toFixed(4) - (accounting.toFixed(invoice.amount, 2) - accounting.toFixed(invoice.balance, 2));
invoice.tax_amount = tax;
invoice.discount_amount = discount;
invoice.has_taxes = hasTaxes;