shareneus 1.6.18 → 1.6.20

package/dist/sales-receive/sales-total-calculation.js

@@ -11,6 +11,86 @@ const util_1 = require("../shared/util");
 function safeArray(arr) {
     return Array.isArray(arr) ? arr : [];
 }
+function getLineNetAmount(line) {
+    return (0, math_operations_1.Subtract)((0, util_1.GetNumber)(line.UnAmt || line.Amt), (0, math_operations_1.Add)((0, util_1.GetNumber)(line.Disc), (0, util_1.GetNumber)(line.RecDisc)));
+}
+function getTaxCodeById(taxCodes, taxCodeId) {
+    const normalizedTaxCodeId = Number(taxCodeId);
+    if (!normalizedTaxCodeId) {
+        return null;
+    }
+    return taxCodes.find((taxCode) => Number(taxCode._id) === normalizedTaxCodeId) || null;
+}
+function getTaxComponentRate(taxCode, code) {
+    const component = safeArray(taxCode === null || taxCode === void 0 ? void 0 : taxCode.Components).find((item) => (item === null || item === void 0 ? void 0 : item.Code) === code);
+    if (component) {
+        return (0, util_1.GetNumber)(component.Rate);
+    }
+    return (0, util_1.GetNumber)(taxCode === null || taxCode === void 0 ? void 0 : taxCode[code]);
+}
+function buildTaxesFromFlatFields(line, taxCode, netAmount) {
+    const flatTaxes = [
+        { Code: "CGST", Amt: (0, util_1.GetNumber)(line.CGST) },
+        { Code: "SGST", Amt: (0, util_1.GetNumber)(line.SGST) },
+        { Code: "IGST", Amt: (0, util_1.GetNumber)(line.IGST) }
+    ];
+    return flatTaxes
+        .filter((tax) => tax.Amt > 0)
+        .map((tax) => ({
+        Code: tax.Code,
+        Amt: tax.Amt,
+        Rate: getTaxComponentRate(taxCode, tax.Code) || (netAmount > 0 ? (0, math_operations_1.Multiply)((0, math_operations_1.Divide)(tax.Amt, netAmount), 100) : 0),
+        TaxCodeId: (0, util_1.GetNumber)(line.TCode) || (0, util_1.GetNumber)(taxCode === null || taxCode === void 0 ? void 0 : taxCode._id)
+    }));
+}
+function buildTaxesFromTaxCode(line, taxCode, netAmount) {
+    if (!taxCode) {
+        return [];
+    }
+    const taxComponents = safeArray(taxCode.Components);
+    if (taxComponents.length > 0) {
+        return taxComponents
+            .filter((component) => ["CGST", "SGST", "IGST"].includes(component === null || component === void 0 ? void 0 : component.Code))
+            .map((component) => ({
+            Code: component.Code,
+            Amt: (0, math_operations_1.Multiply)(netAmount, (0, math_operations_1.Divide)((0, util_1.GetNumber)(component.Rate), 100)),
+            Rate: (0, util_1.GetNumber)(component.Rate),
+            TaxCodeId: (0, util_1.GetNumber)(taxCode._id)
+        }))
+            .filter((tax) => tax.Amt > 0);
+    }
+    const legacyTaxes = [
+        { Code: "CGST", Rate: (0, util_1.GetNumber)(taxCode.CGST) },
+        { Code: "SGST", Rate: (0, util_1.GetNumber)(taxCode.SGST) },
+        { Code: "IGST", Rate: (0, util_1.GetNumber)(taxCode.IGST) }
+    ];
+    return legacyTaxes
+        .filter((tax) => tax.Rate > 0)
+        .map((tax) => ({
+        Code: tax.Code,
+        Amt: (0, math_operations_1.Multiply)(netAmount, (0, math_operations_1.Divide)(tax.Rate, 100)),
+        Rate: tax.Rate,
+        TaxCodeId: (0, util_1.GetNumber)(taxCode._id)
+    }));
+}
+function getResolvedTaxes(line, taxCodes = []) {
+    const lineTaxes = safeArray(line === null || line === void 0 ? void 0 : line.Taxes);
+    if (lineTaxes.length > 0) {
+        return lineTaxes.map((tax) => (Object.assign(Object.assign({}, tax), { Code: tax === null || tax === void 0 ? void 0 : tax.Code, Amt: (0, util_1.GetNumber)(tax === null || tax === void 0 ? void 0 : tax.Amt), Rate: (0, util_1.GetNumber)(tax === null || tax === void 0 ? void 0 : tax.Rate), TaxCodeId: (0, util_1.GetNumber)(tax === null || tax === void 0 ? void 0 : tax.TaxCodeId) }))).filter((tax) => !!tax.Code);
+    }
+    const netAmount = getLineNetAmount(line);
+    const taxCode = getTaxCodeById(taxCodes, line === null || line === void 0 ? void 0 : line.TCode);
+    const taxesFromFlatFields = buildTaxesFromFlatFields(line, taxCode, netAmount);
+    if (taxesFromFlatFields.length > 0) {
+        return taxesFromFlatFields;
+    }
+    return buildTaxesFromTaxCode(line, taxCode, netAmount);
+}
+function getTaxAmountByCode(taxes, code) {
+    return taxes
+        .filter((tax) => tax.Code === code)
+        .reduce((sum, tax) => (0, math_operations_1.Add)(sum, (0, util_1.GetNumber)(tax.Amt)), 0);
+}
 function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCodes = [], Adjust = 0) {
     // Handle null/undefined arrays
     const safeItems = safeArray(items);
@@ -60,9 +140,10 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
             // Add to return subtotal (net amount after discounts)
             returnSubtotal = (0, math_operations_1.Add)(returnSubtotal, itemUnAmt);
             if (isTaxable) {
-                const itemSGST = (0, util_1.GetNumber)(item.SGST);
-                const itemCGST = (0, util_1.GetNumber)(item.CGST);
-                const itemIGST = (0, util_1.GetNumber)(item.IGST);
+                const resolvedItemTaxes = getResolvedTaxes(item, safeTaxCodes);
+                const itemSGST = getTaxAmountByCode(resolvedItemTaxes, "SGST");
+                const itemCGST = getTaxAmountByCode(resolvedItemTaxes, "CGST");
+                const itemIGST = getTaxAmountByCode(resolvedItemTaxes, "IGST");
                 const itemTotalTax = (0, math_operations_1.Add)(itemSGST, itemCGST, itemIGST);
                 // Add to return tax
                 returnTax = (0, math_operations_1.Add)(returnTax, itemTotalTax);
@@ -80,9 +161,10 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
             subtotalOnItems = (0, math_operations_1.Add)(subtotalOnItems, itemUnAmt);
             // Only calculate tax if taxable
             if (isTaxable) {
-                const itemSGST = (0, util_1.GetNumber)(item.SGST);
-                const itemCGST = (0, util_1.GetNumber)(item.CGST);
-                const itemIGST = (0, util_1.GetNumber)(item.IGST);
+                const resolvedItemTaxes = getResolvedTaxes(item, safeTaxCodes);
+                const itemSGST = getTaxAmountByCode(resolvedItemTaxes, "SGST");
+                const itemCGST = getTaxAmountByCode(resolvedItemTaxes, "CGST");
+                const itemIGST = getTaxAmountByCode(resolvedItemTaxes, "IGST");
                 // Add individual tax amounts for items
                 totalSGSTOnItems = (0, math_operations_1.Add)(totalSGSTOnItems, itemSGST);
                 totalCGSTOnItems = (0, math_operations_1.Add)(totalCGSTOnItems, itemCGST);
@@ -100,9 +182,10 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
         subtotalOnLabor = (0, math_operations_1.Add)(subtotalOnLabor, opAmt);
         // Only calculate tax if taxable
         if (isTaxable) {
-            const opSGST = (0, util_1.GetNumber)(op.SGST);
-            const opCGST = (0, util_1.GetNumber)(op.CGST);
-            const opIGST = (0, util_1.GetNumber)(op.IGST);
+            const resolvedOpTaxes = getResolvedTaxes(op, safeTaxCodes);
+            const opSGST = getTaxAmountByCode(resolvedOpTaxes, "SGST");
+            const opCGST = getTaxAmountByCode(resolvedOpTaxes, "CGST");
+            const opIGST = getTaxAmountByCode(resolvedOpTaxes, "IGST");
             // Add individual tax amounts for operations/labor
             totalSGSTOnLabor = (0, math_operations_1.Add)(totalSGSTOnLabor, opSGST);
             totalCGSTOnLabor = (0, math_operations_1.Add)(totalCGSTOnLabor, opCGST);
@@ -180,11 +263,11 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
         result.totalSGSTOnLabor = totalSGSTOnLabor;
         result.totalCGSTOnLabor = totalCGSTOnLabor;
         result.totalIGSTOnLabor = totalIGSTOnLabor;
-        // Calculate tax summary only if taxable and taxCodes provided
+        // Calculate tax summary for both new Taxes[] and legacy tax-code based records
         // Filter out items where Ret is true (only include non-return items)
         const nonReturnItems = safeItems.filter((item) => item.Ret !== true);
-        result.itemsTaxSummary = safeTaxCodes.length > 0 ? CalculateTaxSummary(nonReturnItems, safeTaxCodes) : [];
-        result.opsTaxSummary = safeTaxCodes.length > 0 ? CalculateTaxSummary(safeOps, safeTaxCodes) : [];
+        result.itemsTaxSummary = CalculateTaxSummary(nonReturnItems, safeTaxCodes);
+        result.opsTaxSummary = CalculateTaxSummary(safeOps, safeTaxCodes);
     }
     return result;
 }
@@ -242,15 +325,16 @@ function SalesTotalCalculationsWithDecimals(items = [], ops = [], isTaxable = fa
     return roundedResult;
 }
 function CalculateTaxSummary(items, taxCodes) {
-    // Create lookup for tax codes
-    const taxMap = Object.fromEntries(taxCodes.map(tc => [tc._id, tc]));
     return Object.values(items.reduce((acc, item) => {
-        const tax = taxMap[item.TCode];
-        if (!tax)
+        const taxes = getResolvedTaxes(item, taxCodes);
+        if (taxes.length === 0)
             return acc;
-        const percent = (((tax.IGST || 0) + (tax.CGST || 0) + (tax.SGST || 0)) + "%");
-        // taxable value after discounts
-        const taxable = (0, math_operations_1.Subtract)((0, util_1.GetNumber)(item.UnAmt || item.Amt), (0, math_operations_1.Add)((0, util_1.GetNumber)(item.Disc), (0, util_1.GetNumber)(item.RecDisc)));
+        const percent = (taxes.reduce((sum, tax) => (0, math_operations_1.Add)(sum, (0, util_1.GetNumber)(tax.Rate)), 0) + "%");
+        const taxable = getLineNetAmount(item);
+        const cgstAmount = getTaxAmountByCode(taxes, "CGST");
+        const sgstAmount = getTaxAmountByCode(taxes, "SGST");
+        const igstAmount = getTaxAmountByCode(taxes, "IGST");
+        const totalTaxAmount = (0, math_operations_1.Add)(cgstAmount, sgstAmount, igstAmount);
         if (!acc[percent]) {
             acc[percent] = {
                 Tax: percent,
@@ -262,10 +346,10 @@ function CalculateTaxSummary(items, taxCodes) {
             };
         }
         acc[percent].TaxableAmount = (0, math_operations_1.Add)(acc[percent].TaxableAmount, taxable);
-        acc[percent].TaxAmount = (0, math_operations_1.Add)(acc[percent].TaxAmount, (0, math_operations_1.Add)((0, math_operations_1.Divide)((0, math_operations_1.Multiply)(taxable, (0, util_1.GetNumber)(tax.CGST)), 100), (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(taxable, (0, util_1.GetNumber)(tax.SGST)), 100), (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(taxable, (0, util_1.GetNumber)(tax.IGST)), 100)));
-        acc[percent].CGSTAmount = (0, math_operations_1.Add)(acc[percent].CGSTAmount, (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(taxable, (0, util_1.GetNumber)(tax.CGST)), 100));
-        acc[percent].SGSTAmount = (0, math_operations_1.Add)(acc[percent].SGSTAmount, (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(taxable, (0, util_1.GetNumber)(tax.SGST)), 100));
-        acc[percent].IGSTAmount = (0, math_operations_1.Add)(acc[percent].IGSTAmount, (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(taxable, (0, util_1.GetNumber)(tax.IGST)), 100));
+        acc[percent].TaxAmount = (0, math_operations_1.Add)(acc[percent].TaxAmount, totalTaxAmount);
+        acc[percent].CGSTAmount = (0, math_operations_1.Add)(acc[percent].CGSTAmount, cgstAmount);
+        acc[percent].SGSTAmount = (0, math_operations_1.Add)(acc[percent].SGSTAmount, sgstAmount);
+        acc[percent].IGSTAmount = (0, math_operations_1.Add)(acc[percent].IGSTAmount, igstAmount);
         return acc;
     }, {}));
 }

package/dist/tax/index.d.ts

@@ -4,6 +4,6 @@
  * This is the entry point for all tax-related functionality.
  * Import from "shareneus/tax" in both UI and API code.
  */
-export type { TaxComponentType, CalcMethod, AppliedOn, RoundingMethod, TaxCategory, SupplyType, ResolvedSupplyType, WithholdingType, ResolverType, IRegimeComponent, IRegimeFeatures, IRounding, ITreatment, ITaxRegime, ITaxCodeComponent, ITaxCode, ITaxComponent, ITaxSummaryLine, ITaxSummary, IWithholding, IWithholdingCalcInput, IComponentOverride, ITaxCalcLineInput, ITaxSummaryInput, IRoundingConfig, IDocumentTotalsInput, IDocumentTotals, ITaxIdLabel, ITaxIdEntry, ITaxExemption, ITaxAuthority, IExternalProvider, } from "./tax.types";
+export type { TaxComponentType, CalcMethod, AppliedOn, RoundingMethod, TaxCategory, SupplyType, ResolvedSupplyType, WithholdingType, ResolverType, IRegimeComponent, IRegimeFeatures, IRounding, ITreatment, ITaxRegime, ITaxCodeComponent, ITaxCode, ITaxComponent, ITaxSummaryLine, ITaxSummary, IWithholding, IWithholdingCalcInput, ILineAmountFields, IComponentOverride, ITaxCalcLineInput, ITaxSummaryInput, IRoundingConfig, IDocumentTotalsInput, IDocumentTotals, ITaxIdLabel, ITaxIdEntry, ITaxExemption, ITaxAuthority, IExternalProvider, } from "./tax.types";
 export type { IInclusiveResult } from "./tax-calculator";
-export { CalculateLineTax, ExtractNetFromInclusive, SumTaxComponents, ComputeTaxSummary, ComputeDocumentTotals, DetermineSupplyType, FindTaxCodeByRateAndSupplyType, CalculateWithholding, RoundAmount, ValidateTaxId, ValidateHSNSACLength, ConvertFlatToTaxes, GetDefaultTaxIdLabels, GetPrintableTaxIds, } from "./tax-calculator";
+export { CalculateNetAmt, CalculateLineTax, ExtractNetFromInclusive, SumTaxComponents, ComputeTaxSummary, ComputeDocumentTotals, DetermineSupplyType, FindTaxCodeByRateAndSupplyType, CalculateWithholding, RoundAmount, ValidateTaxId, ValidateHSNSACLength, ConvertFlatToTaxes, GetDefaultTaxIdLabels, GetPrintableTaxIds, } from "./tax-calculator";

package/dist/tax/index.js

@@ -6,8 +6,9 @@
  * Import from "shareneus/tax" in both UI and API code.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetPrintableTaxIds = exports.GetDefaultTaxIdLabels = exports.ConvertFlatToTaxes = exports.ValidateHSNSACLength = exports.ValidateTaxId = exports.RoundAmount = exports.CalculateWithholding = exports.FindTaxCodeByRateAndSupplyType = exports.DetermineSupplyType = exports.ComputeDocumentTotals = exports.ComputeTaxSummary = exports.SumTaxComponents = exports.ExtractNetFromInclusive = exports.CalculateLineTax = void 0;
+exports.GetPrintableTaxIds = exports.GetDefaultTaxIdLabels = exports.ConvertFlatToTaxes = exports.ValidateHSNSACLength = exports.ValidateTaxId = exports.RoundAmount = exports.CalculateWithholding = exports.FindTaxCodeByRateAndSupplyType = exports.DetermineSupplyType = exports.ComputeDocumentTotals = exports.ComputeTaxSummary = exports.SumTaxComponents = exports.ExtractNetFromInclusive = exports.CalculateLineTax = exports.CalculateNetAmt = void 0;
 var tax_calculator_1 = require("./tax-calculator");
+Object.defineProperty(exports, "CalculateNetAmt", { enumerable: true, get: function () { return tax_calculator_1.CalculateNetAmt; } });
 Object.defineProperty(exports, "CalculateLineTax", { enumerable: true, get: function () { return tax_calculator_1.CalculateLineTax; } });
 Object.defineProperty(exports, "ExtractNetFromInclusive", { enumerable: true, get: function () { return tax_calculator_1.ExtractNetFromInclusive; } });
 Object.defineProperty(exports, "SumTaxComponents", { enumerable: true, get: function () { return tax_calculator_1.SumTaxComponents; } });

package/dist/tax/tax-calculator.d.ts

@@ -14,36 +14,58 @@
  * IMPORTANT: All monetary calculations use Big.js to avoid floating-point
  * precision issues. Never use plain JS arithmetic (* / + -) for money.
  */
-import { ITaxCode, ITaxComponent, ITaxSummary, ITaxCalcLineInput, ITaxSummaryInput, IRoundingConfig, IDocumentTotalsInput, IDocumentTotals, ResolvedSupplyType, IWithholding, IWithholdingCalcInput, ITaxIdLabel, ITaxIdEntry } from "./tax.types";
+import { ITaxCode, ITaxComponent, ITaxSummary, ILineAmountFields, ITaxCalcLineInput, ITaxSummaryInput, IRoundingConfig, IDocumentTotalsInput, IDocumentTotals, ResolvedSupplyType, IWithholding, IWithholdingCalcInput, ITaxIdLabel, ITaxIdEntry } from "./tax.types";
+/**
+ * Computes the net taxable amount from line item fields.
+ *
+ * Formula: NetAmt = (Qty × UnitPrice) - Disc - RecDisc
+ *
+ * Generic across both goods and services:
+ *   For Items (goods): pass UnitPrice = item.UnPr
+ *   For Ops (services): pass UnitPrice = op.Pr
+ *
+ * @param input - Line amount fields: Qty, UnitPrice, Disc, RecDisc
+ * @returns The net taxable amount
+ *
+ * @example
+ * // Item: 10 units × Rs 500, line discount Rs 200, record discount Rs 100
+ * CalculateNetAmt({ Qty: 10, UnitPrice: 500, Disc: 200, RecDisc: 100 });
+ * // Returns: 4700 (5000 - 200 - 100)
+ *
+ * @example
+ * // Op: 2 hours × Rs 1500, no discounts
+ * CalculateNetAmt({ Qty: 2, UnitPrice: 1500 });
+ * // Returns: 3000
+ */
+export declare function CalculateNetAmt(input: ILineAmountFields): number;
 /**
  * Calculates tax for a single line item based on the provided TaxCode.
  *
  * This is the MAIN function used by the UI when a user selects a tax code
  * and the system needs to compute CGST, SGST, IGST, Cess, etc.
  *
- * @param input - Line item context (NetAmt, Qty, TaxCode, RCM flag)
+ * @param input - Line item context (Qty, UnitPrice, Disc, RecDisc, TaxCode, RCM flag)
  * @param rounding - Rounding configuration (from TaxRegime.Rounding)
  * @returns Array of ITaxComponent — one entry per tax component
  *
  * @example
- * // India GST 18% Intra-State on Rs 5,000 item
+ * // India GST 18% Intra-State: 10 units × Rs 500
  * const result = CalculateLineTax({
- *     NetAmt: 5000,
+ *     Qty: 10, UnitPrice: 500,
  *     TaxCode: gst18IntraTaxCode,
  * });
- * // Returns: [
+ * // NetAmt = 5000, Returns: [
  * //   { Code: "CGST", Rate: 9, Amt: 450, TaxCodeId: 106 },
  * //   { Code: "SGST", Rate: 9, Amt: 450, TaxCodeId: 106 },
  * // ]
  *
  * @example
- * // India GST 28% + Specific Cess (Rs 12/liter) on 100 liters
+ * // India GST 28% + Specific Cess (Rs 12/liter) on 100 liters × Rs 100
  * const result = CalculateLineTax({
- *     NetAmt: 10000,
- *     Qty: 100,
+ *     Qty: 100, UnitPrice: 100,
  *     TaxCode: gst28CessDrinkTaxCode,
  * });
- * // Returns: [
+ * // NetAmt = 10000, Returns: [
  * //   { Code: "CGST", Rate: 14, Amt: 1400, TaxCodeId: 201 },
  * //   { Code: "SGST", Rate: 14, Amt: 1400, TaxCodeId: 201 },
  * //   { Code: "CESS", Rate: 0,  Amt: 1200, TaxCodeId: 201 },
@@ -103,7 +125,7 @@ export declare function SumTaxComponents(taxes: ITaxComponent[] | undefined | nu
  * Computes the document-level TaxSummary by aggregating all line items' Taxes[].
  *
  * This is a PURE FUNCTION — it does not read from database.
- * Caller must derive NetAmt from line item fields and pass it in.
+ * Computes NetAmt per line internally from Qty/UnitPrice/Disc/RecDisc.
  *
  * Groups tax amounts by Code+Rate (e.g., CGST@9 and CGST@14 are separate buckets).
  * TaxableAmt per bucket = sum of line NetAmt for lines that have that Code+Rate.
@@ -113,14 +135,14 @@ export declare function SumTaxComponents(taxes: ITaxComponent[] | undefined | nu
  *   - TaxComponentTotal ON: each bucket's Amt is rounded to Precision
  *   - Otherwise: Amts are at currency precision (from CalculateLineTax)
  *
- * @param input - All line items with Taxes[] and NetAmt, plus regime code and optional rounding
+ * @param input - All line items with Qty/UnitPrice/Disc/RecDisc and Taxes[], plus regime code and optional rounding
  * @returns ITaxSummary — the aggregated summary (stored on the document)
  *
  * @example
  * const summary = ComputeTaxSummary({
  *     Lines: invoice.Items.map(item => ({
+ *         Qty: item.Qty, UnitPrice: item.UnPr, Disc: item.Disc, RecDisc: item.RecDisc,
  *         Taxes: item.Taxes,
- *         NetAmt: item.UnAmt - item.Disc - item.RecDisc,
  *     })),
  *     RegimeCode: "IN_GST",
  *     Rounding: { Method: "Round", Precision: 0, TaxComponentTotal: true },
@@ -155,17 +177,19 @@ export declare function ComputeTaxSummary(input: ITaxSummaryInput): ITaxSummary;
  * The caller applies those after this function returns:
  *   FinalPayable = Total + Adjust - Withholding.Amt
  *
- * @param input - Line items with NetAmt and Taxes[], plus RoundingConfig
+ * @param input - Line items with Qty/UnitPrice/Disc/RecDisc and Taxes[], plus RoundingConfig
  * @returns IDocumentTotals — all stored financial fields
  *
  * @example
  * // India GST invoice with 2 lines
  * const totals = ComputeDocumentTotals({
  *     Lines: [
- *         { NetAmt: 5000, Taxes: [{ Code: "CGST", Rate: 9, Amt: 450, TaxCodeId: 1 },
- *                                  { Code: "SGST", Rate: 9, Amt: 450, TaxCodeId: 1 }] },
- *         { NetAmt: 3000, Taxes: [{ Code: "CGST", Rate: 9, Amt: 270, TaxCodeId: 1 },
- *                                  { Code: "SGST", Rate: 9, Amt: 270, TaxCodeId: 1 }] },
+ *         { Qty: 10, UnitPrice: 500,
+ *           Taxes: [{ Code: "CGST", Rate: 9, Amt: 450, TaxCodeId: 1 },
+ *                    { Code: "SGST", Rate: 9, Amt: 450, TaxCodeId: 1 }] },
+ *         { Qty: 6, UnitPrice: 500,
+ *           Taxes: [{ Code: "CGST", Rate: 9, Amt: 270, TaxCodeId: 1 },
+ *                    { Code: "SGST", Rate: 9, Amt: 270, TaxCodeId: 1 }] },
  *     ],
  *     Rounding: { Method: "Round", Precision: 0, TaxComponentTotal: true, DocTotal: true },
  *     RegimeCode: "IN_GST",

package/dist/tax/tax-calculator.js

@@ -19,6 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.CalculateNetAmt = CalculateNetAmt;
 exports.CalculateLineTax = CalculateLineTax;
 exports.ExtractNetFromInclusive = ExtractNetFromInclusive;
 exports.SumTaxComponents = SumTaxComponents;
@@ -37,6 +38,42 @@ const big_js_1 = __importDefault(require("big.js"));
 const util_1 = require("../shared/util");
 const math_operations_1 = require("../shared/math-operations");
 // ============================================================
+// Net Amount Calculation
+// ============================================================
+/**
+ * Computes the net taxable amount from line item fields.
+ *
+ * Formula: NetAmt = (Qty × UnitPrice) - Disc - RecDisc
+ *
+ * Generic across both goods and services:
+ *   For Items (goods): pass UnitPrice = item.UnPr
+ *   For Ops (services): pass UnitPrice = op.Pr
+ *
+ * @param input - Line amount fields: Qty, UnitPrice, Disc, RecDisc
+ * @returns The net taxable amount
+ *
+ * @example
+ * // Item: 10 units × Rs 500, line discount Rs 200, record discount Rs 100
+ * CalculateNetAmt({ Qty: 10, UnitPrice: 500, Disc: 200, RecDisc: 100 });
+ * // Returns: 4700 (5000 - 200 - 100)
+ *
+ * @example
+ * // Op: 2 hours × Rs 1500, no discounts
+ * CalculateNetAmt({ Qty: 2, UnitPrice: 1500 });
+ * // Returns: 3000
+ */
+function CalculateNetAmt(input) {
+    const grossAmt = (0, math_operations_1.Multiply)((0, util_1.GetNumber)(input.Qty), (0, util_1.GetNumber)(input.UnitPrice));
+    let netAmt = grossAmt;
+    if (input.Disc) {
+        netAmt = (0, math_operations_1.Subtract)(netAmt, (0, util_1.GetNumber)(input.Disc));
+    }
+    if (input.RecDisc) {
+        netAmt = (0, math_operations_1.Subtract)(netAmt, (0, util_1.GetNumber)(input.RecDisc));
+    }
+    return netAmt;
+}
+// ============================================================
 // Core Tax Calculation
 // ============================================================
 /**
@@ -45,29 +82,28 @@ const math_operations_1 = require("../shared/math-operations");
  * This is the MAIN function used by the UI when a user selects a tax code
  * and the system needs to compute CGST, SGST, IGST, Cess, etc.
  *
- * @param input - Line item context (NetAmt, Qty, TaxCode, RCM flag)
+ * @param input - Line item context (Qty, UnitPrice, Disc, RecDisc, TaxCode, RCM flag)
  * @param rounding - Rounding configuration (from TaxRegime.Rounding)
  * @returns Array of ITaxComponent — one entry per tax component
  *
  * @example
- * // India GST 18% Intra-State on Rs 5,000 item
+ * // India GST 18% Intra-State: 10 units × Rs 500
  * const result = CalculateLineTax({
- *     NetAmt: 5000,
+ *     Qty: 10, UnitPrice: 500,
  *     TaxCode: gst18IntraTaxCode,
  * });
- * // Returns: [
+ * // NetAmt = 5000, Returns: [
  * //   { Code: "CGST", Rate: 9, Amt: 450, TaxCodeId: 106 },
  * //   { Code: "SGST", Rate: 9, Amt: 450, TaxCodeId: 106 },
  * // ]
  *
  * @example
- * // India GST 28% + Specific Cess (Rs 12/liter) on 100 liters
+ * // India GST 28% + Specific Cess (Rs 12/liter) on 100 liters × Rs 100
  * const result = CalculateLineTax({
- *     NetAmt: 10000,
- *     Qty: 100,
+ *     Qty: 100, UnitPrice: 100,
  *     TaxCode: gst28CessDrinkTaxCode,
  * });
- * // Returns: [
+ * // NetAmt = 10000, Returns: [
  * //   { Code: "CGST", Rate: 14, Amt: 1400, TaxCodeId: 201 },
  * //   { Code: "SGST", Rate: 14, Amt: 1400, TaxCodeId: 201 },
  * //   { Code: "CESS", Rate: 0,  Amt: 1200, TaxCodeId: 201 },
@@ -75,7 +111,7 @@ const math_operations_1 = require("../shared/math-operations");
  */
 function CalculateLineTax(input, rounding = { Method: "Round", Precision: 2 }) {
     const { TaxCode, RCM, ComponentOverrides } = input;
-    const netAmt = (0, util_1.GetNumber)(input.NetAmt);
+    const netAmt = CalculateNetAmt(input);
     const qty = (0, util_1.GetNumber)(input.Qty, 1);
     // Exempt / Nil / NonTaxable — no components
     if (!TaxCode.Components || TaxCode.Components.length === 0) {
@@ -300,7 +336,7 @@ function SumTaxComponents(taxes) {
  * Computes the document-level TaxSummary by aggregating all line items' Taxes[].
  *
  * This is a PURE FUNCTION — it does not read from database.
- * Caller must derive NetAmt from line item fields and pass it in.
+ * Computes NetAmt per line internally from Qty/UnitPrice/Disc/RecDisc.
  *
  * Groups tax amounts by Code+Rate (e.g., CGST@9 and CGST@14 are separate buckets).
  * TaxableAmt per bucket = sum of line NetAmt for lines that have that Code+Rate.
@@ -310,14 +346,14 @@ function SumTaxComponents(taxes) {
  *   - TaxComponentTotal ON: each bucket's Amt is rounded to Precision
  *   - Otherwise: Amts are at currency precision (from CalculateLineTax)
  *
- * @param input - All line items with Taxes[] and NetAmt, plus regime code and optional rounding
+ * @param input - All line items with Qty/UnitPrice/Disc/RecDisc and Taxes[], plus regime code and optional rounding
  * @returns ITaxSummary — the aggregated summary (stored on the document)
  *
  * @example
  * const summary = ComputeTaxSummary({
  *     Lines: invoice.Items.map(item => ({
+ *         Qty: item.Qty, UnitPrice: item.UnPr, Disc: item.Disc, RecDisc: item.RecDisc,
  *         Taxes: item.Taxes,
- *         NetAmt: item.UnAmt - item.Disc - item.RecDisc,
  *     })),
  *     RegimeCode: "IN_GST",
  *     Rounding: { Method: "Round", Precision: 0, TaxComponentTotal: true },
@@ -340,7 +376,7 @@ function ComputeTaxSummary(input) {
     for (const line of Lines) {
         if (!line.Taxes || line.Taxes.length === 0)
             continue;
-        const lineNetAmt = (0, util_1.GetNumber)(line.NetAmt);
+        const lineNetAmt = CalculateNetAmt(line);
         // Track this line's taxable amount at document level (once per line, not per component)
         totalTaxable = (0, math_operations_1.Add)(totalTaxable, lineNetAmt);
         // Track which Code+Rate buckets we've already added this line's NetAmt to
@@ -411,17 +447,19 @@ function ComputeTaxSummary(input) {
  * The caller applies those after this function returns:
  *   FinalPayable = Total + Adjust - Withholding.Amt
  *
- * @param input - Line items with NetAmt and Taxes[], plus RoundingConfig
+ * @param input - Line items with Qty/UnitPrice/Disc/RecDisc and Taxes[], plus RoundingConfig
  * @returns IDocumentTotals — all stored financial fields
  *
  * @example
  * // India GST invoice with 2 lines
  * const totals = ComputeDocumentTotals({
  *     Lines: [
- *         { NetAmt: 5000, Taxes: [{ Code: "CGST", Rate: 9, Amt: 450, TaxCodeId: 1 },
- *                                  { Code: "SGST", Rate: 9, Amt: 450, TaxCodeId: 1 }] },
- *         { NetAmt: 3000, Taxes: [{ Code: "CGST", Rate: 9, Amt: 270, TaxCodeId: 1 },
- *                                  { Code: "SGST", Rate: 9, Amt: 270, TaxCodeId: 1 }] },
+ *         { Qty: 10, UnitPrice: 500,
+ *           Taxes: [{ Code: "CGST", Rate: 9, Amt: 450, TaxCodeId: 1 },
+ *                    { Code: "SGST", Rate: 9, Amt: 450, TaxCodeId: 1 }] },
+ *         { Qty: 6, UnitPrice: 500,
+ *           Taxes: [{ Code: "CGST", Rate: 9, Amt: 270, TaxCodeId: 1 },
+ *                    { Code: "SGST", Rate: 9, Amt: 270, TaxCodeId: 1 }] },
  *     ],
  *     Rounding: { Method: "Round", Precision: 0, TaxComponentTotal: true, DocTotal: true },
  *     RegimeCode: "IN_GST",
@@ -437,10 +475,10 @@ function ComputeTaxSummary(input) {
  */
 function ComputeDocumentTotals(input) {
     const { Lines, Rounding, RegimeCode } = input;
-    // 1. SubTotal = sum of line NetAmts
+    // 1. SubTotal = sum of line NetAmts (computed from Qty × UnitPrice - Disc - RecDisc)
     let subTotal = 0;
     for (const line of Lines) {
-        subTotal = (0, math_operations_1.Add)(subTotal, (0, util_1.GetNumber)(line.NetAmt));
+        subTotal = (0, math_operations_1.Add)(subTotal, CalculateNetAmt(line));
     }
     // 2. TaxSummary (handles TaxComponentTotal rounding internally)
     const taxSummary = ComputeTaxSummary({

package/dist/tax/tax.types.d.ts

@@ -235,12 +235,26 @@ export interface IComponentOverride {
     PerUnitAmt?: number;
     Unit?: string;
 }
+/**
+ * Base fields for computing taxable amount (NetAmt) from line item quantities and prices.
+ * NetAmt = (Qty × UnitPrice) - Disc - RecDisc
+ *
+ * Generic across both goods and services:
+ *   For Items (goods): UnitPrice maps to UnPr (unit price)
+ *   For Ops (services): UnitPrice maps to Pr (operation rate)
+ */
+export interface ILineAmountFields {
+    /** Quantity */
+    Qty: number;
+    /** Unit price — Items: UnPr, Ops: Pr */
+    UnitPrice: number;
+    /** Line-level discount amount */
+    Disc?: number;
+    /** Record-level (document-level) discount allocated to this line */
+    RecDisc?: number;
+}
 /** Input context for calculating tax on a single line item */
-export interface ITaxCalcLineInput {
-    /** Net amount after discounts (taxable value) */
-    NetAmt: number;
-    /** Quantity — needed for PerUnit calculations (excise, specific cess) */
-    Qty?: number;
+export interface ITaxCalcLineInput extends ILineAmountFields {
     /** The TaxCode to apply */
     TaxCode: ITaxCode;
     /** Is this a reverse charge line? */
@@ -264,14 +278,12 @@ export interface ITaxCalcLineInput {
 /** Input context for computing document-level TaxSummary.
  *
  * Since TaxableAmt is NOT stored on TaxComponent (it's derivable from line item fields),
- * each line must provide its own NetAmt (taxable value) for summary computation.
- * This is a pure function — caller derives NetAmt from line item fields and passes it in.
+ * each line provides Qty/UnitPrice/Disc/RecDisc and shareneus computes NetAmt internally.
  */
 export interface ITaxSummaryInput {
-    /** All line items with their calculated Taxes[] arrays and taxable value */
-    Lines: Array<{
+    /** All line items with amount fields and calculated Taxes[] arrays */
+    Lines: Array<ILineAmountFields & {
         Taxes?: ITaxComponent[];
-        NetAmt: number;
     }>;
     /** Tax regime code for the snapshot */
     RegimeCode?: string;
@@ -303,9 +315,8 @@ export interface IRoundingConfig {
 }
 /** Input for computing all document-level totals in one call */
 export interface IDocumentTotalsInput {
-    /** All line items — caller derives NetAmt from line item fields (UnAmt - Disc - RecDisc) */
-    Lines: Array<{
-        NetAmt: number;
+    /** All line items with amount fields (Qty, UnitPrice, Disc, RecDisc) and Taxes[] */
+    Lines: Array<ILineAmountFields & {
         Taxes?: ITaxComponent[];
     }>;
     /** Rounding configuration (from TaxRegime.Rounding or Entity Settings) */

package/package.json

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