diff --git a/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js b/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
index 8c2e990bec42ec877008bd9215d01ced748c4631..d08ade47c8128c11f5a2ee7f18d64cd11336cdce 100644
--- a/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
@@ -7,14 +7,16 @@ import("Order_lib");
 import("Product_lib");
 import("Sql_lib");
 
-var oid = vars.get("$field.SALESORDER_ID");
+var rowdata = vars.get("$local.rowdata");
+
+var oid = rowdata["SALESORDERITEM.SALESORDER_ID"];
 if(oid != "")
 {
     var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
     var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
     
-    var oiUtils = new OrderItemUtils(vars.get("$field.SALESORDER_ID"));
-    oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.SALESORDERITEMID"), curr, contactid);
+    var oiUtils = new OrderItemUtils(rowdata["SALESORDERITEM.SALESORDER_ID"]);
+    oiUtils.insertPartsList(rowdata["SALESORDERITEM.PRODUCT_ID"], vars.get("$local.uid"), curr, contactid);
     oiUtils.reOrgItems();
     
     //update order price
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js b/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js
index 49491bda0074fa9406df07580128dfd6240db2cb..f6637e2e48404efdf0ec76d263d1b08251eac30e 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBInsert.js
@@ -1,5 +1,5 @@
 import("system.vars");
 import("Salesproject_lib");
 
-Salesproject.insertMilestone(vars.getString("$field.SALESPROJECTID"), "SalesprojectPhase", vars.get("$field.PHASE"), false);
-Salesproject.insertMilestone(vars.getString("$field.SALESPROJECTID"), "SalesprojectState", vars.get("$field.STATE"), true);
\ No newline at end of file
+Salesproject.insertMilestone(vars.getString("local.uid"), "SalesprojectPhase", rowdata["SALESPROJECT.PHASE"], false);
+Salesproject.insertMilestone(vars.getString("$local.uid"), "SalesprojectState", rowdata["SALESPROJECT.STATE"], true);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js b/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js
index 0a2c2a214c48b0e752b2c1bc122ae428e275fbc7..d03f1ac83c31d9c93fe323c495011bfc9406a7b8 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("system.db");
 import("ActivityTask_lib")
 
-CodeUtils.setCode(vars.get("$field.TICKETID"), "TICKET", "TICKETID", "CODE");
\ No newline at end of file
+CodeUtils.setCode(vars.get("$local.uid"), "TICKET", "TICKETID", "CODE");
\ No newline at end of file