This commit is contained in:
2021-03-01 21:07:59 +00:00
parent 0bfcdfe12d
commit 55bf044ead
2 changed files with 39 additions and 34 deletions

View File

@@ -7,6 +7,11 @@
TODO: SET DEADLINES
todo: currently viz fields for PO and then for Customer to get reporting on track
DisplayRequestUser
MISC ITEMS THAT CAME UP

View File

@@ -986,14 +986,14 @@ export default {
headers.push({
text: vm.$ay.t("Part"),
align: "left",
value: "displayPartNumber"
value: "partViz"
});
if (vm.obj.hasSelectableWarehouses) {
headers.push({
text: vm.$ay.t("PartWarehouse"),
align: "left",
value: "displayWarehouse"
value: "warehouseViz"
});
}
headers.push({
@@ -1035,34 +1035,34 @@ export default {
headers.push({
text: vm.$ay.t("TaxCode"),
align: "left",
value: "displayTaxCode"
value: "purchaseTaxCodeViz"
});
}
headers.push({
text: vm.$ay.t("PurchaseOrderItemNetTotal"),
align: "right",
value: "displayNetTotal"
value: "netTotalViz"
});
if (vm.obj.hasTaxes && vm.form().showMe(vm, "Items.PurchaseTaxCodeId")) {
headers.push({
text: vm.$ay.t("TaxCodeTaxA"),
align: "right",
value: "displayTaxA"
value: "TaxAViz"
});
headers.push({
text: vm.$ay.t("TaxCodeTaxB"),
align: "right",
value: "displayTaxB"
value: "TaxBViz"
});
}
headers.push({
text: vm.$ay.t("PurchaseOrderItemLineTotal"),
align: "right",
value: "displayLineTotal"
value: "lineTotalViz"
});
if (
@@ -1081,14 +1081,14 @@ export default {
headers.push({
text: vm.$ay.t("PurchaseOrderItemPartRequestedByID"),
align: "left",
value: "displayRequestUser"
value: "partRequestedByViz"
});
}
if (vm.form().showMe(vm, "Items.WorkorderItemPartRequestId")) {
headers.push({
text: vm.$ay.t("PurchaseOrderItemWorkOrderNumber"),
align: "left",
value: "displayRequestWorkorder"
value: "workorderItemPartRequestViz"
});
}
}
@@ -1129,28 +1129,28 @@ export default {
vm.hour12
),
vendorPartNumber: x.vendorPartNumber,
displayPartNumber: x.displayPartNumber,
displayWarehouse: x.displayWarehouse,
displayRequestUser: x.displayRequestUser,
displayRequestWorkorder: x.displayRequestWorkorder,
displayTaxCode: x.displayTaxCode,
displayNetTotal: window.$gz.locale.currencyLocalized(
x.displayNetTotal,
partViz: x.partViz,
warehouseViz: x.warehouseViz,
partRequestedByViz: x.partRequestedByViz,
workorderItemPartRequestViz: x.workorderItemPartRequestViz,
purchaseTaxCodeViz: x.purchaseTaxCodeViz,
netTotalViz: window.$gz.locale.currencyLocalized(
x.netTotalViz,
vm.languageName,
vm.currencyName
),
displayTaxA: window.$gz.locale.currencyLocalized(
x.displayTaxA,
TaxAViz: window.$gz.locale.currencyLocalized(
x.TaxAViz,
vm.languageName,
vm.currencyName
),
displayTaxB: window.$gz.locale.currencyLocalized(
x.displayTaxB,
TaxBViz: window.$gz.locale.currencyLocalized(
x.TaxBViz,
vm.languageName,
vm.currencyName
),
displayLineTotal: window.$gz.locale.currencyLocalized(
x.displayLineTotal,
lineTotalViz: window.$gz.locale.currencyLocalized(
x.lineTotalViz,
vm.languageName,
vm.currencyName
)
@@ -1170,7 +1170,7 @@ export default {
headers.push({
text: vm.$ay.t("PartWarehouse"),
align: "left",
value: "displayWarehouse"
value: "warehouseViz"
});
}
@@ -1203,7 +1203,7 @@ export default {
restockItemList: function() {
/**
*
* {"data":[{"partId":2,"partWarehouseId":1,"partNumber":"249986","displayWarehouse":"Default","manufacturerId":2,
* {"data":[{"partId":2,"partWarehouseId":1,"partNumber":"249986","warehouseViz":"Default","manufacturerId":2,
* "displayManufacturer":"Ryan - Legros","wholesalerId":6,"displayWholesaler":"Emmerich and Sons","alternativeWholesalerId":9,
* "displayAlternativeWholesaler":"O'Connell - MacGyver","minimumQuantity":6.0000,"balance":4.0000,"onOrderQuantity":0.0,"requiredQuantity":2.0000}]}
*/
@@ -1214,7 +1214,7 @@ export default {
partId: x.partId,
partWarehouseId: x.partWarehouseId,
partNumber: x.partNumber,
displayWarehouse: x.displayWarehouse,
warehouseViz: x.warehouseViz,
minimumQuantity: window.$gz.locale.decimalLocalized(
x.minimumQuantity,
@@ -1859,15 +1859,15 @@ async function fetchTranslatedText(vm) {
workorderItemPartRequestId: null,
purchaseTaxCodeId: 3,
vendorPartNumber: "man-695831",
displayPartNumber: "695831",
displayWarehouse: "WHS- Lera Brook",
displayRequestUser: null,
displayRequestWorkorder: null,
displayTaxCode: "Sales & Goods",
displayNetTotal: 1019.278,
displayTaxA: 71.34946,
displayTaxB: 71.34946,
displayLineTotal: 1161.97692
partViz: "695831",
warehouseViz: "WHS- Lera Brook",
partRequestedByViz: null,
workorderItemPartRequestViz: null,
purchaseTaxCodeViz: "Sales & Goods",
netTotalViz: 1019.278,
TaxAViz: 71.34946,
TaxBViz: 71.34946,
lineTotalViz: 1161.97692
}
],
hasSelectableWarehouses: true,