shareneus 1.5.4 → 1.5.6

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.
Files changed (3) hide show
  1. package/dist/accounting/counter-sales/sales-receipt-print.service.js +1 -1
  2. package/dist/shared/shared-pdf.service.js +5 -1
  3. package/package.json +1 -1
package/dist/accounting/counter-sales/sales-receipt-print.service.js CHANGED
@@ -57,7 +57,7 @@ class SaleReceiptPrintService {
57
57
  InvoicePrintData.Sts = PaymentData.Sts;
58
58
  }
59
59
  InvoicePrintData.Consolidate = ConsolidateGST;
60
- InvoicePrintData.ShowDiscountColumn = false;
60
+ InvoicePrintData.ShowDiscountColumn = true;
61
61
  if (!ForInsurance && !ConsolidateGST) {
62
62
  if (shared_print_service_1.PrintSharedService.CheckItemIndexWithDisc(InvoicePrintData) !== -1) {
63
63
  InvoicePrintData.ShowDiscountColumn = (InvoicePrintData.Settings.DiscLvl === 'ITM' || InvoicePrintData.Settings.DiscLvl === 'RECITM') ? true : false;
package/dist/shared/shared-pdf.service.js CHANGED
@@ -1991,8 +1991,12 @@ class SharedPDFService {
1991
1991
  if (!Consolidate) {
1992
1992
  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
1993
  }
1994
+ else {
1995
+ 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));
1996
+ 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) });
1997
+ }
1994
1998
  }
1995
- if (!tr_utils_1.TrUtils.IsEmpty(totalTax)) {
1999
+ if (!tr_utils_1.TrUtils.IsEmpty(totalTax) && !Consolidate) {
1996
2000
  AccountFields.push({ name: 'Total Tax', value: totalTax });
1997
2001
  }
1998
2002
  if (!tr_utils_1.TrUtils.IsEmpty(Adj)) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "shareneus",
3
- "version": "1.5.04",
3
+ "version": "1.5.06",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",