projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c98ecec
)
DataObjects/Core_company.php
author
Edward
<edward@roojs.com>
Thu, 8 Nov 2018 04:01:52 +0000
(12:01 +0800)
committer
Edward
<edward@roojs.com>
Thu, 8 Nov 2018 04:01:52 +0000
(12:01 +0800)
DataObjects/Core_company.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_company.php
b/DataObjects/Core_company.php
index
3e7a3e5
..
d6c2787
100644
(file)
--- 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..
){