Fix #7123 - getting abra ready to test

diff --git a/DataObjects/Curr_symbol.php b/DataObjects/Curr_symbol.php
index e2ef134..f54f4ef 100644 (file)
--- a/DataObjects/Curr_symbol.php
+++ b/DataObjects/Curr_symbol.php
@@ -50,6 +50,7 @@ class Pman_Xtuple_DataObjects_Curr_symbol extends DB_DataObject
                 'curr_abbr'=> $curr,  
                 
             ));
+            print_R($cs->table());
             $cs->curr_id ? $cs->update() : $cs->insert();
             
         }

diff --git a/DataObjects/Custinfo.php b/DataObjects/Custinfo.php
index c74a417..bc81282 100644 (file)
--- a/DataObjects/Custinfo.php
+++ b/DataObjects/Custinfo.php
@@ -501,7 +501,7 @@ class Pman_Xtuple_DataObjects_Custinfo extends DB_DataObject
         }
         
     
-        $companies = DB_DataObject::factory('companies');
+        $companies = DB_DataObject::factory('core_company');
         $companies->comptype_id = $enum;
         if ($companies->count() != 1) {
             echo "SKIP - custinfo - create - missing owner company";

diff --git a/Import/Accounts.php b/Import/Accounts.php
index 5fa4c68..8668ca1 100644 (file)
--- a/Import/Accounts.php
+++ b/Import/Accounts.php
@@ -25,7 +25,7 @@ class Pman_Xtuple_Import_Accounts extends Pman_Roo
     }
     
     
-    function get()
+    function get($tab, $opts = [])
     {
         PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, array($this, 'onPearError'));
         //$this->jerr("INVALID");
@@ -42,7 +42,7 @@ class Pman_Xtuple_Import_Accounts extends Pman_Roo
     }
     
     
-    function post( )
+    function post($tab  )
     {
         
         $this->sessionState(0); // turn off the session..

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 9318591..91b91e5 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -218,9 +218,10 @@ class Pman_Xtuple_UpdateDatabase extends Pman_Core_UpdateDatabase
 //                'location', //?? just check hat one exists.
         ) : array($k);
         
-        
-        $core_opts = HTML_FlexyFramework::get()->page->opts;
-        if (!empty($core_opts['base'])) {
+         $core_opts = HTML_FlexyFramework::get()->page->opts;
+         
+         if (!empty($core_opts['base'])) {
+            DB_DataObject::DebugLevel(1);
             DB_DataObject::factory('curr_symbol')->importFromArray($this, array($core_opts['base']));
             DB_DataObject::factory('curr_symbol')->setBase($this, $core_opts['base']);
         }