shareneus 1.5.8 → 1.5.10
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.
|
@@ -83,7 +83,10 @@ class SaleReceiptPrintService {
|
|
|
83
83
|
return InvoicePrintData;
|
|
84
84
|
}
|
|
85
85
|
static GetInvoiceTypeHeading(InvoicePrintData, OriginalInvoiceData, IncludeGST, ConsolidateGST, IsProforma) {
|
|
86
|
-
if (
|
|
86
|
+
if (ConsolidateGST) {
|
|
87
|
+
InvoicePrintData.HeaderName = 'Sales Receipt';
|
|
88
|
+
}
|
|
89
|
+
else if (IsProforma) {
|
|
87
90
|
InvoicePrintData.HeaderName = 'pro-forma Invoice';
|
|
88
91
|
}
|
|
89
92
|
else {
|
|
@@ -105,6 +105,7 @@ class PurchaseOrderTotalsService {
|
|
|
105
105
|
if (tr_utils_1.TrUtils.IsNull(Part.Ind)) {
|
|
106
106
|
Part.DiscountedPrice = this.GetPartDiscountedPrice(Part.Disc, Part.RecDisc);
|
|
107
107
|
// Part.AfterDiscountPrice = Part.NetAmt;
|
|
108
|
+
console.log('Part total', Part.UnAmt, Part.Disc, Part.RecDisc);
|
|
108
109
|
Part.AfterDiscountPrice = (0, math_operations_1.Subtract)(Part.UnAmt, Part.Disc, Part.RecDisc);
|
|
109
110
|
}
|
|
110
111
|
Part.GSTAmt = (0, math_operations_1.Add)(Part.SGST, Part.CGST, Part.IGST);
|
|
@@ -166,6 +167,7 @@ class PurchaseOrderTotalsService {
|
|
|
166
167
|
let ServicesTotalAfterDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(ServicesInfo[0]);
|
|
167
168
|
let ServicesDiscTotal = tr_utils_1.TrUtils.SetValueToZeroIfNull(ServicesInfo[1]);
|
|
168
169
|
let ServicesTaxTotal = tr_utils_1.TrUtils.SetValueToZeroIfNull(ServicesInfo[2]);
|
|
170
|
+
console.log('Subtotal', PartsTotalAfterDisc, PartsDiscTotal, ServicesTotalAfterDisc, ServicesDiscTotal);
|
|
169
171
|
finalTotalsData.SubTotal = (0, math_operations_1.Add)(PartsTotalAfterDisc, PartsDiscTotal, ServicesTotalAfterDisc, ServicesDiscTotal);
|
|
170
172
|
finalTotalsData.Adj = tr_utils_1.TrUtils.FixPriceValue(Adjust, DecimalsNumber);
|
|
171
173
|
// if (GetSubTotal) {
|