X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=13ddb6b68bafe0bffc2b54c32f4a174a6b7d9c90;hp=08916c8e7bb17d3b312b7b0ce6a26849a7a9a38d;hb=5d4ac076dc4f620fbb91944eead3e0af66216a03;hpb=88a01d4b9e35dabf65ea8c2c0210f9da1a07748e

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index 08916c8e..13ddb6b6 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for Companies
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_Company extends DB_DataObject 
 {
@@ -256,7 +256,11 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     function beforeUpdate($old, $q,$roo)
     {
         if(!empty($q['_check_name'])){
-            $this->checkName();
+            if($this->checkName()){
+                $roo->jok('OK');
+            }
+            
+            $roo->jerr('EXIST');
         }
         
         if(!empty($q['_merge_id'])){
@@ -491,7 +495,7 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
         }
         
         if(!$company->find(true)){
-            return true
+            return true;
         }
         
         return false;