//
function install($pref, $force)
{
- global $db_version;
+ global $db_version, $dflt_lang;
if (!$this->preconf)
return false;
if (!db_query($sql))
return false;
}
+ $this->update_lang_cfg();
return update_company_prefs(array('version_id'=>$db_version), $pref);
}
//
include_once("$path_to_root/sales/includes/cart_class.inc");
include_once("$path_to_root/purchasing/includes/po_class.inc");
$cart = new cart(ST_SALESORDER);
- $sql = "SELECT order_no FROM {$pref}sales_orders";
+ $sql = "SELECT order_no, trans_type FROM {$pref}sales_orders";
$orders = db_query($sql);
if (!$orders)
return false;
-
- while ($order_no = db_fetch($orders)) {
- read_sales_order($order_no[0], $cart, ST_SALESORDER);
- $result = db_query("UPDATE {$pref}sales_orders SET total=".$cart->get_trans_total());
+ while ($order = db_fetch($orders)) {
+ read_sales_order($order['order_no'], $cart, $order['trans_type']);
+ $result = db_query("UPDATE {$pref}sales_orders
+ SET total=".$cart->get_trans_total()
+ ." WHERE order_no=".$order[0]);
unset($cart->line_items);
}
unset($cart);
if ($lang_chd)
write_lang();
- $installed_extensions= get_company_extensions();
+ $installed_extensions= get_company_extensions();
if (!isset($next_extension_id))
$next_extension_id = 1;
$new_exts = array();
+/* Old extension modules are uninstalled - they need manual porting after
+ heavy changes in extension system in FA2.3
+
foreach($installed_extensions as $i => $ext)
{
if (isset($ext['title'])) // old type entry
}
if (isset($ext['acc_file']))
$new['acc_file'] = $ext['acc_file'];
- $new['name'] = $ext['name']; // albo access_string(title)
+ $new['name'] = $ext['name'];
$new['package'] = $new['package'] = '';
$new['active'] = 1;
$new_exts[$i] = $new;
}
}
- // Add non-standard themes
+*/
+ // Preserve non-standard themes
$path = $path_to_root.'/themes/';
$themes = array();
$themedir = opendir($path);
} else
return true;
}
+
+ function update_lang_cfg()
+ {
+ global $dflt_lang, $installed_languages;
+
+ foreach($installed_languages as $n => $lang) {
+ if ($lang['code'] == 'en_GB') {
+ $installed_languages[$n] = array('code'=>'C','name'=>'English',
+ 'encoding'=>'iso-8859-1', 'path' => '', 'package' => '');
+ if ($dflt_lang == 'en_GB')
+ $dflt_lang = 'C';
+ write_lang();
+ }
+ }
+ }
+
}
$install = new fa2_3;