X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sql%2Falter2.3.php;h=e480eda5eb12eed2e79079ffb518722d7bd42890;hb=39150665d5955716247c6c6e06adbcc2cad037a9;hp=56f03584e936e3c9bc5fbf31d0fa55f7031e64c5;hpb=b7d139b9bbc1978059be933fece5bbc72575ff9d;p=fa-stable.git

diff --git a/sql/alter2.3.php b/sql/alter2.3.php
index 56f03584..e480eda5 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;
 
 		if (!$this->preconf)
 			return false;
@@ -92,13 +91,14 @@ class fa2_3 {
 			if (!db_query($sql))
 				return false;
 		}
-		return  update_company_prefs(array('version_id'=>$core_version), $pref);
+		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 +109,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;
@@ -264,8 +265,20 @@ class fa2_3 {
 	
 	function fix_extensions()
 	{
-		global $path_to_root, $next_extension_id;
+		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))
@@ -276,7 +289,7 @@ class fa2_3 {
 		{
 			if (isset($ext['title'])) // old type entry
 			{
-				if ($ext['type'] == 'module')
+				if ($ext['type'] == 'module') {
 					$new['type'] = 'extension';
 					$new['tabs'][] = array(
 						'url' => $ext['filename'],