shareneus 1.4.34 → 1.4.35

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

@@ -2,24 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvoiceTotalsService = void 0;
 const aggregation_1 = require("../aggregation/aggregation");
-const tr_utils_1 = require("../utils/tr-utils");
+const utils_1 = require("../shared/utils");
 class InvoiceTotalsService {
     static GetTotalsValue(opCodesList, PartsList, IsIndependentTax, DetailedInfo, LDisc, LPerc, PDisc, PPerc, Disc, Perc, TaxCodes, WithItems, Settings, Adjust, isRoundable) {
-        LPerc = tr_utils_1.TrUtils.SetPercToStringIfNull(LPerc);
-        PPerc = tr_utils_1.TrUtils.SetPercToStringIfNull(PPerc);
-        Perc = tr_utils_1.TrUtils.SetPercToStringIfNull(Perc);
-        LDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(LDisc);
-        PDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(PDisc);
-        Disc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Disc);
-        if (tr_utils_1.TrUtils.IsNull(opCodesList)) {
+        LPerc = utils_1.TrUtils.SetPercToStringIfNull(LPerc);
+        PPerc = utils_1.TrUtils.SetPercToStringIfNull(PPerc);
+        Perc = utils_1.TrUtils.SetPercToStringIfNull(Perc);
+        LDisc = utils_1.TrUtils.SetValueToZeroIfNull(LDisc);
+        PDisc = utils_1.TrUtils.SetValueToZeroIfNull(PDisc);
+        Disc = utils_1.TrUtils.SetValueToZeroIfNull(Disc);
+        if (utils_1.TrUtils.IsNull(opCodesList)) {
             opCodesList = [];
         }
-        if (tr_utils_1.TrUtils.IsNull(PartsList)) {
+        if (utils_1.TrUtils.IsNull(PartsList)) {
             PartsList = [];
         }
         opCodesList = this.CalculateLaborValues(opCodesList, IsIndependentTax);
         PartsList = this.CalculateLaborPartValues(PartsList, IsIndependentTax);
-        let finalTotalsData = this.GetFinalRODataForSave(opCodesList, PartsList, IsIndependentTax, LDisc, LPerc, PDisc, PPerc, Disc, Perc, DetailedInfo, Settings, tr_utils_1.TrUtils.SetValueToZeroIfNull(Adjust), isRoundable);
+        let finalTotalsData = this.GetFinalRODataForSave(opCodesList, PartsList, IsIndependentTax, LDisc, LPerc, PDisc, PPerc, Disc, Perc, DetailedInfo, Settings, utils_1.TrUtils.SetValueToZeroIfNull(Adjust), isRoundable);
         if (DetailedInfo) {
             finalTotalsData = this.GetDetailedTotalsData(finalTotalsData, IsIndependentTax, opCodesList, PartsList, TaxCodes);
         }
@@ -40,7 +40,7 @@ class InvoiceTotalsService {
         opCodesList.forEach((Operation) => {
             Operation = this.ResetLaborValueIfInvalid(Operation);
             Operation.DiscountedPrice = (0, aggregation_1.addition)(Operation.Disc, Operation.RecDisc);
-            if (tr_utils_1.TrUtils.IsNull(Operation.Amt)) {
+            if (utils_1.TrUtils.IsNull(Operation.Amt)) {
                 Operation.Amt = Operation.Pr;
             }
             if (IsIndependentTax) {
@@ -56,12 +56,12 @@ class InvoiceTotalsService {
         return opCodesList;
     }
     static ResetLaborValueIfInvalid(Operation) {
-        Operation.Pr = tr_utils_1.TrUtils.SetValueToZeroIfNull(Operation.Pr);
-        Operation.RecDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Operation.RecDisc);
-        Operation.Disc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Operation.Disc);
-        Operation.CGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Operation.CGST);
-        Operation.SGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Operation.SGST);
-        Operation.IGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Operation.IGST);
+        Operation.Pr = utils_1.TrUtils.SetValueToZeroIfNull(Operation.Pr);
+        Operation.RecDisc = utils_1.TrUtils.SetValueToZeroIfNull(Operation.RecDisc);
+        Operation.Disc = utils_1.TrUtils.SetValueToZeroIfNull(Operation.Disc);
+        Operation.CGST = utils_1.TrUtils.SetValueToZeroIfNull(Operation.CGST);
+        Operation.SGST = utils_1.TrUtils.SetValueToZeroIfNull(Operation.SGST);
+        Operation.IGST = utils_1.TrUtils.SetValueToZeroIfNull(Operation.IGST);
         return Operation;
     }
     static CalculateLaborPartValues(PartsList, IsIndependentTax) {
@@ -88,12 +88,12 @@ class InvoiceTotalsService {
         return PartsList;
     }
     static ResetLaborPartValueIfInvalid(Part) {
-        Part.UnPr = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.UnPr);
-        Part.Disc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.Disc);
-        Part.RecDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.RecDisc);
-        Part.CGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.CGST);
-        Part.SGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.SGST);
-        Part.IGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.IGST);
+        Part.UnPr = utils_1.TrUtils.SetValueToZeroIfNull(Part.UnPr);
+        Part.Disc = utils_1.TrUtils.SetValueToZeroIfNull(Part.Disc);
+        Part.RecDisc = utils_1.TrUtils.SetValueToZeroIfNull(Part.RecDisc);
+        Part.CGST = utils_1.TrUtils.SetValueToZeroIfNull(Part.CGST);
+        Part.SGST = utils_1.TrUtils.SetValueToZeroIfNull(Part.SGST);
+        Part.IGST = utils_1.TrUtils.SetValueToZeroIfNull(Part.IGST);
         return Part;
     }
     static GetFinalRODataForSave(LaborList, PartsList, IsIndependentTax, LDisc, LPerc, PDisc, PPerc, Disc, Perc, DetailedInfo, Settings, Adjust, isRoundable) {
@@ -129,7 +129,7 @@ class InvoiceTotalsService {
     static GetLaborTotalAfterDiscount1(OperationsList) {
         let AfterIndvidualDisc = 0;
         OperationsList.forEach((Operation) => {
-            if (tr_utils_1.TrUtils.IsNull(Operation.Amt)) {
+            if (utils_1.TrUtils.IsNull(Operation.Amt)) {
                 Operation.Amt = Operation.Pr;
             }
             AfterIndvidualDisc = (0, aggregation_1.addition)(AfterIndvidualDisc, (0, aggregation_1.subtraction)(Operation.Amt, Operation.Disc));
@@ -142,7 +142,7 @@ class InvoiceTotalsService {
         let CustPartTaxTotal = this.GetPartsTaxTotalFor(PartsList, IsIndependentTax);
         let RetCustParrtTaxTotal = this.GetRetPartsTaxTotalFor(PartsList, IsIndependentTax);
         let NonRetCustParrtTaxTotal = this.GetNonRetPartsTaxTotalFor(PartsList, IsIndependentTax);
-        finalTotalsData.SubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals);
+        finalTotalsData.SubTotal = utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals);
         let CustLaborDiscTotal = this.GetLaborDiscountedTotal(LaborList, IsIndependentTax, finalTotalsData);
         let CustPartsDiscTotal = this.GetPartDiscountedTotal(PartsList, IsIndependentTax, finalTotalsData);
         let CustLaborTotalAfterDisc = this.GetLaborTotalAfterDiscount(LaborList);
@@ -156,7 +156,7 @@ class InvoiceTotalsService {
         let CustPartsTotalAfterDisc1 = this.GetPartsAfterDiscount1(PartsList);
         let AmtAfterIndvidualItemDisc = (0, aggregation_1.addition)(CustLaborTotalAfterDisc1, CustPartsTotalAfterDisc1);
         finalTotalsData.SIndTotal = AmtAfterIndvidualItemDisc;
-        finalTotalsData.Disc = !tr_utils_1.TrUtils.IsEmpty(finalTotalsData.Perc) ? tr_utils_1.TrUtils.ConvertPercToVal(finalTotalsData.Perc, AmtAfterIndvidualItemDisc) : finalTotalsData.Disc;
+        finalTotalsData.Disc = !utils_1.TrUtils.IsEmpty(finalTotalsData.Perc) ? utils_1.TrUtils.ConvertPercToVal(finalTotalsData.Perc, AmtAfterIndvidualItemDisc) : finalTotalsData.Disc;
         let CustTotal = this.GetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, CustPartTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust);
         let RetCustTotal = this.GetRetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, RetCustParrtTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust);
         let NonRetCustTotal = this.GetNonRetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, NonRetCustParrtTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust);
@@ -165,14 +165,14 @@ class InvoiceTotalsService {
             finalTotalsData.Total = Math.round(CustTotal);
         }
         else {
-            finalTotalsData.Total = tr_utils_1.TrUtils.FixedTo(CustTotal);
+            finalTotalsData.Total = utils_1.TrUtils.FixedTo(CustTotal);
         }
-        finalTotalsData.RetTotal = tr_utils_1.TrUtils.FixedTo(RetCustTotal);
-        finalTotalsData.NonRetTotal = tr_utils_1.TrUtils.FixedTo(NonRetCustTotal);
+        finalTotalsData.RetTotal = utils_1.TrUtils.FixedTo(RetCustTotal);
+        finalTotalsData.NonRetTotal = utils_1.TrUtils.FixedTo(NonRetCustTotal);
         if (DetailedInfo) {
-            finalTotalsData.FixedSubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals);
-            finalTotalsData.FixedTotal = tr_utils_1.TrUtils.FixedTo(CustTotal);
-            finalTotalsData.Adj = tr_utils_1.TrUtils.FixedTo(Adjust);
+            finalTotalsData.FixedSubTotal = utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals);
+            finalTotalsData.FixedTotal = utils_1.TrUtils.FixedTo(CustTotal);
+            finalTotalsData.Adj = utils_1.TrUtils.FixedTo(Adjust);
         }
         return finalTotalsData;
     }
