Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #108 from whitebook/master

Browse Source 
fixed invoice payment calculations
This commit is contained in:
Hillel Coren 2014-05-01 21:14:30 +03:00
commit a4a66cba63
3 changed files with 5 additions and 5 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() { 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() { this.totals.paidToDate = ko.computed(function() {
@ -1142,7 +1142,7 @@
}); });
this.totals.total = ko.computed(function() { this.totals.total = ko.computed(function() {
var total = self.totals.rawSubtotal(); var total = accounting.toFixed(self.totals.rawSubtotal(),2);
var discount = parseFloat(self.discount()); var discount = parseFloat(self.discount());
if (discount > 0) { if (discount > 0) {
@ -1517,4 +1517,4 @@
</script> </script>
@stop @stop

2
public/built.js
View File

@ -36967,7 +36967,7 @@ function calculateAmounts(invoice) {
total = parseFloat(total) + parseFloat(tax); 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.tax_amount = tax;
invoice.discount_amount = discount; invoice.discount_amount = discount;
invoice.has_taxes = hasTaxes; invoice.has_taxes = hasTaxes;

2
public/js/script.js
View File

@ -1500,7 +1500,7 @@ function calculateAmounts(invoice) {
total = parseFloat(total) + parseFloat(tax); 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.tax_amount = tax;
invoice.discount_amount = discount; invoice.discount_amount = discount;
invoice.has_taxes = hasTaxes; invoice.has_taxes = hasTaxes;