X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Falter2.2.php;h=cfc914aad4293703e2b7e70907d7267e88afba1c;hb=45a035785b9a820621da56dec93078b3ccd9832e;hp=091e8860f9284c8631ce1107e66cb80f3db94524;hpb=6bdb8986a143a35e8f8a1c318bd14fab839000b2;p=fa-stable.git
diff --git a/sql/alter2.2.php b/sql/alter2.2.php
index 091e8860..cfc914aa 100644
--- a/sql/alter2.2.php
+++ b/sql/alter2.2.php
@@ -12,11 +12,15 @@
class fa2_2 {
var $version = '2.2'; // version installed
- var $description = 'Version 2.2';
+ var $description;
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() {
+ global $security_groups;
+ $this->beta = !isset($security_groups);
+ $this->description = _('Upgrade from version 2.1/2.2beta to 2.2');
$this->preconf = fix_extensions();
}
@@ -30,7 +34,10 @@ class fa2_2 {
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 "
@@ -49,14 +56,14 @@ class fa2_2 {
$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";
+ $sql = "SELECT DISTINCT {$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'])."')");
+ . $row['id'].",".$typeno.",".db_escape($row['ref']).")");
if (!$res2) {
display_error(_("Cannot copy references from $tbl")
.':
'. db_error_msg($db));
@@ -65,34 +72,7 @@ class fa2_2 {
}
}
}
-/* 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")
- .':
'. db_error_msg($db));
- return false;
- }
- }
- }
- }
-*/
-
+
if (!($ret = db_query("SELECT MAX(`order_no`) FROM `{$pref}sales_orders`")) ||
!db_num_rows($ret))
{
@@ -117,32 +97,44 @@ class fa2_2 {
//
// Checking before install
//
- function pre_check($pref)
- {
+ function pre_check($pref, $force)
+ {
global $security_groups;
- return isset($security_groups); // true when ok, fail otherwise
+
+ if ($this->beta && !$force)
+ $this->sql = 'alter2.2rc.sql';
+ // return ok when security groups still defined (upgrade from 2.1)
+ // or usersonline not defined (upgrade from 2.2 beta)
+ return isset($security_groups) || (check_table($pref, 'usersonline')!=0);
}
//
// Test if patch was applied before.
//
function installed($pref) {
- $n = 15; // number of features to be installed
- if (check_table($pref, 'company', 'custom1_name')) $n--;
- if (!check_table($pref, 'company', 'profit_loss_year_act')) $n--;
- if (!check_table($pref, 'company', 'login_tout')) $n--;
- if (!check_table($pref, 'stock_category', 'dflt_no_sale')) $n--;
- if (!check_table($pref, 'users', 'sticky_doc_date')) $n--;
- if (!check_table($pref, 'users', 'startup_tab')) $n--;
- if (!check_table($pref, 'cust_branch', 'inactive')) $n--;
- if (!check_table($pref, 'chart_class', 'ctype')) $n--;
- if (!check_table($pref, 'audit_trail')) $n--;
- if (!check_table($pref, 'currencies', 'auto_update')) $n--;
- if (!check_table($pref, 'stock_master','no_sale')) $n--;
- if (!check_table($pref, 'suppliers', 'supp_ref')) $n--;
- if (!check_table($pref, 'users', 'role_id')) $n--;
- if (!check_table($pref, 'sales_orders', 'reference')) $n--;
- if (!check_table($pref, 'tags')) $n--;
- return $n == 0 ? true : 15 - $n;
+ $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;
}
};
@@ -167,7 +159,7 @@ function convert_roles($pref)
'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',
@@ -248,7 +240,7 @@ function fix_extensions() {
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 no writeable'));
+ display_error(_('Cannot upgrade extensions system: file /modules/installed_modules.php is not writeable'));
return false;
}