X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fgl_setup.php;h=210274746cb0baabcf380851cf6308687ea14d11;hb=c696fcc9ed013beb349faca8a5ea95d0632d66b7;hp=3af347c8eb0586dc292ba9a268d6be719b9ce5df;hpb=0ad7b92c6cf2e4e65ca0fa94ba31f30f7b292ba8;p=fa-stable.git diff --git a/admin/gl_setup.php b/admin/gl_setup.php index 3af347c8..21027474 100644 --- a/admin/gl_setup.php +++ b/admin/gl_setup.php @@ -1,35 +1,57 @@ . +***********************************************************************/ +$page_security = 'SA_GLSETUP'; $path_to_root=".."; include($path_to_root . "/includes/session.inc"); -page(_("System and General GL Setup")); +page(_($help_context = "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 (!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; + } + + $grn_act = get_company_pref('grn_clearing_act'); + if (get_post('grn_clearing_act') != $grn_act && db_num_rows(get_grn_items(0, '', true))) + { + display_error(_("Before GRN Clearing Account can be changed all GRNs have to be invoiced")); + $_POST['grn_clearing_act'] = $grn_act; + set_focus('grn_clearing_account'); return false; } return true; @@ -37,27 +59,18 @@ 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['default_sales_act'], - $_POST['default_sales_discount_act'], - $_POST['default_prompt_payment_act'], - $_POST['default_inventory_act'], - $_POST['default_cogs_act'], - $_POST['default_adj_act'], - $_POST['default_inv_sales_act'], - $_POST['default_assembly_act'], $_POST['payroll_act'], - check_value('allow_negative_stock'), - input_num('po_over_receive'), - input_num('po_over_charge'), - $_POST['past_due_days'], - $_POST['default_credit_limit'], - $_POST['default_workorder_required'], - $_POST['default_dim_required']); + update_company_prefs( get_post( array( 'retained_earnings_act', 'profit_loss_year_act', + 'debtors_act', 'pyt_discount_act', 'creditors_act', 'freight_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', + 'past_due_days', 'default_workorder_required', 'default_dim_required', + 'default_delivery_required', 'grn_clearing_act', 'tax_algorithm', + 'allow_negative_stock'=> 0, 'accumulate_shipping'=> 0, + 'po_over_receive' => 0.0, 'po_over_charge' => 0.0, 'default_credit_limit'=>0.0 +))); display_notification(_("The general GL setup has been updated.")); @@ -66,20 +79,28 @@ if (isset($_POST['submit']) && can_process()) //------------------------------------------------------------------------------------------------- start_form(); -start_table("class='tablestyle'"); + +start_outer_table(TABLESTYLE2); + +table_section(1); + +if (get_company_pref('grn_clearing_act') === null) { // available form 2.3.1, can be not defined on pre-2.4 installations + set_company_pref('grn_clearing_act', 'glsetup.purchase', 'varchar', 15, 0); + refresh_sys_prefs(); +} $myrow = get_company_prefs(); +$_POST['retained_earnings_act'] = $myrow["retained_earnings_act"]; +$_POST['profit_loss_year_act'] = $myrow["profit_loss_year_act"]; $_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['bank_charge_act'] = $myrow["bank_charge_act"]; +$_POST['tax_algorithm'] = $myrow["tax_algorithm"]; $_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"]; @@ -89,7 +110,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']; @@ -97,21 +117,32 @@ $_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['grn_clearing_act'] = $myrow['grn_clearing_act']; + $_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 "