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

Fix tax columns with inclusive taxes

Browse Source
This commit is contained in:
Hillel Coren 2018-01-02 12:13:22 +02:00
parent 8c8ebf75c6
commit 39640418b5
3 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
public/built.js
View File

File diff suppressed because one or more lines are too long

2
public/built.js.map
View File

File diff suppressed because one or more lines are too long

8
resources/assets/js/script.js
View File

@ -666,7 +666,9 @@ function calculateAmounts(invoice) {
} }
} }
if (invoice.account.inclusive_taxes != '1') { if (! taxRate1) {
var taxAmount1 = 0;
} else if (invoice.account.inclusive_taxes != '1') {
var taxAmount1 = roundToTwo(lineTotal * taxRate1 / 100); var taxAmount1 = roundToTwo(lineTotal * taxRate1 / 100);
} else { } else {
var taxAmount1 = roundToTwo((lineTotal * 100) / (100 + (taxRate1 * 100))); var taxAmount1 = roundToTwo((lineTotal * 100) / (100 + (taxRate1 * 100)));
@ -681,7 +683,9 @@ function calculateAmounts(invoice) {
} }
} }
if (invoice.account.inclusive_taxes != '1') { if (! taxRate2) {
var taxAmount2 = 0;
} else if (invoice.account.inclusive_taxes != '1') {
var taxAmount2 = roundToTwo(lineTotal * taxRate2 / 100); var taxAmount2 = roundToTwo(lineTotal * taxRate2 / 100);
} else { } else {
var taxAmount2 = roundToTwo((lineTotal * 100) / (100 + (taxRate2 * 100))); var taxAmount2 = roundToTwo((lineTotal * 100) / (100 + (taxRate2 * 100)));