X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=f8e2d98cd948bcfcab648dcf601fcefc1fe1fea0;hb=d5fcab1ab1c813fd76828b3e64ee51335b682b49;hp=13d3a72987e96504651e478c0b20bc936b7aceef;hpb=049bee5b373990a090bf841bb011e116af4cc41a;p=Pman.Core

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index 13d3a729..f8e2d98c 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,13 +259,13 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeUpdate($old, $q,$roo)
     {
-        var_dump($roo); exit;
+
         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();
+            $this->deleted_dt = $this->sqlValue("NOW()");
+            $this->deleted_by = $roo->getAuthUser()->name;
             $this->id = $q['_ids'];
-            var_dump($this); die;
+
             $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");