Added the new Company Logo on Reports in default files.

diff --git a/sql/alter2.4.php b/sql/alter2.4.php
index e2cbf7c9f6cb80402f23525f2bfb6807e7b93c35..c51fbb2392e03aea906a419eb20efffc56916cb5 100644 (file)
--- a/sql/alter2.4.php
+++ b/sql/alter2.4.php
@@ -20,7 +20,7 @@ class fa2_4 extends fa_patch {
        
        function fa2_4() {
                parent::fa_patch();
-               $this->description = _('Upgrade from version 2.3 to 2.4RC1');
+               $this->description = _('Upgrade from version 2.3 to 2.4');
        }
        
     /*
@@ -71,6 +71,9 @@ class fa2_4 extends fa_patch {
                if (get_company_pref('suppress_tax_rates') === null) { // available from 2.3.14, can be not defined on pre-2.4 installations
                        set_company_pref('suppress_tax_rates', 'setup.company', 'tinyint', 1, '0');
                }
+               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');
+               }
 
                $result = $this->update_workorders()  && $this->update_grn_rates() && $this->switch_database_to_utf($pref);
 
@@ -108,7 +111,7 @@ 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')");
+                               'bcc_email', 'alternative_tax_include_on_docs', 'suppress_tax_rates', 'company_logo_report')");
        }
 
        function update_workorders()

diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 9234453c37bfddfd37f96a2e619f1d20b01f7fe9..a4152da79b6941001cb4be4d96e1102f36993097 100644 (file)
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -2168,6 +2168,7 @@ INSERT INTO `0_sys_prefs` VALUES ('print_invoice_no','glsetup.sales', 'tinyint',
 INSERT INTO `0_sys_prefs` VALUES ('allow_negative_prices','glsetup.inventory', 'tinyint', 1, '1');
 INSERT INTO `0_sys_prefs` VALUES ('print_item_images_on_quote','glsetup.inventory', 'tinyint', 1, '0');
 INSERT INTO `0_sys_prefs` VALUES ('suppress_tax_rates','setup.company', 'tinyint', 1, '0');
+INSERT INTO `0_sys_prefs` VALUES ('company_logo_report','setup.company', 'tinyint', 1, '0');
 INSERT INTO `0_sys_prefs` VALUES ('default_loss_on_asset_disposal_act', 'glsetup.items', 'varchar', '15', '5660');
 INSERT INTO `0_sys_prefs` VALUES ('depreciation_period', 'glsetup.company', 'tinyint', '1', '1');
 INSERT INTO `0_sys_prefs` VALUES ('use_manufacturing','setup.company', 'tinyint', 1, '1');

diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index 56f5b5f1f5bf6c50eae92ce3adb094e86ea45e4f..b26d66264101b808569e0d07ab5edd69a5b93f55 100644 (file)
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -1892,6 +1892,7 @@ INSERT INTO `0_sys_prefs` VALUES ('print_invoice_no','glsetup.sales', 'tinyint',
 INSERT INTO `0_sys_prefs` VALUES ('allow_negative_prices','glsetup.inventory', 'tinyint', 1, '1');
 INSERT INTO `0_sys_prefs` VALUES ('print_item_images_on_quote','glsetup.inventory', 'tinyint', 1, '0');
 INSERT INTO `0_sys_prefs` VALUES ('suppress_tax_rates','setup.company', 'tinyint', 1, '0');
+INSERT INTO `0_sys_prefs` VALUES ('company_logo_report','setup.company', 'tinyint', 1, '0');
 INSERT INTO `0_sys_prefs` VALUES ('default_loss_on_asset_disposal_act', 'glsetup.items', 'varchar', '15', '5660');
 INSERT INTO `0_sys_prefs` VALUES ('depreciation_period', 'glsetup.company', 'tinyint', '1', '1');
 INSERT INTO `0_sys_prefs` VALUES ('use_manufacturing','setup.company', 'tinyint', 1, '1');