shareneus 1.6.45 → 1.6.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -276,7 +276,7 @@ class PosReceiptPrintService {
|
|
|
276
276
|
TotalData.push({ name: 'Sub Total', value: InvoicePDFData.STotal });
|
|
277
277
|
}
|
|
278
278
|
else {
|
|
279
|
-
TotalData.push({ name: 'Sub Total', value: tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(InvoicePDFData.
|
|
279
|
+
TotalData.push({ name: 'Sub Total', value: tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(InvoicePDFData.CustNonRetRoundedTotal, InvoicePDFData.CustPartsDiscTotal)) });
|
|
280
280
|
}
|
|
281
281
|
if (!tr_utils_1.TrUtils.IsFixedZero(this.GetDiscountOverall(InvoicePDFData))) {
|
|
282
282
|
// TotalData.push({ text: 'Discount : -' + this.GetDiscountOverall(InvoicePDFData), style: ['headerstyle'], alignment: 'right', marginRight: 5, });
|
|
@@ -58,7 +58,7 @@ function GetInvoicePrintInfo(OriginalInvoiceData, OriginalEntityData, image, Inc
|
|
|
58
58
|
InvoicePrintData.PrintInfo = PrepareFormatForInvoicePrint(InvoicePrintData, code_enums_1.ROTypeEnum.Invoice, argInvoiceData.Sts);
|
|
59
59
|
InvoicePrintData = GetFormattedProductDataForPrint(argInvoiceData, InvoicePrintData);
|
|
60
60
|
InvoicePrintData = GetBillNameForInvoicePrint(argInvoiceData, InvoicePrintData);
|
|
61
|
-
let PaymentData = GetPaymentsTotal(argInvoiceData.Credits, argInvoiceData.Payments,
|
|
61
|
+
let PaymentData = GetPaymentsTotal(argInvoiceData.Credits, argInvoiceData.Payments, argInvoiceData.Total, argInvoiceData.Sts, InvoicePrintData.Entity.DecimalsNumber);
|
|
62
62
|
// if (argInvoiceData.Settings.DiscLvl !== 'REC') {
|
|
63
63
|
// InvoicePrintData.FixedDisc = null;
|
|
64
64
|
// }
|
|
@@ -18,12 +18,13 @@ function GetInvoicePDF(invoiceData, entityData, headerConfig, printConfig, taxCo
|
|
|
18
18
|
LaborInvoice: true,
|
|
19
19
|
Size: 'full',
|
|
20
20
|
MoreDiscDetails: false,
|
|
21
|
+
IsProforma: false,
|
|
21
22
|
Orientation: 'portrait'
|
|
22
23
|
};
|
|
23
24
|
}
|
|
24
25
|
const printConfigData = tr_utils_1.TrUtils.ConcatObjects(tr_utils_1.TrUtils.Stringify(headerConfig), tr_utils_1.TrUtils.Stringify(printConfig));
|
|
25
26
|
printConfigData.withPass = withPass;
|
|
26
|
-
const invoicePrintData = (0, inv_print_service_1.GetInvoicePrintInfo)(invoiceData, entityData, image, options.ShowGST, options.ConsolidateGST, taxCodes,
|
|
27
|
+
const invoicePrintData = (0, inv_print_service_1.GetInvoicePrintInfo)(invoiceData, entityData, image, options.ShowGST, options.ConsolidateGST, taxCodes, options.IsProforma, options.PartInvoice, options.LaborInvoice);
|
|
27
28
|
let invPrint;
|
|
28
29
|
if (options.ConsolidateGST || !options.ShowGST) {
|
|
29
30
|
invPrint = (0, unified_invoice_pdf_service_1.GetInvoicePrint)(invoicePrintData, numberofCopies, withPass, options.Size, options.MoreDiscDetails, options.Orientation);
|