From 5ad5a5b08e4dc92328c9a8fc8586da1240692f81 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 21 May 2021 14:22:40 +0000 Subject: [PATCH] --- server/AyaNova/biz/FormFieldReference.cs | 33 ++---------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index b03d3655..688372d9 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -929,8 +929,6 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "TaxBAmt", FieldKey = "ExpenseTaxBViz", TKeySection = "WorkOrderItemExpense" }); l.Add(new FormField { TKey = "LineTotal", FieldKey = "ExpenseLineTotalViz", TKeySection = "WorkOrderItemExpense" }); - - //WORKORDER ITEM LABOR l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStartDate", FieldKey = "WorkOrderItemLaborServiceStartDate", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "WorkOrderItemLaborServiceStopDate", FieldKey = "WorkOrderItemLaborServiceStopDate", TKeySection = "WorkOrderItemLabors" }); @@ -939,45 +937,18 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "WorkOrderItemLaborServiceDetails", FieldKey = "WorkOrderItemLaborServiceDetails", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "WorkOrderItemLaborUserID", FieldKey = "WorkOrderItemLaborUserID", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "WorkOrderItemLaborNoChargeQuantity", FieldKey = "WorkOrderItemLaborNoChargeQuantity", TKeySection = "WorkOrderItemLabors" }); - l.Add(new FormField { TKey = "WorkOrderItemLaborTaxRateSaleID", FieldKey = "WorkOrderItemLaborTaxRateSaleID", TKeySection = "WorkOrderItemLabors" }); - - //STANDARD PRICING FIELDS + l.Add(new FormField { TKey = "WorkOrderItemLaborTaxRateSaleID", FieldKey = "WorkOrderItemLaborTaxRateSaleID", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "Cost", FieldKey = "LaborCost", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "ListPrice", FieldKey = "LaborListPrice", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "Price", FieldKey = "LaborPrice", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "PriceOverride", FieldKey = "LaborPriceOverride", TKeySection = "WorkOrderItemLabors" }); - l.Add(new FormField { TKey = "UnitOfMeasure", FieldKey = "LaborUnitOfMeasureViz", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "NetPrice", FieldKey = "LaborNetViz", TKeySection = "WorkOrderItemLabors" }); - l.Add(new FormField { TKey = "TaxAAmt", FieldKey = "LaborTaxAViz", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "TaxBAmt", FieldKey = "LaborTaxBViz", TKeySection = "WorkOrderItemLabors" }); l.Add(new FormField { TKey = "LineTotal", FieldKey = "LaborLineTotalViz", TKeySection = "WorkOrderItemLabors" }); - /* - - + public decimal? ManualPrice { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero - [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 ChargeUnitViz { get; set; }//"each", "hour" etc - [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) - [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 - - */ - - - + _formFields.Add(AyaType.WorkOrder.ToString(), l); }