shareneus 1.4.69 → 1.4.71

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.
@@ -897,7 +897,7 @@ class InvoiceLandscapePdfService {
897
897
  heights: [105, 105, 105],
898
898
  body: [
899
899
  [
900
- shared_pdf_service_1.SharedPDFService.PartsTaxAmounts(ROPrintData.CustTaxGroupData, true, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn),
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),
@@ -177,7 +177,7 @@ export declare class InvoicePortraitPrintService {
177
177
  stack: {
178
178
  style: string;
179
179
  table: {
180
- widths: number[];
180
+ widths: (string | number)[];
181
181
  headerRows: number;
182
182
  body: any;
183
183
  };
@@ -600,7 +600,7 @@ class InvoicePortraitPrintService {
600
600
  widths: ['*', '*'],
601
601
  body: [
602
602
  [
603
- this.PartsTaxAmounts(ROPrintData.CustTaxGroupData, true, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn),
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.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, ROPrintData.STotal, moreDiscDetails),
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', 30, 45, 45],
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: ['auto', 20, 20, 45, 45],
1388
+ widths: [50, 65, 50, 50],
1389
1389
  headerRows: 1,
1390
1390
  body: this.CreateHSNTaxTable(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
1391
1391
  },
@@ -1514,9 +1514,9 @@ class SharedPDFService {
1514
1514
  columns.forEach((column) => {
1515
1515
  if (!tr_utils_1.TrUtils.IsFixedZero(part[column.Field]) &&
1516
1516
  !tr_utils_1.TrUtils.IsNull(part[column.Field]) || column.Field === 'SGST' || column.Field === 'CGST' || column.Field === 'SGSTAmt' || column.Field === 'CGSTAmt'
1517
- || column.Field === 'TotalTaxAmount') {
1518
- if (column.Field === 'TotalTaxAmount' || column.Field === 'SGSTAmt' || column.Field === 'CGSTAmt' || column.Field === 'IGSTAmt') {
1519
- dataRow.push({ text: part[column.Field].toString(), alignment: 'right', opacity: 0.7, nowrap: true, fontSize: 6 });
1517
+ || column.Field === 'TotalTaxableAmount') {
1518
+ if (column.Field === 'TotalTaxableAmount' || column.Field === 'SGSTAmt' || column.Field === 'CGSTAmt' || column.Field === 'IGSTAmt') {
1519
+ dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(part[column.Field]), alignment: 'right', opacity: 0.7, nowrap: true, fontSize: 6 });
1520
1520
  }
1521
1521
  else if (column.Field === 'CombinedTaxPercentage') {
1522
1522
  dataRow.push({ text: part[column.Field].toString() + '%', alignment: 'center', opacity: 0.7, nowrap: true, fontSize: 6 });
@@ -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.PartsTaxAmounts(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
1756
+ this.PartsTaxAmounts1(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
1757
1757
  ]
1758
1758
  },
1759
1759
  { text: '', width: moreDiscDetails ? 40 : 60 },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "shareneus",
3
- "version": "1.4.69",
3
+ "version": "1.4.71",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",