Enabling popup search in Customers, branches, suppliers, inventory, fixed assets...

[fa-stable.git] / admin / gl_setup.php

diff --git a/admin/gl_setup.php b/admin/gl_setup.php
index 3836493b530f1b4c7e7d9a3c93176d24cf81393e..07f70b7b713ee188a2fde356eed680b530a1ad8d 100644 (file)
--- a/admin/gl_setup.php
+++ b/admin/gl_setup.php
@@ -13,7 +13,11 @@ $page_security = 'SA_GLSETUP';
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
 
-page(_($help_context = "System and General GL Setup"));
+$js = "";
+if ($SysPrefs->use_popup_windows && $SysPrefs->use_popup_search)
+       $js .= get_js_open_window(900, 500);
+
+page(_($help_context = "System and General GL Setup"), false, false, "", $js);
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
@@ -72,8 +76,8 @@ if (isset($_POST['submit']) && can_process())
        update_company_prefs( get_post( array( 'retained_earnings_act', 'profit_loss_year_act',
                'debtors_act', 'pyt_discount_act', 'creditors_act', 'freight_act', 'deferred_income_act',
                'exchange_diff_act', 'bank_charge_act', 'default_sales_act', 'default_sales_discount_act',
-               'default_prompt_payment_act', 'default_inventory_act', 'default_cogs_act',
-               'default_adj_act', 'default_inv_sales_act', 'default_assembly_act', 'legal_text',
+               'default_prompt_payment_act', 'default_inventory_act', 'default_cogs_act', 'depreciation_period',
+               'default_loss_on_asset_disposal_act', 'default_adj_act', 'default_inv_sales_act', 'default_assembly_act', 'legal_text',
                'past_due_days', 'default_workorder_required', 'default_dim_required', 'default_receival_required',
                'default_delivery_required', 'default_quote_valid_days', 'grn_clearing_act', 'tax_algorithm',
                'no_zero_lines_amount', 'show_po_item_codes', 'accounts_alpha', 'loc_notification', 'print_invoice_no',
@@ -141,6 +145,8 @@ $_POST['loc_notification'] = $myrow['loc_notification'];
 $_POST['print_invoice_no'] = $myrow['print_invoice_no'];
 $_POST['allow_negative_prices'] = $myrow['allow_negative_prices'];
 $_POST['print_item_images_on_quote'] = $myrow['print_item_images_on_quote'];
+$_POST['default_loss_on_asset_disposal_act'] = $myrow['default_loss_on_asset_disposal_act'];
+$_POST['depreciation_period'] = $myrow['depreciation_period'];
 
 //---------------
 
@@ -163,6 +169,12 @@ tax_algorithm_list_row(_("Tax Algorithm:"), 'tax_algorithm', $_POST['tax_algorit
 
 //---------------
 
+table_section_title(_("Dimension Defaults"));
+
+text_row(_("Dimension Required By After:"), 'default_dim_required', $_POST['default_dim_required'], 6, 6, '', "", _("days"));
+
+//----------------
+
 table_section_title(_("Customers and Sales"));
 
 text_row(_("Default Credit Limit:"), 'default_credit_limit', $_POST['default_credit_limit'], 12, 12);
@@ -201,12 +213,6 @@ text_row(_("Delivery Required By:"), 'default_delivery_required', $_POST['defaul
 
 table_section(2);
 
-table_section_title(_("Dimension Defaults"));
-
-text_row(_("Dimension Required By After:"), 'default_dim_required', $_POST['default_dim_required'], 6, 6, '', "", _("days"));
-
-//----------------
-
 table_section_title(_("Suppliers and Purchasing"));
 
 percent_row(_("Delivery Over-Receive Allowance:"), 'po_over_receive');
@@ -249,6 +255,14 @@ gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'default_assembly_ac
 
 //----------------
 
+table_section_title(_("Fixed Assets Defaults"));
+
+gl_all_accounts_list_row(_("Loss On Asset Disposal Account:"), 'default_loss_on_asset_disposal_act', $_POST['default_loss_on_asset_disposal_act']);
+
+array_selector_row (_("Depreciation Period:"), 'depreciation_period', $_POST['depreciation_period'], array(FA_MONTHLY => _("Monthly"), FA_YEARLY => _("Yearly")));
+
+//----------------
+
 table_section_title(_("Manufacturing Defaults"));
 
 text_row(_("Work Order Required By After:"), 'default_workorder_required', $_POST['default_workorder_required'], 6, 6, '', "", _("days"));