shareneus 1.4.84 → 1.4.86

package/dist/accounting/invoice/hc-inv-pdf.service.js

@@ -442,7 +442,17 @@ class HCInvoiceprintService {
                                 }
                             }
                             else {
-                                dataRow.push({ text: Ops[column.Field].toString(), bold: Ops.bold });
+                                if (column.Field === 'Desc') {
+                                    let DescData = [];
+                                    DescData.push({ text: Ops[column.Field].toString(), bold: Ops.bold });
+                                    if (!tr_utils_1.TrUtils.IsEmpty(Ops['EDesc'])) {
+                                        DescData.push({ text: Ops['EDesc'].toString(), color: 'grey' });
+                                    }
+                                    dataRow.push({ stack: DescData });
+                                }
+                                else {
+                                    dataRow.push({ text: Ops[column.Field].toString(), bold: Ops.bold });
+                                }
                             }
                         }
                     }
@@ -720,7 +730,18 @@ class HCInvoiceprintService {
                             }
                         }
                         else {
-                            dataRow.push({ text: labor[column.Field].toString() });
+                            // dataRow.push({ text: labor[column.Field].toString() });
+                            if (column.Field === 'Desc') {
+                                let DescData = [];
+                                DescData.push(labor[column.Field].toString());
+                                if (!tr_utils_1.TrUtils.IsEmpty(labor['EDesc'])) {
+                                    DescData.push({ text: labor['EDesc'].toString(), color: 'grey' });
+                                }
+                                dataRow.push({ stack: DescData });
+                            }
+                            else {
+                                dataRow.push({ text: labor[column.Field].toString() });
+                            }
                         }
                     }
                 }

package/dist/accounting/invoice/invoice-portrait-pdf.js

