From 3f2fd43030075c6f2ee28b9f62fc26f23d2fc5b3 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 13 May 2021 17:58:08 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/FormFieldReference.cs | 21 +++++++++++++--------
 server/AyaNova/resource/en.json          |  7 ++++++-
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs
index 2a334964..9a542b44 100644
--- a/server/AyaNova/biz/FormFieldReference.cs
+++ b/server/AyaNova/biz/FormFieldReference.cs
@@ -934,15 +934,20 @@ namespace AyaNova.Biz
                     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" });
-                    l.Add(new FormField { TKey = "WorkOrderItemLaborManualDiscountPct", FieldKey = "WorkOrderItemLaborManualDiscountPct", TKeySection = "WorkOrderItemLabors" });
-                    l.Add(new FormField { TKey = "WorkOrderItemLaborBasePrice", FieldKey = "WorkOrderItemLaborBasePrice", TKeySection = "WorkOrderItemLabors" });
-                    l.Add(new FormField { TKey = "WorkOrderItemLaborPrice", FieldKey = "WorkOrderItemLaborPrice", TKeySection = "WorkOrderItemLabors" });
-
-                    /*
-                     
-  
-                    */
+                    
+                    //STANDARD PRICING FIELDS
+                    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 = "Tax", FieldKey = "LaborTaxName", 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" });
 
+                   
 
 
 
diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json
index 03e05c24..12500ec2 100644
--- a/server/AyaNova/resource/en.json
+++ b/server/AyaNova/resource/en.json
@@ -2220,5 +2220,10 @@
   "WorkOrderItemPriorityList": "Work order item priority list",
   "WorkOrderItemPriorityName": "Name",
   "WorkOrderItemPriorityColor": "Color",
-  "SaveRecordToProceed":"This record must be saved to continue"
+  "SaveRecordToProceed":"This record must be saved to continue",
+  "ListPrice": "List price",
+  "Price": "Price",
+  "Tax": "Tax",
+  "TaxAAmt": "Tax A amount",
+  "TaxBAmt": "Tax B amount"
 }
\ No newline at end of file