shareneus 1.7.335 → 1.7.337

package/dist/accounting/invoice/invoice-total.service.js

@@ -55,7 +55,6 @@ class InvoiceTotalsService {
     }
     static CalculateLaborValues(opCodesList, IsIndependentTax) {
         opCodesList = this.ResetLaborValues(opCodesList, IsIndependentTax);
-        console.log('opCodesList', opCodesList);
         // opCodesList = this.GetOperationsDiscountPrice(opCodesList);
         // opCodesList = this.GetOperationsAfterDiscount(opCodesList,IsIndependentTax);
         // opCodesList = this.GetOperationsAfterTax(opCodesList, IsIndependentTax);

package/dist/transaction-calculations/discounts-distribution.js

@@ -78,7 +78,7 @@ function DiscountAndTaxCalculation(recordData, isTaxable, taxcodes = []) {
         labor.RecDisc = totalTransactionDiscount;
         const laborafterDiscPrice = (0, math_operations_1.Subtract)(labor.Amt, labor.Disc);
         const afterDisc = (0, math_operations_1.Subtract)(laborafterDiscPrice, totalTransactionDiscount);
-        labor.Taxes = recalculateTaxes(afterDisc, labor.TCode, taxcodes, labor.Taxes);
+        labor.Taxes = recalculateTaxes(afterDisc, labor.TCode, taxcodes, labor.Taxes, labor.Qty || 1);
         return labor;
     });
     // ---------- STEP 8: PROCESS INVENTORY ITEMS ----------
@@ -99,7 +99,7 @@ function DiscountAndTaxCalculation(recordData, isTaxable, taxcodes = []) {
         item.RecDisc = totalTransactionDiscount;
         const ItemafterDiscPrice = (0, math_operations_1.Subtract)(item.UnAmt, item.Disc);
         const afterDisc = (0, math_operations_1.Subtract)(ItemafterDiscPrice, totalTransactionDiscount);
-        item.Taxes = recalculateTaxes(afterDisc, item.TCode, taxcodes, item.Taxes);
+        item.Taxes = recalculateTaxes(afterDisc, item.TCode, taxcodes, item.Taxes, item.Qty);
         return item;
     });
     // ---------- STEP 9: FINALIZE ----------
@@ -107,18 +107,48 @@ function DiscountAndTaxCalculation(recordData, isTaxable, taxcodes = []) {
     recordData.Ops = [...finalServices, ...nonDiscountableOps];
     return recordData;
 }