@@ -213,7 +213,7 @@ class InvoiceTotalsService {
     static GetNonRetPartsTotalAfterDiscount(PartsList) {
         let NonRetPartsTotalAfterDisc = 0;
         PartsList.forEach((Part) => {
-            if (tr_utils_1.TrUtils.IsNull(Part.Ret) || Part.Ret === false) {
+            if (utils_1.TrUtils.IsNull(Part.Ret) || Part.Ret === false) {
                 NonRetPartsTotalAfterDisc = (0, aggregation_1.addition)(NonRetPartsTotalAfterDisc, Part.AfterPartDisc);
             }
         });
@@ -232,42 +232,42 @@ class InvoiceTotalsService {
             finalTotalsData.CustPartsTotalBeforeDisc = finalTotalsData.CustPartsTotalAfterDisc;
         }
         let LaborTaxInfo = this.GetLaborGSTTaxTotal(opCodesList, IsIndependentTax);
-        finalTotalsData.CustLaborITax = tr_utils_1.TrUtils.SetValueToZeroIfNull(LaborTaxInfo[3]);
-        finalTotalsData.CustLaborSGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(LaborTaxInfo[1]);
-        finalTotalsData.CustLaborCGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(LaborTaxInfo[0]);
-        finalTotalsData.CustLaborIGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(LaborTaxInfo[2]);
+        finalTotalsData.CustLaborITax = utils_1.TrUtils.SetValueToZeroIfNull(LaborTaxInfo[3]);
+        finalTotalsData.CustLaborSGST = utils_1.TrUtils.SetValueToZeroIfNull(LaborTaxInfo[1]);
+        finalTotalsData.CustLaborCGST = utils_1.TrUtils.SetValueToZeroIfNull(LaborTaxInfo[0]);
+        finalTotalsData.CustLaborIGST = utils_1.TrUtils.SetValueToZeroIfNull(LaborTaxInfo[2]);
         let PartTaxInfo = this.GetPartGSTTaxTotal(PartsList, IsIndependentTax);
         finalTotalsData.CustPartITax = this.GetPartsTaxTotalFor(PartsList, IsIndependentTax);
-        finalTotalsData.CustPartCGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(PartTaxInfo[0]);
-        finalTotalsData.CustPartIGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(PartTaxInfo[2]);
-        finalTotalsData.CustPartSGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(PartTaxInfo[1]);
+        finalTotalsData.CustPartCGST = utils_1.TrUtils.SetValueToZeroIfNull(PartTaxInfo[0]);
+        finalTotalsData.CustPartIGST = utils_1.TrUtils.SetValueToZeroIfNull(PartTaxInfo[2]);
+        finalTotalsData.CustPartSGST = utils_1.TrUtils.SetValueToZeroIfNull(PartTaxInfo[1]);
         finalTotalsData.CustLaborAfterTax = (0, aggregation_1.addition)(finalTotalsData.CustLaborITax, finalTotalsData.CustLaborTotalAfterDisc);
         finalTotalsData.CustPartAfterTax = (0, aggregation_1.addition)(finalTotalsData.CustPartITax, finalTotalsData.CustPartsTotalAfterDisc);
         finalTotalsData.CustTaxGroupData = this.GetTaxGroupingForPartsByHSN(PartsList, TaxCodes);
         finalTotalsData.CustTaxGroupDataByPerc = this.GetTaxGroupingForPartsByPerc(PartsList, TaxCodes);
         finalTotalsData.CustLaborTaxGroupDataByPerc = this.GetTaxGroupingForLaborByPerc(opCodesList, TaxCodes);
-        finalTotalsData.CustTotalRoundedBy = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Round);
-        finalTotalsData.CustRoundedTotal = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Total);
-        finalTotalsData.CustRetRoundedTotal = tr_utils_1.TrUtils.FixedTo(finalTotalsData.RetTotal);
-        finalTotalsData.CustNonRetRoundedTotal = tr_utils_1.TrUtils.FixedTo(finalTotalsData.NonRetTotal);
+        finalTotalsData.CustTotalRoundedBy = utils_1.TrUtils.FixedTo(finalTotalsData.Round);
+        finalTotalsData.CustRoundedTotal = utils_1.TrUtils.FixedTo(finalTotalsData.Total);
+        finalTotalsData.CustRetRoundedTotal = utils_1.TrUtils.FixedTo(finalTotalsData.RetTotal);
+        finalTotalsData.CustNonRetRoundedTotal = utils_1.TrUtils.FixedTo(finalTotalsData.NonRetTotal);
         for (var key in finalTotalsData) {
             if (key !== 'Total' && key !== 'SubTotal' &&
                 key !== 'LDisc' && key !== 'LPerc' && key !== 'PDisc' &&
                 key !== 'PPerc' && key !== 'Disc' && key !== 'Perc' && key !== 'Tax'
                 && typeof finalTotalsData[key] === 'number') {
-                finalTotalsData[key] = tr_utils_1.TrUtils.FixPriceValue(finalTotalsData[key]);
+                finalTotalsData[key] = utils_1.TrUtils.FixPriceValue(finalTotalsData[key]);
             }
         }
         return finalTotalsData;
     }
     static GetTaxGroupingForLaborByPerc(opCodesList, TaxCodes) {
-        opCodesList = this.GetCombinedTaxPercentage(tr_utils_1.TrUtils.Stringify(opCodesList), TaxCodes);
+        opCodesList = this.GetCombinedTaxPercentage(utils_1.TrUtils.Stringify(opCodesList), TaxCodes);
         // opCodesList = this.ResetPartsHSNIfInvalid(opCodesList);
         let FinalMatchedParts = this.CompareLaborByPerc(opCodesList, TaxCodes);
         return this.GetTaxGroupingInfoBySAC(FinalMatchedParts, TaxCodes);
     }
     static GetTaxGroupingForPartsByPerc(Parts, TaxCodes) {
-        Parts = this.GetCombinedTaxPercentage(tr_utils_1.TrUtils.Stringify(Parts), TaxCodes);
+        Parts = this.GetCombinedTaxPercentage(utils_1.TrUtils.Stringify(Parts), TaxCodes);
         // Parts = this.ResetPartsHSNIfInvalid(Parts);
         let FinalMatchedParts = this.ComparePartsByPerc(Parts, TaxCodes);
         return this.GetTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes);
