server/AyaNova/biz/FormFieldReference.cs

@@ -947,34 +947,34 @@ namespace AyaNova.Biz
                     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 = "UnitOfMeasure", FieldKey = "LaborUnitOfMeasureViz", TKeySection = "WorkOrderItemLabors" });
-                   // l.Add(new FormField { TKey = "TaxCodeTaxB", FieldKey = "LaborTaxBPct", TKeySection = "WorkOrderItemLabors" });
+                    l.Add(new FormField { TKey = "NetPrice", FieldKey = "LaborNetViz", 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
+                        + 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]
+                            [NotMapped]
-        public decimal CostViz { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered
+                            public decimal CostViz { get; set; }//cost from source record (e.g. serviceRate) or zero if no cost entered
-        [NotMapped]
+                            [NotMapped]
-        public decimal ListPriceViz { get; set; }//List price from source record (e.g. serviceRate) or zero if no cost entered
+                            public decimal ListPriceViz { get; set; }//List price from source record (e.g. serviceRate) or zero if no cost entered
-        [NotMapped]
+                            [NotMapped]
-     +   public string ChargeUnitViz { get; set; }//"each", "hour" etc
+                         +   public string ChargeUnitViz { get; set; }//"each", "hour" etc
-        [NotMapped]
+                            [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
+                            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]
+                            [NotMapped]
-    +    public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially)
+                        +    public decimal NetViz { get; set; }//quantity * price (before taxes line total essentially)
-        [NotMapped]
+                            [NotMapped]
-        public decimal TaxAViz { get; set; }//total amount of taxA
+                            public decimal TaxAViz { get; set; }//total amount of taxA
-        [NotMapped]
+                            [NotMapped]
-        public decimal TaxBViz { get; set; }//total amount of taxB
+                            public decimal TaxBViz { get; set; }//total amount of taxB
-        [NotMapped]
+                            [NotMapped]
-        public decimal LineTotalViz { get; set; }//line total netViz + taxes
+                            public decimal LineTotalViz { get; set; }//line total netViz + taxes
 
-*/
+                    */
 
 
 

server/AyaNova/biz/WorkOrderBiz.cs

@@ -2028,7 +2028,7 @@ namespace AyaNova.Biz
             {
                 o.CostViz = Rate.Cost;
                 o.ListPriceViz = Rate.Charge;
-                o.ChargeUnitViz = Rate.Unit;
+                o.UnitOfMeasureViz = Rate.Unit;
                 o.PriceViz = Rate.Charge;//default price used if not manual or contract override
             }
 

server/AyaNova/models/WorkOrderItemLabor.cs

@@ -37,7 +37,7 @@ namespace AyaNova.Models
         [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
+        public string UnitOfMeasureViz { 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]

server/AyaNova/resource/de.json

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

server/AyaNova/resource/en.json

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

server/AyaNova/resource/es.json

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

server/AyaNova/resource/fr.json

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