X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=3e7a3e5e382965ff319500ca5261e517753d1906;hp=7e056a1289d633a906643750cd3287de80c60b3f;hb=c98ecec2c1a5bef7fc437e26e51e6f6fece615a6;hpb=11b99f95930656ca7bbe069d4f3ef4f943130328

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index 7e056a12..3e7a3e5e 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -256,6 +256,10 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     {
         // we still use comptype in some old systems...
         
+        if(!empty($q['_merge_id'])){
+            $this->merge($q['_merge_id'], $roo);
+        }
+        
         if (!empty($q['comptype_id'])) {
             $en = DB_DataObject::Factory('core_enum');
             $en->get($q['comptype_id']);