shareneus 1.4.70 → 1.4.72
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.
- package/dist/accounting/invoice/inv-pdf.service.js +5 -5
- package/dist/accounting/invoice/invoice-landscape-pdf.service.js +1 -1
- package/dist/accounting/invoice/invoice-portrait-pdf.d.ts +1 -1
- package/dist/accounting/invoice/invoice-portrait-pdf.js +1 -1
- package/dist/accounting/invoice/shared-inv-pdf.service.js +1 -1
- package/dist/shared/shared-pdf.service.js +3 -3
- package/package.json +1 -1
|
@@ -245,7 +245,7 @@ class InvoiceprintService {
|
|
|
245
245
|
if (column.Field === 'Disc') {
|
|
246
246
|
if (column.type === 'percentage') {
|
|
247
247
|
if (!tr_utils_1.TrUtils.IsEmpty(part[column.Field])) {
|
|
248
|
-
dataRow.push({ text: part[column.Field].toString(), noWrap: true });
|
|
248
|
+
dataRow.push({ text: part[column.Field].toString(), noWrap: true, alignment: 'center' });
|
|
249
249
|
}
|
|
250
250
|
else {
|
|
251
251
|
dataRow.push({ text: '', noWrap: true });
|
|
@@ -253,7 +253,7 @@ class InvoiceprintService {
|
|
|
253
253
|
}
|
|
254
254
|
else {
|
|
255
255
|
if (!tr_utils_1.TrUtils.IsNull(part[column.Field])) {
|
|
256
|
-
dataRow.push({ text: part[column.Field].toString(), noWrap: true });
|
|
256
|
+
dataRow.push({ text: part[column.Field].toString(), noWrap: true, alignment: 'right' });
|
|
257
257
|
}
|
|
258
258
|
else {
|
|
259
259
|
dataRow.push({ text: '', noWrap: true });
|
|
@@ -368,7 +368,7 @@ class InvoiceprintService {
|
|
|
368
368
|
if (column.Field === 'Disc') {
|
|
369
369
|
if (column.type === 'percentage') {
|
|
370
370
|
if (!tr_utils_1.TrUtils.IsEmpty(Ops[column.Field])) {
|
|
371
|
-
dataRow.push({ text: Ops[column.Field].toString(), noWrap: true });
|
|
371
|
+
dataRow.push({ text: Ops[column.Field].toString(), noWrap: true, alignment: 'center' });
|
|
372
372
|
}
|
|
373
373
|
else {
|
|
374
374
|
dataRow.push({ text: '', noWrap: true });
|
|
@@ -376,7 +376,7 @@ class InvoiceprintService {
|
|
|
376
376
|
}
|
|
377
377
|
else {
|
|
378
378
|
if (!tr_utils_1.TrUtils.IsNull(Ops[column.Field])) {
|
|
379
|
-
dataRow.push({ text: Ops[column.Field].toString(), noWrap: true });
|
|
379
|
+
dataRow.push({ text: Ops[column.Field].toString(), noWrap: true, alignment: 'right' });
|
|
380
380
|
}
|
|
381
381
|
else {
|
|
382
382
|
dataRow.push({ text: '', noWrap: true });
|
|
@@ -688,7 +688,7 @@ class InvoiceprintService {
|
|
|
688
688
|
// ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn,
|
|
689
689
|
// TrUtils.isTaxable(ROPrintData.Settings.Tax), ROPrintData.CustLaborITax,
|
|
690
690
|
// ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, ROPrintData.Adj,ROPrintData.STotal),
|
|
691
|
-
shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails1(ROPrintData, ROPrintData.CustLaborTotalAfterDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST, ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustPartsTotalAfterDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST, ROPrintData.CustPartSGST, ROPrintData.
|
|
691
|
+
shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails1(ROPrintData, ROPrintData.CustLaborTotalAfterDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST, ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustPartsTotalAfterDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST, ROPrintData.CustPartSGST, ROPrintData.TaxSummary, 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, ROPrintData.CustLaborTaxGroupDataByPerc, ROPrintData.STotal, isAuto, moreDiscDetails),
|
|
692
692
|
this.GetNumberInWords(ROPrintData.CustRoundedTotal),
|
|
693
693
|
shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, ROPrintData.isCountersale, ROPrintData.Entity.DecimalsNumber),
|
|
694
694
|
shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(ROPrintData.Entity.Terms),
|
|
@@ -897,7 +897,7 @@ class InvoiceLandscapePdfService {
|
|
|
897
897
|
heights: [105, 105, 105],
|
|
898
898
|
body: [
|
|
899
899
|
[
|
|
900
|
-
shared_pdf_service_1.SharedPDFService.
|
|
900
|
+
shared_pdf_service_1.SharedPDFService.PartsTaxAmounts1(ROPrintData.TaxSummary, true, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn),
|
|
901
901
|
// SharedPDFService.GetTaxOnParts(ROPrintData.CustPartsTotalBeforeDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST,
|
|
902
902
|
// ROPrintData.CustPartSGST, ROPrintData.ShowAccParts, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn,
|
|
903
903
|
// ROPrintData.ShowTaxColumn, ROPrintData.From),
|
|
@@ -600,7 +600,7 @@ class InvoicePortraitPrintService {
|
|
|
600
600
|
widths: ['*', '*'],
|
|
601
601
|
body: [
|
|
602
602
|
[
|
|
603
|
-
|
|
603
|
+
shared_pdf_service_1.SharedPDFService.PartsTaxAmounts(ROPrintData.TaxSummary, true, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn),
|
|
604
604
|
{
|
|
605
605
|
columns: [{ text: '', width: moreDiscDetails ? 120 : 150 }, this.GrandTotal(ROPrintData, '0.00', ROPrintData.CustPartsTotalBeforeDisc, totalDisc, totalTax, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, null, ROPrintData.Consolidate, ROPrintData.STotal, moreDiscDetails, ROPrintData.Entity.DecimalsNumber)],
|
|
606
606
|
}
|
|
@@ -669,7 +669,7 @@ class SharedInvoiceprintService {
|
|
|
669
669
|
static CommonTotalDetails(ROPrintData, index, numberofCopies, withPass, moreDiscDetails) {
|
|
670
670
|
// console.log('ROPrintData', ROPrintData);
|
|
671
671
|
let CommonDetails = [
|
|
672
|
-
shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails(ROPrintData, ROPrintData.CustLaborTotalAfterDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST, ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustPartsTotalAfterDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST, ROPrintData.CustPartSGST, ROPrintData.
|
|
672
|
+
shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails(ROPrintData, ROPrintData.CustLaborTotalAfterDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST, ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustPartsTotalAfterDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST, ROPrintData.CustPartSGST, ROPrintData.TaxSummary, 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, ROPrintData.STotal, moreDiscDetails),
|
|
673
673
|
this.GetNumberInWords(ROPrintData.CustRoundedTotal),
|
|
674
674
|
shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, ROPrintData.isCountersale, ROPrintData.Entity.DecimalsNumber),
|
|
675
675
|
shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(ROPrintData.Entity.Terms),
|
|
@@ -1374,7 +1374,7 @@ class SharedPDFService {
|
|
|
1374
1374
|
return {
|
|
1375
1375
|
style: 'tableExample',
|
|
1376
1376
|
table: {
|
|
1377
|
-
widths: ['auto',
|
|
1377
|
+
widths: [40, 'auto', 50],
|
|
1378
1378
|
headerRows: 1,
|
|
1379
1379
|
body: this.CreateHSNTaxTable(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
|
|
1380
1380
|
},
|
|
@@ -1385,7 +1385,7 @@ class SharedPDFService {
|
|
|
1385
1385
|
return {
|
|
1386
1386
|
style: 'tableExample',
|
|
1387
1387
|
table: {
|
|
1388
|
-
widths: [
|
|
1388
|
+
widths: [50, 65, 50, 50],
|
|
1389
1389
|
headerRows: 1,
|
|
1390
1390
|
body: this.CreateHSNTaxTable(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
|
|
1391
1391
|
},
|
|
@@ -1753,7 +1753,7 @@ class SharedPDFService {
|
|
|
1753
1753
|
{
|
|
1754
1754
|
stack: [
|
|
1755
1755
|
this.GetTaxOnParts(BasicPartsTotal, OverAllMainPartsDiscount, PCGST, PSGST, ShowAccParts, PIGST, ShowIGST, ShowTaxColumn, ShowDetailedPartTaxInfo, From, Consolidate),
|
|
1756
|
-
this.
|
|
1756
|
+
this.PartsTaxAmounts1(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
|
|
1757
1757
|
]
|
|
1758
1758
|
},
|
|
1759
1759
|
{ text: '', width: moreDiscDetails ? 40 : 60 },
|