2021-05-26 15:16:57 +00:00
parent e3538f9866
commit 0513ffc3d8
5 changed files with 27 additions and 453 deletions
--- a/ayanova/src/components/work-order-item-labors.vue
+++ b/ayanova/src/components/work-order-item-labors.vue
@@ -488,15 +488,8 @@ export default {
        noChargeQuantity: 0,
        serviceBankId: null,
        taxCodeSaleId: null,
-        taxName: null,
        price: 0,
        priceOverride: null,
-        //costViz: 0,
-        // listPriceViz: 0,
-        //taxAViz: 0,
-        //taxBViz: 0,
-        //lineTotalViz: 0,
-        //unitOfMeasureViz:null,
        isDirty: true,
        workOrderItemId: this.value.items[this.activeWoItemIndex].id,
        uid: Date.now() //used for error tracking / display
--- a/ayanova/src/components/work-order-item-parts.vue
+++ b/ayanova/src/components/work-order-item-parts.vue
@@ -524,24 +524,16 @@ export default {
        id: 0,
        concurrency: 0,
        userId: null,
-        //userViz: null,
-        serviceStartDate: window.$gz.locale.nowUTC8601String(),
-        serviceStopDate: window.$gz.locale.nowUTC8601String(), //TODO:sb now plus one hour to match v7
-        serviceRateId: null,
-        serviceDetails: null,
-        serviceRateQuantity: 1,
-        noChargeQuantity: 0,
-        serviceBankId: null,
-        taxCodeSaleId: null,
-        taxName: null,
+        description: null,
+        serials: null,
+        partId: null,
+        partWarehouseId: null,
+        quantity: 1,
+        taxPartSaleId: null,
        price: 0,
        priceOverride: null,
-        //costViz: 0,
-        // listPriceViz: 0,
-        //taxAViz: 0,
-        //taxBViz: 0,
-        //lineTotalViz: 0,
-        //unitOfMeasureViz:null,
+        cost: 0,
+        listPrice: 0,
        isDirty: true,
        workOrderItemId: this.value.items[this.activeWoItemIndex].id,
        uid: Date.now() //used for error tracking / display
@@ -683,8 +675,6 @@ export default {
        });
      }

-
-
      if (this.form().showMe(this, "PartUnitOfMeasureViz")) {
        headers.push({
          text: this.$ay.t("UnitOfMeasure"),
@@ -693,7 +683,7 @@ export default {
        });
      }

-      if (this.form().showMe(this, "PartCostViz")) {
+      if (this.form().showMe(this, "PartCost")) {
        headers.push({
          text: this.$ay.t("Cost"),
          align: "right",
@@ -701,7 +691,7 @@ export default {
        });
      }

-      if (this.form().showMe(this, "PartListPriceViz")) {
+      if (this.form().showMe(this, "PartListPrice")) {
        headers.push({
          text: this.$ay.t("ListPrice"),
          align: "right",
@@ -709,7 +699,7 @@ export default {
        });
      }

-      if (this.form().showMe(this, "PartPriceViz")) {
+      if (this.form().showMe(this, "PartPriceOverride")) {
        headers.push({
          text: this.$ay.t("PriceOverride"),
          align: "right",
@@ -725,11 +715,11 @@ export default {
        });
      }

-      if (this.form().showMe(this, "WorkOrderItemPartTaxRateSaleID")) {
+      if (this.form().showMe(this, "WorkOrderItemPartTaxPartSaleID")) {
        headers.push({
          text: this.$ay.t("Tax"),
          align: "left",
-          value: "taxCodeSaleViz"
+          value: "taxPartSaleViz"
        });
      }

@@ -771,37 +761,23 @@ export default {
        return {
          index: i,
          id: x.id,
-          serviceStartDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
-            x.serviceStartDate,
-            this.pvm.timeZoneName,
-            this.pvm.languageName,
-            this.pvm.hour12
-          ),
-          serviceStopDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
-            x.serviceStopDate,
-            this.pvm.timeZoneName,
-            this.pvm.languageName,
-            this.pvm.hour12
-          ),
-
-          serviceRateQuantity: window.$gz.locale.decimalLocalized(
-            x.serviceRateQuantity,
-            this.pvm.languageName
-          ),
-          serviceRateViz: x.serviceRateViz,
-          userViz: x.userViz,
-          noChargeQuantity: window.$gz.locale.decimalLocalized(
-            x.noChargeQuantity,
+          partViz: x.partViz,
+          partWarehouseViz: x.partWarehouseViz,
+          quantity: window.$gz.locale.decimalLocalized(
+            x.quantity,
            this.pvm.languageName
          ),
+          upcViz: x.upcViz,
+          description: x.description,
+          serials: window.$gz.util.truncateString(x.serials, 50),
          unitOfMeasureViz: x.unitOfMeasureViz,
-          costViz: window.$gz.locale.currencyLocalized(
-            x.costViz,
+          cost: window.$gz.locale.currencyLocalized(
+            x.cost,
            this.pvm.languageName,
            this.pvm.currencyName
          ),
-          listPriceViz: window.$gz.locale.currencyLocalized(
-            x.listPriceViz,
+          listPrice: window.$gz.locale.currencyLocalized(
+            x.listPrice,
            this.pvm.languageName,
            this.pvm.currencyName
          ),
@@ -810,7 +786,7 @@ export default {
            this.pvm.languageName,
            this.pvm.currencyName
          ),
-          taxCodeSaleViz: x.taxCodeSaleViz,
+          taxPartSaleViz: x.taxPartSaleViz,
          priceOverride: window.$gz.locale.currencyLocalized(
            x.priceOverride,
            this.pvm.languageName,
@@ -835,8 +811,7 @@ export default {
            x.lineTotalViz,
            this.pvm.languageName,
            this.pvm.currencyName
-          ),
-          serviceDetails: window.$gz.util.truncateString(x.serviceDetails, 50)
+          )
        };
      });
    },
--- a/ayanova/src/components/work-order-item-travels.vue
+++ b/ayanova/src/components/work-order-item-travels.vue
@@ -481,7 +481,6 @@ export default {
        id: 0,
        concurrency: 0,
        userId: null,
-        //userViz: null,
        travelStartDate: window.$gz.locale.nowUTC8601String(),
        travelStopDate: window.$gz.locale.nowUTC8601String(), //TODO:sb now plus one hour to match v7
        travelRateId: null,
@@ -490,15 +489,8 @@ export default {
        noChargeQuantity: 0,
        serviceBankId: null,
        taxCodeSaleId: null,
-        taxName: null,
        price: 0,
        priceOverride: null,
-        //costViz: 0,
-        // listPriceViz: 0,
-        //taxAViz: 0,
-        //taxBViz: 0,
-        //lineTotalViz: 0,
-        //unitOfMeasureViz:null,
        isDirty: true,
        workOrderItemId: this.value.items[this.activeWoItemIndex].id,
        uid: Date.now() //used for error tracking / display