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

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index c5c5fa1b..038d092b 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -82,10 +82,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
             $this->whereAddIn('comptype', explode(',', $q['query']['comptype']), 'string');
             
         }
-        /*if (!empty($q['query']['deleted_by'])) {
-            $deleted_by = $this->escape($q['query']['deleted_by']);
-            $this->whereAdd("deleted_by = '$deleted_by'");
-        }*/
+        
         // depricated - should be moved to module specific (texon afair)
         
          if (!empty($q['query']['province'])) {
@@ -262,16 +259,15 @@ 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['_flag_delete'])){
+            $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()){