Additional dev related exclusions in gitignore, small cleanups in old upgrade classes.

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

diff --git a/sql/alter2.4.php b/sql/alter2.4.php
index b3ec864dc6a04da9673678ad3ddacefbabe5166b..6b2d0aa79c59c4c55e215da20a775acb0a025c98 100644 (file)
--- a/sql/alter2.4.php
+++ b/sql/alter2.4.php
@@ -15,7 +15,6 @@ class fa2_4 extends fa_patch {
        var $version = '2.4.1'; // version installed
        var $description;
        var $sql = 'alter2.4.sql';
-       var $preconf = true;
        var     $max_upgrade_time = 900;        // table recoding is really long process
        
        function __construct() {
@@ -74,6 +73,15 @@ class fa2_4 extends fa_patch {
                if (get_company_pref('company_logo_report') === null) { // available from 2.4.2, during updates
                        set_company_pref('company_logo_report', 'setup.company', 'tinyint', 1, '0');
                }
+               if (get_company_pref('print_dialog_direct') === null) { // available from 2.4.5, during updates
+                       set_company_pref('print_dialog_direct', 'setup.company', 'tinyint', 1, '0');
+               }
+               if (get_company_pref('barcodes_on_stock') === null) { // available from 2.4.3, during updates
+                       set_company_pref('barcodes_on_stock', 'setup.company', 'tinyint', 1, '0');
+               }
+               if (get_company_pref('ref_no_auto_increase') === null) { // available from 2.4.4, during updates
+                       set_company_pref('ref_no_auto_increase', 'setup.company', 'tinyint', 1, '0');
+               }
                if (get_company_pref('shortname_name_in_list') === null) { // available from 2.4.2, during updates
                        set_company_pref('shortname_name_in_list', 'setup.company', 'tinyint', 1, '0');
                }
@@ -114,7 +122,8 @@ class fa2_4 extends fa_patch {
                                'tax_algorithm', 'grn_clearing_act', 'default_receival_required',
                                'default_quote_valid_days',     'no_zero_lines_amount', 'show_po_item_codes', 'accounts_alpha',
                                'loc_notification', 'print_invoice_no', 'allow_negative_prices', 'print_item_images_on_quote',
-                               'bcc_email', 'alternative_tax_include_on_docs', 'suppress_tax_rates', 'company_logo_report')");
+                               'bcc_email', 'alternative_tax_include_on_docs', 'suppress_tax_rates', 'company_logo_report',
+                               'barcodes_on_stock', print_dialog_direct', 'ref_no_auto_increase')");
        }
 
        function update_workorders()