X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=aca5be848d4448fc36a450ed30657b39263eb7db;hb=ca4761f3d6530b562525feec940a63c82cf45dc9;hp=cb0af57500e0197cbfa2ee8ae22517f84e9e9d96;hpb=1007a3d809e851a97b49343af72cfb91079e7b21;p=Pman.Core

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index cb0af575..aca5be84 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -255,6 +255,18 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     {
         // we still use comptype in some old systems...
         
+        if(!empty($q['comptype']) && empty($q['comptype_id'])) {
+            $en = DB_DataObject::Factory('core_enum');
+            $en->setFrom(array(
+                'etype' => 'COMPTYPE',
+                'name' => $q['comptype'],
+                'active' => 1
+            ));
+            if($en->find(true)) {
+                $this->comptype_id = $en->id;
+            }
+        }
+        
         if (!empty($q['comptype_id'])) {
             $en = DB_DataObject::Factory('core_enum');
             $en->get($q['comptype_id']);
@@ -274,13 +286,24 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     {
         // we still use comptype in some old systems...
         
+        if(!empty($q['comptype']) && empty($q['comptype_id'])) {
+            $en = DB_DataObject::Factory('core_enum');
+            $en->setFrom(array(
+                'etype' => 'COMPTYPE',
+                'name' => $q['comptype'],
+                'active' => 1
+            ));
+            if($en->find(true)) {
+                $this->comptype_id = $en->id;
+            }
+        }
+        
         if (!empty($q['comptype_id'])) {
             $en = DB_DataObject::Factory('core_enum');
             $en->get($q['comptype_id']);
             $this->comptype = $en->name;
         }
         
-        
         if(!empty($q['_flag_delete'])){
             $this->deleted_dt = $this->sqlValue("NOW()");
             $this->deleted_by = $roo->getAuthUser()->id;