shareneus 1.4.27 → 1.4.29
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.
|
@@ -878,7 +878,7 @@ class DCLandscapePdfService {
|
|
|
878
878
|
// ROPrintData.ShowTaxColumn, ROPrintData.From),
|
|
879
879
|
shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank),
|
|
880
880
|
{
|
|
881
|
-
columns: [{ text: '', width: 175 }, shared_pdf_service_1.SharedPDFService.GrandTotal(ROPrintData, '0.00', ROPrintData.CustPartsTotalBeforeDisc, totalDisc, totalTax, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, null, ROPrintData.Consolidate, null, moreDiscDetails)]
|
|
881
|
+
columns: [{ text: '', width: moreDiscDetails ? 140 : 175 }, shared_pdf_service_1.SharedPDFService.GrandTotal(ROPrintData, '0.00', ROPrintData.CustPartsTotalBeforeDisc, totalDisc, totalTax, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, null, ROPrintData.Consolidate, null, moreDiscDetails)]
|
|
882
882
|
}
|
|
883
883
|
// SharedPDFService.GetCustomer(ROPrintData.Customer, ROPrintData.Type, ROPrintData.For,
|
|
884
884
|
// ROPrintData.Product, ROPrintData.Settings, 'Customer Name & Address', false)
|
|
@@ -898,7 +898,7 @@ class InvoiceLandscapePdfService {
|
|
|
898
898
|
// ROPrintData.ShowTaxColumn, ROPrintData.From),
|
|
899
899
|
shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank),
|
|
900
900
|
{
|
|
901
|
-
columns: [{ text: '', width: 175 }, shared_pdf_service_1.SharedPDFService.GrandTotal(ROPrintData, '0.00', ROPrintData.CustPartsTotalBeforeDisc, totalDisc, totalTax, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, null, ROPrintData.Consolidate, null, moreDiscDetails)]
|
|
901
|
+
columns: [{ text: '', width: moreDiscDetails ? 140 : 175 }, shared_pdf_service_1.SharedPDFService.GrandTotal(ROPrintData, '0.00', ROPrintData.CustPartsTotalBeforeDisc, totalDisc, totalTax, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, null, ROPrintData.Consolidate, null, moreDiscDetails)]
|
|
902
902
|
}
|
|
903
903
|
// SharedPDFService.GetCustomer(ROPrintData.Customer, ROPrintData.Type, ROPrintData.For,
|
|
904
904
|
// ROPrintData.Product, ROPrintData.Settings, 'Customer Name & Address', false)
|
|
@@ -1624,13 +1624,13 @@ class SharedPDFService {
|
|
|
1624
1624
|
];
|
|
1625
1625
|
if (moreDiscDetails) {
|
|
1626
1626
|
if (!tr_utils_1.TrUtils.IsZero(RecordData.PDisc)) {
|
|
1627
|
-
AccountFields.push({ name: 'Items Discount', value: RecordData.PDisc });
|
|
1627
|
+
AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.PDisc) });
|
|
1628
1628
|
}
|
|
1629
1629
|
if (!tr_utils_1.TrUtils.IsZero(RecordData.LDisc)) {
|
|
1630
|
-
AccountFields.push({ name: 'Services Discount', value: RecordData.LDisc });
|
|
1630
|
+
AccountFields.push({ name: 'Services Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.LDisc) });
|
|
1631
1631
|
}
|
|
1632
1632
|
if (!tr_utils_1.TrUtils.IsZero(RecordData.Disc)) {
|
|
1633
|
-
AccountFields.push({ name: 'Overall Discount', value: RecordData.Disc });
|
|
1633
|
+
AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.Disc) });
|
|
1634
1634
|
}
|
|
1635
1635
|
}
|
|
1636
1636
|
else {
|
|
@@ -1721,7 +1721,7 @@ class SharedPDFService {
|
|
|
1721
1721
|
this.PartsTaxAmounts(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
|
|
1722
1722
|
]
|
|
1723
1723
|
},
|
|
1724
|
-
{ text: '', width: 60 },
|
|
1724
|
+
{ text: '', width: moreDiscDetails ? 40 : 60 },
|
|
1725
1725
|
// this.GrandTotal(LaborAfterGST, PartsAfterGST, totalDisc, For, OverAllRecordTotal, Rounded, GrandTotal)
|
|
1726
1726
|
this.GrandTotal(RecordData, BasicLaborTotal, BasicPartsTotal, totalDisc, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, STotal, moreDiscDetails)
|
|
1727
1727
|
]
|
|
@@ -1930,13 +1930,13 @@ class SharedPDFService {
|
|
|
1930
1930
|
];
|
|
1931
1931
|
if (moreDiscDetails) {
|
|
1932
1932
|
if (!tr_utils_1.TrUtils.IsZero(RecordData.PDisc)) {
|
|
1933
|
-
AccountFields.push({ name: 'Items Discount', value: RecordData.PDisc });
|
|
1933
|
+
AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.PDisc) });
|
|
1934
1934
|
}
|
|
1935
1935
|
if (!tr_utils_1.TrUtils.IsZero(RecordData.LDisc)) {
|
|
1936
|
-
AccountFields.push({ name: 'Services Discount', value: RecordData.LDisc });
|
|
1936
|
+
AccountFields.push({ name: 'Services Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.LDisc) });
|
|
1937
1937
|
}
|
|
1938
1938
|
if (!tr_utils_1.TrUtils.IsZero(RecordData.Disc)) {
|
|
1939
|
-
AccountFields.push({ name: 'Overall Discount', value: RecordData.Disc });
|
|
1939
|
+
AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.Disc) });
|
|
1940
1940
|
}
|
|
1941
1941
|
}
|
|
1942
1942
|
else {
|