diff --git a/server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs b/server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs
index ef370e6d..a4ee74b8 100644
--- a/server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs
@@ -22,6 +22,7 @@ namespace AyaNova.DataList
             //workorder item expense
             + "left join aworkorderitemexpense on aworkorderitem.id=aworkorderitemexpense.workorderitemid "
             + "left join auser on (aworkorderitemexpense.userid=auser.id) "
+            + "left join ataxcode on (aworkorderitemexpense.chargetaxcodeid=ataxcode.id) "
             ;
 
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
@@ -50,7 +51,7 @@ namespace AyaNova.DataList
             */
 
             #region WorkOrderItemExpense fields
-        
+
             FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "WorkOrderItemExpenseName",
@@ -117,6 +118,15 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "aworkorderitemexpense.reimburseuser"
             });
 
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemExpenseChargeTaxCodeID",
+                FieldKey = "WorkOrderItemExpenseChargeTaxCodeID",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AType = (int)AyaType.TaxCode,
+                SqlIdColumnName = "aworkorderitemexpense.chargetaxcodeid",
+                SqlValueColumnName = "ataxcode.name"
+            });
 
 
             //META column 
@@ -487,7 +497,7 @@ namespace AyaNova.DataList
             });
 
 
-           FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" });
+            FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" });
             FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" });
             FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" });
             FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" });
diff --git a/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs b/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs
index a6e7314c..e3ae8b4d 100644
--- a/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs
@@ -22,6 +22,7 @@ namespace AyaNova.DataList
             //workorder item loan
             + "left join aworkorderitemloan on aworkorderitem.id=aworkorderitemloan.workorderitemid "
             + "left join aloanunit on (aworkorderitemloan.loanunitid=aloanunit.id) "
+            + "left join ataxcode on (aworkorderitemloan.taxcodeid=ataxcode.id) "
             ;
 
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
@@ -112,7 +113,15 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "aworkorderitemloan.quantity"
             });
 
-
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemLoanTaxCodeID",
+                FieldKey = "WorkOrderItemLoanTaxCodeID",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AType = (int)AyaType.TaxCode,
+                SqlIdColumnName = "aworkorderitemloan.taxcodeid",
+                SqlValueColumnName = "ataxcode.name"
+            });
 
 
             //META column 
diff --git a/server/AyaNova/DataList/WorkOrderItemOutsideServiceDataList.cs b/server/AyaNova/DataList/WorkOrderItemOutsideServiceDataList.cs
index 174fb545..abc1b83c 100644
--- a/server/AyaNova/DataList/WorkOrderItemOutsideServiceDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemOutsideServiceDataList.cs
@@ -24,6 +24,7 @@ namespace AyaNova.DataList
             + "left join aunit on (aworkorderitemoutsideservice.unitid=aunit.id) "
             + "left join avendor as vendto on (aworkorderitemoutsideservice.vendorsenttoid=vendto.id) "
             + "left join avendor as vendvia on (aworkorderitemoutsideservice.vendorsentviaid=vendvia.id) "
+            + "left join ataxcode on (aworkorderitemoutsideservice.taxcodeid=ataxcode.id) "
             ;
 
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
@@ -54,25 +55,7 @@ namespace AyaNova.DataList
             */
 
             #region WorkOrderItemOutsideService fields
