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

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index 25e37a02..82455007 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -260,15 +260,12 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     function beforeUpdate($old, $q,$roo)
     {
          
-        if(!empty($q['_flag_delete'])){
-            if($q['_flag_delete'] * 1 == 1){
-                
-                $this->deleted_dt = $this->sqlValue("NOW()");
-                $this->deleted_by = $roo->getAuthUser()->id;
-            } 
+        if(!empty($q['_flag_delete']) && $q['_flag_delete'] * 1 == 1){
+            $this->deleted_dt = $this->sqlValue("NOW()");
+            $this->deleted_by = $roo->getAuthUser()->id;
         }
         
-        if(!empty($q['_flag_undelete'])){
+        if(!empty($q['_flag_undelete']) && $q['_flag_undelete'] * 1 == 1){
             $this->deleted_dt = "";
             $this->deleted_by = 0;
         }
@@ -339,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);    
     }