diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs
index d3a802d3..9d2f3347 100644
--- a/server/AyaNova/util/DbUtil.cs
+++ b/server/AyaNova/util/DbUtil.cs
@@ -320,6 +320,12 @@ namespace AyaNova.Util
 
                     cmd.CommandText = "update aloanunit set unitid=null, workorderitemloanid=null;";
                     await cmd.ExecuteNonQueryAsync();
+
+                    cmd.CommandText = "update aglobalbizsettings set taxpartpurchaseid=null,taxpartsaleid=null,taxratesaleid=null;";
+                    await cmd.ExecuteNonQueryAsync();
+
+
+
                 }
 
 
@@ -332,7 +338,7 @@ namespace AyaNova.Util
                     cmd.CommandText = "update auseroptions set translationid=1;";
                     await cmd.ExecuteNonQueryAsync();
 
-                    cmd.CommandText = "delete from  atranslationitem where translationid > 4;";
+                    cmd.CommandText = "delete from atranslationitem where translationid > 4;";
                     await cmd.ExecuteNonQueryAsync();
 
                     cmd.CommandText = "delete from  atranslation where id > 4;";
@@ -340,6 +346,25 @@ namespace AyaNova.Util
                 }
 
                 //REMOVE ALL REMAINING DATA
+
+                //--- WorkOrder
+                await EraseTableAsync("aworkorderitemexpense", conn);
+                await EraseTableAsync("aworkorderitemlabor", conn);
+                await EraseTableAsync("aworkorderitemloan", conn);
+                await EraseTableAsync("aworkorderitempart", conn);
+                await EraseTableAsync("aworkorderitempartrequest", conn);
+                await EraseTableAsync("aworkorderitemscheduleduser", conn);
+                await EraseTableAsync("aworkorderitemtask", conn);
+                await EraseTableAsync("aworkorderitemtravel", conn);
+                await EraseTableAsync("aworkorderitemunit", conn);
+                await EraseTableAsync("aworkorderitemoutsideservice", conn);
+                await EraseTableAsync("aworkorderitem", conn);
+                await EraseTableAsync("aworkorderstate", conn);
+                await EraseTableAsync("aworkorder", conn);
+                await EraseTableAsync("aworkordertemplateitem", conn);
+                await EraseTableAsync("aworkordertemplate", conn);
+                //---
+
                 await EraseTableAsync("afileattachment", conn);
                 await EraseTableAsync("acustomerservicerequest", conn);
                 await EraseTableAsync("awidget", conn);
@@ -352,11 +377,9 @@ namespace AyaNova.Util
                 await EraseTableAsync("asearchdictionary", conn);
                 await EraseTableAsync("atag", conn);
                 await EraseTableAsync("apurchaseorder", conn);
-                await EraseTableAsync("aunit", conn);
-                await EraseTableAsync("acustomernote", conn);
-                await EraseTableAsync("acustomer", conn);
-                await EraseTableAsync("aheadoffice", conn);
-                await EraseTableAsync("acontract", conn);
+
+
+
                 await EraseTableAsync("aloanunit", conn);
                 await EraseTableAsync("apartassemblyitem", conn);
                 await EraseTableAsync("apartassembly", conn);
@@ -375,25 +398,15 @@ namespace AyaNova.Util
 
                 await EraseTableAsync("aunitmodel", conn);
                 await EraseTableAsync("avendor", conn);
-                //--- WorkOrder
-                await EraseTableAsync("aworkorderitemexpense", conn);
-                await EraseTableAsync("aworkorderitemlabor", conn);
-                await EraseTableAsync("aworkorderitemloan", conn);
-                await EraseTableAsync("aworkorderitempart", conn);
-                await EraseTableAsync("aworkorderitempartrequest", conn);
-                await EraseTableAsync("aworkorderitemscheduleduser", conn);
-                await EraseTableAsync("aworkorderitemtask", conn);
-                await EraseTableAsync("aworkorderitemtravel", conn);
-                await EraseTableAsync("aworkorderitemunit", conn);
-                //---
-                await EraseTableAsync("aworkorderitem", conn);
-                await EraseTableAsync("aworkorderstate", conn);
-                await EraseTableAsync("aworkorder", conn);
-                await EraseTableAsync("aworkordertemplateitem", conn);
-                await EraseTableAsync("aworkordertemplate", conn);
 
+                await EraseTableAsync("aunit", conn);
                 await EraseTableAsync("aproject", conn);//depends on User, dependants are wo,quote,pm
 
+                await EraseTableAsync("acustomernote", conn);
+                await EraseTableAsync("acustomer", conn);
+                await EraseTableAsync("aheadoffice", conn);
+                await EraseTableAsync("acontract", conn);
+
                 //----- NOTIFICATION
                 await EraseTableAsync("anotification", conn);
                 await EraseTableAsync("anotifyevent", conn);