shareneus 1.6.45 → 1.6.47

package/dist/accounting/counter-sales/pos-receipt-pdf.js

@@ -276,7 +276,7 @@ class PosReceiptPrintService {
             TotalData.push({ name: 'Sub Total', value: InvoicePDFData.STotal });
         }
         else {
-            TotalData.push({ name: 'Sub Total', value: tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(InvoicePDFData.STotal, InvoicePDFData.CustPartITax)) });
+            TotalData.push({ name: 'Sub Total', value: tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(InvoicePDFData.CustNonRetRoundedTotal, InvoicePDFData.CustPartsDiscTotal)) });
         }
         if (!tr_utils_1.TrUtils.IsFixedZero(this.GetDiscountOverall(InvoicePDFData))) {
             // TotalData.push({ text: 'Discount : -' + this.GetDiscountOverall(InvoicePDFData), style: ['headerstyle'], alignment: 'right', marginRight: 5, });

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

@@ -58,7 +58,7 @@ function GetInvoicePrintInfo(OriginalInvoiceData, OriginalEntityData, image, Inc
     InvoicePrintData.PrintInfo = PrepareFormatForInvoicePrint(InvoicePrintData, code_enums_1.ROTypeEnum.Invoice, argInvoiceData.Sts);
     InvoicePrintData = GetFormattedProductDataForPrint(argInvoiceData, InvoicePrintData);
     InvoicePrintData = GetBillNameForInvoicePrint(argInvoiceData, InvoicePrintData);
-    let PaymentData = GetPaymentsTotal(argInvoiceData.Credits, argInvoiceData.Payments, InvoicePrintData.Total, argInvoiceData.Sts, InvoicePrintData.Entity.DecimalsNumber);
+    let PaymentData = GetPaymentsTotal(argInvoiceData.Credits, argInvoiceData.Payments, argInvoiceData.Total, argInvoiceData.Sts, InvoicePrintData.Entity.DecimalsNumber);
     // if (argInvoiceData.Settings.DiscLvl !== 'REC') {
     //     InvoicePrintData.FixedDisc = null;
     // }

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

@@ -67,7 +67,7 @@ function buildPdfDocDefinition(PDFInvoiceData = {}, PrintConfigData = {}, printC
     const pageSize = (0, pdf_header_footer_section_1.resolvePageSize)(PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.PSize, requestedPageOrientation);
     const basePageMargins = (0, pdf_header_footer_section_1.resolvePageMargins)(PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.pageMargins);
     const copyLabels = normalizeCopyLabels(printCopies);
-    const watermark = (0, pdf_header_footer_section_1.buildWatermark)(PrintConfig);
+    const watermark = (0, pdf_header_footer_section_1.buildWatermark)(PrintConfig, PDFInvoiceData);
     const background = (0, pdf_header_footer_section_1.buildLogoWatermarkBackground)(PrintConfig, PDFInvoiceData);
     const pageHeader = (0, pdf_header_footer_section_1.buildPageNumberHeader)(PrintConfig);
     const pageFooter = (0, pdf_header_footer_section_1.buildFooter)(PrintConfig);

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

@@ -18,12 +18,13 @@ function GetInvoicePDF(invoiceData, entityData, headerConfig, printConfig, taxCo
             LaborInvoice: true,
             Size: 'full',
             MoreDiscDetails: false,
+            IsProforma: false,
             Orientation: 'portrait'
         };
     }
     const printConfigData = tr_utils_1.TrUtils.ConcatObjects(tr_utils_1.TrUtils.Stringify(headerConfig), tr_utils_1.TrUtils.Stringify(printConfig));
     printConfigData.withPass = withPass;
-    const invoicePrintData = (0, inv_print_service_1.GetInvoicePrintInfo)(invoiceData, entityData, image, options.ShowGST, options.ConsolidateGST, taxCodes, false, options.PartInvoice, options.LaborInvoice);
+    const invoicePrintData = (0, inv_print_service_1.GetInvoicePrintInfo)(invoiceData, entityData, image, options.ShowGST, options.ConsolidateGST, taxCodes, options.IsProforma, options.PartInvoice, options.LaborInvoice);
     let invPrint;
     if (options.ConsolidateGST || !options.ShowGST) {
         invPrint = (0, unified_invoice_pdf_service_1.GetInvoicePrint)(invoicePrintData, numberofCopies, withPass, options.Size, options.MoreDiscDetails, options.Orientation);

package/dist/accounting/invoice/unified-invoice-pdf.service.js

@@ -145,7 +145,10 @@ function PreparesparePartsTable(invoicePdfData, orientation = 'portrait') {
             if (tr_utils_1.TrUtils.IsNull(invoicePdfData.PrintInfo[i].Text)) {
                 invoicePdfData.PrintInfo[i].Text = '';
             }
-            List.push(invoicePdfData.PrintInfo[i].Text, GetLaborPartsTableForView(tr_utils_1.TrUtils.Stringify(invoicePdfData.PrintInfo[i].Items), tr_utils_1.TrUtils.Stringify(invoicePdfData.PrintInfo[i].Ops), printPartNo, orientation));
+            if (!tr_utils_1.TrUtils.IsEmpty(invoicePdfData.PrintInfo[i].Text)) {
+                List.push(invoicePdfData.PrintInfo[i].Text);
+            }
+            List.push(GetLaborPartsTableForView(tr_utils_1.TrUtils.Stringify(invoicePdfData.PrintInfo[i].Items), tr_utils_1.TrUtils.Stringify(invoicePdfData.PrintInfo[i].Ops), printPartNo, orientation));
         }
     }
     else {
@@ -154,19 +157,25 @@ function PreparesparePartsTable(invoicePdfData, orientation = 'portrait') {
                 if (tr_utils_1.TrUtils.IsNull(invoicePdfData.PrintInfo[i].Text)) {
                     invoicePdfData.PrintInfo[i].Text = '';
                 }
-                List.push(invoicePdfData.PrintInfo[i].Text, WithOutDiscountFieldTable(tr_utils_1.TrUtils.Stringify(invoicePdfData.PrintInfo[i].Items), tr_utils_1.TrUtils.Stringify(invoicePdfData.PrintInfo[i].Ops), invoicePdfData.ShowTaxColumn, printPartNo, invoicePdfData.Entity.Body, invoicePdfData.ShowIGST, invoicePdfData.ConsolidateGST, invoicePdfData.ShowDiscountColumn, invoicePdfData.Entity.DecimalsNumber, invoicePdfData, orientation));
+                if (!tr_utils_1.TrUtils.IsEmpty(invoicePdfData.PrintInfo[i].Text)) {
+                    List.push(invoicePdfData.PrintInfo[i].Text);
+                }
+                List.push(WithOutDiscountFieldTable(tr_utils_1.TrUtils.Stringify(invoicePdfData.PrintInfo[i].Items), tr_utils_1.TrUtils.Stringify(invoicePdfData.PrintInfo[i].Ops), invoicePdfData.ShowTaxColumn, printPartNo, invoicePdfData.Entity.Body, invoicePdfData.ShowIGST, invoicePdfData.ConsolidateGST, invoicePdfData.ShowDiscountColumn, invoicePdfData.Entity.DecimalsNumber, invoicePdfData, orientation));
             }
         }
         else {
             if (invoicePdfData.Summary) {
-                List.push('', GetLaborPartsTableForView(invoicePdfData.Items, invoicePdfData.Ops, printPartNo, orientation));
+                List.push(GetLaborPartsTableForView(invoicePdfData.Items, invoicePdfData.Ops, printPartNo, orientation));
             }
             else {
                 for (let i = 0; i < invoicePdfData.PrintInfo.length; i++) {
                     if (tr_utils_1.TrUtils.IsNull(invoicePdfData.PrintInfo[i].Text)) {
                         invoicePdfData.PrintInfo[i].Text = '';
                     }
-                    List.push(invoicePdfData.PrintInfo[i].Text, GetWithOutDiscAndTaxFieldHeader(tr_utils_1.TrUtils.Stringify(invoicePdfData.PrintInfo[i].Items), tr_utils_1.TrUtils.Stringify(invoicePdfData.PrintInfo[i].Ops), invoicePdfData.ShowTaxColumn, printPartNo, invoicePdfData.Entity.Body, invoicePdfData.ShowIGST, invoicePdfData.ConsolidateGST, invoicePdfData.ShowDiscountColumn, invoicePdfData.Entity.DecimalsNumber, invoicePdfData, orientation));
+                    if (!tr_utils_1.TrUtils.IsEmpty(invoicePdfData.PrintInfo[i].Text)) {
+                        List.push(invoicePdfData.PrintInfo[i].Text);
+                    }
+                    List.push(GetWithOutDiscAndTaxFieldHeader(tr_utils_1.TrUtils.Stringify(invoicePdfData.PrintInfo[i].Items), tr_utils_1.TrUtils.Stringify(invoicePdfData.PrintInfo[i].Ops), invoicePdfData.ShowTaxColumn, printPartNo, invoicePdfData.Entity.Body, invoicePdfData.ShowIGST, invoicePdfData.ConsolidateGST, invoicePdfData.ShowDiscountColumn, invoicePdfData.Entity.DecimalsNumber, invoicePdfData, orientation));
                 }
             }
         }

package/dist/shared/header-footer-section/pdf-header-footer.section.d.ts

@@ -104,7 +104,7 @@ export declare function buildDocumentHeadingSection(PDFInvoiceData: any, PrintCo
     fontSize?: undefined;
     alignment?: undefined;
 })[];
-export declare function buildWatermark(PrintConfig: any): {
+export declare function buildWatermark(PrintConfig: any, DocumentData?: any): {
     text: string;
     color: string;
     opacity: number;

package/dist/shared/header-footer-section/pdf-header-footer.section.js

@@ -176,8 +176,8 @@ function buildDocumentHeadingSection(PDFInvoiceData, PrintConfig, availableWidth
         }
     ];
 }
-function buildWatermark(PrintConfig) {
-    const value = (0, pdf_shared_utils_1.firstValue)(PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.WatermarkText);
+function buildWatermark(PrintConfig, DocumentData = {}) {
+    const value = (DocumentData === null || DocumentData === void 0 ? void 0 : DocumentData.IsProforma) ? 'Not a final invoice' : (0, pdf_shared_utils_1.firstValue)(PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.WatermarkText);
     const isEnabled = !!((PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.Watermark) || (PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.WatermarkEnabled) || value);
     if (!isEnabled) {
         return null;

package/dist/shared/party-details-section/pdf-party-details.section.js

@@ -290,12 +290,12 @@ function buildPartyStack(title, party, customerLayout) {
             color: '#111827',
             margin: [0, 3, 0, 1]
         });
-        stack.push({
-            canvas: [
-                { type: 'line', x1: 0, y1: 0, x2: 170, y2: 0, lineWidth: 0.5, lineColor: '#111827' }
-            ],
-            margin: [0, 2, 0, 0]
-        });
+        // stack.push({
+        //     canvas: [
+        //         { type: 'line', x1: 0, y1: 0, x2: 170, y2: 0, lineWidth: 0.5, lineColor: '#111827' }
+        //     ],
+        //     margin: [0, 2, 0, 0]
+        // });
     }
     return stack;
 }

package/package.json

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