shareneus 1.0.7 → 1.0.9
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.
|
@@ -240,6 +240,7 @@ class InvPrintService {
|
|
|
240
240
|
// Item['Desc'].lastIndexOf('}#'));
|
|
241
241
|
// }
|
|
242
242
|
// Item.Desc = Item['Desc'].split(' #{')[0];
|
|
243
|
+
Item.MRP = tr_utils_1.TrUtils.FixPriceValue(Item.MRP);
|
|
243
244
|
Item.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.CGST);
|
|
244
245
|
Item.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.SGST);
|
|
245
246
|
Item.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.IGST);
|
|
@@ -238,12 +238,14 @@ class InvoiceLandscapePdfService {
|
|
|
238
238
|
{ text: 'Qty', style: 'tableheader', rowSpan: 2, lineHeight: 0.5 },
|
|
239
239
|
{ text: 'Offer Qty', style: 'tableheader', rowSpan: 2, lineHeight: 1 },
|
|
240
240
|
{ text: 'Unit Price', style: 'tableheader', rowSpan: 2, lineHeight: 0.5, alignment: 'center', },
|
|
241
|
+
{ text: 'M.R.P', style: 'tableheader', rowSpan: 2, lineHeight: 0.5, alignment: 'center', },
|
|
241
242
|
{ text: 'Line Total', rowSpan: 2, lineHeight: 0.5, style: 'tabFleheader' }
|
|
242
243
|
],
|
|
243
244
|
[{ text: '', Field: 'SNo', lineHeight: 0.5 }, { text: '', Field: 'MPN', lineHeight: 0.5 },
|
|
244
245
|
{ text: '', Field: 'Desc', lineHeight: 0.5 }, { text: 'HSN/SAC', Field: 'HSN', lineHeight: 0.5 },
|
|
245
246
|
{ text: '', Field: 'Batch', lineHeight: 0.5 }, { text: 'Expiry', Field: 'ExDate', lineHeight: 0.5 },
|
|
246
247
|
{ text: '', Field: 'QtyAndUoM', lineHeight: 0.5 }, { text: '', Field: 'OfQty', lineHeight: 0.5 }, { text: '', Field: 'UnPr', lineHeight: 0.5 },
|
|
248
|
+
{ text: '', Field: 'MRP', lineHeight: 0.5 },
|
|
247
249
|
{ text: 'Line Total', Field: 'LineTotal', lineHeight: 0.5 }
|
|
248
250
|
]
|
|
249
251
|
];
|
|
@@ -281,12 +283,13 @@ class InvoiceLandscapePdfService {
|
|
|
281
283
|
{ text: 'Qty', style: 'tableheader', rowSpan: 2, lineHeight: 0.6 },
|
|
282
284
|
{ text: 'Offer Qty', style: 'tableheader', rowSpan: 2, lineHeight: 1 },
|
|
283
285
|
{ text: 'Unit Price', style: 'tableheader', rowSpan: 2, alignment: 'center', lineHeight: 0.6 },
|
|
286
|
+
{ text: 'M.R.P', style: 'tableheader', rowSpan: 2, lineHeight: 0.5, alignment: 'center', },
|
|
284
287
|
{ text: 'Line Total', rowSpan: 2, style: 'tableheader', lineHeight: 0.6 }
|
|
285
288
|
],
|
|
286
289
|
[{ text: '', Field: 'SNo', lineHeight: 0.5 },
|
|
287
290
|
{ text: '', Field: 'Desc', lineHeight: 0.5 }, { text: 'HSN/SAC', Field: 'HSN', lineHeight: 0.5 },
|
|
288
291
|
{ text: '', Field: 'Batch', lineHeight: 0.5 }, { text: 'Expiry', Field: 'ExDate', lineHeight: 0.5 },
|
|
289
|
-
{ text: '', Field: 'QtyAndUoM', lineHeight: 0.5 }, { text: '', Field: 'OfQty', lineHeight: 0.5 }, { text: '', Field: 'UnPr', lineHeight: 0.5 },
|
|
292
|
+
{ text: '', Field: 'QtyAndUoM', lineHeight: 0.5 }, { text: '', Field: 'OfQty', lineHeight: 0.5 }, { text: '', Field: 'UnPr', lineHeight: 0.5 }, { text: '', Field: 'MRP', lineHeight: 0.5 },
|
|
290
293
|
{ text: 'Line Total', Field: 'LineTotal', lineHeight: 0.5 }
|
|
291
294
|
]];
|
|
292
295
|
let Count = 8;
|
|
@@ -610,36 +613,36 @@ class InvoiceLandscapePdfService {
|
|
|
610
613
|
if (PrintPartNo) {
|
|
611
614
|
if (ShowIGST) {
|
|
612
615
|
if (ShowDiscountColumn) {
|
|
613
|
-
return [24, 50, '*', 35, 35, 35, 30, 25, 40, 20, 35, 20, 35, 45];
|
|
616
|
+
return [24, 50, '*', 35, 35, 35, 30, 25, 40, 20, 35, 35, 20, 35, 45];
|
|
614
617
|
}
|
|
615
618
|
else {
|
|
616
|
-
return [24, 50, '*', 35, 35, 35, 30, 25, 40, 20, 35, 51];
|
|
619
|
+
return [24, 50, '*', 35, 35, 35, 30, 25, 40, 40, 20, 35, 51];
|
|
617
620
|
}
|
|
618
621
|
}
|
|
619
622
|
else {
|
|
620
623
|
if (ShowDiscountColumn) {
|
|
621
|
-
return [24, 45, '*', 35, 35, 35, 30, 22, 40, 20, 34, 20, 32, 20, 32, 48];
|
|
624
|
+
return [24, 45, '*', 35, 35, 35, 30, 22, 40, 20, 34, 20, 32, 32, 20, 32, 48];
|
|
622
625
|
}
|
|
623
626
|
else {
|
|
624
|
-
return [24, 45, '*', 35, 35, 35, 30, 22, 40, 20, 32, 20, 32, 54];
|
|
627
|
+
return [24, 45, '*', 35, 35, 35, 30, 22, 40, 20, 32, 32, 20, 32, 54];
|
|
625
628
|
}
|
|
626
629
|
}
|
|
627
630
|
}
|
|
628
631
|
else {
|
|
629
632
|
if (ShowIGST) {
|
|
630
633
|
if (ShowDiscountColumn) {
|
|
631
|
-
return [24, '*', 35, 41, 35, 30, 25, 40, 20, 35, 20, 35, 41];
|
|
634
|
+
return [24, '*', 35, 41, 35, 30, 25, 40, 20, 35, 35, 20, 35, 41];
|
|
632
635
|
}
|
|
633
636
|
else {
|
|
634
|
-
return [24, '*', 35, 50, 35, 30, 25, 40, 20, 40, 50];
|
|
637
|
+
return [24, '*', 35, 50, 35, 30, 25, 40, 40, 20, 40, 50];
|
|
635
638
|
}
|
|
636
639
|
}
|
|
637
640
|
else {
|
|
638
641
|
if (ShowDiscountColumn) {
|
|
639
|
-
return [24, '*', 35, 45, 35, 30, 22, 40, 20, 34, 20, 35, 20, 35, 45];
|
|
642
|
+
return [24, '*', 35, 45, 35, 30, 22, 40, 20, 34, 20, 35, 35, 20, 35, 45];
|
|
640
643
|
}
|
|
641
644
|
else {
|
|
642
|
-
return [24, '*', 35, 50, 35, 30, 22, 40, 20, 35, 20, 35, 50];
|
|
645
|
+
return [24, '*', 35, 50, 35, 30, 22, 40, 20, 35, 35, 20, 35, 50];
|
|
643
646
|
}
|
|
644
647
|
}
|
|
645
648
|
}
|
|
@@ -34,7 +34,7 @@ class VendorCreditNoteTotalsService {
|
|
|
34
34
|
ItemsList.forEach((Item) => {
|
|
35
35
|
Item = this.ResetLaborItemValueIfInvalid(Item);
|
|
36
36
|
Item.DiscountedPrice = (0, aggregation_1.addition)(Item.Disc, Item.RecDisc);
|
|
37
|
-
Item.AfterItemDisc = Item.
|
|
37
|
+
Item.AfterItemDisc = (0, aggregation_1.subtraction)(Item.UnAmt, Item.Disc, Item.RecDisc);
|
|
38
38
|
if (IsIndependentTax) {
|
|
39
39
|
Item.AfterItemTax = (0, aggregation_1.addition)(Item.AfterItemDisc, Item.CGST, Item.SGST, Item.IGST);
|
|
40
40
|
}
|
|
@@ -45,7 +45,7 @@ class VendorCreditNoteTotalsService {
|
|
|
45
45
|
return ItemsList;
|
|
46
46
|
}
|
|
47
47
|
static ResetLaborItemValueIfInvalid(Item) {
|
|
48
|
-
Item.
|
|
48
|
+
Item.UnCo = tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.UnCo);
|
|
49
49
|
Item.Disc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.Disc);
|
|
50
50
|
Item.RecDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.RecDisc);
|
|
51
51
|
Item.CGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.CGST);
|