From 11b99f95930656ca7bbe069d4f3ef4f943130328 Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 8 Nov 2018 11:59:47 +0800 Subject: [PATCH] DataObjects/Core_company.php --- DataObjects/Core_company.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php index d6c27872..7e056a12 100644 --- a/DataObjects/Core_company.php +++ b/DataObjects/Core_company.php @@ -299,10 +299,6 @@ 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