X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Falter2.3.php;h=0b1c230c4df1fa2c17d2dafd317de5d00390dd70;hb=5504e73f20fee3210b55eb1ecf954e1eb4992bb7;hp=8cbb42c451014d543b9289ec4f96daf8098ca3c2;hpb=cc35c9ad8e48de52fd95be9ac500f37b533af12a;p=fa-stable.git

diff --git a/sql/alter2.3.php b/sql/alter2.3.php
index 8cbb42c4..0b1c230c 100644
--- a/sql/alter2.3.php
+++ b/sql/alter2.3.php
@@ -18,7 +18,6 @@ class fa2_3 {
 	
 	function fa2_3() {
 		$this->description = _('Upgrade from version 2.2 to 2.3');
-		$this->preconf = $this->fix_extensions();
 	}
 	
 	//
@@ -27,7 +26,7 @@ class fa2_3 {
 	//
 	function install($pref, $force) 
 	{
-		global $core_version;
+		global $db_version, $dflt_lang;
 
 		if (!$this->preconf)
 			return false;
@@ -92,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';
 
@@ -109,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;
@@ -269,8 +271,9 @@ class fa2_3 {
 		$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'] = 'lang/'.$code;
+				$installed_languages[$i]['package'] = $code;
 				$lang_chd = true;
 			}
 		}
@@ -346,6 +349,21 @@ class fa2_3 {
 		} 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;