X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=c5c5fa1b26243f878e202861c658e5ad0ccaff3a;hb=6d722da4dbadba2a4a82add292326a848cd04d52;hp=af5d3ef6c2cc0a15b5f2b95863f5d5f91a5258d8;hpb=40ae01070aee6ab3308617b2fca9a143da60a4c7;p=Pman.Core

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index af5d3ef6..c5c5fa1b 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -262,6 +262,17 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeUpdate($old, $q,$roo)
     {
+
+        if(!empty($q['_flag_delete']) && $q['_flag_delete'] * 1 == 1){
+            //$delete_dt = date('Y-m-d H:i:s');
+            $this->deleted_dt = date('Y-m-d H:i:s');
+            $this->deleted_by = $roo->getAuthUser()->name;
+            $this->id = $q['_ids'];
+
+            $this->update();
+            //$roo->query("UPDATE {$old->tableName()} SET deleted_by = {$roo->getAuthUser()} , deleted_dt = {$delete_dt} WHERE id = {$req['_update_id']}");
+            //$this->addEvent("UPDATE", false, "update core_company record");
+        }
         if(!empty($q['_check_name'])){
             if($this->checkName()){
                 $roo->jok('OK');
@@ -283,22 +294,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;