From eaf72d1608506914804ac8ba3da7846966ddc99b Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Wed, 20 Sep 2023 19:25:37 +0200 Subject: [PATCH] fix(server): tax percentage calculation of tax sales liability summary report --- .../SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.ts b/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.ts index 375905639..7f9da7e7c 100644 --- a/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.ts +++ b/packages/server/src/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.ts @@ -55,8 +55,9 @@ export class SalesTaxLiabilitySummary extends FinancialSheet { const salesTaxAmount = salesTax ? salesTax.credit - salesTax.debit : 0; // Calculates the tax percentage. - const taxPercentage = salesTaxAmount / payableTaxAmount; - const taxPercentageRate = taxPercentage / 100; + const taxPercentage = R.compose( + R.unless(R.equals(0), R.divide(R.__, salesTaxAmount)) + )(payableTaxAmount); // Calculates the payable tax amount. const collectedTaxAmount = payableTax ? payableTax.debit : 0; @@ -66,7 +67,7 @@ export class SalesTaxLiabilitySummary extends FinancialSheet { taxName: `${taxRate.name} (${taxRate.rate}%)`, taxableAmount: this.getAmountMeta(salesTaxAmount), taxAmount: this.getAmountMeta(payableTaxAmount), - taxPercentage: this.getPercentageAmountMeta(taxPercentageRate), + taxPercentage: this.getPercentageTotalAmountMeta(taxPercentage), collectedTaxAmount: this.getAmountMeta(collectedTaxAmount), }; };