Fixed duplicated groups in list selectors.

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

diff --git a/admin/gl_setup.php b/admin/gl_setup.php
index 9720679474d19245ea3d786a4e6e513a63aa1b15..9a05784ffcc014bce34fd0efa70d6a2cd739f15f 100644 (file)
--- a/admin/gl_setup.php
+++ b/admin/gl_setup.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU Affero General Public License,
+       AGPL, as published by the Free Software Foundation, either version 
+       3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security =10;
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
@@ -14,23 +23,23 @@ include_once($path_to_root . "/admin/db/company_db.inc");
 
 //-------------------------------------------------------------------------------------------------
 
-function can_process() 
+function can_process()
 {
-       if (!check_num('po_over_receive', 0, 100)) 
+       if (!check_num('po_over_receive', 0, 100))
        {
                display_error(_("The delivery over-receive allowance must be between 0 and 100."));
                set_focus('po_over_receive');
                return false;
        }
 
-       if (!check_num('po_over_charge', 0, 100)) 
+       if (!check_num('po_over_charge', 0, 100))
        {
                display_error(_("The invoice over-charge allowance must be between 0 and 100."));
                set_focus('po_over_charge');
                return false;
        }
 
-       if (!check_num('past_due_days', 0, 100)) 
+       if (!check_num('past_due_days', 0, 100))
        {
                display_error(_("The past due days interval allowance must be between 0 and 100."));
                set_focus('past_due_days');
@@ -41,10 +50,11 @@ function can_process()
 
 //-------------------------------------------------------------------------------------------------
 
-if (isset($_POST['submit']) && can_process()) 
+if (isset($_POST['submit']) && can_process())
 {
        update_company_gl_setup($_POST['debtors_act'], $_POST['pyt_discount_act'],
                $_POST['creditors_act'], $_POST['freight_act'],
+               $_POST['exchange_diff_act'],
                $_POST['default_sales_act'],
                $_POST['default_sales_discount_act'],
                $_POST['default_prompt_payment_act'],
@@ -68,7 +78,11 @@ if (isset($_POST['submit']) && can_process())
 //-------------------------------------------------------------------------------------------------
 
 start_form();
-start_table("class='tablestyle'");
+
+//start_outer_table("class='tablestyle'");
+start_outer_table($table_style2, 5);
+
+table_section(1);
 
 $myrow = get_company_prefs();
 
@@ -77,6 +91,7 @@ $_POST['creditors_act']  = $myrow["creditors_act"];
 $_POST['freight_act'] = $myrow["freight_act"];
 $_POST['pyt_discount_act']  = $myrow["pyt_discount_act"];
 
+$_POST['exchange_diff_act'] = $myrow["exchange_diff_act"];
 $_POST['default_sales_act'] = $myrow["default_sales_act"];
 $_POST['default_sales_discount_act']  = $myrow["default_sales_discount_act"];
 $_POST['default_prompt_payment_act']  = $myrow["default_prompt_payment_act"];
@@ -109,15 +124,15 @@ table_section_title(_("General GL"));
 //gl_all_accounts_list_row(_("Payroll Account:"), 'payroll_act', $_POST['payroll_act']);
 
 text_row(_("Past Due Days Interval:"), 'past_due_days', $_POST['past_due_days'], 6, 6, '', "", _("days"));
+
+gl_all_accounts_list_row(_("Exchange Variances Account:"), 'exchange_diff_act', $_POST['exchange_diff_act']);
+
 //---------------
 
 table_section_title(_("Customers and Sales"));
 
 text_row(_("Default Credit Limit:"), 'default_credit_limit', $_POST['default_credit_limit'], 12, 12);
 
-// Not used in FA2.0.
-//gl_all_accounts_list_row(_("Sales Exchange Variances Account:"), 'exchange_diff_act', $_POST['exchange_diff_act']);
-
 gl_all_accounts_list_row(_("Shipping Charged Account:"), 'freight_act', $_POST['freight_act']);
 
 //---------------
@@ -127,7 +142,7 @@ table_section_title(_("Customers and Sales Defaults"));
 gl_all_accounts_list_row(_("Receivable Account:"), 'debtors_act');
 
 gl_all_accounts_list_row(_("Sales Account:"), 'default_sales_act', null,
-       false, false, false, true);
+       false, false, true);
 
 gl_all_accounts_list_row(_("Sales Discount Account:"), 'default_sales_discount_act');
 
@@ -145,14 +160,14 @@ percent_row(_("Invoice Over-Charge Allowance:"), 'po_over_charge');
 // Not used in FA2.0.
 //gl_all_accounts_list_row(_("Goods Received Clearing Account:"), 'grn_act', $_POST['grn_act']);
 
+//---------------
+table_section(2);
 table_section_title(_("Suppliers and Purchasing Defaults"));
 
 gl_all_accounts_list_row(_("Payable Account:"), 'creditors_act', $_POST['creditors_act']);
 
 gl_all_accounts_list_row(_("Purchase Discount Account:"), 'pyt_discount_act', $_POST['pyt_discount_act']);
 
-//---------------
-
 table_section_title(_("Inventory"));
 
 check_row(_("Allow Negative Inventory:"), 'allow_negative_stock', null);
@@ -182,9 +197,9 @@ text_row(_("Dimension Required By After:"), 'default_dim_required', $_POST['defa
 
 //----------------
 
-end_table(1);
+end_outer_table(1);
 
-submit_center('submit', _("Update"));
+submit_center('submit', _("Update"), true, '', true);
 
 end_form(2);