-            /*
-                        l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceNotes", FieldKey = "WorkOrderItemOutsideServiceNotes", TKeySection = "WorkOrderItemOutsideServiceList" });
-                        l.Add(new FormField { TKey = "Unit", FieldKey = "WorkOrderItemOutsideServiceUnit", TKeySection = "WorkOrderItemOutsideServiceList" });
-                        l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceVendorSentToID", FieldKey = "WorkOrderItemOutsideServiceVendorSentToID", TKeySection = "WorkOrderItemOutsideServiceList" });
-                        l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceVendorSentViaID", FieldKey = "WorkOrderItemOutsideServiceVendorSentViaID", TKeySection = "WorkOrderItemOutsideServiceList" });
-                        l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceRMANumber", FieldKey = "WorkOrderItemOutsideServiceRMANumber", TKeySection = "WorkOrderItemOutsideServiceList" });
-                        l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceTrackingNumber", FieldKey = "WorkOrderItemOutsideServiceTrackingNumber", TKeySection = "WorkOrderItemOutsideServiceList" });
-            l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceRepairCost", FieldKey = "WorkOrderItemOutsideServiceRepairCost", TKeySection = "WorkOrderItemOutsideServiceList" });
-            l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceRepairPrice", FieldKey = "WorkOrderItemOutsideServiceRepairPrice", TKeySection = "WorkOrderItemOutsideServiceList" });
-            l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceShippingCost", FieldKey = "WorkOrderItemOutsideServiceShippingCost", TKeySection = "WorkOrderItemOutsideServiceList" });
-            l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceShippingPrice", FieldKey = "WorkOrderItemOutsideServiceShippingPrice", TKeySection = "WorkOrderItemOutsideServiceList" });
-                        l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceDateSent", FieldKey = "WorkOrderItemOutsideServiceDateSent", TKeySection = "WorkOrderItemOutsideServiceList" });
-                        l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceDateETA", FieldKey = "WorkOrderItemOutsideServiceDateETA", TKeySection = "WorkOrderItemOutsideServiceList" });
-                        l.Add(new FormField { TKey = "WorkOrderItemOutsideServiceDateReturned", FieldKey = "WorkOrderItemOutsideServiceDateReturned", TKeySection = "WorkOrderItemOutsideServiceList" });
 
-            "notes TEXT, unitid BIGINT NOT NULL REFERENCES aunit, vendorsenttoid BIGINT REFERENCES avendor, vendorsentviaid BIGINT REFERENCES avendor, rmanumber text, trackingnumber text, "
-            taxcodeid BIGINT REFERENCES ataxcode, repaircost DECIMAL(38,18) NOT NULL default 0, repairprice DECIMAL(38,18) NOT NULL default 0, shippingcost DECIMAL(38,18) NOT NULL default 0, 
-            shippingprice DECIMAL(38,18) NOT NULL default 0, SentDate TIMESTAMP, etadate TIMESTAMP, returndate TIMESTAMP"
-            */
             FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "Unit",
@@ -154,6 +137,16 @@ namespace AyaNova.DataList
             //     SqlValueColumnName = "aworkorderitemoutsideservice.repaircost"
             // });
 
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemOutsideServiceTaxCode",
+                FieldKey = "WorkOrderItemOutsideServiceTaxCode",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AType = (int)AyaType.TaxCode,
+                SqlIdColumnName = "aworkorderitemoutsideservice.taxcodeid",
+                SqlValueColumnName = "ataxcode.name"
+            });
+
 
             //META column 
             FieldDefinitions.Add(new DataListFieldDefinition
diff --git a/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs b/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs
index a4126276..f99edbfd 100644
--- a/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs
@@ -23,7 +23,7 @@ namespace AyaNova.DataList
             + "left join aworkorderitemtravel on aworkorderitem.id=aworkorderitemtravel.workorderitemid "
             + "left join auser on (aworkorderitemtravel.userid=auser.id) "
             + "left join atravelrate on (aworkorderitemtravel.travelrateid=atravelrate.id) "
-
+            + "left join ataxcode on (aworkorderitemtravel.taxcodesaleid=ataxcode.id) "
             ;
 
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
@@ -51,7 +51,7 @@ namespace AyaNova.DataList
                    ╚═╝   ╚═╝  ╚═╝╚═╝  ╚═╝  ╚═══╝  ╚══════╝╚══════╝
             */
             #region WorkOrderItemTravel fields
-    
+
             FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "WorkOrderItemTravelUserID",
@@ -122,6 +122,15 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "aworkorderitemtravel.nochargequantity"
             });
 
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemTravelTaxRateSaleID",
+                FieldKey = "WorkOrderItemTravelTaxRateSaleID",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AType = (int)AyaType.TaxCode,
+                SqlIdColumnName = "aworkorderitemtravel.taxcodesaleid",
+                SqlValueColumnName = "ataxcode.name"
+            });
 
             //META column 
             FieldDefinitions.Add(new DataListFieldDefinition