X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fgl_setup.php;h=b69397477570010ac9a1d8403ee27a91439461a6;hb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;hp=a0c99433fb3871de91470d9318c5699d7f3b30b9;hpb=de3a75773afa86df1739d14f24399d6f7a46f809;p=fa-stable.git

diff --git a/admin/gl_setup.php b/admin/gl_setup.php
index a0c99433..b6939747 100644
--- a/admin/gl_setup.php
+++ b/admin/gl_setup.php
@@ -14,23 +14,26 @@ 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');
 		return false;
 	}
 	return true;
@@ -38,12 +41,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['grn_act'],
-		$_POST['exchange_diff_act'], $_POST['purch_exchange_diff_act'],
-		$_POST['retained_earnings_act'], $_POST['freight_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'],
@@ -51,7 +53,7 @@ if (isset($_POST['submit']) && can_process())
 		$_POST['default_cogs_act'],
 		$_POST['default_adj_act'],
 		$_POST['default_inv_sales_act'],
-		$_POST['default_assembly_act'], $_POST['payroll_act'],
+		$_POST['default_assembly_act'],
 		check_value('allow_negative_stock'),
 		input_num('po_over_receive'),
 		input_num('po_over_charge'),
@@ -73,14 +75,10 @@ $myrow = get_company_prefs();
 
 $_POST['debtors_act']  = $myrow["debtors_act"];
 $_POST['creditors_act']  = $myrow["creditors_act"];
-$_POST['grn_act'] = $myrow["grn_act"];
-$_POST['retained_earnings_act'] = $myrow["retained_earnings_act"];
 $_POST['freight_act'] = $myrow["freight_act"];
-$_POST['exchange_diff_act']  = $myrow["exchange_diff_act"];
-
-$_POST['purch_exchange_diff_act']  = $myrow["purch_exchange_diff_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"];
@@ -90,7 +88,6 @@ $_POST['default_cogs_act'] = $myrow["default_cogs_act"];
 $_POST['default_adj_act'] = $myrow["default_adj_act"];
 $_POST['default_inv_sales_act'] = $myrow['default_inv_sales_act'];
 $_POST['default_assembly_act'] = $myrow['default_assembly_act'];
-$_POST['payroll_act'] = $myrow['payroll_act'];
 
 $_POST['allow_negative_stock'] = $myrow['allow_negative_stock'];
 
@@ -103,16 +100,19 @@ $_POST['default_credit_limit'] = $myrow['default_credit_limit'];
 $_POST['default_workorder_required'] = $myrow['default_workorder_required'];
 $_POST['default_dim_required'] = $myrow['default_dim_required'];
 
-//echo "<table>";
-
 //---------------
 
 
 table_section_title(_("General GL"));
 
-gl_all_accounts_list_row(_("Retained Earning Clearing Account:"), 'retained_earnings_act', $_POST['retained_earnings_act']);
-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"));
+// Not used in FA2.0.
+//gl_all_accounts_list_row(_("Retained Earning Clearing Account:"), 'retained_earnings_act', $_POST['retained_earnings_act']);
+// Not used in FA2.0.
+//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']);
 
 //---------------
 
@@ -120,21 +120,20 @@ table_section_title(_("Customers and Sales"));
 
 text_row(_("Default Credit Limit:"), 'default_credit_limit', $_POST['default_credit_limit'], 12, 12);
 
-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']);
 
 //---------------
 
 table_section_title(_("Customers and Sales Defaults"));
+// default for customer branch
+gl_all_accounts_list_row(_("Receivable Account:"), 'debtors_act');
 
-gl_all_accounts_list_row(_("Accounts Receivable Account:"), 'debtors_act', $_POST['debtors_act']);
+gl_all_accounts_list_row(_("Sales Account:"), 'default_sales_act', null,
+	false, false, false, true);
 
-gl_all_accounts_list_row(_("Sales Account:"), 'default_sales_act', $_POST['default_sales_act']);
+gl_all_accounts_list_row(_("Sales Discount Account:"), 'default_sales_discount_act');
 
-gl_all_accounts_list_row(_("Sales Discount Account:"), 'default_sales_discount_act', $_POST['default_sales_discount_act']);
-
-gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'default_prompt_payment_act', $_POST['default_prompt_payment_act']);
+gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'default_prompt_payment_act');
 
 //---------------
 
@@ -143,27 +142,28 @@ table_section_title(_("Suppliers and Purchasing"));
 percent_row(_("Delivery Over-Receive Allowance:"), 'po_over_receive');
 
 percent_row(_("Invoice Over-Charge Allowance:"), 'po_over_charge');
-
-gl_all_accounts_list_row(_("Purchases Exchange Variances Account:"), 'purch_exchange_diff_act', $_POST['purch_exchange_diff_act']);
-
-gl_all_accounts_list_row(_("Goods Received Clearing Account:"), 'grn_act', $_POST['grn_act']);
+// Not used in FA2.0.
+//gl_all_accounts_list_row(_("Purchases Exchange Variances Account:"), 'purch_exchange_diff_act', $_POST['purch_exchange_diff_act']);
+// Not used in FA2.0.
+//gl_all_accounts_list_row(_("Goods Received Clearing Account:"), 'grn_act', $_POST['grn_act']);
 
 table_section_title(_("Suppliers and Purchasing Defaults"));
 
-gl_all_accounts_list_row(_("Accounts Payable Account:"), 'creditors_act', $_POST['creditors_act']);
+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 Defaults"));
+table_section_title(_("Inventory"));
 
 check_row(_("Allow Negative Inventory:"), 'allow_negative_stock', null);
 
+table_section_title(_("Items Defaults"));
 gl_all_accounts_list_row(_("Sales Account:"), 'default_inv_sales_act', $_POST['default_inv_sales_act']);
 
 gl_all_accounts_list_row(_("Inventory Account:"), 'default_inventory_act', $_POST['default_inventory_act']);
-
+// this one is default for items and suppliers (purchase account)
 gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'default_cogs_act', $_POST['default_cogs_act']);
 
 gl_all_accounts_list_row(_("Inventory Adjustments Account:"), 'default_adj_act', $_POST['default_adj_act']);
@@ -174,19 +174,19 @@ gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'default_assembly_ac
 
 table_section_title(_("Manufacturing Defaults"));
 
-text_row(_("Default Work Order Required By After:"), 'default_workorder_required', $_POST['default_workorder_required'], 6, 6, "", _("days"));
+text_row(_("Work Order Required By After:"), 'default_workorder_required', $_POST['default_workorder_required'], 6, 6, '', "", _("days"));
 
 //----------------
 
 table_section_title(_("Dimension Defaults"));
 
-text_row(_("Default Dimension Required By After:"), 'default_dim_required', $_POST['default_dim_required'], 6, 6, "", _("days"));
+text_row(_("Dimension Required By After:"), 'default_dim_required', $_POST['default_dim_required'], 6, 6, '', "", _("days"));
 
 //----------------
 
 end_table(1);
 
-submit_center('submit', _("Update"));
+submit_center('submit', _("Update"), true, '', true);
 
 end_form(2);