server/AyaNova/biz/FormFieldReference.cs

@@ -945,15 +945,36 @@ namespace AyaNova.Biz
                     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 = "TaxCodeTaxA", FieldKey = "LaborTaxAPct", TKeySection = "WorkOrderItemLabors" });
-                    l.Add(new FormField { TKey = "TaxCodeTaxB", FieldKey = "LaborTaxBPct", TKeySection = "WorkOrderItemLabors" });
-                    l.Add(new FormField { TKey = "TaxCodeTaxOnTax", FieldKey = "LaborTaxOnTax", TKeySection = "WorkOrderItemLabors" });
+                   // l.Add(new FormField { TKey = "TaxCodeTaxA", FieldKey = "LaborTaxAPct", TKeySection = "WorkOrderItemLabors" });
+                   // l.Add(new FormField { TKey = "TaxCodeTaxB", FieldKey = "LaborTaxBPct", TKeySection = "WorkOrderItemLabors" });
+                   // l.Add(new FormField { TKey = "TaxCodeTaxOnTax", FieldKey = "LaborTaxOnTax", 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
+
+*/
 
 
 

server/AyaNova/biz/WorkOrderBiz.cs

@@ -2033,8 +2033,8 @@ namespace AyaNova.Biz
             }
 
             //manual price overrides anything
-            if (o.ManualPrice != null)
-                o.PriceViz = (decimal)o.ManualPrice;
+            if (o.PriceOverride != null)
+                o.PriceViz = (decimal)o.PriceOverride;
             else
             {
                 //not manual so could potentially have a contract adjustment

server/AyaNova/models/WorkOrderItemLabor.cs

@@ -31,7 +31,7 @@ namespace AyaNova.Models
 
         //Standard pricing fields (mostly to support printed reports though some show in UI)
         //some not to be sent with record depending on role (i.e. cost and charge in some cases)
-        public decimal? ManualPrice { get; set; }//user entered manually overridden price, if null then ignored in calcs otherwise this *is* the price even if zero
+        public decimal? PriceOverride { 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]

server/AyaNova/resource/de.json

@@ -2221,5 +2221,6 @@
   "WorkOrderItemPriorityName": "Name",
   "WorkOrderItemPriorityColor": "Farbe",
   "SaveRecordToProceed":"Dieser Datensatz muss gespeichert werden, um fortzufahren",
-  "GlobalWorkOrderCompleteByAge":"Standardalter für die Fertigstellung des Arbeitsauftrags"
+  "GlobalWorkOrderCompleteByAge":"Standardalter für die Fertigstellung des Arbeitsauftrags",
+  "PriceOverride":"Preisüberschreibung"
 }

server/AyaNova/resource/en.json

@@ -2226,5 +2226,6 @@
   "Tax": "Tax",
   "TaxAAmt": "Tax A amount",
   "TaxBAmt": "Tax B amount",
-  "GlobalWorkOrderCompleteByAge":"Default work order completion age"
+  "GlobalWorkOrderCompleteByAge":"Default work order completion age",
+  "PriceOverride":"Price override"
 }

server/AyaNova/resource/es.json

@@ -2221,5 +2221,6 @@
   "WorkOrderItemPriorityName": "Nombre",
   "WorkOrderItemPriorityColor": "Color",
   "SaveRecordToProceed":"Este registro debe guardarse para continuar",
-  "GlobalWorkOrderCompleteByAge":"Âge d'achèvement des bons de travail par défaut"
+  "GlobalWorkOrderCompleteByAge":"Âge d'achèvement des bons de travail par défaut",
+  "PriceOverride":"Anulación de precio"
 }

server/AyaNova/resource/fr.json

@@ -2221,5 +2221,6 @@
   "WorkOrderItemPriorityName": "Nom",
   "WorkOrderItemPriorityColor": "Couleur",
   "SaveRecordToProceed":"Enregistrer pour continuer",
-  "GlobalWorkOrderCompleteByAge":"Âge d'achèvement des bons de travail par défaut"
+  "GlobalWorkOrderCompleteByAge":"Âge d'achèvement des bons de travail par défaut",
+  "PriceOverride":"Remplacement de prix"
 }