X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Falter2.2.php;h=c5dc619d9cc7ad28b33e01ca732f3bc4165b4e14;hb=d61fc6be5aaa0b100f3059a6f85b1ed602dfb2e3;hp=bcd772e1251b8408091f18441f72e8b132705cca;hpb=850b2dc645b7e16d6b2f5a5e10cac03d8956180c;p=fa-stable.git

diff --git a/sql/alter2.2.php b/sql/alter2.2.php
index bcd772e1..c5dc619d 100644
--- a/sql/alter2.2.php
+++ b/sql/alter2.2.php
@@ -9,17 +9,33 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+
 class fa2_2 {
 	var $version = '2.2';	// version installed
-	var $description = 'Version 2.2';
+	var $description = _('Upgrade from version 2.1/2.2beta to 2.2');
 	var $sql = 'alter2.2.sql';
+	var $preconf = true;
+	var $beta = false; // upgrade from 2.1 or 2.2beta; set in pre_check
+	
+	function fa2_2() {
+
+		$this->preconf = fix_extensions();
+	}
+	
 	//
 	//	Install procedure. All additional changes 
 	//	not included in sql file should go here.
 	//
 	function install($pref, $force) 
 	{
-		global $db;
+		global $db, $systypes_array;
+		
+		if (!$this->preconf)
+			return false;
+
+		if ($this->beta)	// nothing special to be done on upgrade form 2.2beta
+			return true;
+
 		// set item category dflt accounts to values from company GL setup
 		$prefs = get_company_prefs();
 		$sql = "UPDATE {$pref}stock_category SET "
@@ -28,26 +44,234 @@ class fa2_2 {
 			."dflt_inventory_act = '" . $prefs['default_inventory_act'] . "',"
 			."dflt_adjustment_act = '" . $prefs['default_adj_act'] . "',"
 			."dflt_assembly_act = '" . $prefs['default_assembly_act']."'";
-		$ret = db_query($sql, "Cannot update category default GL accounts");
-		return $ret;
+		if (db_query($sql)==false) {
+			display_error("Cannot update category default GL accounts"
+			.':<br>'. db_error_msg($db));
+			return false;
+		}
+		// add all references to refs table for easy searching via journal interface
+		foreach($systypes_array as $typeno => $typename) {
+			$info = get_systype_db_info($typeno);
+			if ($info == null || $info[3] == null) continue;
+			$tbl = str_replace(TB_PREF, $pref, $info[0]);
+			$sql = "SELECT {$info[2]} as id,{$info[3]} as ref FROM $tbl";
+			if ($info[1])
+				$sql .= " WHERE {$info[1]}=$typeno";
+			$result = db_query($sql);
+			if (db_num_rows($result)) {
+				while ($row = db_fetch($result)) {
+					$res2 = db_query("INSERT INTO {$pref}refs VALUES("
+						. $row['id'].",".$typeno.",'".addslashes($row['ref'])."')");
+					if (!$res2) {
+						display_error(_("Cannot copy references from $tbl")
+							.':<br>'. db_error_msg($db));
+						return false;
+					}
+				}
+			}
+		}
+
+	if (!($ret = db_query("SELECT MAX(`order_no`) FROM `{$pref}sales_orders`")) ||
+		!db_num_rows($ret))
+	{
+		display_error(_('Cannot query max sales order number.'));
+		return false;
+	} 
+	$row = db_fetch($ret);
+	$max_order = $row[0];
+	$next_ref = $max_order+1;
+	$sql = "UPDATE `{$pref}sys_types` 
+		SET `type_no`='$max_order', 
+			`next_reference`='$next_ref'
+		WHERE `type_id`=30";
+	if(!db_query($sql))
+	{
+		display_error(_('Cannot store next sales order reference.'));
+		return false;
+	}
+
+	return convert_roles($pref);
 	}
 	//
 	//	Checking before install
 	//
-	function pre_check($pref)
-	{
-		return true; // true when ok, fail otherwise
+	function pre_check($pref, $force)
+	{	
+		global $security_groups;
+		
+		$this->beta = !isset($security_groups);
+		if ($this->beta && !$force)
+			$this->sql = 'alter2.2rc.sql';
+		return $this->beta || !check_table($pref, 'usersonline');
 	}
 	//
 	//	Test if patch was applied before.
 	//
 	function installed($pref) {
-		if (check_table($pref, 'company', 'default_delivery_required')) return false;
-		if (check_table($pref, 'stock_category', 'dflt_dim2')) return false;
-		if (check_table($pref, 'users', 'sticky_doc_date')) return false;
-		return true;
+		$n = 1; // number of patches to be installed
+		$patchcnt = 0;
+		if (!$this->beta) {
+			$n = 16;
+			if (check_table($pref, 'company', 'custom1_name')) $patchcnt++;
+			if (!check_table($pref, 'company', 'profit_loss_year_act')) $patchcnt++;
+			if (!check_table($pref, 'company', 'login_tout')) $patchcnt++;
+			if (!check_table($pref, 'stock_category', 'dflt_no_sale')) $patchcnt++;
+			if (!check_table($pref, 'users', 'sticky_doc_date')) $patchcnt++;
+			if (!check_table($pref, 'users', 'startup_tab')) $patchcnt++;
+			if (!check_table($pref, 'cust_branch', 'inactive')) $patchcnt++;
+			if (!check_table($pref, 'chart_class', 'ctype')) $patchcnt++;
+			if (!check_table($pref, 'audit_trail')) $patchcnt++;
+			if (!check_table($pref, 'currencies', 'auto_update')) $patchcnt++;
+			if (!check_table($pref, 'stock_master','no_sale')) $patchcnt++;
+			if (!check_table($pref, 'suppliers', 'supp_ref')) $patchcnt++;
+			if (!check_table($pref, 'users', 'role_id')) $patchcnt++;
+			if (!check_table($pref, 'sales_orders', 'reference')) $patchcnt++;
+			if (!check_table($pref, 'tags')) $patchcnt++;
+		} 
+		if (!check_table($pref, 'useronline')) $patchcnt++;
+
+		$n -= $patchcnt;
+		return $n == 0 ? true : $patchcnt;
 	}
 };
 
+/*
+	Conversion of old security roles stored into $security_groups table
+*/
+function convert_roles($pref) 
+{
+		global $security_groups, $security_headings, $security_areas, $path_to_root;
+		include_once($path_to_root."/includes/access_levels.inc");
+
+	$trans_sec = array(
+		1 => array('SA_CHGPASSWD', 'SA_SETUPDISPLAY', 'SA_BANKTRANSVIEW',
+			'SA_ITEMSTRANSVIEW','SA_SUPPTRANSVIEW', 'SA_SALESORDER',
+			'SA_SALESALLOC', 'SA_SALESTRANSVIEW'),
+		2 => array('SA_DIMTRANSVIEW', 'SA_STANDARDCOST', 'SA_ITEMSTRANSVIEW',
+			'SA_ITEMSSTATVIEW', 'SA_SALESPRICE', 'SA_MANUFTRANSVIEW',
+			'SA_WORKORDERANALYTIC', 'SA_WORKORDERCOST', 'SA_SUPPTRANSVIEW',
+			'SA_SUPPLIERALLOC', 'SA_STEMPLATE', 'SA_SALESTRANSVIEW',
+			'SA_SALESINVOICE', 'SA_SALESDELIVERY', 'SA_CUSTPAYMREP',
+			'SA_CUSTBULKREP', 'SA_PRICEREP', 'SA_SALESBULKREP', 'SA_SALESMANREP',
+			'SA_SALESBULKREP', 'SA_CUSTSTATREP', 'SA_SUPPLIERANALYTIC',
+			'SA_SUPPPAYMREP', 'SA_SUPPBULKREP', 'SA_ITEMSVALREP', 'SA_ITEMSANALYTIC',
+			'SA_BOMREP', 'SA_MANUFBULKREP', 'SA_DIMENSIONREP', 'SA_BANKREP', 'SA_GLREP',
+			'SA_GLANALYTIC', 'SA_TAXREP', 'SA_SALESANALYTIC', 'SA_SALESQUOTE'),
+		3 => array('SA_GLACCOUNTGROUP', 'SA_GLACCOUNTCLASS','SA_PAYMENT', 
+			'SA_DEPOSIT', 'SA_JOURNALENTRY', 'SA_INVENTORYMOVETYPE',
+			'SA_LOCATIONTRANSFER', 'SA_INVENTORYADJUSTMENT', 'SA_WORKCENTRES',
+			'SA_MANUFISSUE', 'SA_SUPPLIERALLOC', 'SA_CUSTOMER', 'SA_CRSTATUS',
+			'SA_SALESMAN', 'SA_SALESAREA', 'SA_SALESALLOC', 'SA_SALESCREDITINV',
+			'SA_SALESPAYMNT', 'SA_SALESCREDIT', 'SA_SALESGROUP', 'SA_SRECURRENT',
+			'SA_TAXRATES', 'SA_ITEMTAXTYPE', 'SA_TAXGROUPS', 'SA_QUICKENTRY'),
+		4 => array('SA_REORDER', 'SA_PURCHASEPRICING', 'SA_PURCHASEORDER'),
+		5 => array('SA_VIEWPRINTTRANSACTION', 'SA_BANKTRANSFER', 'SA_SUPPLIER',
+			'SA_SUPPLIERINVOICE', 'SA_SUPPLIERPAYMNT', 'SA_SUPPLIERCREDIT'),
+		8 => array('SA_ATTACHDOCUMENT', 'SA_RECONCILE',	'SA_GLANALYTIC',
+			'SA_TAXREP', 'SA_BANKTRANSVIEW', 'SA_GLTRANSVIEW'),
+		9 => array('SA_FISCALYEARS', 'SA_CURRENCY', 'SA_EXCHANGERATE', 
+			'SA_BOM'),
+		10 => array('SA_PAYTERMS', 'SA_GLSETUP', 'SA_SETUPCOMPANY',
+			'SA_FORMSETUP', 'SA_DIMTRANSVIEW', 'SA_DIMENSION', 'SA_BANKACCOUNT',
+			'SA_GLACCOUNT', 'SA_BUDGETENTRY', 'SA_MANUFRECEIVE',
+			'SA_MANUFRELEASE', 'SA_WORKORDERENTRY', 'SA_MANUFTRANSVIEW',
+			'SA_WORKORDERCOST'),
+		11 => array('SA_ITEMCATEGORY', 'SA_ITEM', 'SA_UOM', 'SA_INVENTORYLOCATION',
+			 'SA_GRN', 'SA_FORITEMCODE', 'SA_SALESKIT'),
+		14 => array('SA_SHIPPING', 'SA_VOIDTRANSACTION', 'SA_SALESTYPES'),
+		15 => array('SA_PRINTERS', 'SA_PRINTPROFILE', 'SA_BACKUP', 'SA_USERS',
+			'SA_POSSETUP'),
+		20 => array('SA_CREATECOMPANY', 'SA_CREATELANGUAGE', 'SA_CREATEMODULES',
+			'SA_SOFTWAREUPGRADE', 'SA_SECROLES', 'SA_DIMTAGS', 'SA_GLACCOUNTTAGS')
+		);
+		$new_ids = array();
+		foreach ($security_groups as $role_id => $areas) {
+			$area_set = array();
+			$sections = array();
+			foreach ($areas as $a) {
+			 if (isset($trans_sec[$a]))
+				foreach ($trans_sec[$a] as $id) {
+				 if ($security_areas[$id][0] != 0)
+//				 	error_log('invalid area id: '.$a.':'.$id);
+					$area_set[] = $security_areas[$id][0];
+					$sections[$security_areas[$id][0]&~0xff] = 1;
+				}
+			}
+			$sections  = array_keys($sections);
+			sort($sections); sort($area_set);
+			import_security_role($pref, $security_headings[$role_id], $sections, $area_set);
+			$new_ids[$role_id] = db_insert_id();
+		}
+		$result = get_users(true);
+		$users = array();
+		while($row = db_fetch($result)) { // complete old user ids and roles
+			$users[$row['role_id']][] = $row['id'];
+		}
+		foreach($users as $old_id => $uids)
+			foreach( $uids as $id) {
+				$sql = "UPDATE {$pref}users set role_id=".$new_ids[$old_id].
+					" WHERE id=$id";
+				$ret = db_query($sql, 'cannot update users roles');
+				if(!$ret) return false;
+			}
+		return true;
+}
+
+function import_security_role($pref, $name, $sections, $areas)
+{
+	$sql = "INSERT INTO {$pref}security_roles (role, description, sections, areas)
+	VALUES (".db_escape('FA 2.1 '.$name).",".db_escape($name).","
+	.db_escape(implode(';',$sections)).",".db_escape(implode(';',$areas)).")";
+
+	db_query($sql, "could not add new security role");
+}
+
+/*
+	Changes in extensions system.
+	This function is executed once on first Upgrade System display.
+*/
+function fix_extensions() {
+	global $path_to_root, $db_connections;
+
+	if (!file_exists($path_to_root.'/modules/installed_modules.php'))
+		return true; // already converted
+	
+	if (!is_writable($path_to_root.'/modules/installed_modules.php')) {
+		display_error(_('Cannot upgrade extensions system: file /modules/installed_modules.php is not writeable'));
+		return false;
+	}
+	
+	$exts = array();
+	include($path_to_root.'/installed_extensions.php');
+	foreach($installed_extensions as $ext) {
+		$ext['filename'] = $ext['app_file']; unset($ext['app_file']);
+		$ext['tab'] = $ext['name'];
+		$ext['name'] = access_string($ext['title'], true); 
+		$ext['path'] = $ext['folder']; unset($ext['folder']);
+		$ext['type'] = 'module';
+		$ext['active'] = '1';
+		$exts[] = $ext;
+	}
+
+	include($path_to_root.'/modules/installed_modules.php');
+	foreach($installed_modules as $mod) {
+		$mod['title'] = $mod['name'];
+		$mod['name'] = access_string($mod['name'], true);
+		$mod['type'] = 'plugin';
+		$ext['active'] = '1';
+		$exts[] = $mod;
+	}
+	if (!write_extensions($exts))
+		return false;
+	
+	$cnt = count($db_connections);
+	for ($i = 0; $i < $cnt; $i++)
+		write_extensions($exts, $i);
+
+	unlink($path_to_root.'/modules/installed_modules.php');
+	return true;
+}
+
 $install = new fa2_2;
+
 ?>
\ No newline at end of file