X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=4768b93de56981958dfdedd73be8772876925f4d;hb=93b3bcbfe8b1b9b37219249fb69014eebca55c8d;hp=346bc4003cc1f61143fc86406301bf7b8883e346;hpb=29ad6931abe5149161354941ae7d1f39b9ccdd20;p=Pman.Core

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index 346bc400..4768b93d 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -259,16 +259,23 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeUpdate($old, $q,$roo)
     {
-         
+        // we still use comptype in some old systems...
+        
+        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'])){
-            if($q['_flag_delete'] * 1 == 1){
-                
-                $this->deleted_dt = $this->sqlValue("NOW()");
-                $this->deleted_by = $roo->getAuthUser()->id;
-            } else {
-                $this->deleted_dt = "";
-                $this->deleted_by = 0;
-            }
+            $this->deleted_dt = $this->sqlValue("NOW()");
+            $this->deleted_by = $roo->getAuthUser()->id;
+        }
+        
+        if(!empty($q['_flag_undelete'])){
+            $this->deleted_dt = "";
+            $this->deleted_by = 0;
         }
         if(!empty($q['_check_name'])){
             if($this->checkName()){