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: SET DEADLINES
todo: currently viz fields for PO and then for Customer to get reporting on track
DisplayRequestUser
MISC ITEMS THAT CAME UP MISC ITEMS THAT CAME UP

View File

@@ -986,14 +986,14 @@ export default {
headers.push({ headers.push({
text: vm.$ay.t("Part"), text: vm.$ay.t("Part"),
align: "left", align: "left",
value: "displayPartNumber" value: "partViz"
}); });
if (vm.obj.hasSelectableWarehouses) { if (vm.obj.hasSelectableWarehouses) {
headers.push({ headers.push({
text: vm.$ay.t("PartWarehouse"), text: vm.$ay.t("PartWarehouse"),
align: "left", align: "left",
value: "displayWarehouse" value: "warehouseViz"
}); });
} }
headers.push({ headers.push({
@@ -1035,34 +1035,34 @@ export default {
headers.push({ headers.push({
text: vm.$ay.t("TaxCode"), text: vm.$ay.t("TaxCode"),
align: "left", align: "left",
value: "displayTaxCode" value: "purchaseTaxCodeViz"
}); });
} }
headers.push({ headers.push({
text: vm.$ay.t("PurchaseOrderItemNetTotal"), text: vm.$ay.t("PurchaseOrderItemNetTotal"),
align: "right", align: "right",
value: "displayNetTotal" value: "netTotalViz"
}); });
if (vm.obj.hasTaxes && vm.form().showMe(vm, "Items.PurchaseTaxCodeId")) { if (vm.obj.hasTaxes && vm.form().showMe(vm, "Items.PurchaseTaxCodeId")) {
headers.push({ headers.push({
text: vm.$ay.t("TaxCodeTaxA"), text: vm.$ay.t("TaxCodeTaxA"),
align: "right", align: "right",
value: "displayTaxA" value: "TaxAViz"
}); });
headers.push({ headers.push({
text: vm.$ay.t("TaxCodeTaxB"), text: vm.$ay.t("TaxCodeTaxB"),
align: "right", align: "right",
value: "displayTaxB" value: "TaxBViz"
}); });
} }
headers.push({ headers.push({
text: vm.$ay.t("PurchaseOrderItemLineTotal"), text: vm.$ay.t("PurchaseOrderItemLineTotal"),
align: "right", align: "right",
value: "displayLineTotal" value: "lineTotalViz"
}); });
if ( if (
@@ -1081,14 +1081,14 @@ export default {
headers.push({ headers.push({
text: vm.$ay.t("PurchaseOrderItemPartRequestedByID"), text: vm.$ay.t("PurchaseOrderItemPartRequestedByID"),
align: "left", align: "left",
value: "displayRequestUser" value: "partRequestedByViz"
}); });
} }
if (vm.form().showMe(vm, "Items.WorkorderItemPartRequestId")) { if (vm.form().showMe(vm, "Items.WorkorderItemPartRequestId")) {
headers.push({ headers.push({
text: vm.$ay.t("PurchaseOrderItemWorkOrderNumber"), text: vm.$ay.t("PurchaseOrderItemWorkOrderNumber"),
align: "left", align: "left",
value: "displayRequestWorkorder" value: "workorderItemPartRequestViz"
}); });
} }
} }
@@ -1129,28 +1129,28 @@ export default {
vm.hour12 vm.hour12
), ),
vendorPartNumber: x.vendorPartNumber, vendorPartNumber: x.vendorPartNumber,
displayPartNumber: x.displayPartNumber, partViz: x.partViz,
displayWarehouse: x.displayWarehouse, warehouseViz: x.warehouseViz,
displayRequestUser: x.displayRequestUser, partRequestedByViz: x.partRequestedByViz,
displayRequestWorkorder: x.displayRequestWorkorder, workorderItemPartRequestViz: x.workorderItemPartRequestViz,
displayTaxCode: x.displayTaxCode, purchaseTaxCodeViz: x.purchaseTaxCodeViz,
displayNetTotal: window.$gz.locale.currencyLocalized( netTotalViz: window.$gz.locale.currencyLocalized(
x.displayNetTotal, x.netTotalViz,
vm.languageName, vm.languageName,
vm.currencyName vm.currencyName
), ),
displayTaxA: window.$gz.locale.currencyLocalized( TaxAViz: window.$gz.locale.currencyLocalized(
x.displayTaxA, x.TaxAViz,
vm.languageName, vm.languageName,
vm.currencyName vm.currencyName
), ),
displayTaxB: window.$gz.locale.currencyLocalized( TaxBViz: window.$gz.locale.currencyLocalized(
x.displayTaxB, x.TaxBViz,
vm.languageName, vm.languageName,
vm.currencyName vm.currencyName
), ),
displayLineTotal: window.$gz.locale.currencyLocalized( lineTotalViz: window.$gz.locale.currencyLocalized(
x.displayLineTotal, x.lineTotalViz,
vm.languageName, vm.languageName,
vm.currencyName vm.currencyName
) )
@@ -1170,7 +1170,7 @@ export default {
headers.push({ headers.push({
text: vm.$ay.t("PartWarehouse"), text: vm.$ay.t("PartWarehouse"),
align: "left", align: "left",
value: "displayWarehouse" value: "warehouseViz"
}); });
} }
@@ -1203,7 +1203,7 @@ export default {
restockItemList: function() { 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, * "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}]} * "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, partId: x.partId,
partWarehouseId: x.partWarehouseId, partWarehouseId: x.partWarehouseId,
partNumber: x.partNumber, partNumber: x.partNumber,
displayWarehouse: x.displayWarehouse, warehouseViz: x.warehouseViz,
minimumQuantity: window.$gz.locale.decimalLocalized( minimumQuantity: window.$gz.locale.decimalLocalized(
x.minimumQuantity, x.minimumQuantity,
@@ -1859,15 +1859,15 @@ async function fetchTranslatedText(vm) {
workorderItemPartRequestId: null, workorderItemPartRequestId: null,
purchaseTaxCodeId: 3, purchaseTaxCodeId: 3,
vendorPartNumber: "man-695831", vendorPartNumber: "man-695831",
displayPartNumber: "695831", partViz: "695831",
displayWarehouse: "WHS- Lera Brook", warehouseViz: "WHS- Lera Brook",
displayRequestUser: null, partRequestedByViz: null,
displayRequestWorkorder: null, workorderItemPartRequestViz: null,
displayTaxCode: "Sales & Goods", purchaseTaxCodeViz: "Sales & Goods",
displayNetTotal: 1019.278, netTotalViz: 1019.278,
displayTaxA: 71.34946, TaxAViz: 71.34946,
displayTaxB: 71.34946, TaxBViz: 71.34946,
displayLineTotal: 1161.97692 lineTotalViz: 1161.97692
} }
], ],
hasSelectableWarehouses: true, hasSelectableWarehouses: true,