shareneus 1.7.359 → 1.7.360

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/shared/transactions-pdf.service.js +4 -1
  2. package/package.json +1 -1
  3. package/src/shared/transactions-pdf.service.ts +10 -8
package/dist/shared/transactions-pdf.service.js CHANGED
@@ -44,13 +44,16 @@ function GetInvoicePDF(invoiceData, entityData, headerConfig, printConfig, taxCo
44
44
  invPrint = (0, unified_invoice_pdf_service_1.GetInvoicePrint)(invoicePrintData, numberofCopies, withPass, options.Size, options.MoreDiscDetails, options.Orientation);
45
45
  }
46
46
  else {
47
- console.log('invoicePrintData', invoicePrintData, 'options', options);
47
+ // console.log('invoicePrintData', invoicePrintData, 'options', options);
48
48
  if (options.PartInvoice && options.LaborInvoice) {
49
49
  invoicePrintData.Round = tr_utils_1.TrUtils.FixedTo(invoiceData.Round);
50
50
  invoicePrintData.Total = tr_utils_1.TrUtils.FixedTo(invoiceData.Total);
51
51
  invoicePrintData.SubToal = tr_utils_1.TrUtils.FixedTo(invoiceData.SubToal);
52
52
  invoicePrintData.TaxTotal = tr_utils_1.TrUtils.FixedTo(invoiceData.TaxTotal);
53
53
  }
54
+ else {
55
+ invoicePrintData.TaxTotal = tr_utils_1.TrUtils.FixedTo((0, math_operations_1.Add)(Number(invoiceData.CustPartITax), Number(invoiceData.CustLaborITax)));
56
+ }
54
57
  delete invoicePrintData.SIndTotal;
55
58
  invPrint = (0, invoice_pdf_service_1.CreateInvoicePDFService)(invoicePrintData, printConfigData, numberofCopies);
56
59
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "shareneus",
3
- "version": "1.7.359",
3
+ "version": "1.7.360",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/shared/transactions-pdf.service.ts CHANGED
@@ -40,12 +40,14 @@ export function GetInvoicePDF(invoiceData: any, entityData: any, headerConfig: a
40
40
  if (options.ConsolidateGST) {
41
41
  invPrint = GetInvoicePrint(invoicePrintData, numberofCopies, withPass, options.Size, options.MoreDiscDetails, options.Orientation);
42
42
  } else {
43
- console.log('invoicePrintData', invoicePrintData, 'options', options);
44
- if(options.PartInvoice && options.LaborInvoice){
45
- invoicePrintData.Round = TrUtils.FixedTo(invoiceData.Round);
46
- invoicePrintData.Total = TrUtils.FixedTo(invoiceData.Total);
47
- invoicePrintData.SubToal = TrUtils.FixedTo(invoiceData.SubToal);
48
- invoicePrintData.TaxTotal = TrUtils.FixedTo(invoiceData.TaxTotal);
43
+ // console.log('invoicePrintData', invoicePrintData, 'options', options);
44
+ if (options.PartInvoice && options.LaborInvoice) {
45
+ invoicePrintData.Round = TrUtils.FixedTo(invoiceData.Round);
46
+ invoicePrintData.Total = TrUtils.FixedTo(invoiceData.Total);
47
+ invoicePrintData.SubToal = TrUtils.FixedTo(invoiceData.SubToal);
48
+ invoicePrintData.TaxTotal = TrUtils.FixedTo(invoiceData.TaxTotal);
49
+ } else {
50
+ invoicePrintData.TaxTotal = TrUtils.FixedTo(Add(Number(invoiceData.CustPartITax), Number(invoiceData.CustLaborITax)));
49
51
  }
50
52
  delete invoicePrintData.SIndTotal;
51
53
  invPrint = CreateInvoicePDFService(invoicePrintData, printConfigData, numberofCopies);
@@ -106,7 +108,7 @@ export function GetDeliveryChallanPDF(deliveryChallanData: any, entityData: any,
106
108
  let dcPrint: any;
107
109
  if (options.ConsolidateGST) {
108
110
  dcPrint = DeliveryChallanPdfService.GetDeliveryChallanPrint(deliveryChallanData, numberofCopies, false);
109
- } else {
111
+ } else {
110
112
  dcPrintData.Round = TrUtils.FixedTo(deliveryChallanData.Round);
111
113
  dcPrintData.Total = TrUtils.FixedTo(deliveryChallanData.Total);
112
114
  dcPrintData.SubToal = TrUtils.FixedTo(deliveryChallanData.SubToal);
@@ -166,7 +168,7 @@ export function GetDebitNotePDF(debitNoteData: any, entityData: any, headerConfi
166
168
  true, false, taxCodes, false, true);
167
169
  let dnPrint: any;
168
170
  if (options.ConsolidateGST) {
169
- dnPrint = DebitNotePrintService.GetDebitNotePrintInfo(debitNotePrintData,entityData, image,true, true, taxCodes, false, true);
171
+ dnPrint = DebitNotePrintService.GetDebitNotePrintInfo(debitNotePrintData, entityData, image, true, true, taxCodes, false, true);
170
172
  } else {
171
173
  debitNotePrintData.Round = TrUtils.FixedTo(debitNoteData.Round);
172
174
  debitNotePrintData.Total = TrUtils.FixedTo(debitNoteData.Total);