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

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);
} else {
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);
} else {
var taxAmount2 = roundToTwo((lineTotal * 100) / (100 + (taxRate2 * 100)));