DataObjects/Core_company.php

[Pman.Core] / DataObjects / Core_company.php

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index 3e7a3e5..e12b32c 100644 (file)
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -255,11 +255,6 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     function beforeInsert($q, $roo)
     {
         // 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']);
@@ -277,6 +272,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeUpdate($old, $q,$roo)
     {
+        print_r('test?????');exit;
         // we still use comptype in some old systems...
         
         if (!empty($q['comptype_id'])) {
@@ -303,6 +299,10 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
             $roo->jerr('EXIST');
         }
         
+        if(!empty($q['_merge_id'])){
+            $this->merge($q['_merge_id'], $roo);
+        }
+        
         if(!empty($this->is_system) && 
             ($old->code != $this->code  ) // used to be not allowed to change name..
         ){