shareneus 1.4.87 → 1.4.89
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.
|
@@ -545,7 +545,7 @@ class ROTotalsService {
|
|
|
545
545
|
SubTotalWithTax = (0, aggregation_1.addition)(LaborTotalAfterDisc, PartsTotalAfterDisc, LaborTaxAmount, PartsTaxAmount);
|
|
546
546
|
}
|
|
547
547
|
else {
|
|
548
|
-
SubTotalWithTax = (0, aggregation_1.addition)(
|
|
548
|
+
SubTotalWithTax = (0, aggregation_1.addition)(LaborTotalAfterDisc, PartsTotalAfterDisc);
|
|
549
549
|
}
|
|
550
550
|
return SubTotalWithTax;
|
|
551
551
|
}
|
|
@@ -797,10 +797,10 @@ class PrintSharedService {
|
|
|
797
797
|
}
|
|
798
798
|
else {
|
|
799
799
|
if (ShowDiscountColumn) {
|
|
800
|
-
return [25,
|
|
800
|
+
return [25, 210, 40, 70, 40, 40, 70];
|
|
801
801
|
}
|
|
802
802
|
else {
|
|
803
|
-
return [25,
|
|
803
|
+
return [25, 308, 40, 60, 80];
|
|
804
804
|
}
|
|
805
805
|
}
|
|
806
806
|
}
|