shareneus 1.5.5 → 1.5.7
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.
|
@@ -593,6 +593,7 @@ class SalesReceiptpdfService {
|
|
|
593
593
|
return headersNames;
|
|
594
594
|
}
|
|
595
595
|
static CommonTotalDetails(ROPrintData, index, numberofCopies, moreDiscDetails) {
|
|
596
|
+
console.log('isConsolidate', ROPrintData.Consolidate);
|
|
596
597
|
let CommonDetails = [
|
|
597
598
|
shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails(ROPrintData, ROPrintData.CustLaborTotalBeforeDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST, ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustPartsTotalBeforeDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST, ROPrintData.CustPartSGST, ROPrintData.CustTaxGroupData, ROPrintData.ShowAccParts, ROPrintData.CustLaborAfterTax, ROPrintData.CustPartAfterTax, ROPrintData.FixedDisc, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn, tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax), ROPrintData.CustLaborITax, ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, ROPrintData.Adj, null, moreDiscDetails),
|
|
598
599
|
shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, false, ROPrintData.Entity.DecimalsNumber),
|
|
@@ -1970,6 +1970,7 @@ class SharedPDFService {
|
|
|
1970
1970
|
// { name: 'Labor Total', value: LaborAfterGST },
|
|
1971
1971
|
// { name: 'Part Total', value: PartsAfterGST },
|
|
1972
1972
|
];
|
|
1973
|
+
console.log('shared Consolidate', Consolidate);
|
|
1973
1974
|
if (moreDiscDetails) {
|
|
1974
1975
|
if (!tr_utils_1.TrUtils.IsZero(RecordData.PDisc)) {
|
|
1975
1976
|
AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.PDisc, DecimalsNumber) });
|
|
@@ -1992,10 +1993,11 @@ class SharedPDFService {
|
|
|
1992
1993
|
AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST))), DecimalsNumber) });
|
|
1993
1994
|
}
|
|
1994
1995
|
else {
|
|
1996
|
+
console.log('Test', tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(totalTax))), DecimalsNumber));
|
|
1995
1997
|
AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(totalTax))), DecimalsNumber) });
|
|
1996
1998
|
}
|
|
1997
1999
|
}
|
|
1998
|
-
if (!tr_utils_1.TrUtils.IsEmpty(totalTax)) {
|
|
2000
|
+
if (!tr_utils_1.TrUtils.IsEmpty(totalTax) && !Consolidate) {
|
|
1999
2001
|
AccountFields.push({ name: 'Total Tax', value: totalTax });
|
|
2000
2002
|
}
|
|
2001
2003
|
if (!tr_utils_1.TrUtils.IsEmpty(Adj)) {
|