X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fgl_setup.php;h=354e76c22d1d44330bc237fca68aacf491ff2522;hb=2250f142e1034dc28adb819c4d8f7cce05911489;hp=161888547bdcb8c072563ac40258a940badf1a9b;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git diff --git a/admin/gl_setup.php b/admin/gl_setup.php index 16188854..354e76c2 100644 --- a/admin/gl_setup.php +++ b/admin/gl_setup.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security =10; $path_to_root=".."; include($path_to_root . "/includes/session.inc"); @@ -8,31 +17,32 @@ 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"); //------------------------------------------------------------------------------------------------- -function can_process() +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; @@ -40,12 +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['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'], @@ -53,14 +62,17 @@ 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'), - $_POST['po_over_receive'], - $_POST['po_over_charge'], + input_num('po_over_receive'), + input_num('po_over_charge'), + check_value('accumulate_shipping'), + $_POST['legal_text'], $_POST['past_due_days'], $_POST['default_credit_limit'], $_POST['default_workorder_required'], - $_POST['default_dim_required']); + $_POST['default_dim_required'], + $_POST['default_delivery_required']); display_notification(_("The general GL setup has been updated.")); @@ -69,20 +81,20 @@ 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(); $_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"]; @@ -92,29 +104,34 @@ $_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']; -$_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']; +$_POST['legal_text'] = $myrow['legal_text']; +$_POST['accumulate_shipping'] = $myrow['accumulate_shipping']; $_POST['default_workorder_required'] = $myrow['default_workorder_required']; $_POST['default_dim_required'] = $myrow['default_dim_required']; - -//echo "