Merge branch 'master' of http://git.roojs.com:8081/Pman.Core

[Pman.Core] / DataObjects / Core_office.php

diff --git a/DataObjects/Core_office.php b/DataObjects/Core_office.php
index 75d47c2..447eedf 100644 (file)
--- a/DataObjects/Core_office.php
+++ b/DataObjects/Core_office.php
@@ -4,12 +4,12 @@
  */
 require_once 'DB/DataObject.php';
 
-class Pman_Core_DataObjects_Office extends DB_DataObject 
+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_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_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..");