projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
DataObjects/Core_company.php
[Pman.Core]
/
DataObjects
/
Core_company.php
diff --git
a/DataObjects/Core_company.php
b/DataObjects/Core_company.php
index
d6c2787
..
7e056a1
100644
(file)
--- 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..
){