|
|
|
@ -578,8 +578,16 @@
|
|
|
|
|
this.dataForm.invoicesitem0List.forEach((model, i) => {
|
|
|
|
|
invoiceAmount = invoiceAmount + parseFloat(model.invoiceAmount);
|
|
|
|
|
if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){
|
|
|
|
|
model.amountNotTax = model.invoiceAmount * taxRateName / 100;
|
|
|
|
|
model.taxAmount = model.invoiceAmount - model.amountNotTax
|
|
|
|
|
this.taxRateOptions.forEach((model1, i) => {
|
|
|
|
|
if(e.taxRate == model1.id){
|
|
|
|
|
model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100)));
|
|
|
|
|
model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
// model.amountNotTax = model.invoiceAmount * taxRateName / 100;
|
|
|
|
|
// model.taxAmount = model.invoiceAmount - model.amountNotTax
|
|
|
|
|
// model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1, this.jnpf.floatDiv(taxRateName,100)));
|
|
|
|
|
// model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,taxRateName),100)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
this.dataForm.invoiceAmount = invoiceAmount
|
|
|
|
@ -593,8 +601,16 @@
|
|
|
|
|
})
|
|
|
|
|
this.dataForm.invoicesitem0List.forEach((model, i) => {
|
|
|
|
|
if(e.invoiceAmount == model.invoiceAmount && e.taxRate == model.taxRate){
|
|
|
|
|
model.amountNotTax = model.invoiceAmount * taxRateName / 100;
|
|
|
|
|
model.taxAmount = model.invoiceAmount - model.amountNotTax
|
|
|
|
|
this.taxRateOptions.forEach((model1, i) => {
|
|
|
|
|
if(e.taxRate == model1.id){
|
|
|
|
|
model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(model1.fullName,100)));
|
|
|
|
|
model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,model1.fullName),100)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
// model.amountNotTax = model.invoiceAmount * taxRateName / 100;
|
|
|
|
|
// model.taxAmount = model.invoiceAmount - model.amountNotTax
|
|
|
|
|
// model.amountNotTax = this.jnpf.floatDiv(model.invoiceAmount,this.jnpf.floatAdd(1,this.jnpf.floatDiv(taxRateName,100)));
|
|
|
|
|
// model.taxAmount = this.jnpf.floatDiv(this.jnpf.floatMul(model.invoiceAmount,taxRateName),100)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|