Option to hide Manufacturing and Fixed Assets tabs in reorganized company settings...

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 74b7071bbe76a9b4e926bd1f045fa9809d6c1946..65c27787b69466fe87aef071b343184081c3fa69 100644 (file)
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -115,7 +115,8 @@ if (isset($_POST['update']) && $_POST['update'] != "")
                                'no_item_list' => 0, 'no_customer_list' => 0, 
                                'no_supplier_list' =>0, 'base_sales', 
                                'time_zone' => 0, 'add_pct', 'round_to', 'login_tout', 'auto_curr_reval',
-                               'bcc_email', 'alternative_tax_include_on_docs', 'suppress_tax_rates'))
+                               'bcc_email', 'alternative_tax_include_on_docs', 'suppress_tax_rates',
+                               'use_manufacturing', 'use_fixed_assets'))
                );
 
                $_SESSION['wa_current_user']->timeout = $_POST['login_tout'];
@@ -159,13 +160,16 @@ $_POST['del_coy_logo']  = 0;
 $_POST['bcc_email']  = $myrow["bcc_email"];
 $_POST['alternative_tax_include_on_docs']  = $myrow["alternative_tax_include_on_docs"];
 $_POST['suppress_tax_rates']  = $myrow["suppress_tax_rates"];
+$_POST['use_manufacturing']  = $myrow["use_manufacturing"];
+$_POST['use_fixed_assets']  = $myrow["use_fixed_assets"];
 
 start_outer_table(TABLESTYLE2);
 
 table_section(1);
+table_section_title(_("General settings"));
 
 text_row_ex(_("Name (to appear on reports):"), 'coy_name', 50, 50);
-textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 34, 6);
+textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 34, 5);
 text_row_ex(_("Domicile:"), 'domicile', 25, 55);
 
 text_row_ex(_("Phone Number:"), 'phone', 25, 55);
@@ -176,36 +180,46 @@ email_row_ex(_("BCC Address for all outgoing mails:"), 'bcc_email', 50, 55);
 
 text_row_ex(_("Official Company Number:"), 'coy_no', 25);
 text_row_ex(_("GSTNo:"), 'gst_no', 25);
+currencies_list_row(_("Home Currency:"), 'curr_default', $_POST['curr_default']);
 
+label_row(_("Company Logo:"), $_POST['coy_logo']);
+file_row(_("New Company Logo (.jpg)") . ":", 'pic', 'pic');
+check_row(_("Delete Company Logo:"), 'del_coy_logo', $_POST['del_coy_logo']);
+
+check_row(_("Automatic Revaluation Currency Accounts"), 'auto_curr_reval', $_POST['auto_curr_reval']);
+check_row(_("Time Zone on Reports"), 'time_zone', $_POST['time_zone']);
+label_row(_("Database Scheme Version"), $_POST['version_id']);
+
+table_section(2);
+
+table_section_title(_("General Ledger Settings"));
 fiscalyears_list_row(_("Fiscal Year:"), 'f_year', $_POST['f_year']);
 text_row_ex(_("Tax Periods:"), 'tax_prd', 10, 10, '', null, null, _('Months.'));
 text_row_ex(_("Tax Last Period:"), 'tax_last', 10, 10, '', null, null, _('Months back.'));
 check_row(_("Put alternative Tax Include on Docs"), 'alternative_tax_include_on_docs', null);
 check_row(_("Suppress Tax Rates on Docs"), 'suppress_tax_rates', null);
 
-table_section(2);
-
-label_row(_("Company Logo:"), $_POST['coy_logo']);
-file_row(_("New Company Logo (.jpg)") . ":", 'pic', 'pic');
-check_row(_("Delete Company Logo:"), 'del_coy_logo', $_POST['del_coy_logo']);
-
-number_list_row(_("Use Dimensions:"), 'use_dimension', null, 0, 2);
+table_section_title(_("Sales Pricing"));
 sales_types_list_row(_("Base for auto price calculations:"), 'base_sales', $_POST['base_sales'], false,
     _('No base price list') );
+
 text_row_ex(_("Add Price from Std Cost:"), 'add_pct', 10, 10, '', null, null, "%");
 $curr = get_currency($_POST['curr_default']);
-text_row_ex(_("Round to nearest:"), 'round_to', 10, 10, '', null, null, $curr['hundreds_name']);
+text_row_ex(_("Round calculated prices to nearest:"), 'round_to', 10, 10, '', null, null, $curr['hundreds_name']);
 label_row("", " ");
 
+
+table_section_title(_("Optional Modules"));
+check_row(_("Manufacturing"), 'use_manufacturing', null);
+check_row(_("Fixed Assets"), 'use_fixed_assets', null);
+number_list_row(_("Use Dimensions:"), 'use_dimension', null, 0, 2);
+
+table_section_title(_("User Interface Options"));
+
 check_row(_("Search Item List"), 'no_item_list', null);
 check_row(_("Search Customer List"), 'no_customer_list', null);
 check_row(_("Search Supplier List"), 'no_supplier_list', null);
