From 6c908d8cc7a36920d2d1ace2dc887a72c3025679 Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 8 Nov 2018 12:01:52 +0800 Subject: [PATCH] DataObjects/Core_company.php --- DataObjects/Core_company.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php index 3e7a3e5e..d6c27872 100644 --- a/DataObjects/Core_company.php +++ b/DataObjects/Core_company.php @@ -256,10 +256,6 @@ 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']); @@ -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.. ){ -- 2.39.2