X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=5e564b51192b809b7d647040854e6bc36cae96b3;hb=9768d4726a3967f8671217a78475d6e133bfeb48;hp=af5d3ef6c2cc0a15b5f2b95863f5d5f91a5258d8;hpb=2bdcc0b9a8ce36791e882d122bf9c1d27a8859ee;p=Pman.Core

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index af5d3ef6..5e564b51 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -262,6 +262,12 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeUpdate($old, $q,$roo)
     {
+        if(!empty($req['_flag_delete']) && $req['_flag_delete'] * 1 == 1){
+            $delete_dt = date('Y-m-d H:i:s');
+            $this->query("UPDATE {$old->tableName()} SET deleted_by = {$roo->getAuthUser()} , deleted_dt = {$delete_dt} WHERE id = {$req['_delete']}");
+            //$this->addEvent("UPDATE", false, "update core_company record");
+            $this->jok("Updated");
+        }
         if(!empty($q['_check_name'])){
             if($this->checkName()){
                 $roo->jok('OK');
@@ -283,22 +289,18 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeDelete($req, $roo)
     {
-        if(!empty($req['_flag_delete']) && $req['_flag_delete'] * 1 == 1){
-            $delete_dt = date('Y-m-d H:i:s');
-            $this->query("UPDATE {$x->tableName()} SET deleted_by = {$this->getAuthUser()} , deleted_dt = {$delete_dt} WHERE id = {$req['_delete']}");
-            //$this->addEvent("UPDATE", false, "update core_company record");
-            $this->jok("Updated");
-        }
+        
         // should check for members....
         if(!empty($this->is_system) && 
             ($old->code != $this->code || $old->name != $this->name)
         ){
             $roo->jerr('This company is not allow to delete');
         }
+        
+        
     }
     function onDelete($req, $roo)
     {   
-         
         $img = DB_DataObject::factory('Images');
         $img->ontable = $this->tableName();
         $img->onid = $this->id;