@@ -435,7 +435,17 @@ class InvoicePortraitPrintService {
                 var _a;
                 let dataRow = [];
                 dataRow.push({ text: index + 1, });
-                dataRow.push({ text: item.Desc, });
+                if (!tr_utils_1.TrUtils.IsEmpty(item.EDesc)) {
+                    let DescData = [];
+                    DescData.push({ text: item.Desc, });
+                    if (!tr_utils_1.TrUtils.IsEmpty(item['EDesc'])) {
+                        DescData.push({ text: item.EDesc, color: 'grey' });
+                    }
+                    dataRow.push({ stack: DescData });
+                }
+                else {
+                    dataRow.push({ text: item.Desc, });
+                }
                 if (ShowTaxColumn) {
                     dataRow.push({ text: item.SAC, alignment: 'center', style: ['headerstyle'], });
                 }
@@ -504,7 +514,18 @@ class InvoicePortraitPrintService {
                 var _a, _b, _c;
                 let dataRow = [];
                 dataRow.push({ text: index + 1, });
-                dataRow.push({ text: item.Desc, });
+                // dataRow.push({ text: item.Desc, });
+                if (!tr_utils_1.TrUtils.IsEmpty(item.EDesc)) {
+                    let DescData = [];
+                    DescData.push({ text: item.Desc, });
+                    if (!tr_utils_1.TrUtils.IsEmpty(item['EDesc'])) {
+                        DescData.push({ text: item.EDesc, color: 'grey' });
+                    }
+                    dataRow.push({ stack: DescData });
+                }
+                else {
+                    dataRow.push({ text: item.Desc, });
+                }
                 if (ShowTaxColumn) {
                     dataRow.push({ text: item.HSN, alignment: 'center', style: ['headerstyle'], });
                 }
@@ -600,7 +621,9 @@ class InvoicePortraitPrintService {
                     widths: ['*', '*'],
                     body: [
                         [
-                            { stack: [this.PartsTaxAmounts1(ROPrintData.TaxSummary, true, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn)] },
+                            {
+                                stack: [this.PartsTaxAmounts1(ROPrintData.TaxSummary, true, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn)]
+                            },
                             {
                                 columns: [{ text: '', width: moreDiscDetails ? 120 : 150 }, this.GrandTotal(ROPrintData, '0.00', ROPrintData.CustPartsTotalBeforeDisc, totalDisc, totalTax, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, null, ROPrintData.Consolidate, ROPrintData.STotal, moreDiscDetails, ROPrintData.Entity.DecimalsNumber)],
                             }

package/dist/purchases/purchase-order/purchase-order-totals.service.d.ts

@@ -13,6 +13,12 @@ export declare class PurchaseOrderTotalsService {
     static GetPartsTotalTaxAndAfterDiscount(PartsList: any): any[];
     static GetTotalBasedOnTaxType(PartsTotalAfterDisc: number, PartsTaxAmount: number, ServicesTotalAfterDisc: number, ServicesTaxTotal: number, IsTaxable: boolean, Adjust: number, DecimalsNumber: number): number;
     static GetDetailedTotalsData(finalTotalsData: any, IsTaxable: boolean, PartsList: any, LaborList: any, TaxCodes: any, Tax: any, HasNoTax: boolean, DecimalsNumber: number): any;
+    static groupTaxData(items: any[], ops: any[]): any[];
+    static GetTaxGroupingForLaborByPerc(opCodesList: any, TaxCodes: any, DecimalsNumber: any): any[];
+    static GetTaxGroupingForPartsByPerc(Parts: any, TaxCodes: any, DecimalsNumber: any): any[];
+    static GetTaxGroupingInfoBySAC(FinalMatchedLabors: any, TaxCodes: any, DecimalsNumber: any): any[];
+    static CompareLaborByPerc(opCodesList: any, TaxCodes: any): any[];
+    static ComparePartsByPerc(Parts: any, TaxCodes: any): any[];
     static GetPartGSTTaxTotal(PartsList: Array<any>): number[];
     static GetServicesGSTTaxTotal(ServicesList: Array<any>): number[];
     static GetPartsTaxGroupingFor(PartsList: any, TaxCodes: any, DecimalsNumber: number): any[];

package/dist/purchases/purchase-order/purchase-order-totals.service.js

@@ -250,12 +250,148 @@ class PurchaseOrderTotalsService {
         finalTotalsData.Tax = Tax;
         finalTotalsData.HasNoTax = HasNoTax;
         finalTotalsData.TaxGroupData = this.GetPartsTaxGroupingFor(PartsList, TaxCodes, DecimalsNumber);
+        finalTotalsData.CustTaxGroupDataByPerc = this.GetTaxGroupingForPartsByPerc(PartsList, TaxCodes, DecimalsNumber);
+        finalTotalsData.CustLaborTaxGroupDataByPerc = this.GetTaxGroupingForLaborByPerc(LaborList, TaxCodes, DecimalsNumber);
+        finalTotalsData.TaxSummary = this.groupTaxData(finalTotalsData.CustTaxGroupData, finalTotalsData.CustLaborTaxGroupDataByPerc);
         // finalTotalsData.TotalRoundedBy = TrUtils.FixedTo(Math.round(finalTotalsData.Total) - finalTotalsData.Total);
         finalTotalsData.RoundedTotal = Math.round(finalTotalsData.Total);
         // finalTotalsData.Round = TrUtils.FixedTo(Math.round(finalTotalsData.Total) - finalTotalsData.Total);
         // finalTotalsData.Total = Math.round(finalTotalsData.Total);
         return finalTotalsData;
     }
+    static groupTaxData(items, ops) {
+        const combined = [...items, ...ops];
+        const groupedMap = new Map();
+        combined.forEach(item => {
+            if (groupedMap.has(item.CombinedTaxPercentage)) {
+                const existing = groupedMap.get(item.CombinedTaxPercentage);
+                existing.CGSTAmt = (0, aggregation_1.addition)(existing.CGSTAmt, item.CGSTAmt);
+                existing.SGSTAmt = (0, aggregation_1.addition)(existing.SGSTAmt, item.SGSTAmt);
+                // Sum IGST if present
+                if (item.IGSTAmt !== undefined) {
+                    existing.IGSTAmt = (0, aggregation_1.addition)(existing.IGSTAmt || 0, item.IGSTAmt);
+                }
+                existing.TotalTaxAmount = (0, aggregation_1.addition)(existing.TotalTaxAmount || 0, item.TotalTaxAmount || 0);
+                existing.TotalTaxableAmount = (0, aggregation_1.addition)(existing.TotalTaxableAmount || 0, item.TotalTaxableAmount || 0);
+            }
+            else {
+                // Clone the object to avoid mutation
+                groupedMap.set(item.CombinedTaxPercentage, Object.assign({}, item));
+            }
+        });
+        return Array.from(groupedMap.values());
+    }
+    static GetTaxGroupingForLaborByPerc(opCodesList, TaxCodes, DecimalsNumber) {
+        opCodesList = this.GetCombinedTaxPercentage(tr_utils_1.TrUtils.Stringify(opCodesList), TaxCodes);
+        // opCodesList = this.ResetPartsHSNIfInvalid(opCodesList);
+        let FinalMatchedParts = this.CompareLaborByPerc(opCodesList, TaxCodes);
+        return this.GetTaxGroupingInfoBySAC(FinalMatchedParts, TaxCodes, DecimalsNumber);
+    }
+    static GetTaxGroupingForPartsByPerc(Parts, TaxCodes, DecimalsNumber) {
+        Parts = this.GetCombinedTaxPercentage(tr_utils_1.TrUtils.Stringify(Parts), TaxCodes);
+        // Parts = this.ResetPartsHSNIfInvalid(Parts);
+        let FinalMatchedParts = this.ComparePartsByPerc(Parts, TaxCodes);
+        return this.GetTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes, DecimalsNumber);
+    }
+    static GetTaxGroupingInfoBySAC(FinalMatchedLabors, TaxCodes, DecimalsNumber) {
+        let SACTaxInfo = [];
+        FinalMatchedLabors === null || FinalMatchedLabors === void 0 ? void 0 : FinalMatchedLabors.forEach((MatchedLabor) => {
+            let TaxInfo = {};
+            let TaxOnAmount = 0;
+            let TaxAmount = 0;
+            let CGSTAmt = 0;
+            let SGSTAmt = 0;
+            let IGSTAmt = 0;
+            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, DecimalsNumber));
+                TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTLabor.CGST, DecimalsNumber));
+                TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTLabor.IGST, DecimalsNumber));
+                TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTLabor.SGST, DecimalsNumber));
+                CGSTAmt = (0, aggregation_1.addition)(CGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTLabor.CGST, DecimalsNumber));
+                SGSTAmt = (0, aggregation_1.addition)(SGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTLabor.SGST, DecimalsNumber));
+                IGSTAmt = (0, aggregation_1.addition)(IGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTLabor.IGST, DecimalsNumber));
+            });
+            TaxInfo.SAC = SAC;
+            TaxInfo.CGSTAmt = CGSTAmt;
+            TaxInfo.SGSTAmt = SGSTAmt;
+            TaxInfo.IGSTAmt = IGSTAmt;
+            TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount, DecimalsNumber);
+            TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount, DecimalsNumber);
+            TaxInfo.ItemsCount = MatchedLabor.length;
+            let GSTValues = this.GetGSTValueBasedOnTaxCode(MatchedLabor[0].TCode, TaxCodes);
+            TaxInfo.CGST = GSTValues[0];
+            TaxInfo.SGST = GSTValues[1];
+            TaxInfo.IGST = GSTValues[2];
+            if (TaxOnAmount !== 0) {
+                SACTaxInfo.push(TaxInfo);
+            }
+        });
+        return SACTaxInfo;
+    }
+    static CompareLaborByPerc(opCodesList, TaxCodes) {
+        let FinalMatchedLabors = [];
+        opCodesList === null || opCodesList === void 0 ? void 0 : opCodesList.forEach((Labor) => {
+            let MatchedLaborsBasedOnPerc = opCodesList.filter((argLabor) => {
+                let PartFound = false;
+                FinalMatchedLabors.forEach((FinalArgLabors) => {
+                    let PartIndex = FinalArgLabors.findIndex((FinalArgPart) => {
+                        return FinalArgPart._id === argLabor._id;
+                    });
+                    if (PartIndex !== -1) {
+                        PartFound = true;
+                    }
+                });
+                // let argGSTValues: any[] = this.GetGSTValueBasedOnTaxCode(argLabor.TCode, TaxCodes);
+                // let argCGST = argGSTValues[0];
+                // let argSGST = argGSTValues[1];
+                // let argIGST = argGSTValues[2];
+                // let laborGSTValues: any[] = this.GetGSTValueBasedOnTaxCode(Labor.TCode, TaxCodes);
+                // let laborCGST = laborGSTValues[0];
+                // let laborSGST = laborGSTValues[1];
+                // let laborIGST = laborGSTValues[2];
+                return (!PartFound) &&
+                    (argLabor.CGSTAmt === Labor.CGSTAmt) && (argLabor.IGSTAmt === Labor.IGSTAmt) &&
+                    (argLabor.SGSTAmt === Labor.SGSTAmt);
+            });
+            if (MatchedLaborsBasedOnPerc.length !== 0) {
+                FinalMatchedLabors.push(MatchedLaborsBasedOnPerc);
+            }
+        });
+        return FinalMatchedLabors;
+    }
+    static ComparePartsByPerc(Parts, TaxCodes) {
+        let FinalMatchedParts = [];
+        Parts === null || Parts === void 0 ? void 0 : Parts.forEach((Part) => {
+            let MatchedPartsBasedOnHSN = Parts.filter((argPart) => {
+                let PartFound = false;
+                FinalMatchedParts.forEach((FinalArgParts) => {
+                    let PartIndex = FinalArgParts.findIndex((FinalArgPart) => {
+                        return FinalArgPart._id === argPart._id;
+                    });
+                    if (PartIndex !== -1) {
+                        PartFound = true;
+                    }
+                });
+                // let argGSTValues: any[] = this.GetGSTValueBasedOnTaxCode(argPart.TCode, TaxCodes);
+                // let argCGST = argGSTValues[0];
+                // let argSGST = argGSTValues[1];
+                // let argIGST = argGSTValues[2];
+                // let partGSTValues: any[] = this.GetGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
+                // let partCGST = partGSTValues[0];
+                // let partSGST = partGSTValues[1];
+                // let partIGST = partGSTValues[2];
+                return (!PartFound) &&
+                    (argPart.CGSTAmt === Part.CGSTAmt) && (argPart.IGSTAmt === Part.IGSTAmt) &&
+                    (argPart.SGSTAmt === Part.SGSTAmt);
+            });
+            if (MatchedPartsBasedOnHSN.length !== 0) {
+                FinalMatchedParts.push(MatchedPartsBasedOnHSN);
+            }
+        });
+        return FinalMatchedParts;
+    }
     static GetPartGSTTaxTotal(PartsList) {
         let CGSTAmt = 0;
         let SGSTAmt = 0;

package/package.json

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