shareneus 1.7.331 → 1.7.333
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.
- package/dist/accounting/invoice/inv-print.service.js +1 -0
- package/dist/accounting/invoice/invoice-total.service.js +1 -0
- package/dist/inventory/items/item-price-for-pricelist.js +0 -4
- package/package.json +1 -1
- package/src/accounting/invoice/inv-print.service.ts +2 -1
- package/src/accounting/invoice/invoice-total.service.ts +1 -1
- package/src/inventory/items/item-price-for-pricelist.ts +2 -4
|
@@ -235,6 +235,7 @@ function GetTCodeFromTaxes(item) {
|
|
|
235
235
|
return item === null || item === void 0 ? void 0 : item.TCode;
|
|
236
236
|
}
|
|
237
237
|
function GetLaborPrintInfo(LaborList, Consolidate, TaxCodes, LineTotal, DecimalsNumber) {
|
|
238
|
+
console.log('LaborList', LaborList);
|
|
238
239
|
LaborList.forEach((Labor) => {
|
|
239
240
|
Labor.HSN = Labor.SAC;
|
|
240
241
|
if (tr_utils_1.TrUtils.IsNull(Labor.Qty)) {
|
|
@@ -55,6 +55,7 @@ class InvoiceTotalsService {
|
|
|
55
55
|
}
|
|
56
56
|
static CalculateLaborValues(opCodesList, IsIndependentTax) {
|
|
57
57
|
opCodesList = this.ResetLaborValues(opCodesList, IsIndependentTax);
|
|
58
|
+
console.log('opCodesList', opCodesList);
|
|
58
59
|
// opCodesList = this.GetOperationsDiscountPrice(opCodesList);
|
|
59
60
|
// opCodesList = this.GetOperationsAfterDiscount(opCodesList,IsIndependentTax);
|
|
60
61
|
// opCodesList = this.GetOperationsAfterTax(opCodesList, IsIndependentTax);
|
|
@@ -80,10 +80,8 @@ function GetItemPriceForPriceList(item, priceList, includeMargin = false, quanti
|
|
|
80
80
|
if (includeMargin && (0, util_1.IsNotNull)(element.Cost)) {
|
|
81
81
|
element.Margin = (0, math_operations_1.GetMarginValue)(element.Price, element.Cost);
|
|
82
82
|
}
|
|
83
|
-
console.log('element', element);
|
|
84
83
|
}
|
|
85
84
|
}
|
|
86
|
-
console.log('item after price list application', item);
|
|
87
85
|
return item;
|
|
88
86
|
}
|
|
89
87
|
return CalculatePriceBasedOnPriceList(item, priceList, includeMargin, resolvedQty);
|
|
@@ -170,7 +168,6 @@ function CalculatePriceBasedOnPriceList(item, priceList, includeMargin, quantity
|
|
|
170
168
|
if (includeMargin && (0, util_1.IsNotNull)(batch.Cost)) {
|
|
171
169
|
batch.Margin = (0, math_operations_1.GetMarginValue)(batch.Price, batch.Cost);
|
|
172
170
|
}
|
|
173
|
-
console.log('element batch', batch);
|
|
174
171
|
}
|
|
175
172
|
}
|
|
176
173
|
}
|
|
@@ -218,7 +215,6 @@ function CalculatePriceBasedOnPriceList(item, priceList, includeMargin, quantity
|
|
|
218
215
|
}
|
|
219
216
|
}
|
|
220
217
|
}
|
|
221
|
-
console.log('item after price list application', item);
|
|
222
218
|
return item;
|
|
223
219
|
}
|
|
224
220
|
function ApplyRounding(price, priceList) {
|
package/package.json
CHANGED
|
@@ -251,7 +251,8 @@ export function GetTCodeFromTaxes(item: any) {
|
|
|
251
251
|
}
|
|
252
252
|
|
|
253
253
|
export function GetLaborPrintInfo(LaborList: any, Consolidate: boolean, TaxCodes: any, LineTotal: string, DecimalsNumber: number) {
|
|
254
|
-
|
|
254
|
+
console.log('LaborList', LaborList);
|
|
255
|
+
LaborList.forEach((Labor: any) => {
|
|
255
256
|
Labor.HSN = Labor.SAC;
|
|
256
257
|
if (TrUtils.IsNull(Labor.Qty)) {
|
|
257
258
|
Labor.Qty = 1;
|
|
@@ -71,7 +71,7 @@ export class InvoiceTotalsService {
|
|
|
71
71
|
|
|
72
72
|
static CalculateLaborValues(opCodesList: any, IsIndependentTax: boolean) {
|
|
73
73
|
opCodesList = this.ResetLaborValues(opCodesList, IsIndependentTax);
|
|
74
|
-
|
|
74
|
+
console.log('opCodesList', opCodesList);
|
|
75
75
|
// opCodesList = this.GetOperationsDiscountPrice(opCodesList);
|
|
76
76
|
|
|
77
77
|
// opCodesList = this.GetOperationsAfterDiscount(opCodesList,IsIndependentTax);
|
|
@@ -91,10 +91,9 @@ export function GetItemPriceForPriceList(
|
|
|
91
91
|
if (includeMargin && IsNotNull(element.Cost)) {
|
|
92
92
|
element.Margin = GetMarginValue(element.Price, element.Cost);
|
|
93
93
|
}
|
|
94
|
-
console.log('element', element);
|
|
95
94
|
}
|
|
96
95
|
}
|
|
97
|
-
|
|
96
|
+
|
|
98
97
|
return item;
|
|
99
98
|
}
|
|
100
99
|
|
|
@@ -202,7 +201,6 @@ function CalculatePriceBasedOnPriceList(
|
|
|
202
201
|
if (includeMargin && IsNotNull(batch.Cost)) {
|
|
203
202
|
batch.Margin = GetMarginValue(batch.Price, batch.Cost);
|
|
204
203
|
}
|
|
205
|
-
console.log('element batch', batch);
|
|
206
204
|
}
|
|
207
205
|
}
|
|
208
206
|
}
|
|
@@ -251,7 +249,7 @@ function CalculatePriceBasedOnPriceList(
|
|
|
251
249
|
}
|
|
252
250
|
}
|
|
253
251
|
}
|
|
254
|
-
|
|
252
|
+
|
|
255
253
|
return item;
|
|
256
254
|
}
|
|
257
255
|
|