From 83e3bca480ef8c33cf9310d04d5831ed2922bcd8 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Fri, 8 Sep 2017 09:52:57 +0200 Subject: [PATCH] Added the new Company Logo on Reports in default files. --- sql/alter2.4.php | 7 +++++-- sql/en_US-demo.sql | 1 + sql/en_US-new.sql | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sql/alter2.4.php b/sql/alter2.4.php index e2cbf7c9..c51fbb23 100644 --- 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 9234453c..a4152da7 100644 --- 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 56f5b5f1..b26d6626 100644 --- 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'); -- 2.30.2