shareneus 1.4.26 → 1.4.27
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.
|
@@ -601,7 +601,7 @@ class InvoicePortraitPrintService {
|
|
|
601
601
|
[
|
|
602
602
|
this.PartsTaxAmounts(ROPrintData.CustTaxGroupData, true, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn),
|
|
603
603
|
{
|
|
604
|
-
columns: [{ text: '', width: 150 }, this.GrandTotal(ROPrintData, '0.00', ROPrintData.CustPartsTotalBeforeDisc, totalDisc, totalTax, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, null, ROPrintData.Consolidate,
|
|
604
|
+
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)]
|
|
605
605
|
}
|
|
606
606
|
],
|
|
607
607
|
]
|
|
@@ -624,13 +624,13 @@ class InvoicePortraitPrintService {
|
|
|
624
624
|
let AccountFields = [];
|
|
625
625
|
if (moreDiscDetails) {
|
|
626
626
|
if (!tr_utils_1.TrUtils.IsZero(InvoiceData.PDisc)) {
|
|
627
|
-
AccountFields.push({ name: 'Items Discount', value: InvoiceData.PDisc });
|
|
627
|
+
AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(InvoiceData.PDisc) });
|
|
628
628
|
}
|
|
629
629
|
if (!tr_utils_1.TrUtils.IsZero(InvoiceData.LDisc)) {
|
|
630
|
-
AccountFields.push({ name: 'Services Discount', value: InvoiceData.LDisc });
|
|
630
|
+
AccountFields.push({ name: 'Services Discount', value: tr_utils_1.TrUtils.FixPriceValue(InvoiceData.LDisc) });
|
|
631
631
|
}
|
|
632
632
|
if (!tr_utils_1.TrUtils.IsZero(InvoiceData.Disc)) {
|
|
633
|
-
AccountFields.push({ name: 'Overall Discount', value: InvoiceData.Disc });
|
|
633
|
+
AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(InvoiceData.Disc) });
|
|
634
634
|
}
|
|
635
635
|
}
|
|
636
636
|
else {
|