X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=8245500704ba0df06a7e77f7de347bd3ce722100;hb=536034683a4a88d95d573eef5d413786d000a513;hp=97f3707df1aed441d2923c7f4616a3c5bcaf671a;hpb=a0553c52fe35efd4140774bffb40610a9f3cd583;p=Pman.Core

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index 97f3707d..82455007 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -259,12 +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 = $this->sqlValue("NOW()");
             $this->deleted_by = $roo->getAuthUser()->id;
-            $this->id = $q['_ids'];
-
+        }
+        
+        if(!empty($q['_flag_undelete']) && $q['_flag_undelete'] * 1 == 1){
+            $this->deleted_dt = "";
+            $this->deleted_by = 0;
         }
         if(!empty($q['_check_name'])){
             if($this->checkName()){
@@ -333,7 +336,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
             
             return $this->id == $au->company_id;
         }
-        
+        return true;
         return $au->hasPerm("Core.Companies", $lvl);    
     }