-label_row("", " ");
-currencies_list_row(_("Home Currency:"), 'curr_default', $_POST['curr_default']);
-check_row(_("Automatic Revaluation Currency Accounts"), 'auto_curr_reval', $_POST['auto_curr_reval']);
-check_row(_("Time Zone on Reports"), 'time_zone', $_POST['time_zone']);
 text_row_ex(_("Login Timeout:"), 'login_tout', 10, 10, '', null, null, _('seconds'));
-label_row(_("Version Id"), $_POST['version_id']);
 
 end_outer_table(1);
 

diff --git a/frontaccounting.php b/frontaccounting.php
index 326f74ae8cfd540c96b3e14502fccf0938b43a57..a81b66c303ce46bf9d8de4834e00d4464cacefdb 100644 (file)
--- a/frontaccounting.php
+++ b/frontaccounting.php
@@ -70,6 +70,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
                }
                function init()
                {
+                       global $SysPrefs;
 
                        $this->menu = new menu(_("Main  Menu"));
                        $this->menu->add_item(_("Main  Menu"), "index.php");
@@ -78,8 +79,10 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
                        $this->add_application(new customers_app());
                        $this->add_application(new suppliers_app());
                        $this->add_application(new inventory_app());
-                       $this->add_application(new manufacturing_app());
-                   $this->add_application(new assets_app());
+                       if (get_company_pref('use_manufacturing'))
+                               $this->add_application(new manufacturing_app());
+                       if (get_company_pref('use_fixed_assets'))
+                           $this->add_application(new assets_app());
                        $this->add_application(new dimensions_app());
                        $this->add_application(new general_ledger_app());
 

diff --git a/sql/alter2.4rc1.sql b/sql/alter2.4rc1.sql
index 7755fae722c81706a9ab8200c5b285c0fd486481..83dab46dd966b4abaeb4940ad439274eee3aff4a 100644 (file)
--- a/sql/alter2.4rc1.sql
+++ b/sql/alter2.4rc1.sql
@@ -22,3 +22,5 @@ ALTER TABLE `0_stock_master` CHANGE `actual_cost` `purchase_cost` double NOT NUL
 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');
+INSERT INTO `0_sys_prefs` VALUES ('use_fixed_assets','setup.company', 'tinyint', 1, '1');

diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 8bff858e75055cc3b1bd0e2a58735b70f5c16813..921f6da79085a16f5e8d6e326d0d178db3c70842 100644 (file)
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -2171,6 +2171,8 @@ INSERT INTO `0_sys_prefs` VALUES ('print_item_images_on_quote','glsetup.inventor
 INSERT INTO `0_sys_prefs` VALUES ('suppress_tax_rates','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');
+INSERT INTO `0_sys_prefs` VALUES ('use_fixed_assets','setup.company', 'tinyint', 1, '1');
 
 
 -- --------------------------------------------------------

diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index 12da1901328530347bd25a11e9bb36e52d9f0f4b..2486d26183aa23986b0b7e9d71943fd963d937c7 100644 (file)
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -250,7 +250,7 @@ INSERT INTO `0_chart_master` VALUES ('1205', '', 'Allowance for doubtful account
 INSERT INTO `0_chart_master` VALUES ('1510', '', 'Inventory', '2', 0);
 INSERT INTO `0_chart_master` VALUES ('1520', '', 'Stocks of Raw Materials', '2', 0);
 INSERT INTO `0_chart_master` VALUES ('1530', '', 'Stocks of Work In Progress', '2', 0);
-INSERT INTO `0_chart_master` VALUES ('1540', '', 'Stocks of Finsihed Goods', '2', 0);
+INSERT INTO `0_chart_master` VALUES ('1540', '', 'Stocks of Finished Goods', '2', 0);
 INSERT INTO `0_chart_master` VALUES ('1550', '', 'Goods Received Clearing account', '2', 0);
 INSERT INTO `0_chart_master` VALUES ('1820', '', 'Office Furniture & Equipment', '3', 0);
 INSERT INTO `0_chart_master` VALUES ('1825', '', 'Accum. Amort. -Furn. & Equip.', '3', 0);
@@ -1895,6 +1895,8 @@ INSERT INTO `0_sys_prefs` VALUES ('print_item_images_on_quote','glsetup.inventor
 INSERT INTO `0_sys_prefs` VALUES ('suppress_tax_rates','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');
+INSERT INTO `0_sys_prefs` VALUES ('use_fixed_assets','setup.company', 'tinyint', 1, '1');
 
 -- --------------------------------------------------------