shareneus 1.7.348 → 1.7.350

package/dist/sales-receive/sales-receive-print.service.js

@@ -11,7 +11,8 @@ const tr_utils_1 = require("../utils/tr-utils");
 class SalesReceivePrintService {
     static GetSalesReceivePrintInfo(OriginalSalesReceiveData, OriginalEntityData, image, IncludeGST, ConsolidateGST, TaxCodes, IsProforma, HeaderName) {
         var _a, _b;
-        let ForInsurance = !tr_utils_1.TrUtils.IsNull(OriginalSalesReceiveData.BillTo.InsId);
+        // let ForInsurance: boolean = !TrUtils.IsNull(OriginalSalesReceiveData.BillTo.InsId);
+        let ForInsurance = false;
         let SalesReceivePrintData = {};
         let argSalesReceiveData = tr_utils_1.TrUtils.Stringify(OriginalSalesReceiveData);
         if (!IncludeGST) {
@@ -75,6 +76,7 @@ class SalesReceivePrintService {
             const itemSGST = this.GetTaxAmountFromTaxes(Item, 'SGST', Item.SGST);
             const itemIGST = this.GetTaxAmountFromTaxes(Item, 'IGST', Item.IGST);
             Item.TCode = this.GetTCodeFromTaxes(Item);
+            Item.AfterPartDisc = (0, math_operations_1.Subtract)(Item.UnAmt, Item.Disc, Item.RecDisc);
             if (Consolidate) {
                 let AfterPartDisc = (0, math_operations_1.Subtract)(Item.UnAmt, Item.Disc, Item.RecDisc);
                 let AfterDiscForEach = (0, math_operations_1.Divide)(AfterPartDisc, Item.Qty);
@@ -168,30 +170,32 @@ class SalesReceivePrintService {
         return SalesReceivePrintData;
     }
     static GetBillNameForSalesReceivePrint(OriginalSalesReceiveData, SalesReceivePrintData) {
+        var _a;
+        const BillTo = (_a = OriginalSalesReceiveData.BillTo) !== null && _a !== void 0 ? _a : OriginalSalesReceiveData.BFrom;
         let Customer = {};
-        Customer.Name = OriginalSalesReceiveData.BillTo.Name;
+        Customer.Name = BillTo.Name;
         Customer.Adrs = [];
         Customer.Cons = [];
-        if (!tr_utils_1.TrUtils.IsNull(OriginalSalesReceiveData.BillTo.Adrs)) {
-            Customer.Adrs.push(OriginalSalesReceiveData.BillTo.Adrs.A1);
-            if (!tr_utils_1.TrUtils.IsEmpty(OriginalSalesReceiveData.BillTo.Adrs.A2)) {
-                Customer.Adrs.push(OriginalSalesReceiveData.BillTo.Adrs.A2);
+        if (!tr_utils_1.TrUtils.IsNull(BillTo.Adrs)) {
+            Customer.Adrs.push(BillTo.Adrs.A1);
+            if (!tr_utils_1.TrUtils.IsEmpty(BillTo.Adrs.A2)) {
+                Customer.Adrs.push(BillTo.Adrs.A2);
             }
-            if (!tr_utils_1.TrUtils.IsEmpty(OriginalSalesReceiveData.BillTo.Adrs.Ct)) {
-                Customer.Adrs.push(OriginalSalesReceiveData.BillTo.Adrs.Ct);
+            if (!tr_utils_1.TrUtils.IsEmpty(BillTo.Adrs.Ct)) {
+                Customer.Adrs.push(BillTo.Adrs.Ct);
             }
         }
-        Customer.GSTIN = OriginalSalesReceiveData.BillTo.GSTIN;
-        if (!tr_utils_1.TrUtils.IsEmpty(OriginalSalesReceiveData.BillTo.Ph)) {
+        Customer.GSTIN = BillTo.GSTIN;
+        if (!tr_utils_1.TrUtils.IsEmpty(BillTo.Ph)) {
             Customer.Cons = [
                 {
                     Type: 'M',
-                    No: OriginalSalesReceiveData.BillTo.Ph
+                    No: BillTo.Ph
                 }
             ];
         }
         SalesReceivePrintData.Customer = Customer;
-        if (!tr_utils_1.TrUtils.IsNull(OriginalSalesReceiveData.BillTo.InsId)) {
+        if (!tr_utils_1.TrUtils.IsNull(BillTo.InsId)) {
             SalesReceivePrintData.Cust = this.GetCustomerDetails(OriginalSalesReceiveData);
         }
         return SalesReceivePrintData;

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

@@ -1296,6 +1296,21 @@ class SharedPDFService {
         else if (Type === 'SalesOrder') {
             id = 'SO#';
         }
+        else if (Type === 'Sales Return') {
+            id = 'SR#';
+        }
+        else if (Type === 'Sales Receive') {
+            id = 'SRR#';
+        }
+        else if (Type === 'Purchase Return') {
+            id = 'PR#';
+        }
+        else if (Type === 'Purchase Shipment') {
+            id = 'PS#';
+        }
+        else if (Type === 'Purchase Order') {
+            id = 'PO#';
+        }
         else if (Type === 'Sales Estimate') {
             id = 'Estimate#';
         }

package/package.json

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

package/src/sales-receive/sales-receive-print.service.ts

@@ -12,7 +12,8 @@ export class SalesReceivePrintService {
     static GetSalesReceivePrintInfo(OriginalSalesReceiveData: any, OriginalEntityData: any, image: any,
         IncludeGST: boolean, ConsolidateGST: boolean, TaxCodes: any, IsProforma: boolean, HeaderName: string) {
 
-        let ForInsurance: boolean = !TrUtils.IsNull(OriginalSalesReceiveData.BillTo.InsId);
+        // let ForInsurance: boolean = !TrUtils.IsNull(OriginalSalesReceiveData.BillTo.InsId);
+        let ForInsurance: boolean =  false;
         let SalesReceivePrintData: any = {};
         let argSalesReceiveData = TrUtils.Stringify(OriginalSalesReceiveData);
         if (!IncludeGST) {
@@ -80,12 +81,13 @@ export class SalesReceivePrintService {
         return SalesReceivePrintData;
     }
 
-    static GetItemsPrintInfo(Items: any, Consolidate: boolean, TaxCodes: any, LineTotal: string, IsTaxable:boolean, DecimalsNumber: number) {
+    static GetItemsPrintInfo(Items: any, Consolidate: boolean, TaxCodes: any, LineTotal: string, IsTaxable: boolean, DecimalsNumber: number) {
         Items.forEach((Item: any) => {
             const itemCGST = this.GetTaxAmountFromTaxes(Item, 'CGST', Item.CGST);
             const itemSGST = this.GetTaxAmountFromTaxes(Item, 'SGST', Item.SGST);
             const itemIGST = this.GetTaxAmountFromTaxes(Item, 'IGST', Item.IGST);
             Item.TCode = this.GetTCodeFromTaxes(Item);
+            Item.AfterPartDisc = Subtract(Item.UnAmt, Item.Disc, Item.RecDisc);
             if (Consolidate) {
                 let AfterPartDisc = Subtract(Item.UnAmt, Item.Disc, Item.RecDisc);
                 let AfterDiscForEach = Divide(AfterPartDisc, Item.Qty);
@@ -102,7 +104,7 @@ export class SalesReceivePrintService {
             Item.CGSTPerc = this.GetTaxRateFromTaxes(Item, 'CGST', PrintSharedService.GetCGSTValueBasedOnTaxCode(Item.TCode, TaxCodes));
             Item.SGSTPerc = this.GetTaxRateFromTaxes(Item, 'SGST', PrintSharedService.GetSGSTValueBasedOnTaxCode(Item.TCode, TaxCodes));
             Item.IGSTPerc = this.GetTaxRateFromTaxes(Item, 'IGST', PrintSharedService.GetIGSTValueBasedOnTaxCode(Item.TCode, TaxCodes));
-              // Calculate amount after tax based on tax type
+            // Calculate amount after tax based on tax type
             if (IsTaxable) {
                 Item.AfterPartTax = Add(Item.AfterPartDisc, itemCGST, itemSGST, itemIGST);
             } else {
@@ -188,32 +190,33 @@ export class SalesReceivePrintService {
     }
 
     static GetBillNameForSalesReceivePrint(OriginalSalesReceiveData: any, SalesReceivePrintData: any) {
+      const BillTo: any = OriginalSalesReceiveData.BillTo ?? OriginalSalesReceiveData.BFrom;
         let Customer: any = {};
-        Customer.Name = OriginalSalesReceiveData.BillTo.Name;
+        Customer.Name = BillTo.Name;
         Customer.Adrs = [];
         Customer.Cons = [];
-        if (!TrUtils.IsNull(OriginalSalesReceiveData.BillTo.Adrs)) {
-            Customer.Adrs.push(OriginalSalesReceiveData.BillTo.Adrs.A1);
-            if (!TrUtils.IsEmpty(OriginalSalesReceiveData.BillTo.Adrs.A2)) {
-                Customer.Adrs.push(OriginalSalesReceiveData.BillTo.Adrs.A2);
+        if (!TrUtils.IsNull(BillTo.Adrs)) {
+            Customer.Adrs.push(BillTo.Adrs.A1);
+            if (!TrUtils.IsEmpty(BillTo.Adrs.A2)) {
+                Customer.Adrs.push(BillTo.Adrs.A2);
             }
-            if (!TrUtils.IsEmpty(OriginalSalesReceiveData.BillTo.Adrs.Ct)) {
-                Customer.Adrs.push(OriginalSalesReceiveData.BillTo.Adrs.Ct);
+            if (!TrUtils.IsEmpty(BillTo.Adrs.Ct)) {
+                Customer.Adrs.push(BillTo.Adrs.Ct);
             }
         }
-        Customer.GSTIN = OriginalSalesReceiveData.BillTo.GSTIN;
+        Customer.GSTIN = BillTo.GSTIN;
 
-        if (!TrUtils.IsEmpty(OriginalSalesReceiveData.BillTo.Ph)) {
+        if (!TrUtils.IsEmpty(BillTo.Ph)) {
             Customer.Cons = [
                 {
                     Type: 'M',
-                    No: OriginalSalesReceiveData.BillTo.Ph
+                    No: BillTo.Ph
                 }
             ];
         }
         SalesReceivePrintData.Customer = Customer;
 
-        if (!TrUtils.IsNull(OriginalSalesReceiveData.BillTo.InsId)) {
+        if (!TrUtils.IsNull(BillTo.InsId)) {
             SalesReceivePrintData.Cust = this.GetCustomerDetails(OriginalSalesReceiveData);
         }
         return SalesReceivePrintData;

package/src/shared/shared-pdf.service.ts

@@ -1325,7 +1325,7 @@ export class SharedPDFService {
   static GetCustomerGSTIN(Customer: any) {
     const customerTaxId = TrUtils.IsEmpty(Customer?.TaxId?.Value) ? Customer?.GSTIN : Customer.TaxId.Value;
     if (!TrUtils.IsEmpty(customerTaxId)) {
-      let GSTIN = { columns: [{ text: Customer?.TaxId?.Label ||'GSTIN :', width: 33, style: 'hed' }, { text: customerTaxId, marginTop: 1.5 }] };
+      let GSTIN = { columns: [{ text: Customer?.TaxId?.Label || 'GSTIN :', width: 33, style: 'hed' }, { text: customerTaxId, marginTop: 1.5 }] };
       return GSTIN;
     } else {
       return this.emptyObject();
@@ -1385,6 +1385,16 @@ export class SharedPDFService {
       id = 'WO#';
     } else if (Type === 'SalesOrder') {
       id = 'SO#';
+    } else if (Type === 'Sales Return') {
+      id = 'SR#';
+    } else if (Type === 'Sales Receive') {
+      id = 'SRR#';
+    } else if (Type === 'Purchase Return') {
+      id = 'PR#';
+    } else if (Type === 'Purchase Shipment') {
+      id = 'PS#';
+    } else if (Type === 'Purchase Order') {
+      id = 'PO#';
     } else if (Type === 'Sales Estimate') {
       id = 'Estimate#';
     } else if (Type === 'Debit Notes') {