-function recalculateTaxes(amount, taxCode, taxCodes = [], existingTaxes = []) {
+function recalculateTaxes(amount, taxCode, taxCodes = [], existingTaxes = [], qty = 1) {
     const normalizedTaxCode = tr_utils_1.TrUtils.IsNull(taxCode) ? null : Number(taxCode);
     const defaultRates = getDefaultTaxRates(taxCode, taxCodes);
+    const normalizedQty = toFiniteNumber(qty, 1);
     return (Array.isArray(existingTaxes) ? existingTaxes : []).map((tax) => {
+        var _a, _b;
         const code = tax === null || tax === void 0 ? void 0 : tax.Code;
         const rate = Number(tax === null || tax === void 0 ? void 0 : tax.Rate);
         const normalizedRate = Number.isFinite(rate) ? rate : (defaultRates[code] || 0);
-        return Object.assign(Object.assign({}, tax), { Rate: normalizedRate, Amt: (0, math_operations_1.Multiply)(amount, (0, math_operations_1.Divide)(normalizedRate, 100)), TaxCodeId: !tr_utils_1.TrUtils.IsNull(tax === null || tax === void 0 ? void 0 : tax.TaxCodeId)
+        const calcMethod = normalizeCalcMethod(tax === null || tax === void 0 ? void 0 : tax.CalcMethod);
+        return Object.assign(Object.assign({}, tax), { Rate: normalizedRate, Amt: calculateComponentTaxAmount(amount, normalizedRate, tax, normalizedQty), TaxCodeId: !tr_utils_1.TrUtils.IsNull(tax === null || tax === void 0 ? void 0 : tax.TaxCodeId)
                 ? Number(tax.TaxCodeId)
-                : normalizedTaxCode });
+                : normalizedTaxCode, PerUnitAmt: (tax === null || tax === void 0 ? void 0 : tax.PerUnitAmt) || undefined, CalcMethod: calcMethod, Unit: (_b = (_a = tax === null || tax === void 0 ? void 0 : tax.Unit) !== null && _a !== void 0 ? _a : tax === null || tax === void 0 ? void 0 : tax.Units) !== null && _b !== void 0 ? _b : undefined });
     });
 }
+function calculateComponentTaxAmount(amount, rate, tax, qty) {
+    const baseAmt = toFiniteNumber(amount);
+    const calcMethod = normalizeCalcMethod(tax === null || tax === void 0 ? void 0 : tax.CalcMethod);
+    const perUnitAmt = toFiniteNumber(tax === null || tax === void 0 ? void 0 : tax.PerUnitAmt);
+    const perUnitResult = (0, math_operations_1.Multiply)(perUnitAmt, qty);
+    const percentResult = (0, math_operations_1.Multiply)(baseAmt, (0, math_operations_1.Divide)(rate, 100));
+    switch (calcMethod) {
+        case 'PerUnit':
+            return perUnitResult;
+        case 'PerUnitPlusPercent':
+            return (0, math_operations_1.Add)(perUnitResult, percentResult);
+        case 'MaxOfPercentOrPerUnit':
+            return Math.max(perUnitResult, percentResult);
+        case 'Percent':
+        default:
+            return percentResult;
+    }
+}
+function normalizeCalcMethod(calcMethod) {
+    return calcMethod === 'Percentage' || tr_utils_1.TrUtils.IsNull(calcMethod)
+        ? 'Percent'
+        : calcMethod;
+}
+function toFiniteNumber(value, fallback = 0) {
+    const normalized = Number(value);
+    return Number.isFinite(normalized) ? normalized : fallback;
+}
 function getDefaultTaxRates(taxCode, taxCodes = []) {
     const normalizedTaxCode = tr_utils_1.TrUtils.IsNull(taxCode) ? null : taxCode;
     const taxCodeRow = Array.isArray(taxCodes)
@@ -139,6 +169,7 @@ function getDefaultTaxRates(taxCode, taxCodes = []) {
     let CGST = getComponentRate('CGST');
     let SGST = getComponentRate('SGST');
     let IGST = getComponentRate('IGST');
+    const CESS = getComponentRate('CESS');
     if (CGST === 0 && SGST === 0 && IGST === 0) {
         const gstRateSum = transaction_calculation_engine_1.TransactionCalculationEngine.getGSTRateSumByTaxCode(normalizedTaxCode, taxCodes);
         if (components.length === 1) {
@@ -149,7 +180,7 @@ function getDefaultTaxRates(taxCode, taxCodes = []) {
             SGST = gstRateSum / 2;
         }
     }
-    return { CGST, SGST, IGST };
+    return { CGST, SGST, IGST, CESS };
 }
 /**
 * Calculates the record-level discount amount (RecDisc) for a single line.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shareneus",
-  "version": "1.7.335",
+  "version": "1.7.337",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/accounting/invoice/invoice-total.service.ts

@@ -71,7 +71,7 @@ export class InvoiceTotalsService {
 
     static CalculateLaborValues(opCodesList: any, IsIndependentTax: boolean) {
         opCodesList = this.ResetLaborValues(opCodesList, IsIndependentTax);
-console.log('opCodesList', opCodesList);
+
         // opCodesList = this.GetOperationsDiscountPrice(opCodesList);
 
         // opCodesList = this.GetOperationsAfterDiscount(opCodesList,IsIndependentTax);

package/src/transaction-calculations/discounts-distribution.ts

@@ -101,7 +101,7 @@ export function DiscountAndTaxCalculation(recordData: any, isTaxable: boolean, t
         const laborafterDiscPrice = Subtract(labor.Amt, labor.Disc);
         const afterDisc = Subtract(laborafterDiscPrice, totalTransactionDiscount);
 
-        labor.Taxes = recalculateTaxes(afterDisc, labor.TCode, taxcodes, labor.Taxes);
+        labor.Taxes = recalculateTaxes(afterDisc, labor.TCode, taxcodes, labor.Taxes, labor.Qty || 1);
 
         return labor;
     });
@@ -134,7 +134,7 @@ export function DiscountAndTaxCalculation(recordData: any, isTaxable: boolean, t
         const ItemafterDiscPrice = Subtract(item.UnAmt, item.Disc);
         const afterDisc = Subtract(ItemafterDiscPrice, totalTransactionDiscount);
 
-        item.Taxes = recalculateTaxes(afterDisc, item.TCode, taxcodes, item.Taxes);
+        item.Taxes = recalculateTaxes(afterDisc, item.TCode, taxcodes, item.Taxes, item.Qty);
 
         return item;
     });
@@ -146,26 +146,62 @@ export function DiscountAndTaxCalculation(recordData: any, isTaxable: boolean, t
     return recordData;
 }
 
-function recalculateTaxes(amount: any, taxCode: any, taxCodes: any[] = [], existingTaxes: any[] = []): any[] {
+function recalculateTaxes(amount: any, taxCode: any, taxCodes: any[] = [], existingTaxes: any[] = [], qty: any = 1): any[] {
     const normalizedTaxCode = TrUtils.IsNull(taxCode) ? null : Number(taxCode);
     const defaultRates = getDefaultTaxRates(taxCode, taxCodes);
+    const normalizedQty = toFiniteNumber(qty, 1);
 
     return (Array.isArray(existingTaxes) ? existingTaxes : []).map((tax: any) => {
         const code = tax?.Code;
         const rate = Number(tax?.Rate);
         const normalizedRate = Number.isFinite(rate) ? rate : (defaultRates[code] || 0);
+        const calcMethod = normalizeCalcMethod(tax?.CalcMethod);
 
         return {
             ...tax,
             Rate: normalizedRate,
-            Amt: Multiply(amount, Divide(normalizedRate, 100)),
+            Amt: calculateComponentTaxAmount(amount, normalizedRate, tax, normalizedQty),
             TaxCodeId: !TrUtils.IsNull(tax?.TaxCodeId)
                 ? Number(tax.TaxCodeId)
-                : normalizedTaxCode
+                : normalizedTaxCode,
+            PerUnitAmt: tax?.PerUnitAmt || undefined,
+            CalcMethod: calcMethod,
+            Unit: tax?.Unit ?? tax?.Units ?? undefined,
         };
     });
 }
 
+function calculateComponentTaxAmount(amount: any, rate: number, tax: any, qty: number): number {
+    const baseAmt = toFiniteNumber(amount);
+    const calcMethod = normalizeCalcMethod(tax?.CalcMethod);
+    const perUnitAmt = toFiniteNumber(tax?.PerUnitAmt);
+    const perUnitResult = Multiply(perUnitAmt, qty);
+    const percentResult = Multiply(baseAmt, Divide(rate, 100));
+
+    switch (calcMethod) {
+        case 'PerUnit':
+            return perUnitResult;
+        case 'PerUnitPlusPercent':
+            return Add(perUnitResult, percentResult);
+        case 'MaxOfPercentOrPerUnit':
+            return Math.max(perUnitResult, percentResult);
+        case 'Percent':
+        default:
+            return percentResult;
+    }
+}
+
+function normalizeCalcMethod(calcMethod: any): string {
+    return calcMethod === 'Percentage' || TrUtils.IsNull(calcMethod)
+        ? 'Percent'
+        : calcMethod;
+}
+
+function toFiniteNumber(value: any, fallback = 0): number {
+    const normalized = Number(value);
+    return Number.isFinite(normalized) ? normalized : fallback;
+}
+
 function getDefaultTaxRates(taxCode: any, taxCodes: any[] = []): any {
     const normalizedTaxCode = TrUtils.IsNull(taxCode) ? null : taxCode;
     const taxCodeRow = Array.isArray(taxCodes)
@@ -187,6 +223,7 @@ function getDefaultTaxRates(taxCode: any, taxCodes: any[] = []): any {
     let CGST = getComponentRate('CGST');
     let SGST = getComponentRate('SGST');
     let IGST = getComponentRate('IGST');
+    const CESS = getComponentRate('CESS');
 
     if (CGST === 0 && SGST === 0 && IGST === 0) {
         const gstRateSum =
@@ -202,7 +239,7 @@ function getDefaultTaxRates(taxCode: any, taxCodes: any[] = []): any {
         }
     }
 
-    return { CGST, SGST, IGST };
+    return { CGST, SGST, IGST, CESS };
 }
 
 /**