{
// 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']);
$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..
){