shareneus 1.4.84 → 1.4.85
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.
|
@@ -442,7 +442,17 @@ class HCInvoiceprintService {
|
|
|
442
442
|
}
|
|
443
443
|
}
|
|
444
444
|
else {
|
|
445
|
-
|
|
445
|
+
if (column.Field === 'Desc') {
|
|
446
|
+
let DescData = [];
|
|
447
|
+
DescData.push({ text: Ops[column.Field].toString(), bold: Ops.bold });
|
|
448
|
+
if (!tr_utils_1.TrUtils.IsEmpty(Ops['EDesc'])) {
|
|
449
|
+
DescData.push({ text: Ops['EDesc'].toString(), color: 'grey' });
|
|
450
|
+
}
|
|
451
|
+
dataRow.push({ stack: DescData });
|
|
452
|
+
}
|
|
453
|
+
else {
|
|
454
|
+
dataRow.push({ text: Ops[column.Field].toString(), bold: Ops.bold });
|
|
455
|
+
}
|
|
446
456
|
}
|
|
447
457
|
}
|
|
448
458
|
}
|
|
@@ -720,7 +730,18 @@ class HCInvoiceprintService {
|
|
|
720
730
|
}
|
|
721
731
|
}
|
|
722
732
|
else {
|
|
723
|
-
dataRow.push({ text: labor[column.Field].toString() });
|
|
733
|
+
// dataRow.push({ text: labor[column.Field].toString() });
|
|
734
|
+
if (column.Field === 'Desc') {
|
|
735
|
+
let DescData = [];
|
|
736
|
+
DescData.push(labor[column.Field].toString());
|
|
737
|
+
if (!tr_utils_1.TrUtils.IsEmpty(labor['EDesc'])) {
|
|
738
|
+
DescData.push({ text: labor['EDesc'].toString(), color: 'grey' });
|
|
739
|
+
}
|
|
740
|
+
dataRow.push({ stack: DescData });
|
|
741
|
+
}
|
|
742
|
+
else {
|
|
743
|
+
dataRow.push({ text: labor[column.Field].toString() });
|
|
744
|
+
}
|
|
724
745
|
}
|
|
725
746
|
}
|
|
726
747
|
}
|
|
@@ -435,7 +435,17 @@ class InvoicePortraitPrintService {
|
|
|
435
435
|
var _a;
|
|
436
436
|
let dataRow = [];
|
|
437
437
|
dataRow.push({ text: index + 1, });
|
|
438
|
-
|
|
438
|
+
if (!tr_utils_1.TrUtils.IsEmpty(item.EDesc)) {
|
|
439
|
+
let DescData = [];
|
|
440
|
+
DescData.push({ text: item.Desc, });
|
|
441
|
+
if (!tr_utils_1.TrUtils.IsEmpty(item['EDesc'])) {
|
|
442
|
+
DescData.push({ text: item.EDesc, color: 'grey' });
|
|
443
|
+
}
|
|
444
|
+
dataRow.push({ stack: DescData });
|
|
445
|
+
}
|
|
446
|
+
else {
|
|
447
|
+
dataRow.push({ text: item.Desc, });
|
|
448
|
+
}
|
|
439
449
|
if (ShowTaxColumn) {
|
|
440
450
|
dataRow.push({ text: item.SAC, alignment: 'center', style: ['headerstyle'], });
|
|
441
451
|
}
|
|
@@ -504,7 +514,18 @@ class InvoicePortraitPrintService {
|
|
|
504
514
|
var _a, _b, _c;
|
|
505
515
|
let dataRow = [];
|
|
506
516
|
dataRow.push({ text: index + 1, });
|
|
507
|
-
dataRow.push({ text: item.Desc, });
|
|
517
|
+
// dataRow.push({ text: item.Desc, });
|
|
518
|
+
if (!tr_utils_1.TrUtils.IsEmpty(item.EDesc)) {
|
|
519
|
+
let DescData = [];
|
|
520
|
+
DescData.push({ text: item.Desc, });
|
|
521
|
+
if (!tr_utils_1.TrUtils.IsEmpty(item['EDesc'])) {
|
|
522
|
+
DescData.push({ text: item.EDesc, color: 'grey' });
|
|
523
|
+
}
|
|
524
|
+
dataRow.push({ stack: DescData });
|
|
525
|
+
}
|
|
526
|
+
else {
|
|
527
|
+
dataRow.push({ text: item.Desc, });
|
|
528
|
+
}
|
|
508
529
|
if (ShowTaxColumn) {
|
|
509
530
|
dataRow.push({ text: item.HSN, alignment: 'center', style: ['headerstyle'], });
|
|
510
531
|
}
|
|
@@ -600,7 +621,9 @@ class InvoicePortraitPrintService {
|
|
|
600
621
|
widths: ['*', '*'],
|
|
601
622
|
body: [
|
|
602
623
|
[
|
|
603
|
-
{
|
|
624
|
+
{
|
|
625
|
+
stack: [this.PartsTaxAmounts1(ROPrintData.TaxSummary, true, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn)]
|
|
626
|
+
},
|
|
604
627
|
{
|
|
605
628
|
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
629
|
}
|