X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fgl_setup.php;h=d3c487768c5572c5f9308b04e23a58f865b25f27;hb=3f3cfa578adbc2b71f4fd9c8d0f5536d26af43d8;hp=7d3f23f106450d0f901a9b1e794337294a871be3;hpb=303eb17e9cdd9702eee9fdfcaee51e654a1da541;p=fa-stable.git diff --git a/admin/gl_setup.php b/admin/gl_setup.php index 7d3f23f1..d3c48776 100644 --- a/admin/gl_setup.php +++ b/admin/gl_setup.php @@ -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',0) != $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; } @@ -53,12 +62,12 @@ function can_process() if (isset($_POST['submit']) && can_process()) { update_company_prefs( get_post( array( 'retained_earnings_act', 'profit_loss_year_act', - 'debtors_act', 'pyt_discount_act', 'creditors_act', 'freight_act', + 'debtors_act', 'pyt_discount_act', 'creditors_act', 'freight_act', 'deferred_income_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', + 'past_due_days', 'default_workorder_required', 'default_dim_required', 'default_receival_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 ))); @@ -71,11 +80,19 @@ 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 from 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(); +} +if (get_company_pref('default_receival_required') === null) { // new in 2.4 installations + set_company_pref('default_receival_required', 'glsetup.purchase', 'smallint', 6, '10'); + refresh_sys_prefs(); +} + $myrow = get_company_prefs(); $_POST['retained_earnings_act'] = $myrow["retained_earnings_act"]; @@ -83,10 +100,12 @@ $_POST['profit_loss_year_act'] = $myrow["profit_loss_year_act"]; $_POST['debtors_act'] = $myrow["debtors_act"]; $_POST['creditors_act'] = $myrow["creditors_act"]; $_POST['freight_act'] = $myrow["freight_act"]; +$_POST['deferred_income_act'] = $myrow["deferred_income_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"]; @@ -103,6 +122,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']; @@ -110,6 +131,7 @@ $_POST['accumulate_shipping'] = $myrow['accumulate_shipping']; $_POST['default_workorder_required'] = $myrow['default_workorder_required']; $_POST['default_dim_required'] = $myrow['default_dim_required']; $_POST['default_delivery_required'] = $myrow['default_delivery_required']; +$_POST['default_receival_required'] = $myrow['default_receival_required']; //--------------- @@ -126,6 +148,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")); @@ -134,10 +158,13 @@ text_row(_("Default Credit Limit:"), 'default_credit_limit', $_POST['default_cre check_row(_("Accumulate batch shipping:"), 'accumulate_shipping', null); -textarea_row(_("Legal Text on Invoice:"), 'legal_text', $_POST['legal_text'], 32, 3); +textarea_row(_("Legal Text on Invoice:"), 'legal_text', $_POST['legal_text'], 32, 4); gl_all_accounts_list_row(_("Shipping Charged Account:"), 'freight_act', $_POST['freight_act']); +gl_all_accounts_list_row(_("Deferred Income Account:"), 'deferred_income_act', $_POST['deferred_income_act'], true, false, + _("Not used"), false, false, false); + //--------------- table_section_title(_("Customers and Sales Defaults")); @@ -153,14 +180,15 @@ gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'default_prompt_ text_row(_("Delivery Required By:"), 'default_delivery_required', $_POST['default_delivery_required'], 6, 6, '', "", _("days")); -//---------------- +//--------------- table_section(2); table_section_title(_("Dimension Defaults")); text_row(_("Dimension Required By After:"), 'default_dim_required', $_POST['default_dim_required'], 6, 6, '', "", _("days")); -//--------------- + +//---------------- table_section_title(_("Suppliers and Purchasing")); @@ -174,6 +202,10 @@ 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")); + +text_row(_("Receival Required By:"), 'default_receival_required', $_POST['default_receival_required'], 6, 6, '', "", _("days")); + table_section_title(_("Inventory")); check_row(_("Allow Negative Inventory:"), 'allow_negative_stock', null);