X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_office.php;h=5a7ccfdf40aa257a3814384857e9f0bed85b3d6c;hp=590e5dd7b11e34237daa01161a7053f05483f625;hb=HEAD;hpb=72062ac87fc203ca1311822b66283649e33e8940

diff --git a/DataObjects/Core_office.php b/DataObjects/Core_office.php
index 590e5dd7..5a7ccfdf 100644
--- a/DataObjects/Core_office.php
+++ b/DataObjects/Core_office.php
@@ -2,14 +2,14 @@
 /**
  * Table Definition for Office
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_office extends DB_DataObject 
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
-    public $__table = 'Office';                          // table name
+    public $__table = 'core_office';                          // table name
     public $id;                              // int(11)  not_null primary_key auto_increment
     public $company_id;                      // int(11)  not_null
     public $name;                            // string(64)  not_null
@@ -45,7 +45,7 @@ class Pman_Core_DataObjects_Core_office extends DB_DataObject
     
     function company()
     {
-        $c = DB_DataObject::Factory('Companies');
+        $c = DB_DataObject::Factory('core_company');
         $c->get($this->company_id);
         return $c;
         
@@ -58,7 +58,7 @@ class Pman_Core_DataObjects_Core_office extends DB_DataObject
             return true; // standard error message.
         }
         
-        $p = DB_DAtaObject::Factory('Person');
+        $p = DB_DAtaObject::Factory('core_person');
         
         if (!is_a($dependants_array[0], get_class($p))) {
             $roo->jerr("dep is not a person..");