shareneus 1.5.5 → 1.5.6
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.
|
@@ -1992,10 +1992,11 @@ class SharedPDFService {
|
|
|
1992
1992
|
AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST))), DecimalsNumber) });
|
|
1993
1993
|
}
|
|
1994
1994
|
else {
|
|
1995
|
+
console.log('Test', tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(totalTax))), DecimalsNumber));
|
|
1995
1996
|
AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(totalTax))), DecimalsNumber) });
|
|
1996
1997
|
}
|
|
1997
1998
|
}
|
|
1998
|
-
if (!tr_utils_1.TrUtils.IsEmpty(totalTax)) {
|
|
1999
|
+
if (!tr_utils_1.TrUtils.IsEmpty(totalTax) && !Consolidate) {
|
|
1999
2000
|
AccountFields.push({ name: 'Total Tax', value: totalTax });
|
|
2000
2001
|
}
|
|
2001
2002
|
if (!tr_utils_1.TrUtils.IsEmpty(Adj)) {
|