DataObjects/Core_company.php

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index c709f3a..c7e703f 100644 (file)
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -247,6 +247,10 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeUpdate($old, $q,$roo)
     {
     
     function beforeUpdate($old, $q,$roo)
     {

+        if(!empty($request['_merge_id'])){
+            $this->merge($request['_merge_id'], $roo);
+        }
+        

         if(!empty($this->is_system) && 
             ($old->code != $this->code  ) // used to be not allowed to change name..
         ){
         if(!empty($this->is_system) && 
             ($old->code != $this->code  ) // used to be not allowed to change name..
         ){