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, $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 "
if (db_num_rows($result)) {
while ($row = db_fetch($result)) {
$res2 = db_query("INSERT INTO {$pref}refs VALUES("
- . $row['id'].",".$typeno.",'".$row['ref']."')");
+ . $row['id'].",".$typeno.",'".addslashes($row['ref'])."')");
if (!$res2) {
display_error(_("Cannot copy references from $tbl")
.':<br>'. db_error_msg($db));
}
}
}
-/* FIX // restore/init audit_trail data
- $datatbl = array (
- "gl_trans"=> array("type", "type_no","tran_date"),
- "purch_orders" => array("order_no", "'18'", "ord_date"),
- "sales_orders" => array("order_no", "'30'", "ord_date"),
- "workorders" => array("id", "'26'", "date_") );
- foreach ( $datatbl as $tblname => $tbl) {
- $sql = "SELECT {$tbl[0]} as type, {$tbl[1]} as trans, {$tbl[2]} as dat"
- . " FROM {$pref}{$tblname}";
- $result = db_query($sql);
- if (db_num_rows($result)) {
- $user = ;
- $year = ;
- while ($row = db_fetch($result)) {
- $sql2 = "INSERT INTO ".$pref."audit_trail"
- ." (type, trans_no, user, fiscal_year, gl_date, gl_seq) VALUES ("
- . "{$row['type']},{$row['trans']},$user,$year,{$row['dat']},0)";
- $res2 = db_query($sql2);
- if (!$res2) {
- display_error(_("Cannot init audit_trail data")
- .':<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)
- {
+ function pre_check($pref, $force)
+ {
global $security_groups;
- return isset($security_groups); // true when ok, fail otherwise
+
+ $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', 'login_tout')) return false;
- if (check_table($pref, 'stock_category', 'dflt_dim2')) return false;
- if (check_table($pref, 'users', 'sticky_doc_date')) return false;
- if (check_table($pref, 'audit_trail')) return false;
- if (check_table($pref, 'stock_master','no_sale')) return false;
- if (check_table($pref, 'users', 'role_id')) 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;
}
};
'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_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',
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_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)
+ 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 = db_insert_id();
- $sql = "UPDATE {$pref}users set role_id=$new WHERE role_id=$role_id";
- $ret = db_query($sql, 'cannot update users roles');
- if(!$ret) return false;
+ $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;
}
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
projects / fa-stable.git / blobdiff