X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fgl_setup.php;h=210274746cb0baabcf380851cf6308687ea14d11;hb=c696fcc9ed013beb349faca8a5ea95d0632d66b7;hp=6aea5d3b9db5ab3aee3fd80c71806ca2b84c06d9;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git diff --git a/admin/gl_setup.php b/admin/gl_setup.php index 6aea5d3b..21027474 100644 --- a/admin/gl_setup.php +++ b/admin/gl_setup.php @@ -13,7 +13,7 @@ $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"); @@ -45,6 +45,15 @@ function can_process() 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; } @@ -52,28 +61,16 @@ function can_process() if (isset($_POST['submit']) && can_process()) { - update_company_gl_setup($_POST['retained_earnings_act'], $_POST['profit_loss_year_act'], - $_POST['debtors_act'], $_POST['pyt_discount_act'], - $_POST['creditors_act'], $_POST['freight_act'], - $_POST['exchange_diff_act'], $_POST['bank_charge_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'], - check_value('allow_negative_stock'), - 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_delivery_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.")); @@ -83,11 +80,15 @@ if (isset($_POST['submit']) && can_process()) start_form(); -//start_outer_table("class='tablestyle'"); -start_outer_table($table_style2, 5); +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"]; @@ -99,6 +100,7 @@ $_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"]; @@ -115,6 +117,8 @@ $_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']; @@ -128,11 +132,6 @@ $_POST['default_delivery_required'] = $myrow['default_delivery_required']; table_section_title(_("General GL")); -// 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(_("Retained Earnings:"), 'retained_earnings_act', $_POST['retained_earnings_act']); @@ -143,6 +142,8 @@ gl_all_accounts_list_row(_("Exchange Variances Account:"), 'exchange_diff_act', gl_all_accounts_list_row(_("Bank Charges Account:"), 'bank_charge_act', $_POST['bank_charge_act']); +tax_algorithm_list_row(_("Tax Algorithm:"), 'tax_algorithm', $_POST['tax_algorithm']); + //--------------- table_section_title(_("Customers and Sales")); @@ -191,9 +192,12 @@ gl_all_accounts_list_row(_("Payable Account:"), 'creditors_act', $_POST['credito gl_all_accounts_list_row(_("Purchase Discount Account:"), 'pyt_discount_act', $_POST['pyt_discount_act']); +gl_all_accounts_list_row(_("GRN Clearing Account:"), 'grn_clearing_act', get_post('grn_clearing_act'), true, false, _("No postings on GRN")); + table_section_title(_("Inventory")); check_row(_("Allow Negative Inventory:"), 'allow_negative_stock', null); +label_row(null, _("Warning: This may cause a delay in GL postings"), "", "class='stockmankofg' colspan=2"); table_section_title(_("Items Defaults")); gl_all_accounts_list_row(_("Sales Account:"), 'default_inv_sales_act', $_POST['default_inv_sales_act']);