shareneus 1.4.47 → 1.4.49

package/dist/services/ro-print-service.js

@@ -46,7 +46,7 @@ class ROPrintService {
         argROData = this.ReverseItemsForROPrint(argROData, isReverse);
         let finalTotalsData = ro_totals_service_1.ROTotalsService.GetTotalsValue(argROData, TaxCodes, true, true, true, ROPrintData.Entity.Round);
         finalTotalsData.Settings = tr_utils_1.TrUtils.Stringify(argROData.Settings);
-        finalTotalsData = this.GetDetailedInfoForItems(finalTotalsData, IncludeGST, ConsolidateGST, AsCustomerOnly, AsInsuranceOnly, TaxCodes);
+        finalTotalsData = this.GetDetailedInfoForItems(finalTotalsData, IncludeGST, ConsolidateGST, AsCustomerOnly, AsInsuranceOnly, TaxCodes, ROPrintData.Entity.DecimalsNumber);
         if (ConsolidateGST) {
             finalTotalsData.CustLaborTotalBeforeDisc = finalTotalsData.CustLaborAfterTax;
             finalTotalsData.CustPartsTotalBeforeDisc = finalTotalsData.CustPartAfterTax;
@@ -62,7 +62,7 @@ class ROPrintService {
         ROPrintData.VehMore = tr_utils_1.TrUtils.Stringify(argROData.VehMore);
         ROPrintData.SANotes = tr_utils_1.TrUtils.Stringify(argROData.SANotes);
         ROPrintData.OrdType = tr_utils_1.TrUtils.Stringify(argROData.OrdType);
-        ROPrintData = this.GetLineTotals(ROPrintData, IncludeGST, ConsolidateGST, AsCustomerOnly, AsInsuranceOnly);
+        ROPrintData = this.GetLineTotals(ROPrintData, IncludeGST, ConsolidateGST, AsCustomerOnly, AsInsuranceOnly, ROPrintData.Entity.DecimalsNumber);
         ROPrintData.PrintInfo = this.PrepareFormatForROPrint(ROPrintData, Payee, code_enums_1.ROTypeEnum.RepairOrder);
         ROPrintData = this.CheckAndCombineDescMPNForAR(ROPrintData.Entity.MPN, ROPrintData);
         ROPrintData.Vehicle = shared_print_service_1.PrintSharedService.GetVehicleFromServiceAndFormatData(OriginalVehicleData);
@@ -387,12 +387,12 @@ class ROPrintService {
         });
         return Colli;
     }
-    static GetLineTotals(ROPrintData, IncludeGST, ConsolidateGST, AsCustomerOnly, AsInsuranceOnly) {
+    static GetLineTotals(ROPrintData, IncludeGST, ConsolidateGST, AsCustomerOnly, AsInsuranceOnly, DecimalsNumber) {
         ROPrintData.Ops.forEach((Labor) => {
-            Labor.LineTotal = this.GetLaborLineTotal(Labor, IncludeGST, AsCustomerOnly, AsInsuranceOnly);
+            Labor.LineTotal = this.GetLaborLineTotal(Labor, IncludeGST, AsCustomerOnly, AsInsuranceOnly, DecimalsNumber);
         });
         ROPrintData.Parts.forEach((Part) => {
-            Part.LineTotal = this.GetPartLineTotal(Part, IncludeGST, AsCustomerOnly, AsInsuranceOnly);
+            Part.LineTotal = this.GetPartLineTotal(Part, IncludeGST, AsCustomerOnly, AsInsuranceOnly, DecimalsNumber);
         });
         ROPrintData.Colli.forEach((Collision) => {
             let LineTotal = 0;
@@ -408,7 +408,7 @@ class ROPrintService {
             if (!tr_utils_1.TrUtils.IsNull(Collision.DtngData)) {
                 LineTotal = (0, aggregation_1.addition)(LineTotal, this.GetCollisionLaborLineTotal(Collision.DtngData, ConsolidateGST, AsCustomerOnly, AsInsuranceOnly));
             }
-            Collision.LineTotal = tr_utils_1.TrUtils.FixPriceValue(LineTotal);
+            Collision.LineTotal = tr_utils_1.TrUtils.FixPriceValue(LineTotal, DecimalsNumber);
         });
         return ROPrintData;
     }
@@ -468,7 +468,7 @@ class ROPrintService {
         }
         return Number(LineTotal);
     }
-    static GetLaborLineTotal(LaborData, IncludeGST, AsCustomerOnly, AsInsuranceOnly) {
+    static GetLaborLineTotal(LaborData, IncludeGST, AsCustomerOnly, AsInsuranceOnly, DecimalsNumber) {
         let LineTotal = 0;
         if (AsCustomerOnly) {
             if (IncludeGST) {
@@ -494,9 +494,9 @@ class ROPrintService {
                 LineTotal = (0, aggregation_1.addition)(LaborData.InsAfterLaborDisc, LaborData.CustAfterLaborDisc);
             }
         }
-        return tr_utils_1.TrUtils.FixPriceValue(LineTotal);
+        return tr_utils_1.TrUtils.FixPriceValue(LineTotal, DecimalsNumber);
     }
-    static GetPartLineTotal(PartData, IncludeGST, AsCustomerOnly, AsInsuranceOnly) {
+    static GetPartLineTotal(PartData, IncludeGST, AsCustomerOnly, AsInsuranceOnly, DecimalsNumber) {
         let LineTotal = 0;
         if (AsCustomerOnly) {
             if (IncludeGST) {
@@ -522,7 +522,7 @@ class ROPrintService {
                 LineTotal = (0, aggregation_1.addition)(PartData.InsAfterPartDisc, PartData.CustAfterPartDisc);
             }
         }
-        return tr_utils_1.TrUtils.FixPriceValue(LineTotal);
+        return tr_utils_1.TrUtils.FixPriceValue(LineTotal, DecimalsNumber);
     }
     static ReverseItemsForROPrint(argROData, isReverse) {
         if (isReverse) {
@@ -567,9 +567,9 @@ class ROPrintService {
         argROData.Parts = ReversedParts;
         return argROData;
     }
-    static GetDetailedInfoForItems(ROTotalsData, IncludeGST, ConsolidateGST, AsCustomerOnly, AsInsuranceOnly, TaxCodes) {
-        ROTotalsData.Ops = this.GetLaborPrintInfo(ROTotalsData.Ops, ConsolidateGST, IncludeGST, AsCustomerOnly, AsInsuranceOnly, TaxCodes);
-        ROTotalsData.Parts = this.GetItemsPrintInfo(tr_utils_1.TrUtils.Stringify(ROTotalsData.Parts), ConsolidateGST, IncludeGST, AsCustomerOnly, AsInsuranceOnly, TaxCodes);
+    static GetDetailedInfoForItems(ROTotalsData, IncludeGST, ConsolidateGST, AsCustomerOnly, AsInsuranceOnly, TaxCodes, DecimalsNumber) {
+        ROTotalsData.Ops = this.GetLaborPrintInfo(ROTotalsData.Ops, ConsolidateGST, IncludeGST, AsCustomerOnly, AsInsuranceOnly, TaxCodes, DecimalsNumber);
+        ROTotalsData.Parts = this.GetItemsPrintInfo(tr_utils_1.TrUtils.Stringify(ROTotalsData.Parts), ConsolidateGST, IncludeGST, AsCustomerOnly, AsInsuranceOnly, TaxCodes, DecimalsNumber);
         if (IncludeGST && !ConsolidateGST) {
             ROTotalsData.ShowDetailedLaborTaxInfo = this.CheckLaborTaxItemIndex(ROTotalsData.Ops) !== -1;
             ROTotalsData.ShowDetailedPartTaxInfo = this.CheckPartTaxItemIndex(ROTotalsData.Parts) !== -1;
@@ -580,23 +580,23 @@ class ROPrintService {
         }
         return ROTotalsData;
     }
-    static GetLaborPrintInfo(LaborList, ConsolidateGST, IncludeGST, AsCustomerOnly, AsInsuranceOnly, TaxCodes) {
+    static GetLaborPrintInfo(LaborList, ConsolidateGST, IncludeGST, AsCustomerOnly, AsInsuranceOnly, TaxCodes, DecimalsNumber) {
         LaborList.forEach((Labor) => {
             Labor.HSN = Labor.SAC;
             if (AsCustomerOnly) {
                 if (IncludeGST) {
                     if (ConsolidateGST) {
-                        Labor.UnPr = tr_utils_1.TrUtils.FixedTo(Labor.CustAfterTax);
+                        Labor.UnPr = tr_utils_1.TrUtils.FixedTo(Labor.CustAfterTax, DecimalsNumber);
                     }
                     else {
-                        Labor.UnPr = tr_utils_1.TrUtils.FixedTo(Labor.Pr);
+                        Labor.UnPr = tr_utils_1.TrUtils.FixedTo(Labor.Pr, DecimalsNumber);
                     }
-                    Labor.CGSTAmt = tr_utils_1.TrUtils.FixedTo(Labor.CCGST);
-                    Labor.SGSTAmt = tr_utils_1.TrUtils.FixedTo(Labor.CSGST);
-                    Labor.IGSTAmt = tr_utils_1.TrUtils.FixedTo(Labor.CIGST);
+                    Labor.CGSTAmt = tr_utils_1.TrUtils.FixedTo(Labor.CCGST, DecimalsNumber);
+                    Labor.SGSTAmt = tr_utils_1.TrUtils.FixedTo(Labor.CSGST, DecimalsNumber);
+                    Labor.IGSTAmt = tr_utils_1.TrUtils.FixedTo(Labor.CIGST, DecimalsNumber);
                 }
                 else {
-                    Labor.UnPr = tr_utils_1.TrUtils.FixedTo(Labor.Pr);
+                    Labor.UnPr = tr_utils_1.TrUtils.FixedTo(Labor.Pr, DecimalsNumber);
                     Labor.CGSTAmt = 0;
                     Labor.SGSTAmt = 0;
                     Labor.IGSTAmt = 0;
@@ -605,17 +605,17 @@ class ROPrintService {
             else if (AsInsuranceOnly) {
                 if (IncludeGST) {
                     if (ConsolidateGST) {
-                        Labor.UnPr = tr_utils_1.TrUtils.FixedTo(Labor.InsAfterTax);
+                        Labor.UnPr = tr_utils_1.TrUtils.FixedTo(Labor.InsAfterTax, DecimalsNumber);
                     }
                     else {
-                        Labor.UnPr = tr_utils_1.TrUtils.FixedTo(Labor.AssPr);
+                        Labor.UnPr = tr_utils_1.TrUtils.FixedTo(Labor.AssPr, DecimalsNumber);
                     }
-                    Labor.CGSTAmt = tr_utils_1.TrUtils.FixedTo(Labor.ACGST);
-                    Labor.SGSTAmt = tr_utils_1.TrUtils.FixedTo(Labor.ASGST);
-                    Labor.IGSTAmt = tr_utils_1.TrUtils.FixedTo(Labor.AIGST);
+                    Labor.CGSTAmt = tr_utils_1.TrUtils.FixedTo(Labor.ACGST, DecimalsNumber);
+                    Labor.SGSTAmt = tr_utils_1.TrUtils.FixedTo(Labor.ASGST, DecimalsNumber);
+                    Labor.IGSTAmt = tr_utils_1.TrUtils.FixedTo(Labor.AIGST, DecimalsNumber);
                 }
                 else {
-                    Labor.UnPr = tr_utils_1.TrUtils.FixedTo(Labor.AssPr);
+                    Labor.UnPr = tr_utils_1.TrUtils.FixedTo(Labor.AssPr, DecimalsNumber);
                     Labor.CGSTAmt = 0;
                     Labor.SGSTAmt = 0;
                     Labor.IGSTAmt = 0;
@@ -627,22 +627,22 @@ class ROPrintService {
         });
         return LaborList;
     }
-    static GetItemsPrintInfo(Items, ConsolidateGST, IncludeGST, AsCustomerOnly, AsInsuranceOnly, TaxCodes) {
+    static GetItemsPrintInfo(Items, ConsolidateGST, IncludeGST, AsCustomerOnly, AsInsuranceOnly, TaxCodes, DecimalsNumber) {
         Items.forEach((Item) => {
             if (AsCustomerOnly) {
                 if (IncludeGST) {
                     if (ConsolidateGST) {
-                        Item.UnPr = tr_utils_1.TrUtils.FixedTo(Item.CustAfterTaxPerItem);
+                        Item.UnPr = tr_utils_1.TrUtils.FixedTo(Item.CustAfterTaxPerItem, DecimalsNumber);
                     }
                     else {
-                        Item.UnPr = tr_utils_1.TrUtils.FixedTo(Item.UnPr);
+                        Item.UnPr = tr_utils_1.TrUtils.FixedTo(Item.UnPr, DecimalsNumber);
                     }
-                    Item.CGSTAmt = tr_utils_1.TrUtils.FixedTo(Item.CCGST);
-                    Item.SGSTAmt = tr_utils_1.TrUtils.FixedTo(Item.CSGST);
-                    Item.IGSTAmt = tr_utils_1.TrUtils.FixedTo(Item.CIGST);
+                    Item.CGSTAmt = tr_utils_1.TrUtils.FixedTo(Item.CCGST, DecimalsNumber);
+                    Item.SGSTAmt = tr_utils_1.TrUtils.FixedTo(Item.CSGST, DecimalsNumber);
+                    Item.IGSTAmt = tr_utils_1.TrUtils.FixedTo(Item.CIGST, DecimalsNumber);
                 }
                 else {
-                    Item.UnPr = tr_utils_1.TrUtils.FixedTo(Item.UnPr);
+                    Item.UnPr = tr_utils_1.TrUtils.FixedTo(Item.UnPr, DecimalsNumber);
                     Item.CGSTAmt = 0;
                     Item.SGSTAmt = 0;
                     Item.IGSTAmt = 0;
@@ -651,17 +651,17 @@ class ROPrintService {
             else if (AsInsuranceOnly) {
                 if (IncludeGST) {
                     if (ConsolidateGST) {
-                        Item.UnPr = tr_utils_1.TrUtils.FixedTo(Item.InsAfterTaxPerItem);
+                        Item.UnPr = tr_utils_1.TrUtils.FixedTo(Item.InsAfterTaxPerItem, DecimalsNumber);
                     }
                     else {
-                        Item.UnPr = tr_utils_1.TrUtils.FixedTo(Item.AssPr);
+                        Item.UnPr = tr_utils_1.TrUtils.FixedTo(Item.AssPr, DecimalsNumber);
                     }
-                    Item.CGSTAmt = tr_utils_1.TrUtils.FixedTo(Item.ACGST);
-                    Item.SGSTAmt = tr_utils_1.TrUtils.FixedTo(Item.ASGST);
-                    Item.IGSTAmt = tr_utils_1.TrUtils.FixedTo(Item.AIGST);
+                    Item.CGSTAmt = tr_utils_1.TrUtils.FixedTo(Item.ACGST, DecimalsNumber);
+                    Item.SGSTAmt = tr_utils_1.TrUtils.FixedTo(Item.ASGST, DecimalsNumber);
+                    Item.IGSTAmt = tr_utils_1.TrUtils.FixedTo(Item.AIGST, DecimalsNumber);
                 }
                 else {
-                    Item.UnPr = tr_utils_1.TrUtils.FixedTo(Item.AssPr);
+                    Item.UnPr = tr_utils_1.TrUtils.FixedTo(Item.AssPr, DecimalsNumber);
                     Item.CGSTAmt = 0;
                     Item.SGSTAmt = 0;
                     Item.IGSTAmt = 0;

package/dist/services/separate-wo-print.service.d.ts

@@ -457,7 +457,7 @@ export declare class WOPrintService {
         };
         layout: string;
     };
-    static GetServiceInformation(Other: any, Phone2: any): {
+    static GetServiceInformation(Other: any, Entity: any): {
         style: string;
         table: {
             widths: (string | number)[];

package/dist/services/separate-wo-print.service.js

@@ -63,7 +63,7 @@ class WOPrintService {
             columns: [
                 this.GetCustomerInformation(ROPrintData.Customer),
                 this.GetVehicleInformation(ROPrintData.Vehicle, ROPrintData.MIn),
-                this.GetServiceInformation(ROPrintData, ROPrintData.Entity.Phone2),
+                this.GetServiceInformation(ROPrintData, ROPrintData.Entity),
             ],
             columnGap: 5
         };
@@ -295,7 +295,7 @@ class WOPrintService {
             layout: 'noBorders'
         };
     }
-    static GetServiceInformation(Other, Phone2) {
+    static GetServiceInformation(Other, Entity) {
         return {
             style: 'tableExample',
             table: {
@@ -305,10 +305,10 @@ class WOPrintService {
                     ['Work Type', { text: Other.OrdType, opacity: 0.9, }],
                     ['RO Date', { text: Other.CrDate, opacity: 0.9, }],
                     ['RO Number', { text: Other._id, opacity: 0.9, }],
-                    ['Printing Time', { text: my_date_1.MyDate.GetWeekDateAndTime(my_date_1.MyDate.GetDateTimeNowInUTC()), opacity: 0.9, }],
+                    ['Printing Time', { text: my_date_1.MyDate.GetWeekDateAndTime(my_date_1.MyDate.GetDateTimeNowInUTC(Entity.User.TZ), Entity.User.TZ), opacity: 0.9, }],
                     ['Promise Date', { text: Other.PrDate, opacity: 0.9, }],
                     ['Service Advisor', { text: Other.Advisor.Name, opacity: 0.9, }],
-                    ['Mobile Number', { text: this.GetPhone(Other.Advisor.Ph, Phone2), opacity: 0.9, }],
+                    ['Mobile Number', { text: this.GetPhone(Other.Advisor.Ph, Entity.Phone2), opacity: 0.9, }],
                 ]
             },
             layout: 'noBorders'

package/dist/shared/shared-pdf.service.d.ts

@@ -465,22 +465,6 @@ export declare class SharedPDFService {
     }[];
     static CreateHSNTaxTable1(PartsTaxInfo: any, ShowAccParts: any, ShowIGST: any, ShowTaxColumn: any): any;
     static CreateHSNTaxTable(PartsTaxInfo: any, ShowAccParts: any, ShowIGST: any, ShowTaxColumn: any): any;
-    static GetHCFinalTotalDetails(RecordData: any, BasicLaborTotal: any, OverAllMainLaborDiscount: any, LCGST: any, LSGST: any, LIGST: any, PIGST: any, ShowIGST: any, ShowTaxColumn: any, BasicPartsTotal: any, OverAllMainPartsDiscount: any, PCGST: any, PSGST: any, PartsTaxInfo: any, ShowAccParts: any, LaborAfterGST: any, PartsAfterGST: any, OverAllRecordDiscount: any, For: any, OverAllRecordTotal: any, Rounded: any, GrandTotal: any, ShowDetailedLaborTaxInfo: any, ShowDetailedPartTaxInfo: any, istaxable: boolean, LaborTotalTax: any, PartTotalTax: any, Consolidate: boolean, From: string, Adj: any, STotal: any, moreDiscDetails: boolean): {
-        columns: ({
-            style: string[];
-            lineHeight: number;
-            marginBottom: number;
-            width: string;
-            table: {
-                body: any;
-            };
-            layout: string;
-        } | {
-            text: string;
-            width: number;
-        })[];
-        marginLeft: number;
-    };
     static GetFinalTotalDetails1(RecordData: any, BasicLaborTotal: any, OverAllMainLaborDiscount: any, LCGST: any, LSGST: any, LIGST: any, PIGST: any, ShowIGST: any, ShowTaxColumn: any, BasicPartsTotal: any, OverAllMainPartsDiscount: any, PCGST: any, PSGST: any, PartsTaxInfo: any, ShowAccParts: any, LaborAfterGST: any, PartsAfterGST: any, OverAllRecordDiscount: any, For: any, OverAllRecordTotal: any, Rounded: any, GrandTotal: any, ShowDetailedLaborTaxInfo: any, ShowDetailedPartTaxInfo: any, istaxable: boolean, LaborTotalTax: any, PartTotalTax: any, Consolidate: boolean, From: string, Adj: any, CustLaborTaxGroupDataByPerc: any, STotal: any, isAuto: boolean, moreDiscDetails: boolean): {
         columns: ({
             style: string[];

package/dist/shared/shared-pdf.service.js

@@ -1536,40 +1536,42 @@ class SharedPDFService {
             return [{}];
         }
     }
-    static GetHCFinalTotalDetails(RecordData, BasicLaborTotal, OverAllMainLaborDiscount, LCGST, LSGST, LIGST, PIGST, ShowIGST, ShowTaxColumn, BasicPartsTotal, OverAllMainPartsDiscount, PCGST, PSGST, PartsTaxInfo, ShowAccParts, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, For, OverAllRecordTotal, Rounded, GrandTotal, ShowDetailedLaborTaxInfo, ShowDetailedPartTaxInfo, istaxable, LaborTotalTax, PartTotalTax, Consolidate, From, Adj, STotal, moreDiscDetails) {
-        let totalDisc;
-        let totalTax;
-        if (!Consolidate) {
-            totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(LaborTotalTax) + Number(PartTotalTax));
-            if (istaxable) {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
-            }
-            else {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount) + Number(OverAllRecordDiscount));
-            }
-        }
-        return {
-            columns: [
-                // this.GetTaxOnLabor(BasicLaborTotal, OverAllMainLaborDiscount, LCGST,
-                //   LSGST, LIGST, ShowIGST, ShowTaxColumn, ShowDetailedLaborTaxInfo),
-                { text: '', width: 225 },
-                // {
-                //   stack: [
-                //     this.GetTaxOnParts(BasicPartsTotal, OverAllMainPartsDiscount, PCGST,
-                //       PSGST, ShowAccParts, PIGST, ShowIGST, ShowTaxColumn, ShowDetailedPartTaxInfo, From),
-                //     this.PartsTaxAmounts(PartsTaxInfo, ShowAccParts, ShowIGST,
-                //       ShowTaxColumn)
-                //   ]
-                // },
-                { text: '', width: 230 },
-                // this.GrandTotal(LaborAfterGST, PartsAfterGST, totalDisc, For, OverAllRecordTotal, Rounded, GrandTotal)
-                this.GrandTotal(RecordData, BasicLaborTotal, BasicPartsTotal, totalDisc, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, STotal, moreDiscDetails)
-            ]
-            // columnGap: 40
-            ,
-            marginLeft: 10
-        };
-    }
+    // static GetHCFinalTotalDetails(RecordData: any, BasicLaborTotal: any, OverAllMainLaborDiscount: any, LCGST: any, LSGST: any, LIGST: any, PIGST: any, ShowIGST: any, ShowTaxColumn: any,
+    //   BasicPartsTotal: any, OverAllMainPartsDiscount: any, PCGST: any, PSGST: any, PartsTaxInfo: any,
+    //   ShowAccParts: any, LaborAfterGST: any, PartsAfterGST: any, OverAllRecordDiscount: any, For: any,
+    //   OverAllRecordTotal: any, Rounded: any, GrandTotal: any, ShowDetailedLaborTaxInfo: any,
+    //   ShowDetailedPartTaxInfo: any, istaxable: boolean, LaborTotalTax: any, PartTotalTax: any, Consolidate: boolean, From: string, Adj: any, STotal: any, moreDiscDetails: boolean) {
+    //   let totalDisc: any;
+    //   let totalTax: any;
+    //   if (!Consolidate) {
+    //     totalTax = TrUtils.FixPriceValue(Number(LaborTotalTax) + Number(PartTotalTax));
+    //     if (istaxable) {
+    //       totalDisc = TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
+    //     } else {
+    //       totalDisc = TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount) + Number(OverAllRecordDiscount));
+    //     }
+    //   }
+    //   return {
+    //     columns: [
+    //       // this.GetTaxOnLabor(BasicLaborTotal, OverAllMainLaborDiscount, LCGST,
+    //       //   LSGST, LIGST, ShowIGST, ShowTaxColumn, ShowDetailedLaborTaxInfo),
+    //       { text: '', width: 225 },
+    //       // {
+    //       //   stack: [
+    //       //     this.GetTaxOnParts(BasicPartsTotal, OverAllMainPartsDiscount, PCGST,
+    //       //       PSGST, ShowAccParts, PIGST, ShowIGST, ShowTaxColumn, ShowDetailedPartTaxInfo, From),
+    //       //     this.PartsTaxAmounts(PartsTaxInfo, ShowAccParts, ShowIGST,
+    //       //       ShowTaxColumn)
+    //       //   ]
+    //       // },
+    //       { text: '', width: 230 },
+    //       // this.GrandTotal(LaborAfterGST, PartsAfterGST, totalDisc, For, OverAllRecordTotal, Rounded, GrandTotal)
+    //       this.GrandTotal(RecordData, BasicLaborTotal, BasicPartsTotal, totalDisc, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, STotal, moreDiscDetails)
+    //     ]
+    //     // columnGap: 40
+    //     , marginLeft: 10
+    //   };
+    // }
     static GetFinalTotalDetails1(RecordData, BasicLaborTotal, OverAllMainLaborDiscount, LCGST, LSGST, LIGST, PIGST, ShowIGST, ShowTaxColumn, BasicPartsTotal, OverAllMainPartsDiscount, PCGST, PSGST, PartsTaxInfo, ShowAccParts, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, For, OverAllRecordTotal, Rounded, GrandTotal, ShowDetailedLaborTaxInfo, ShowDetailedPartTaxInfo, istaxable, LaborTotalTax, PartTotalTax, Consolidate, From, Adj, CustLaborTaxGroupDataByPerc, STotal, isAuto, moreDiscDetails) {
         let totalDisc;
         let totalTax;

package/dist/shared/shared-print.service.js

@@ -19,8 +19,10 @@ class PrintSharedService {
         if (tr_utils_1.TrUtils.IsNull(EntityData.User.TZ)) {
             EntityData.User.TZ = 'Asia/Calcutta';
         }
-        my_date_1.MyDate.UserTimeZone = EntityData.User.TZ;
+        // MyDate.UserTimeZone = EntityData.User.TZ;
         let Entity = {};
+        Entity.User = EntityData.User;
+        Entity.DecimalsNumber = 2;
         if (tr_utils_1.TrUtils.IsNull(tempEntity.Settings.Common)) {
             tempEntity.Settings.Common = {};
         }

package/dist/tasks/meetings/meeting-pdf.d.ts

@@ -1,6 +1,6 @@
 export declare class MeetingPdfService {
     static BodySize: number;
-    static MeetingPrintData(meetingData: any, isAgendata: boolean): void;
+    static MeetingPrintData(meetingData: any, isAgendata: boolean, EntityData: any): void;
     static HeadingforMeeting(isAgendata: any): {
         text: string;
         alignment: string;
@@ -97,10 +97,10 @@ export declare class MeetingPdfService {
         layout: string;
     };
     static GetDetailsTable(data: any): any;
-    static GetTopicsAndSubTopicsAndItemsList(meetingData: any, items: any, isAgendata: boolean): any;
-    static TopicsItemView(item: any, meetingData: any, tpcs: any): void;
+    static GetTopicsAndSubTopicsAndItemsList(meetingData: any, items: any, isAgendata: boolean, TZ: any): any;
+    static TopicsItemView(item: any, meetingData: any, tpcs: any, TZ: any): void;
     static GetDescrption(Item: any, MeetingData: any): any;
-    static GetDueDate(Item: any, MeetingData: any): string | null;
+    static GetDueDate(Item: any, MeetingData: any, TZ: any): string | null;
     static getAssignee(Item: any, MeetingData: any): string;
     static GetTypeOfItem(type: any): "Task" | "Desc" | "Note";
     static GetColorsBasedOnType(type: any): "#b30000" | "blue" | "green";

package/dist/tasks/meetings/meeting-pdf.js

@@ -5,7 +5,7 @@ const shared_pdf_service_1 = require("../../shared/shared-pdf.service");
 const my_date_1 = require("../../utils/my-date");
 const tr_utils_1 = require("../../utils/tr-utils");
 class MeetingPdfService {
-    static MeetingPrintData(meetingData, isAgendata) {
+    static MeetingPrintData(meetingData, isAgendata, EntityData) {
         let Images;
         shared_pdf_service_1.SharedPDFService.convertImgToBase64URL(meetingData.image, function (base64Img) {
             Images = base64Img.toString();
@@ -27,7 +27,7 @@ class MeetingPdfService {
                     this.GetMeetingDetails(meetingData, isAgendata),
                     shared_pdf_service_1.SharedPDFService.HeaderAfterLine(),
                     {
-                        stack: [{ text: 'Topics', bold: true, marginBottom: 7 }, this.GetTopicsAndSubTopicsAndItemsList(meetingData, meetingData.Items, isAgendata)], marginTop: 10
+                        stack: [{ text: 'Topics', bold: true, marginBottom: 7 }, this.GetTopicsAndSubTopicsAndItemsList(meetingData, meetingData.Items, isAgendata, EntityData.User.TZ)], marginTop: 10
                     },
                 ],
                 styles: shared_pdf_service_1.SharedPDFService.GetStyles()
@@ -208,7 +208,7 @@ class MeetingPdfService {
         });
         return body;
     }
-    static GetTopicsAndSubTopicsAndItemsList(meetingData, items, isAgendata) {
+    static GetTopicsAndSubTopicsAndItemsList(meetingData, items, isAgendata, TZ) {
         let tpcs = [];
         meetingData.Topics.forEach((tpc, index) => {
             let a;
@@ -219,7 +219,7 @@ class MeetingPdfService {
                 if (!isAgendata) {
                     items.forEach((item) => {
                         if (item.Tpc === tpc._id) {
-                            this.TopicsItemView(item, meetingData, tpcs);
+                            this.TopicsItemView(item, meetingData, tpcs, TZ);
                         }
                     });
                 }
@@ -233,7 +233,7 @@ class MeetingPdfService {
                     if (!isAgendata) {
                         items.forEach((item) => {
                             if (item.Tpc === subtpc._id) {
-                                this.TopicsItemView(item, meetingData, tpcs);
+                                this.TopicsItemView(item, meetingData, tpcs, TZ);
                             }
                         });
                     }
@@ -242,14 +242,14 @@ class MeetingPdfService {
         });
         return tpcs;
     }
-    static TopicsItemView(item, meetingData, tpcs) {
+    static TopicsItemView(item, meetingData, tpcs, TZ) {
         let ItemType = {
             text: this.GetTypeOfItem(item.Type), marginLeft: 20, marginBottom: 5, marginTop: 5, width: 50,
             color: this.GetColorsBasedOnType(item.Type), background: 'white', fontSize: this.BodySize,
         };
         let ItemDesc = this.GetDescrption(item, meetingData);
         let TaskAssignees = this.getAssignee(item, meetingData);
-        let TaskDueDate = this.GetDueDate(item, meetingData);
+        let TaskDueDate = this.GetDueDate(item, meetingData, TZ);
         let Item;
         if (item.Type !== 'TAS') {
             Item = {
@@ -298,13 +298,13 @@ class MeetingPdfService {
             return Item.Desc;
         }
     }
-    static GetDueDate(Item, MeetingData) {
+    static GetDueDate(Item, MeetingData, TZ) {
         if (Item.Type === 'TAS' && !tr_utils_1.TrUtils.IsNull(MeetingData.MeetingTasks)) {
             let Index = MeetingData.MeetingTasks.findIndex((task) => {
                 return task._id === Item.T_Id;
             });
             if (Index !== -1) {
-                return tr_utils_1.TrUtils.IsNull(MeetingData.MeetingTasks[Index].EstEnDt) ? '' : my_date_1.MyDate.GetWeekAndDate(MeetingData.MeetingTasks[Index].EstEnDt);
+                return tr_utils_1.TrUtils.IsNull(MeetingData.MeetingTasks[Index].EstEnDt) ? '' : my_date_1.MyDate.GetWeekAndDate(MeetingData.MeetingTasks[Index].EstEnDt, TZ);
             }
             else {
                 return '';

package/dist/tasks/tasks/task-pdf.service.d.ts

@@ -1,6 +1,6 @@
 export declare class TaskPDfService {
     static BodySize: number;
-    static GetPdfForUnAssignedTasks(TaskData: any, Image: any): void;
+    static GetPdfForUnAssignedTasks(TaskData: any, Image: any, EntityData: any): void;
     static GetHeader(task: any): {
         stack: {
             text: string;
@@ -55,7 +55,7 @@ export declare class TaskPDfService {
     };
     static GetDescription(task: any): string;
     static stripHtml(html: any): string;
-    static GetTaskDetails(TaskData: any): {
+    static GetTaskDetails(TaskData: any, UserTimeZone: any): {
         stack: {
             style: string;
             fontSize: number;
@@ -73,7 +73,7 @@ export declare class TaskPDfService {
             };
         }[];
     };
-    static GetTableHeadersForApproval(TaskData: any): {
+    static GetTableHeadersForApproval(TaskData: any, UserTimeZone: any): {
         style: string;
         fontSize: number;
         lineHeight: number;
@@ -92,7 +92,7 @@ export declare class TaskPDfService {
     static GetValue(value: any): any;
     static GetProgress(value: any): string;
     static GetPriority(value: any): any;
-    static GetTime(date: any): string | null;
+    static GetTime(date: any, UserTimeZone: any): string | null;
     static GetAssinessList(Members: any): any;
     static GetOwner(Members: any): any;
     static GetDetails(data: any): {

package/dist/tasks/tasks/task-pdf.service.js

@@ -6,7 +6,7 @@ const shared_print_service_1 = require("../../shared/shared-print.service");
 const my_date_1 = require("../../utils/my-date");
 const tr_utils_1 = require("../../utils/tr-utils");
 class TaskPDfService {
-    static GetPdfForUnAssignedTasks(TaskData, Image) {
+    static GetPdfForUnAssignedTasks(TaskData, Image, EntityData) {
         let Images;
         // let IsThere: boolean = false;
         // Images = this.imageExists(meetingData.image);
@@ -34,7 +34,7 @@ class TaskPDfService {
                     this.HeaderAfterLine(),
                     this.GetTaskSubHeadre(TaskData),
                     // this.HeaderAfterLine(),
-                    this.GetTaskDetails(TaskData),
+                    this.GetTaskDetails(TaskData, EntityData.User.TZ),
                 ],
                 styles: shared_pdf_service_1.SharedPDFService.GetStyles(),
             };
@@ -89,19 +89,19 @@ class TaskPDfService {
         // Retrieve the text property of the element (cross-browser support)
         return temporalDivElement.textContent || temporalDivElement.innerText || "";
     }
-    static GetTaskDetails(TaskData) {
+    static GetTaskDetails(TaskData, UserTimeZone) {
         return {
             stack: [
-                this.GetTableHeadersForApproval(TaskData),
+                this.GetTableHeadersForApproval(TaskData, UserTimeZone),
             ]
         };
     }
-    static GetTableHeadersForApproval(TaskData) {
+    static GetTableHeadersForApproval(TaskData, UserTimeZone) {
         let headersNames = [
             { name: 'Status', value: this.GetValue(TaskData.Sts) },
             { name: 'Start date', value: this.GetValue(my_date_1.MyDate.ConvertUTCDateToReadable(TaskData.EstStDt)) },
             { name: 'Due date', value: this.GetValue(my_date_1.MyDate.ConvertUTCDateToReadable(TaskData.EstEnDt)) },
-            { name: 'Estimated Time', value: this.GetTime(TaskData.EstEnDt) },
+            { name: 'Estimated Time', value: this.GetTime(TaskData.EstEnDt, UserTimeZone) },
             { name: 'Priority', value: this.GetPriority(TaskData.Prty) },
             { name: 'Progress', value: this.GetProgress(TaskData.CoPerc) },
             { name: 'Assingned To', value: this.GetValue(this.GetAssinessList(TaskData.Members)) },
@@ -133,9 +133,9 @@ class TaskPDfService {
             return 'None';
         }
     }
-    static GetTime(date) {
+    static GetTime(date, UserTimeZone) {
         if (!tr_utils_1.TrUtils.IsNull(date)) {
-            let time = my_date_1.MyDate.ConvertUTCDateTimeToReadable(date);
+            let time = my_date_1.MyDate.ConvertUTCDateTimeToReadable(date, UserTimeZone);
             return time;
         }
         else {

package/dist/tasks/tasks/task-reports-pdf.service.d.ts

@@ -8,7 +8,7 @@ declare class Group {
 export declare class TaskReportsPDfService {
     static overdueTasks: any[];
     static groupByColumns: string[];
-    static GetPdfForUnAssignedTasks(TaskData: any, IsLandScape: any, ReportType: any, Image: any): void;
+    static GetPdfForUnAssignedTasks(TaskData: any, IsLandScape: any, ReportType: any, Image: any, EntityData: any): void;
     static GetHeader(Images: any, ReportType: any): {
         stack: ({
             text: string;
@@ -48,7 +48,7 @@ export declare class TaskReportsPDfService {
         })[];
         stack?: undefined;
     };
-    static GetTableForApproval(TaskData: any, ReportType: any): {
+    static GetTableForApproval(TaskData: any, ReportType: any, TZ: any): {
         style: string;
         marginTop: number;
         lineHeight: number;
@@ -64,9 +64,9 @@ export declare class TaskReportsPDfService {
             vLineColor: (i: any, node: any) => string;
         };
     };
-    static GetApprovalTableHeaderBody(TaskData: any, ReportType: any): any;
+    static GetApprovalTableHeaderBody(TaskData: any, ReportType: any, TZ: any): any;
     static GetTableHeadersForApproval(): any;
-    static GetOverDuePrint(TaskData: any, IsLandScape: any, ReportType: any, Image: any): void;
+    static GetOverDuePrint(TaskData: any, IsLandScape: any, ReportType: any, Image: any, EntityData: any): void;
     static GetTableForApprovalUnAssignedTasks(TaskData: any, ReportType: any): {
         style: string;
         marginTop: number;
@@ -85,8 +85,8 @@ export declare class TaskReportsPDfService {
     };
     static GetApprovalTableHeaderUnAssignedTasksBody(TaskData: any, ReportType: any): any;
     static GetOverDueTableHeadersForApproval(): any;
-    static GetDueDate(params: any): string;
-    static PrepareDataForTable(overdueEmpTasks: any[]): any[];
+    static GetDueDate(params: any, TZ: any): string;
+    static PrepareDataForTable(overdueEmpTasks: any[], EntityData: any): any[];
     static addGroups(data: any[], groupByColumns: string[]): any[];
     static getSublevel(data: any[], level: number, groupByColumns: string[], parent: Group): any[];
     static uniqueBy(a: any, key: any): any;