From da8ceb5de4f5469e01a919d6a9e6e666bf51e0db Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 24 Jan 2022 01:23:39 +0000 Subject: [PATCH] --- server/AyaNova/biz/FormFieldReference.cs | 48 ++++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index 86f0f290..7688ce96 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -923,10 +923,10 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "WorkOrderItemUnitCustom16", FieldKey = "WorkOrderItemUnitCustom16", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); //WORKORDER ITEM SCHEDULED USER - l.Add(new FormField { TKey = "WorkOrderItemScheduledUserServiceRateID", FieldKey = "ServiceRateId", TKeySection = "WorkOrderItemScheduledUser" }); + l.Add(new FormField { TKey = "WorkOrderItemScheduledUserServiceRateID", FieldKey = "ScheduledUserServiceRateId", TKeySection = "WorkOrderItemScheduledUser", ModelProperty = "ServiceRateId" }); l.Add(new FormField { TKey = "WorkOrderItemScheduledUserStartDate", FieldKey = "StartDate", TKeySection = "WorkOrderItemScheduledUser" }); l.Add(new FormField { TKey = "WorkOrderItemScheduledUserStopDate", FieldKey = "StopDate", TKeySection = "WorkOrderItemScheduledUser" }); - l.Add(new FormField { TKey = "WorkOrderItemScheduledUserUserID", FieldKey = "UserId", TKeySection = "WorkOrderItemScheduledUser" }); + l.Add(new FormField { TKey = "WorkOrderItemScheduledUserUserID", FieldKey = "ScheduledUserId", TKeySection = "WorkOrderItemScheduledUser", ModelProperty = "UserId" }); //WORKORDER ITEM TASKS l.Add(new FormField { TKey = "Sequence", FieldKey = "Sequence", TKeySection = "WorkOrderItemTask", Requireable = false }); @@ -946,7 +946,7 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "Cost", FieldKey = "PartCost", TKeySection = "WorkOrderItemPart", Requireable = false }); l.Add(new FormField { TKey = "ListPrice", FieldKey = "PartListPrice", TKeySection = "WorkOrderItemPart", Requireable = false }); l.Add(new FormField { TKey = "Price", FieldKey = "PartPriceViz", TKeySection = "WorkOrderItemPart", Requireable = false }); - l.Add(new FormField { TKey = "PriceOverride", FieldKey = "PriceOverride", TKeySection = "WorkOrderItemPart" }); + l.Add(new FormField { TKey = "PriceOverride", FieldKey = "PartPriceOverride", TKeySection = "WorkOrderItemPart", ModelProperty = "PriceOverride" }); l.Add(new FormField { TKey = "UnitOfMeasure", FieldKey = "PartUnitOfMeasureViz", TKeySection = "WorkOrderItemPart", Requireable = false }); l.Add(new FormField { TKey = "NetPrice", FieldKey = "PartNetViz", TKeySection = "WorkOrderItemPart", Requireable = false }); l.Add(new FormField { TKey = "TaxAAmt", FieldKey = "PartTaxAViz", TKeySection = "WorkOrderItemPart", Requireable = false }); @@ -954,35 +954,35 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "LineTotal", FieldKey = "PartLineTotalViz", TKeySection = "WorkOrderItemPart", Requireable = false }); //WORKORDER ITEM PART REQUEST - l.Add(new FormField { TKey = "WorkOrderItemPartRequestPartID", FieldKey = "WorkOrderItemPartRequestPartID", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); - l.Add(new FormField { TKey = "WorkOrderItemPartRequestPartWarehouseID", FieldKey = "WorkOrderItemPartRequestPartWarehouseID", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); - l.Add(new FormField { TKey = "WorkOrderItemPartRequestQuantity", FieldKey = "WorkOrderItemPartRequestQuantity", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); - l.Add(new FormField { TKey = "PartDescription", FieldKey = "PartRequestPartDescription", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); - l.Add(new FormField { TKey = "PartUPC", FieldKey = "PartRequestPartUPC", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); - l.Add(new FormField { TKey = "PurchaseOrder", FieldKey = "WorkOrderItemPartRequestPurchaseOrder", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); - l.Add(new FormField { TKey = "PurchaseOrderExpectedReceiveDate", FieldKey = "WorkOrderItemPartRequestExpectedReceiveDate", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); - l.Add(new FormField { TKey = "PurchaseOrderOrderedDate", FieldKey = "WorkOrderItemPartRequestOrderedDate", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); + l.Add(new FormField { TKey = "WorkOrderItemPartRequestPartID", FieldKey = "WorkOrderItemPartRequestPartID", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); + l.Add(new FormField { TKey = "WorkOrderItemPartRequestPartWarehouseID", FieldKey = "WorkOrderItemPartRequestPartWarehouseID", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); + l.Add(new FormField { TKey = "WorkOrderItemPartRequestQuantity", FieldKey = "WorkOrderItemPartRequestQuantity", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); + l.Add(new FormField { TKey = "PartDescription", FieldKey = "PartRequestPartDescription", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); + l.Add(new FormField { TKey = "PartUPC", FieldKey = "PartRequestPartUPC", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); + l.Add(new FormField { TKey = "PurchaseOrder", FieldKey = "WorkOrderItemPartRequestPurchaseOrder", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); + l.Add(new FormField { TKey = "PurchaseOrderExpectedReceiveDate", FieldKey = "WorkOrderItemPartRequestExpectedReceiveDate", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); + l.Add(new FormField { TKey = "PurchaseOrderOrderedDate", FieldKey = "WorkOrderItemPartRequestOrderedDate", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); // l.Add(new FormField { TKey = "WorkOrderItemPartRequestOnOrder", FieldKey = "WorkOrderItemPartRequestOnOrder", TKeySection = "WorkOrderItemPartRequests" }); - l.Add(new FormField { TKey = "WorkOrderItemPartRequestReceived", FieldKey = "WorkOrderItemPartRequestReceived", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); + l.Add(new FormField { TKey = "WorkOrderItemPartRequestReceived", FieldKey = "WorkOrderItemPartRequestReceived", TKeySection = "WorkOrderItemPartRequests", Requireable = false }); //WORKORDER ITEM LABOR l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStartDate", FieldKey = "ServiceStartDate", TKeySection = "WorkOrderItemLabor" }); l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStopDate", FieldKey = "ServiceStopDate", TKeySection = "WorkOrderItemLabor" }); - l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateQuantity", FieldKey = "ServiceRateQuantity", TKeySection = "WorkOrderItemLabor", Requireable=false }); - l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateID", FieldKey = "ServiceRateId", TKeySection = "WorkOrderItemLabor" }); + l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateQuantity", FieldKey = "ServiceRateQuantity", TKeySection = "WorkOrderItemLabor", Requireable = false }); + l.Add(new FormField { TKey = "WorkOrderItemLaborServiceRateID", FieldKey = "LaborServiceRateId", TKeySection = "WorkOrderItemLabor", ModelProperty = "ServiceRateId" }); l.Add(new FormField { TKey = "WorkOrderItemLaborServiceDetails", FieldKey = "ServiceDetails", TKeySection = "WorkOrderItemLabor" }); - l.Add(new FormField { TKey = "WorkOrderItemLaborUserID", FieldKey = "UserId", TKeySection = "WorkOrderItemLabor" }); - l.Add(new FormField { TKey = "WorkOrderItemLaborNoChargeQuantity", FieldKey = "NoChargeQuantity", TKeySection = "WorkOrderItemLabor", Requireable=false }); + l.Add(new FormField { TKey = "WorkOrderItemLaborUserID", FieldKey = "LaborUserId", TKeySection = "WorkOrderItemLabor", ModelProperty = "UserId" }); + l.Add(new FormField { TKey = "WorkOrderItemLaborNoChargeQuantity", FieldKey = "NoChargeQuantity", TKeySection = "WorkOrderItemLabor", Requireable = false }); l.Add(new FormField { TKey = "WorkOrderItemLaborTaxRateSaleID", FieldKey = "TaxCodeSaleId", TKeySection = "WorkOrderItemLabor" }); l.Add(new FormField { TKey = "Cost", FieldKey = "LaborCostViz", TKeySection = "WorkOrderItemLabor" }); - l.Add(new FormField { TKey = "ListPrice", FieldKey = "LaborListPriceViz", TKeySection = "WorkOrderItemLabor", Requireable=false }); - l.Add(new FormField { TKey = "Price", FieldKey = "LaborPriceViz", TKeySection = "WorkOrderItemLabor", Requireable=false }); - l.Add(new FormField { TKey = "PriceOverride", FieldKey = "PriceOverride", TKeySection = "WorkOrderItemLabor" }); - l.Add(new FormField { TKey = "UnitOfMeasure", FieldKey = "LaborUnitOfMeasureViz", TKeySection = "WorkOrderItemLabor", Requireable=false }); - l.Add(new FormField { TKey = "NetPrice", FieldKey = "LaborNetViz", TKeySection = "WorkOrderItemLabor", Requireable=false }); - l.Add(new FormField { TKey = "TaxAAmt", FieldKey = "LaborTaxAViz", TKeySection = "WorkOrderItemLabor", Requireable=false }); - l.Add(new FormField { TKey = "TaxBAmt", FieldKey = "LaborTaxBViz", TKeySection = "WorkOrderItemLabor", Requireable=false }); - l.Add(new FormField { TKey = "LineTotal", FieldKey = "LaborLineTotalViz", TKeySection = "WorkOrderItemLabor", Requireable=false }); + l.Add(new FormField { TKey = "ListPrice", FieldKey = "LaborListPriceViz", TKeySection = "WorkOrderItemLabor", Requireable = false }); + l.Add(new FormField { TKey = "Price", FieldKey = "LaborPriceViz", TKeySection = "WorkOrderItemLabor", Requireable = false }); + l.Add(new FormField { TKey = "PriceOverride", FieldKey = "LaborPriceOverride", TKeySection = "WorkOrderItemLabor", ModelProperty = "PriceOverride" }); + l.Add(new FormField { TKey = "UnitOfMeasure", FieldKey = "LaborUnitOfMeasureViz", TKeySection = "WorkOrderItemLabor", Requireable = false }); + l.Add(new FormField { TKey = "NetPrice", FieldKey = "LaborNetViz", TKeySection = "WorkOrderItemLabor", Requireable = false }); + l.Add(new FormField { TKey = "TaxAAmt", FieldKey = "LaborTaxAViz", TKeySection = "WorkOrderItemLabor", Requireable = false }); + l.Add(new FormField { TKey = "TaxBAmt", FieldKey = "LaborTaxBViz", TKeySection = "WorkOrderItemLabor", Requireable = false }); + l.Add(new FormField { TKey = "LineTotal", FieldKey = "LaborLineTotalViz", TKeySection = "WorkOrderItemLabor", Requireable = false }); //WORKORDER ITEM TRAVEL l.Add(new FormField { TKey = "WorkOrderItemTravelStartDate", FieldKey = "WorkOrderItemTravelStartDate", TKeySection = "WorkOrderItemTravel" });