shareneus 1.4.65 → 1.4.67

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

@@ -789,7 +789,7 @@ class HCInvoiceprintService {
             return {
                 // lineHeight: 0.7,
                 fontSize: 9,
-                marginTop: 10,
+                marginTop: 5,
                 marginBottom: 5,
                 table: {
                     widths: ['*', 'auto'],

package/dist/accounting/invoice/inv-print.service.js

@@ -347,7 +347,11 @@ class InvPrintService {
                     Customer.Adrs.push(argInvoiceData.BillTo.Adrs.A2);
                 }
                 if (!tr_utils_1.TrUtils.IsEmpty(argInvoiceData.BillTo.Adrs.Ct)) {
-                    Customer.Adrs.push(argInvoiceData.BillTo.Adrs.Ct);
+                    let city = argInvoiceData.BillTo.Adrs.Ct;
+                    if (!tr_utils_1.TrUtils.IsEmpty(argInvoiceData.BillTo.Adrs.Pin)) {
+                        city = city + ', ' + argInvoiceData.BillTo.Adrs.StCode + '-' + argInvoiceData.BillTo.Adrs.Pin;
+                    }
+                    Customer.Adrs.push(city);
                 }
             }
             Customer.GSTIN = argInvoiceData.BillTo.GSTIN;

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

@@ -497,10 +497,6 @@ export declare class SharedPDFService {
                         hLineColor: (i: any, node: any) => string;
                     };
                 }[];
-            } | {
-                text: string;
-                fontSize: number;
-                opacity: number;
             })[];
         })[];
         marginLeft: number;

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

@@ -999,10 +999,10 @@ class SharedPDFService {
         if (tr_utils_1.TrUtils.IsNull(Customer)) {
             return this.emptyObject();
         }
-        let Data = [{ text: CustHeader + ':', style: 'hed2' },
-            { text: Customer.Code, fontSize: this.SubHeaderSize },
-            { text: Customer.Name, fontSize: this.SubHeaderSize },
-            { text: this.GetAddress(Customer), marginTop: 3 },
+        let Data = [{ text: CustHeader + ':', fontSize: 7 },
+            { text: Customer.Code, fontSize: 11, bold: true },
+            { text: Customer.Name, fontSize: 10 },
+            { text: this.GetAddress(Customer), marginTop: 2 },
             this.GetCustPhoneNumber(Customer, Type), this.GetCustomerGSTIN(Customer), this.GetCustomerDLNo(Customer),
             ,
             this.GetCustomerName(Customer.CustName)];
@@ -1073,7 +1073,7 @@ class SharedPDFService {
         if (Type !== 'Technician Copy') {
             var contact = this.GetFormatContact(Customer);
             if (contact.length !== 0) {
-                return { columns: [{ text: 'Phone', width: 27, style: 'hed' }, contact] };
+                return { columns: [{ text: 'Phone', width: 'auto', style: 'hed' }, { text: contact, width: '*' }] };
             }
             else {
                 return this.emptyObject();
@@ -1397,7 +1397,7 @@ class SharedPDFService {
         return {
             style: 'tableExample',
             table: {
-                widths: [20, 20, 40, 40],
+                widths: [20, 60, 40, 40],
                 body: this.ALLPartsCGSTTaxListTable(PartsTaxInfo, ShowAccParts, ShowTaxColumn)
             },
             layout: this.HeaderLineStyle(),
@@ -1617,16 +1617,15 @@ class SharedPDFService {
                 totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
             }
         }
-        let serviceName;
-        let itemName;
-        if (isAuto) {
-            serviceName = 'Labor Tax';
-            itemName = 'Parts Tax';
-        }
-        else {
-            serviceName = 'Service Tax';
-            itemName = 'Items Tax';
-        }
+        // let serviceName: string;
+        // let itemName: string;
+        // if (isAuto) {
+        //   serviceName = 'Labor Tax';
+        //   itemName = 'Parts Tax';
+        // } else {
+        //   serviceName = 'Service Tax';
+        //   itemName = 'Items Tax';
+        // }
         return {
             columns: [
                 // this.GetTaxOnLabor(BasicLaborTotal, OverAllMainLaborDiscount, LCGST,
@@ -1636,7 +1635,7 @@ class SharedPDFService {
                     stack: [
                         // this.GetTaxOnParts(BasicPartsTotal, OverAllMainPartsDiscount, PCGST,
                         //   PSGST, ShowAccParts, PIGST, ShowIGST, ShowTaxColumn, ShowDetailedPartTaxInfo, From),
-                        { text: (istaxable && CustLaborTaxGroupDataByPerc.length !== 0) ? serviceName : '', fontSize: 7, opacity: 0.8 },
+                        // { text: (istaxable && CustLaborTaxGroupDataByPerc.length !== 0) ? serviceName : '', fontSize: 7, opacity: 0.8 },
                         this.PartsTaxAmounts1(CustLaborTaxGroupDataByPerc, ShowAccParts, ShowIGST, ShowTaxColumn),
                         // { text: (istaxable && PartsTaxInfo.length !== 0) ? itemName : '', fontSize: 7, opacity: 0.8 },
                         // this.PartsTaxAmounts1(PartsTaxInfo, ShowAccParts, ShowIGST,

package/package.json

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