X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=2a55369440745695f27dc9bae55cce4ccb78c902;hb=e23146506d2ade4e9263cb608f9e21f5da13020e;hp=e65c8215a4ad93c07afea0c342e6c5bf612c873c;hpb=75d39f1b1a878b9b8710c2dc24bf31bb7587841d;p=Pman.Core

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index e65c8215..2a553694 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -110,6 +110,12 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
                 {$tn}.name LIKE '%$s%'
             ");
         }
+        if(!empty($q['search']['name'])){ 
+            $s = $this->escape($q['search']['name']);
+            $this->whereAdd("
+                {$tn}.name LIKE '%$s%'
+            ");
+        }
         if(!empty($q['search']['name_starts'])){
             $s = $this->escape($q['search']['name_starts']);
             $this->whereAdd("
@@ -259,13 +265,21 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     
     function beforeUpdate($old, $q,$roo)
     {
-         
-        if(!empty($q['_flag_delete']) && $q['_flag_delete'] * 1 == 1){
+        // we still use comptype in some old systems...
+        
+        if (!empty($q['comptype_id'])) {
+            $en = DB_DataObject::Factory('core_enum');
+            $en->get($q['comptype_id']);
+            $this->comptype = $en->name;
+        }
+        
+        
+        if(!empty($q['_flag_delete'])){
             $this->deleted_dt = $this->sqlValue("NOW()");
             $this->deleted_by = $roo->getAuthUser()->id;
         }
         
-        if(!empty($q['_flag_undelete']) && $q['_flag_undelete'] * 1 == 1){
+        if(!empty($q['_flag_undelete'])){
             $this->deleted_dt = "";
             $this->deleted_by = 0;
         }
@@ -336,7 +350,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
             
             return $this->id == $au->company_id;
         }
-        print_r($au);exit;
+        
         return $au->hasPerm("Core.Companies", $lvl);    
     }