shareneus 1.4.82 → 1.4.84

package/dist/accounting/invoice/invoice-portrait-pdf.d.ts

@@ -113,19 +113,7 @@ export declare class InvoicePortraitPrintService {
             lineWidth: number;
         }[];
     };
-    static GetSignatures(CName: any, Total: any): ({
-        columns: ({
-            text: string;
-            fontSize: number;
-            width: number;
-            bold?: undefined;
-        } | {
-            text: string;
-            bold: boolean;
-            fontSize: number;
-            width: string;
-        })[];
-    } | {
+    static GetSignatures(CName: any, Total: any): (string | {
         style: string;
         text: (string | {
             text: any;
@@ -173,20 +161,23 @@ export declare class InvoicePortraitPrintService {
         marginTop: number;
         table: {
             widths: string[];
-            body: (string | {
-                stack: {
-                    style: string;
-                    table: {
-                        widths: (string | number)[];
-                        headerRows: number;
-                        body: any;
-                    };
-                    layout: {
-                        hLineWidth: (i: any, node: any) => 0 | 0.1;
-                        vLineWidth: (i: any, node: any) => number;
-                        hLineColor: (i: any, node: any) => string;
-                    };
-                }[];
+            body: ({
+                stack: (string | {
+                    stack: {
+                        style: string;
+                        table: {
+                            widths: number[];
+                            headerRows: number;
+                            body: any;
+                        };
+                        layout: {
+                            hLineWidth: (i: any, node: any) => 0 | 0.1;
+                            vLineWidth: (i: any, node: any) => number;
+                            hLineColor: (i: any, node: any) => string;
+                        };
+                    }[];
+                })[];
+                columns?: undefined;
             } | {
                 columns: ({
                     style: string[];
@@ -202,6 +193,7 @@ export declare class InvoicePortraitPrintService {
                     text: string;
                     width: number;
                 })[];
+                stack?: undefined;
             })[][];
         };
         layout: string;
@@ -245,6 +237,35 @@ export declare class InvoicePortraitPrintService {
             hLineColor: (i: any, node: any) => string;
         };
     };
+    static PartsTaxAmounts1(PartsTaxInfo: any, ShowAccParts: any, ShowIGST: any, ShowTaxColumn: any): "" | {
+        stack: {
+            style: string;
+            table: {
+                widths: number[];
+                headerRows: number;
+                body: any;
+            };
+            layout: {
+                hLineWidth: (i: any, node: any) => 0 | 0.1;
+                vLineWidth: (i: any, node: any) => number;
+                hLineColor: (i: any, node: any) => string;
+            };
+        }[];
+    };
+    static AllHSNPartCGSTTaxListTable1(PartsTaxInfo: any, ShowAccParts: any, ShowIGST: any, ShowTaxColumn: any): {
+        style: string;
+        table: {
+            widths: number[];
+            headerRows: number;
+            body: any;
+        };
+        layout: {
+            hLineWidth: (i: any, node: any) => 0 | 0.1;
+            vLineWidth: (i: any, node: any) => number;
+            hLineColor: (i: any, node: any) => string;
+        };
+    };
+    static CreateHSNTaxTable1(PartsTaxInfo: any, ShowAccParts: any, ShowIGST: any, ShowTaxColumn: any): any;
     static CreateHeadingAllHSNTaxList(ShowIGST: any): {
         text: string;
         style: string;
@@ -253,6 +274,14 @@ export declare class InvoicePortraitPrintService {
         Field: string;
         alignment: string;
     }[];
+    static CreateHeadingAllTaxList(ShowIGST: any): {
+        text: string;
+        style: string;
+        fontSize: number;
+        lineHeight: number;
+        Field: string;
+        alignment: string;
+    }[];
     static CreateHSNTaxTable(PartsTaxInfo: any, ShowAccParts: any, ShowIGST: any, ShowTaxColumn: any): any;
     static GetNumberInWords(TotalAmount: any): {
         columns: ({

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

@@ -39,6 +39,7 @@ class InvoicePortraitPrintService {
                 },
                 this.GetItemsTable(InvoicePDFData.Ops, InvoicePDFData.Items, InvoicePDFData.ShowTaxColumn, InvoicePDFData.SType, printOptions, size, InvoicePDFData.Entity.DecimalsNumber),
                 [this.TotalDetails(InvoicePDFData, moreDiscDetails, InvoicePDFData.Entity.DecimalsNumber)],
+                [this.GetNumberInWords(InvoicePDFData.CustRoundedTotal)],
                 [this.InvoiceDueStatus(InvoicePDFData.Type, InvoicePDFData.Paid, InvoicePDFData.Due, InvoicePDFData.Sts, InvoicePDFData.isCountersale, InvoicePDFData.Entity.DecimalsNumber)
                 ],
                 {
@@ -108,7 +109,7 @@ class InvoicePortraitPrintService {
             return {
                 // lineHeight: 0.7,
                 fontSize: this.TableHeaders,
-                marginTop: 10,
+                marginTop: 3,
                 marginBottom: 5,
                 table: {
                     widths: ['*', 'auto'],
@@ -359,7 +360,7 @@ class InvoicePortraitPrintService {
     //   };
     // }
     static GetSignatures(CName, Total) {
-        return [[this.GetNumberInWords(Total), this.CompanyName(CName)]];
+        return [['', this.CompanyName(CName)]];
     }
     static CompanyName(CName) {
         return {
@@ -599,7 +600,7 @@ class InvoicePortraitPrintService {
                     widths: ['*', '*'],
                     body: [
                         [
-                            shared_pdf_service_1.SharedPDFService.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)],
                             }
@@ -721,6 +722,74 @@ class InvoicePortraitPrintService {
             };
         }
     }
+    static PartsTaxAmounts1(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn) {
+        if (ShowTaxColumn && !tr_utils_1.TrUtils.IsNull(PartsTaxInfo) && PartsTaxInfo.length > 0) {
+            return {
+                stack: [this.AllHSNPartCGSTTaxListTable1(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)]
+            };
+        }
+        else {
+            return '';
+        }
+    }
+    static AllHSNPartCGSTTaxListTable1(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn) {
+        if (ShowIGST) {
+            return {
+                style: 'tableExample',
+                table: {
+                    widths: [25, 60, 50],
+                    headerRows: 1,
+                    body: this.CreateHSNTaxTable1(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
+                },
+                layout: this.HeaderLineStyle(),
+            };
+        }
+        else {
+            return {
+                style: 'tableExample',
+                table: {
+                    widths: [25, 60, 40, 40],
+                    headerRows: 1,
+                    body: shared_pdf_service_1.SharedPDFService.CreateHSNTaxTable1(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
+                },
+                layout: this.HeaderLineStyle(),
+            };
+        }
+    }
+    static CreateHSNTaxTable1(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn) {
+        if (!tr_utils_1.TrUtils.IsNull(PartsTaxInfo) && PartsTaxInfo.length !== 0 && ShowAccParts && ShowTaxColumn) {
+            var body = [];
+            let columns = this.CreateHeadingAllTaxList(ShowIGST);
+            body.push(columns);
+            PartsTaxInfo.forEach((part) => {
+                var dataRow = [];
+                columns.forEach((column) => {
+                    if (!tr_utils_1.TrUtils.IsFixedZero(part[column.Field]) &&
+                        !tr_utils_1.TrUtils.IsNull(part[column.Field]) || column.Field === 'SGST' || column.Field === 'CGST' || column.Field === 'SGSTAmt' || column.Field === 'CGSTAmt'
+                        || column.Field === 'TotalTaxableAmount') {
+                        if (column.Field === 'TotalTaxableAmount' || column.Field === 'SGSTAmt' || column.Field === 'CGSTAmt' || column.Field === 'IGSTAmt') {
+                            dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(part[column.Field]), alignment: 'right', opacity: 0.7, nowrap: true, fontSize: 6 });
+                        }
+                        else if (column.Field === 'CombinedTaxPercentage') {
+                            dataRow.push({ text: part[column.Field].toString() + '%', alignment: 'left', opacity: 0.7, nowrap: true, fontSize: 6 });
+                        }
+                        else {
+                            dataRow.push({ text: part[column.Field].toString(), alignment: 'left', opacity: 0.7, nowrap: true, fontSize: 6 });
+                        }
+                    }
+                    else {
+                        part[column.Field] = '';
+                        dataRow.push({ text: part[column.Field].toString(), alignment: 'left', opacity: 0.7, fontSize: 6 });
+                    }
+                });
+                body.push(dataRow);
+            });
+            return body;
+        }
+        else {
+            return [{}];
+        }
+    }
     static CreateHeadingAllHSNTaxList(ShowIGST) {
         let HeaderNames = [{ text: 'HSN', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'HSN', alignment: 'right' },
             { text: 'Taxable Value', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'TotalTaxableAmount', alignment: 'right' },
@@ -735,11 +804,32 @@ class InvoicePortraitPrintService {
         }
         return HeaderNames;
     }
+    static CreateHeadingAllTaxList(ShowIGST) {
+        let HeaderNames = [
+            // { text: 'CGST', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'CGST' },
+            // { text: 'SGST', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'SGST' },
+            // { text: 'Count', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'PartsCount' },
+            { text: 'Tax Rate', style: 'tableheader2', fontSize: 6, lineHeight: 0.8, Field: 'CombinedTaxPercentage', alignment: 'left' },
+            { text: 'Taxable Amount', style: 'tableheader2', fontSize: 6, lineHeight: 0.8, Field: 'TotalTaxableAmount', alignment: 'right' },
+            // { text: 'Tax Amount', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'TotalTaxAmount' },
+        ];
+        if (ShowIGST) {
+            // HeaderNames.splice(1, 0, { text: 'IGST(%)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'IGST' });
+            HeaderNames.splice(2, 0, { text: 'IGST(Rs.)', style: 'tableheader2', fontSize: 6, lineHeight: 0.8, Field: 'IGSTAmt', alignment: 'right' });
+        }
+        else {
+            // HeaderNames.splice(1, 0, { text: 'CGST(%)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'CGST' });
+            HeaderNames.splice(2, 0, { text: 'CGST(Rs.)', style: 'tableheader2', fontSize: 6, lineHeight: 0.8, Field: 'CGSTAmt', alignment: 'right' });
+            // HeaderNames.splice(3, 0, { text: 'SGST(%)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'CGST' });
+            HeaderNames.splice(3, 0, { text: 'SGST(Rs.)', style: 'tableheader2', fontSize: 6, lineHeight: 0.8, Field: 'SGSTAmt', alignment: 'right' });
+        }
+        return HeaderNames;
+    }
     static CreateHSNTaxTable(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn) {
         if (!tr_utils_1.TrUtils.IsNull(PartsTaxInfo) && PartsTaxInfo.length !== 0 && ShowAccParts && ShowTaxColumn) {
             var body = [];
             let columns = this.CreateHeadingAllHSNTaxList(ShowIGST);
-            body.push(columns);
+            // body.push(columns);
             PartsTaxInfo.forEach((part) => {
                 var dataRow = [];
                 columns.forEach((column) => {

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

@@ -370,7 +370,7 @@ export declare class SharedPDFService {
         stack: {
             style: string;
             table: {
-                widths: (string | number)[];
+                widths: number[];
                 headerRows: number;
                 body: any;
             };
@@ -399,7 +399,7 @@ export declare class SharedPDFService {
     static AllHSNPartCGSTTaxListTable1(PartsTaxInfo: any, ShowAccParts: any, ShowIGST: any, ShowTaxColumn: any): {
         style: string;
         table: {
-            widths: (string | number)[];
+            widths: number[];
             headerRows: number;
             body: any;
         };
@@ -487,7 +487,7 @@ export declare class SharedPDFService {
                 stack: {
                     style: string;
                     table: {
-                        widths: (string | number)[];
+                        widths: number[];
                         headerRows: number;
                         body: any;
                     };

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

@@ -1353,7 +1353,7 @@ class SharedPDFService {
             return {
                 style: 'tableExample',
                 table: {
-                    widths: [40, 'auto', 50],
+                    widths: [25, 60, 50],
                     headerRows: 1,
                     body: this.CreateHSNTaxTable1(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
                 },
@@ -1364,7 +1364,7 @@ class SharedPDFService {
             return {
                 style: 'tableExample',
                 table: {
-                    widths: [50, 65, 50, 50],
+                    widths: [25, 60, 40, 40],
                     headerRows: 1,
                     body: this.CreateHSNTaxTable1(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
                 },

package/package.json

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