Feature 5388: Print Invoices (documents) list gets too long. Fixed by default 180...

[fa-stable.git] / sql / alter2.4rc1.php

diff --git a/sql/alter2.4rc1.php b/sql/alter2.4rc1.php
index 984acde8f30ffe40855e7def15865b38f3221643..66a029fbda63c6630099c92bafb5aa5d09389f38 100644 (file)
--- a/sql/alter2.4rc1.php
+++ b/sql/alter2.4rc1.php
@@ -16,9 +16,10 @@ class fa2_4rc1 extends fa_patch {
        var $description;
        var $sql = ''; // 'alter2.4rc1.sql';
        var $preconf = true;
+       var     $max_upgrade_time = 900;        // table recoding is really long process
 
-       function fa2_4rc1() {
-               parent::fa_patch();
+       function __construct() {
+               parent::__construct();
                $this->description = _('Upgrade from version 2.4beta to 2.4RC1');
        }
 
@@ -33,10 +34,6 @@ class fa2_4rc1 extends fa_patch {
                table_section_title(_("Fixed Assets Defaults"));
                gl_all_accounts_list_row(_("Loss On Asset Disposal Account:"), 'default_loss_on_asset_disposal_act', '5660',
                        true, false, _("None (will be set later)"));
-
-               table_section_title(_("Manufacturing"));
-               gl_all_accounts_list_row(_("Work In Progress Account:"), 'wip_act', '1530',
-                       true, false, _("None (will be set later)"));
          end_row();
          end_table();
          br();
@@ -47,7 +44,6 @@ class fa2_4rc1 extends fa_patch {
     */
        function prepare()
     {
-               $this->wip_account = get_post('wip_act');
                $this->fixed_disposal_act = get_post('default_loss_on_asset_disposal_act');
                return true;
        }
@@ -69,9 +65,7 @@ class fa2_4rc1 extends fa_patch {
                $pref = $this->companies[$company]['tbpref'];
 
                if ($result)
-                       if (!db_query("UPDATE ".$pref."sys_prefs SET value=".db_escape($this->wip_act)
-                                       ." WHERE name='wip_act'")
-                               || !db_query("UPDATE ".$pref."sys_prefs SET value=".db_escape($this->fixed_disposal_act)
+                       if (!db_query("UPDATE ".$pref."sys_prefs SET value=".db_escape($this->fixed_disposal_act)
                                        ." WHERE name='default_loss_on_asset_disposal_act'")
                        )
                                return $this->log_error(sprintf(_("Cannot update sys prefs setting:\n%s"), db_error_msg($db)));
@@ -92,8 +86,7 @@ class fa2_4rc1 extends fa_patch {
                                'default_loss_on_asset_disposal_act',
                                'depreciation_period',
                                'use_manufacturing',
-                               'use_fixed_assets',
-                               'wip_act')");
+                               'use_fixed_assets')");
        }
 
 }