@@ -284,20 +284,20 @@ class InvoiceTotalsService {
             let SAC = MatchedLabor[0].SAC;
             TaxInfo.CombinedTaxPercentage = MatchedLabor[0].CombinedTaxPercentage;
             MatchedLabor === null || MatchedLabor === void 0 ? void 0 : MatchedLabor.forEach((argMatchedGSTLabor) => {
-                TaxOnAmount = (0, aggregation_1.addition)(TaxOnAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTLabor.AfterLaborDisc));
-                TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTLabor.CGST));
-                TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTLabor.IGST));
-                TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTLabor.SGST));
-                CGSTAmt = (0, aggregation_1.addition)(CGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTLabor.CGST));
-                SGSTAmt = (0, aggregation_1.addition)(SGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTLabor.SGST));
-                IGSTAmt = (0, aggregation_1.addition)(IGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTLabor.IGST));
+                TaxOnAmount = (0, aggregation_1.addition)(TaxOnAmount, utils_1.TrUtils.FixedTo(argMatchedGSTLabor.AfterLaborDisc));
+                TaxAmount = (0, aggregation_1.addition)(TaxAmount, utils_1.TrUtils.FixedTo(argMatchedGSTLabor.CGST));
+                TaxAmount = (0, aggregation_1.addition)(TaxAmount, utils_1.TrUtils.FixedTo(argMatchedGSTLabor.IGST));
+                TaxAmount = (0, aggregation_1.addition)(TaxAmount, utils_1.TrUtils.FixedTo(argMatchedGSTLabor.SGST));
+                CGSTAmt = (0, aggregation_1.addition)(CGSTAmt, utils_1.TrUtils.FixedTo(argMatchedGSTLabor.CGST));
+                SGSTAmt = (0, aggregation_1.addition)(SGSTAmt, utils_1.TrUtils.FixedTo(argMatchedGSTLabor.SGST));
+                IGSTAmt = (0, aggregation_1.addition)(IGSTAmt, utils_1.TrUtils.FixedTo(argMatchedGSTLabor.IGST));
             });
             TaxInfo.SAC = SAC;
             TaxInfo.CGSTAmt = CGSTAmt;
             TaxInfo.SGSTAmt = SGSTAmt;
             TaxInfo.IGSTAmt = IGSTAmt;
