X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fgl_setup.php;h=e61bb8d61a43be25b8fa33f1b345e68455e343e7;hb=d7dde51cf888dfc7e049fefed38e786a369b9b38;hp=161888547bdcb8c072563ac40258a940badf1a9b;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/admin/gl_setup.php b/admin/gl_setup.php
index 16188854..e61bb8d6 100644
--- a/admin/gl_setup.php
+++ b/admin/gl_setup.php
@@ -8,6 +8,7 @@ page(_("System and General GL Setup"));
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
+include_once($path_to_root . "/includes/data_checks.inc");
 
 include_once($path_to_root . "/admin/db/company_db.inc");
 
@@ -15,24 +16,24 @@ include_once($path_to_root . "/admin/db/company_db.inc");
 
 function can_process() 
 {
-	if (!is_numeric($_POST['po_over_receive']) || ($_POST['po_over_receive'] < 0)
-			|| ($_POST['po_over_receive'] > 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 (!is_numeric($_POST['po_over_charge']) || ($_POST['po_over_charge'] < 0)
-			|| ($_POST['po_over_charge'] > 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 (!is_numeric($_POST['past_due_days']) || ($_POST['past_due_days'] < 0)
-			|| ($_POST['past_due_days'] > 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;
@@ -55,8 +56,8 @@ if (isset($_POST['submit']) && can_process())
 		$_POST['default_inv_sales_act'],
 		$_POST['default_assembly_act'], $_POST['payroll_act'],
 		check_value('allow_negative_stock'),
-		$_POST['po_over_receive'],
-		$_POST['po_over_charge'],
+		input_num('po_over_receive'),
+		input_num('po_over_charge'),
 		$_POST['past_due_days'],
 		$_POST['default_credit_limit'],
 		$_POST['default_workorder_required'],
@@ -96,8 +97,8 @@ $_POST['payroll_act'] = $myrow['payroll_act'];
 
 $_POST['allow_negative_stock'] = $myrow['allow_negative_stock'];
 
-$_POST['po_over_receive'] = $myrow['po_over_receive'];
-$_POST['po_over_charge'] = $myrow['po_over_charge'];
+$_POST['po_over_receive'] = percent_format($myrow['po_over_receive']);
+$_POST['po_over_charge'] = percent_format($myrow['po_over_charge']);
 $_POST['past_due_days'] = $myrow['past_due_days'];
 
 $_POST['default_credit_limit'] = $myrow['default_credit_limit'];
@@ -114,7 +115,7 @@ 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"));
+text_row(_("Past Due Days Interval:"), 'past_due_days', $_POST['past_due_days'], 6, 6, '', "", _("days"));
 
 //---------------
 
@@ -176,13 +177,13 @@ 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(_("Default 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(_("Default Dimension Required By After:"), 'default_dim_required', $_POST['default_dim_required'], 6, 6, '', "", _("days"));
 
 //----------------