This commit is contained in:
@@ -339,21 +339,15 @@ todo: many biz objects are not using new PUT methodology
|
||||
|
||||
|
||||
|
||||
CURRENTLY DOING:
|
||||
|
||||
|
||||
todo: remove taxcode edit control once done
|
||||
|
||||
|
||||
todo: part prices are going to change / volatile, are they snapshotted? (cost/charge)
|
||||
rates and taxes are ok to not snapshot, their values are protected once used but parts are volatile and should be snapshotted
|
||||
|
||||
|
||||
|
||||
|
||||
CURRENTLY DOING: WorkOrderItemTravel
|
||||
|
||||
ORDER: Travel, tasks, parts, loans, units, outside service
|
||||
|
||||
todo: WorkorderItemPart- part prices are going to change / volatile so snapshot them (cost/charge)
|
||||
rates and taxes are ok to not snapshot, their values are protected once used but parts are volatile and should be snapshotted
|
||||
(resurrect the bizaction stuff)
|
||||
|
||||
|
||||
todo: "DispatchFull" and "DispatchLimited" roles MUST be renamed to "ServiceFull" and "ServiceLimited" to match other roles and intent
|
||||
dispatch is a subset of a service manager job
|
||||
Rename at both ends and all translations and docs as well.
|
||||
|
||||
@@ -278,44 +278,6 @@
|
||||
></gz-currency>
|
||||
</v-col>
|
||||
|
||||
<!-- <v-col
|
||||
v-if="form().showMe(this, 'WorkOrderItemExpenseChargeTaxCodeID')"
|
||||
cols="12"
|
||||
sm="6"
|
||||
lg="4"
|
||||
xl="3"
|
||||
>
|
||||
<gz-tax-picker
|
||||
:show-edit-icon="true"
|
||||
v-model="
|
||||
value.items[activeWoItemIndex].expenses[activeItemIndex]
|
||||
.chargeTaxCodeId
|
||||
"
|
||||
:display="
|
||||
value.items[activeWoItemIndex].expenses[activeItemIndex].taxName
|
||||
"
|
||||
:readonly="formState.readOnly || isDeleted"
|
||||
:disabled="isDeleted"
|
||||
:label="$ay.t('WorkOrderItemExpenseChargeTaxCodeID')"
|
||||
:ref="
|
||||
`Items[${activeWoItemIndex}].expenses[${activeItemIndex}].chargeTaxCodeId`
|
||||
"
|
||||
data-cy="expenseChargeTaxCode"
|
||||
:error-messages="
|
||||
form().serverErrors(
|
||||
this,
|
||||
`Items[${activeWoItemIndex}].expenses[${activeItemIndex}].chargeTaxCodeId`
|
||||
)
|
||||
"
|
||||
@input="
|
||||
fieldValueChanged(
|
||||
`Items[${activeWoItemIndex}].expenses[${activeItemIndex}].chargeTaxCodeId`
|
||||
)
|
||||
"
|
||||
@update:name="taxCodeChange"
|
||||
></gz-tax-picker>
|
||||
</v-col> -->
|
||||
|
||||
<v-col
|
||||
v-if="form().showMe(this, 'WorkOrderItemExpenseChargeTaxCodeID')"
|
||||
cols="12"
|
||||
|
||||
@@ -306,44 +306,6 @@
|
||||
></gz-decimal>
|
||||
</v-col>
|
||||
|
||||
<!-- <v-col
|
||||
v-if="form().showMe(this, 'WorkOrderItemLaborTaxRateSaleID')"
|
||||
cols="12"
|
||||
sm="6"
|
||||
lg="4"
|
||||
xl="3"
|
||||
>
|
||||
<gz-tax-picker
|
||||
:show-edit-icon="true"
|
||||
v-model="
|
||||
value.items[activeWoItemIndex].labors[activeItemIndex]
|
||||
.taxCodeSaleId
|
||||
"
|
||||
:display="
|
||||
value.items[activeWoItemIndex].labors[activeItemIndex].taxName
|
||||
"
|
||||
:readonly="formState.readOnly || isDeleted"
|
||||
:disabled="isDeleted"
|
||||
:label="$ay.t('WorkOrderItemLaborTaxRateSaleID')"
|
||||
:ref="
|
||||
`Items[${activeWoItemIndex}].labors[${activeItemIndex}].taxCodeSaleId`
|
||||
"
|
||||
data-cy="laborTaxCodeSaleId"
|
||||
:error-messages="
|
||||
form().serverErrors(
|
||||
this,
|
||||
`Items[${activeWoItemIndex}].labors[${activeItemIndex}].taxCodeSaleId`
|
||||
)
|
||||
"
|
||||
@input="
|
||||
fieldValueChanged(
|
||||
`Items[${activeWoItemIndex}].labors[${activeItemIndex}].taxCodeSaleId`
|
||||
)
|
||||
"
|
||||
@update:name="taxCodeChange"
|
||||
></gz-tax-picker>
|
||||
</v-col> -->
|
||||
|
||||
<v-col
|
||||
v-if="form().showMe(this, 'WorkOrderItemLaborTaxRateSaleID')"
|
||||
cols="12"
|
||||
@@ -462,35 +424,8 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
/* XXXeslint-disable */
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//import GzTaxPicker from "./tax-picker.vue";
|
||||
/*
|
||||
|
||||
+ public decimal? PriceOverride { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero
|
||||
l.Add(new FormField { TKey = "PriceOverride", FieldKey = "LaborPriceOverride", TKeySection = "WorkOrderItemLabors" });
|
||||
[NotMapped]
|
||||
public decimal CostViz { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered
|
||||
[NotMapped]
|
||||
public decimal ListPriceViz { get; set; }//List price from source record (e.g. serviceRate) or zero if no cost entered
|
||||
[NotMapped]
|
||||
+ public string UnitOfMeasureViz { get; set; }//"each", "hour" etc
|
||||
l.Add(new FormField { TKey = "UnitOfMeasure", FieldKey = "LaborUnitOfMeasureViz", TKeySection = "WorkOrderItemLabors" });
|
||||
[NotMapped]
|
||||
public decimal PriceViz { get; set; }//per unit price used in calcs after discounts or manual price if non-null or just ListPrice if no discount or manual override
|
||||
[NotMapped]
|
||||
+ public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially)
|
||||
l.Add(new FormField { TKey = "NetPrice", FieldKey = "LaborNetViz", TKeySection = "WorkOrderItemLabors" });
|
||||
[NotMapped]
|
||||
public decimal TaxAViz { get; set; }//total amount of taxA
|
||||
[NotMapped]
|
||||
public decimal TaxBViz { get; set; }//total amount of taxB
|
||||
[NotMapped]
|
||||
public decimal LineTotalViz { get; set; }//line total netViz + taxes
|
||||
|
||||
*/
|
||||
export default {
|
||||
// components: {
|
||||
// GzTaxPicker
|
||||
// },
|
||||
created() {
|
||||
this.setDefaultView();
|
||||
},
|
||||
@@ -607,11 +542,6 @@ export default {
|
||||
this.activeItemIndex
|
||||
].isDirty = true;
|
||||
window.$gz.form.fieldValueChanged(this.pvm, ref);
|
||||
|
||||
// //set viz if applicable
|
||||
// if(ref==""){
|
||||
// let selectedPartWarehouse = vm.$refs.partWarehouseId.getFullSelectionValue();
|
||||
// }
|
||||
}
|
||||
},
|
||||
itemRowClasses: function(item) {
|
||||
@@ -633,6 +563,7 @@ export default {
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
//---
|
||||
},
|
||||
computed: {
|
||||
isDeleted: function() {
|
||||
@@ -763,22 +694,6 @@ export default {
|
||||
});
|
||||
}
|
||||
|
||||
// if (this.form().showMe(this, "LaborTaxAPct")) {
|
||||
// headers.push({
|
||||
// text: this.$ay.t("TaxCodeTaxA"),
|
||||
// align: "right",
|
||||
// value: "taxAPct"
|
||||
// });
|
||||
// }
|
||||
|
||||
// if (this.form().showMe(this, "LaborTaxBPct")) {
|
||||
// headers.push({
|
||||
// text: this.$ay.t("TaxCodeTaxB"),
|
||||
// align: "right",
|
||||
// value: "taxBPct"
|
||||
// });
|
||||
// }
|
||||
|
||||
if (this.form().showMe(this, "LaborNetViz")) {
|
||||
headers.push({
|
||||
text: this.$ay.t("NetPrice"),
|
||||
@@ -803,14 +718,6 @@ export default {
|
||||
});
|
||||
}
|
||||
|
||||
// if (this.form().showMe(this, "LaborTaxOnTax")) {
|
||||
// headers.push({
|
||||
// text: this.$ay.t("TaxCodeTaxOnTax"),
|
||||
// align: "center",
|
||||
// value: "taxOnTax"
|
||||
// });
|
||||
// }
|
||||
|
||||
if (this.form().showMe(this, "LaborLineTotalViz")) {
|
||||
headers.push({
|
||||
text: this.$ay.t("LineTotal"),
|
||||
@@ -913,31 +820,7 @@ export default {
|
||||
this.pvm.subRights.labors.delete
|
||||
);
|
||||
}
|
||||
// , laborTaxRateSaleHint: function() {
|
||||
// if (this.activeItemIndex == null || this.activeWoItemIndex == null) {
|
||||
// return null;
|
||||
// }
|
||||
// // console.log(
|
||||
// // "laborTaxRateSaleHint",
|
||||
// // this.value.items[this.activeWoItemIndex].labors[this.activeItemIndex]
|
||||
// // .taxCodeSaleId
|
||||
// // );
|
||||
// if (
|
||||
// this.value.items[this.activeWoItemIndex].labors[this.activeItemIndex]
|
||||
// .taxCodeSaleId == null &&
|
||||
// this.value.items[this.activeWoItemIndex].labors[this.activeItemIndex]
|
||||
// .taxName != null
|
||||
// ) {
|
||||
// return (
|
||||
// '"' +
|
||||
// this.value.items[this.activeWoItemIndex].labors[this.activeItemIndex]
|
||||
// .taxName +
|
||||
// '"'
|
||||
// );
|
||||
// } else {
|
||||
// return null;
|
||||
// }
|
||||
// }
|
||||
//----
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user