X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Falter2.3.php;h=c568245962f3a648890ebd5b1dd9c278f93a2c15;hb=34bfbfad2dd0239174e03f7cce2b0bdcfa6a8a10;hp=fe455bfb4874a165fd9a4fa0c831528dd7208ba7;hpb=b9185a0190595e671a9750eb4e9f8e0bd6c713f9;p=fa-stable.git

diff --git a/sql/alter2.3.php b/sql/alter2.3.php
index fe455bfb..c5682459 100644
--- a/sql/alter2.3.php
+++ b/sql/alter2.3.php
@@ -26,7 +26,10 @@ class fa2_3 {
 	//
 	function install($pref, $force) 
 	{
-		global $core_version;
+		global $db_version, $dflt_lang;
+
+		if (!$this->preconf)
+			return false;
 
 		if (!$this->beta) {
 			// all specials below are already done on 2.3beta
@@ -88,13 +91,15 @@ class fa2_3 {
 			if (!db_query($sql))
 				return false;
 		}
-		return  update_company_prefs(array('version_id'=>$core_version), $pref);
+		$this->update_lang_cfg();
+		return  update_company_prefs(array('version_id'=>$db_version), $pref);
 	}
 	//
 	//	Checking before install
 	//
 	function pre_check($pref, $force)
 	{
+
 		if ($this->beta && !$force)
 			$this->sql = 'alter2.3rc.sql';
 
@@ -105,6 +110,7 @@ class fa2_3 {
 	//
 	function installed($pref) {
 		$this->beta = !check_table($pref, 'suppliers', 'tax_included');
+		$this->preconf = $this->fix_extensions();
 
 		$n = 1; // number of patches to be installed
 		$patchcnt = 0;
@@ -132,14 +138,15 @@ class fa2_3 {
 		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);
@@ -257,6 +264,107 @@ class fa2_3 {
 		}
 	return true;
 	}
+	
+	function fix_extensions()
+	{
+		global $path_to_root, $next_extension_id, $installed_languages;
+		
+		$lang_chd = false;
+		foreach($installed_languages as $i => $lang) {
+			if (!isset($lang['path'])) {
+				$code = $lang['code'];
+				$installed_languages[$i]['path'] = 'lang/'.$code;
+				$installed_languages[$i]['package'] = $code;
+				$lang_chd = true;
+			}
+		}
+		if ($lang_chd)
+			write_lang();
+
+		$installed_extensions= get_company_extensions();
+		
+		if (!isset($next_extension_id))
+			$next_extension_id = 1;
+		$new_exts = array();
+		
+		foreach($installed_extensions as $i => $ext)
+		{
+			if (isset($ext['title'])) // old type entry
+			{
+				if ($ext['type'] == 'module') {
+					$new['type'] = 'extension';
+					$new['tabs'][] = array(
+						'url' => $ext['filename'],
+						'access' => isset($ext['access']) ? $ext['access'] : 'SA_OPEN',
+						'tab_id' => $ext['tab'],
+						'title' => $ext['title']
+					);
+					$new['path'] = $ext['path'];
+				}
+				else // plugin
+				{
+					$new['type'] = 'extension';
+					$new['tabs'] = array();
+					$new['path'] = 'modules/'.$ext['path'];
+					$new['entries'][] = array(
+						'url' => $ext['filename'],
+						'access' => isset($ext['access']) ? $ext['access'] : 'SA_OPEN',
+						'tab_id' => $ext['tab'],
+						'title' => $ext['title']
+					);
+				}
+				if (isset($ext['acc_file']))
+					$new['acc_file'] = $ext['acc_file'];
+				$new['name'] = $ext['name']; // albo access_string(title)
+				$new['package'] = $new['package'] = '';
+				$new['active'] = 1;
+
+				$new_exts[$i] = $new;
+			}
+		}
+		// Add non-standard themes
+		$path = $path_to_root.'/themes/';
+		$themes = array();
+		$themedir = opendir($path);
+		while (false !== ($fname = readdir($themedir)))
+		{
+			if ($fname!='.' && $fname!='..' && $fname!='CVS' && is_dir($path.$fname)
+				&& !in_array($fname, array('aqua', 'cool', 'default')))
+			{
+				foreach($installed_extensions as $ext)  
+					if ($ext['path'] == 'themes/'.$fname) // skip if theme is already listed
+						continue 2;
+				$new_exts[$next_extension_id++] = array(
+					'name' => 'Theme '. ucwords($fname),
+					'package' => $fname,
+					'type' => 'theme',
+					'active' => true,
+					'path' => 'themes/'.$fname
+				);
+			}
+		}
+		closedir($themedir);
+
+		if (count($new_exts)) {
+			return update_extensions($new_exts);
+		} 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;