-            TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount);
-            TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount);
+            TaxInfo.TotalTaxableAmount = utils_1.TrUtils.FixPriceValue(TaxOnAmount);
+            TaxInfo.TotalTaxAmount = utils_1.TrUtils.FixPriceValue(TaxAmount);
             TaxInfo.ItemsCount = MatchedLabor.length;
             let GSTValues = this.GetGSTValueBasedOnTaxCode(MatchedLabor[0].TCode, TaxCodes);
             TaxInfo.CGST = GSTValues[0];
@@ -440,7 +440,7 @@ class InvoiceTotalsService {
         let NonRetTotalTaxAmt = 0;
         if (IsIndependentTax) {
             PartsList.forEach((Part) => {
-                if (tr_utils_1.TrUtils.IsNull(Part.Ret) || Part.Ret === false) {
+                if (utils_1.TrUtils.IsNull(Part.Ret) || Part.Ret === false) {
                     NonRetTotalTaxAmt = (0, aggregation_1.addition)(NonRetTotalTaxAmt, Part.CGST, Part.SGST, Part.IGST);
                 }
             });
@@ -464,7 +464,7 @@ class InvoiceTotalsService {
             return (0, aggregation_1.addition)(LaborTotalAfterDisc, PartsTotalAfterDisc, LaborTaxAmount, PartsTaxAmount);
         }
         else {
-            return tr_utils_1.TrUtils.FixedTo((0, aggregation_1.addition)(LaborTotalAfterDisc, PartsTotalAfterDisc));
+            return utils_1.TrUtils.FixedTo((0, aggregation_1.addition)(LaborTotalAfterDisc, PartsTotalAfterDisc));
         }
     }
     static GetNonRetCustomerTotalBasedOnTaxType(finalTotalsData, LaborTaxAmount, PartsTaxAmount, LaborList, PartsList, IsIndependentTax, Adjust) {
@@ -474,13 +474,13 @@ class InvoiceTotalsService {
             return (0, aggregation_1.addition)(LaborTotalAfterDisc, PartsTotalAfterDisc, LaborTaxAmount, PartsTaxAmount);
         }
         else {
-            return tr_utils_1.TrUtils.FixedTo((0, aggregation_1.addition)(LaborTotalAfterDisc, PartsTotalAfterDisc));
+            return utils_1.TrUtils.FixedTo((0, aggregation_1.addition)(LaborTotalAfterDisc, PartsTotalAfterDisc));
         }
     }
     static LaborTotalAfterDiscount(LaborTotalAfterDisc, LaborTaxAmount, MainLDisc, LDiscInPerc) {
         let LaborTotal = (0, aggregation_1.addition)(LaborTotalAfterDisc, LaborTaxAmount);
-        if (!tr_utils_1.TrUtils.IsZero(MainLDisc)) {
-            if (!tr_utils_1.TrUtils.IsEmpty(LDiscInPerc)) {
+        if (!utils_1.TrUtils.IsZero(MainLDisc)) {
+            if (!utils_1.TrUtils.IsEmpty(LDiscInPerc)) {
                 LaborTotal = (0, aggregation_1.subtraction)(LaborTotal, (0, aggregation_1.division)((0, aggregation_1.multiply)(LaborTotal, Number(LDiscInPerc)), 100));
             }
             else {
@@ -491,8 +491,8 @@ class InvoiceTotalsService {
     }
     static ItemsTotalAfterDiscount(PartsTotalAfterDisc, PartsTaxAmount, MainPDisc, PDiscInPerc) {
         let ItemsTotal = (0, aggregation_1.addition)(PartsTotalAfterDisc, PartsTaxAmount);
-        if (!tr_utils_1.TrUtils.IsZero(MainPDisc)) {
-            if (!tr_utils_1.TrUtils.IsEmpty(PDiscInPerc)) {
+        if (!utils_1.TrUtils.IsZero(MainPDisc)) {
+            if (!utils_1.TrUtils.IsEmpty(PDiscInPerc)) {
                 ItemsTotal = (0, aggregation_1.subtraction)(ItemsTotal, (0, aggregation_1.division)((0, aggregation_1.multiply)(ItemsTotal, Number(PDiscInPerc)), 100));
             }
             else {
@@ -540,23 +540,23 @@ class InvoiceTotalsService {
         return [TotalCGSTAmt, TotalSGSTAmt, TotalIGSTAmt];
     }
     static GetTaxGroupingForPartsByHSN(Parts, TaxCodes) {
-        Parts = this.GetCombinedTaxPercentage(tr_utils_1.TrUtils.Stringify(Parts), TaxCodes);
+        Parts = this.GetCombinedTaxPercentage(utils_1.TrUtils.Stringify(Parts), TaxCodes);
         // Parts = this.ResetPartsHSNIfInvalid(Parts);
         let FinalMatchedParts = this.ComparePartsByHSN(Parts, TaxCodes);
         return this.GetTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes);
     }
     static GetCombinedTaxPercentage(Parts, TaxCodes) {
         Parts.forEach((Part) => {
-            if (tr_utils_1.TrUtils.IsNull(Part.HSN)) {
+            if (utils_1.TrUtils.IsNull(Part.HSN)) {
                 Part.HSN = '';
             }
             let GSTValues = this.GetGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
             // let CGST = GSTValues[0];
             // let SGST = GSTValues[1];
             // let IGST = GSTValues[2];
-            Part.CGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(GSTValues[0]);
-            Part.SGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(GSTValues[1]);
-            Part.IGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(GSTValues[2]);
+            Part.CGSTAmt = utils_1.TrUtils.SetValueToZeroIfNull(GSTValues[0]);
+            Part.SGSTAmt = utils_1.TrUtils.SetValueToZeroIfNull(GSTValues[1]);
+            Part.IGSTAmt = utils_1.TrUtils.SetValueToZeroIfNull(GSTValues[2]);
             Part.CombinedTaxPercentage = (0, aggregation_1.addition)(Part.CGSTAmt, Part.SGSTAmt, Part.IGSTAmt);
         });
         return Parts;
@@ -604,20 +604,20 @@ class InvoiceTotalsService {
             let HSN = MatchedPart[0].HSN;
             TaxInfo.CombinedTaxPercentage = MatchedPart[0].CombinedTaxPercentage;
             MatchedPart.forEach((argMatchedGSTPart) => {
-                TaxOnAmount = (0, aggregation_1.addition)(TaxOnAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.AfterPartDisc));
-                TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CGST));
-                TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.IGST));
-                TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.SGST));
-                CGSTAmt = (0, aggregation_1.addition)(CGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CGST));
-                SGSTAmt = (0, aggregation_1.addition)(SGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.SGST));
-                IGSTAmt = (0, aggregation_1.addition)(IGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.IGST));
+                TaxOnAmount = (0, aggregation_1.addition)(TaxOnAmount, utils_1.TrUtils.FixedTo(argMatchedGSTPart.AfterPartDisc));
+                TaxAmount = (0, aggregation_1.addition)(TaxAmount, utils_1.TrUtils.FixedTo(argMatchedGSTPart.CGST));
+                TaxAmount = (0, aggregation_1.addition)(TaxAmount, utils_1.TrUtils.FixedTo(argMatchedGSTPart.IGST));
+                TaxAmount = (0, aggregation_1.addition)(TaxAmount, utils_1.TrUtils.FixedTo(argMatchedGSTPart.SGST));
+                CGSTAmt = (0, aggregation_1.addition)(CGSTAmt, utils_1.TrUtils.FixedTo(argMatchedGSTPart.CGST));
+                SGSTAmt = (0, aggregation_1.addition)(SGSTAmt, utils_1.TrUtils.FixedTo(argMatchedGSTPart.SGST));
+                IGSTAmt = (0, aggregation_1.addition)(IGSTAmt, utils_1.TrUtils.FixedTo(argMatchedGSTPart.IGST));
             });
             TaxInfo.HSN = HSN;
             TaxInfo.CGSTAmt = CGSTAmt;
             TaxInfo.SGSTAmt = SGSTAmt;
             TaxInfo.IGSTAmt = IGSTAmt;
-            TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount);
-            TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount);
+            TaxInfo.TotalTaxableAmount = utils_1.TrUtils.FixPriceValue(TaxOnAmount);
+            TaxInfo.TotalTaxAmount = utils_1.TrUtils.FixPriceValue(TaxAmount);
             TaxInfo.ItemsCount = MatchedPart.length;
             // let GSTValues: any[] = this.GetGSTValueBasedOnTaxCode(MatchedPart[0].TCode, TaxCodes);
             // TaxInfo.CGST = GSTValues[0];
@@ -636,7 +636,7 @@ class InvoiceTotalsService {
         let CGST = 0;
         let SGST = 0;
         let IGST = 0;
-        if (tr_utils_1.TrUtils.IsNull(TCode)) {
+        if (utils_1.TrUtils.IsNull(TCode)) {
             return [CGST, SGST, IGST];
         }
         let TCodeIndex = TaxCodes.findIndex((TaxCode) => {