diff --git a/process/Dependency_lib/process.js b/process/Dependency_lib/process.js
index cd11ecdecab1d9f9b2163a0349810d27188a8e21..e8967c862a7420d9c411fe3067ac16899dce9451 100644
--- a/process/Dependency_lib/process.js
+++ b/process/Dependency_lib/process.js
@@ -1,4 +1,5 @@
 import("Sql_lib");
+import("system.favorite");
 
 function Dependency(){}
 
@@ -228,6 +229,20 @@ Dependency.mapping = function ()
                 },
                 "getUIDsfn" : Dependency.defaultFunctionForRelation("ACTIVITYLINK", "OBJECT_ROWID", "SALESORDERID", "Order", "SALESORDER", "ACTIVITY_ID")
             },
+            "Organisation_entity" : {
+                "options" : {
+                    "isObservable" : true
+                },
+                "getUIDsfn" : function (pRowData, pChangedData) {
+                    var tableField = "SALESORDER.CONTACT_ID";
+                    var res = [];
+                    if (pRowData[tableField])
+                        res.push(pRowData[tableField])
+                    if (pChangedData[tableField] && pChangedData[tableField] != pRowData[tableField])
+                        res.push(pChangedData[tableField])
+                    return res;
+                }
+            },
             "Task_entity" : {
                 "options" : {
                     "isObservable" : true
@@ -707,42 +722,6 @@ Dependency.mapping = function ()
                 "getUIDsfn" : Dependency.defaultFunctionForField("LEAD.LEADIMPORT_ID")
             }
         }
-        ,"Order_entity": {
-            "Organisation_entity" : {
-                "options" : {
-                    "isObservable" : true
-                },
-                "getUIDsfn" : function (pRowData, pChangedData) {
-                    var tableField = "SALESORDER.CONTACT_ID";
-                    var res = [];
-                    if (pRowData[tableField])
-                        res.push(pRowData[tableField])
-                    if (pChangedData[tableField] && pChangedData[tableField] != pRowData[tableField])
-                        res.push(pChangedData[tableField])
-                    return res;
-                }
-            }
-        }
-        ,"AttributeRelation_entity": {
-                "Organisation_entity" : {
-                    "options" : {
-                        "isObservable" : true
-                    },
-                    "getUIDsfn" : Dependency.defaultFunctionForRelation("AB_ATTRIBUTERELATION", "AB_ATTRIBUTERELATIONID", "AB_ATTRIBUTERELATIONID", "Organisation")
-                },
-                "Activity_entity" : {
-                     "options" : {
-                        "isObservable" : true
-                    },
-                    "getUIDsfn" : Dependency.defaultFunctionForRelation("AB_ATTRIBUTERELATION", "AB_ATTRIBUTERELATIONID", "AB_ATTRIBUTERELATIONID", "Activity")
-                },
-                "Salesproject_entity" : {
-                     "options" : {
-                        "isObservable" : true
-                    },
-                    "getUIDsfn" : Dependency.defaultFunctionForRelation("AB_ATTRIBUTERELATION", "AB_ATTRIBUTERELATIONID", "AB_ATTRIBUTERELATIONID", "Salesproject")
-                }
-            }
     };
 };
 /**