X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fgl_setup.php;h=415fca0ebd423e3856a2e498419c609015ea9afb;hb=fd069bba86276f15311ff6ab10b22d4a06a55513;hp=79cda9b9911aaabbdc52770a66f8f1ef9c65dcda;hpb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;p=fa-stable.git diff --git a/admin/gl_setup.php b/admin/gl_setup.php index 79cda9b9..415fca0e 100644 --- a/admin/gl_setup.php +++ b/admin/gl_setup.php @@ -47,7 +47,10 @@ function can_process() } $grn_act = get_company_pref('grn_clearing_act'); - if ((get_post('grn_clearing_act') != $grn_act) && db_num_rows(get_grn_items(0, '', true))) + $post_grn_act = get_post('grn_clearing_act'); + if ($post_grn_act == null) + $post_grn_act = 0; + if (($post_grn_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; @@ -69,10 +72,12 @@ 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', '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', + 'default_prompt_payment_act', 'default_inventory_act', 'default_cogs_act', 'depreciation_period', + 'default_loss_on_asset_disposal_act', 'default_adj_act', 'default_inv_sales_act', 'default_assembly_act', 'legal_text', 'past_due_days', 'default_workorder_required', 'default_dim_required', 'default_receival_required', - 'default_delivery_required', 'grn_clearing_act', 'tax_algorithm', + 'default_delivery_required', 'default_quote_valid_days', 'grn_clearing_act', 'tax_algorithm', + 'no_zero_lines_amount', 'show_po_item_codes', 'accounts_alpha', 'loc_notification', 'print_invoice_no', + 'allow_negative_prices', 'print_item_images_on_quote', 'allow_negative_stock'=> 0, 'accumulate_shipping'=> 0, 'po_over_receive' => 0.0, 'po_over_charge' => 0.0, 'default_credit_limit'=>0.0 ))); @@ -89,15 +94,6 @@ 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"]; @@ -137,6 +133,16 @@ $_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']; +$_POST['default_quote_valid_days'] = $myrow['default_quote_valid_days']; +$_POST['no_zero_lines_amount'] = $myrow['no_zero_lines_amount']; +$_POST['show_po_item_codes'] = $myrow['show_po_item_codes']; +$_POST['accounts_alpha'] = $myrow['accounts_alpha']; +$_POST['loc_notification'] = $myrow['loc_notification']; +$_POST['print_invoice_no'] = $myrow['print_invoice_no']; +$_POST['allow_negative_prices'] = $myrow['allow_negative_prices']; +$_POST['print_item_images_on_quote'] = $myrow['print_item_images_on_quote']; +$_POST['default_loss_on_asset_disposal_act'] = $myrow['default_loss_on_asset_disposal_act']; +$_POST['depreciation_period'] = $myrow['depreciation_period']; //--------------- @@ -145,6 +151,8 @@ table_section_title(_("General GL")); text_row(_("Past Due Days Interval:"), 'past_due_days', $_POST['past_due_days'], 6, 6, '', "", _("days")); +accounts_type_list_row(_("Accounts Type:"), 'accounts_alpha', $_POST['accounts_alpha']); + gl_all_accounts_list_row(_("Retained Earnings:"), 'retained_earnings_act', $_POST['retained_earnings_act']); gl_all_accounts_list_row(_("Profit/Loss Year:"), 'profit_loss_year_act', $_POST['profit_loss_year_act']); @@ -161,8 +169,12 @@ table_section_title(_("Customers and Sales")); text_row(_("Default Credit Limit:"), 'default_credit_limit', $_POST['default_credit_limit'], 12, 12); +yesno_list_row(_("Invoice Identification:"), 'print_invoice_no', $_POST['print_invoice_no'], $name_yes=_("Number"), $name_no=_("Reference")); + check_row(_("Accumulate batch shipping:"), 'accumulate_shipping', null); +check_row(_("Print Item Image on Quote:"), 'print_item_images_on_quote', null); + 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']); @@ -183,6 +195,8 @@ gl_all_accounts_list_row(_("Sales Discount Account:"), 'default_sales_discount_a gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'default_prompt_payment_act'); +text_row(_("Quote Valid Days:"), 'default_quote_valid_days', $_POST['default_quote_valid_days'], 6, 6, '', "", _("days")); + text_row(_("Delivery Required By:"), 'default_delivery_required', $_POST['default_delivery_required'], 6, 6, '', "", _("days")); //--------------- @@ -211,11 +225,19 @@ gl_all_accounts_list_row(_("GRN Clearing Account:"), 'grn_clearing_act', get_pos text_row(_("Receival Required By:"), 'default_receival_required', $_POST['default_receival_required'], 6, 6, '', "", _("days")); +check_row(_("Show PO item codes:"), 'show_po_item_codes', null); + 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"); +check_row(_("No zero-amounts (Service):"), 'no_zero_lines_amount', null); + +check_row(_("Location Notifications:"), 'loc_notification', null); + +check_row(_("Allow Negative Prices:"), 'allow_negative_prices', null); + table_section_title(_("Items Defaults")); gl_all_accounts_list_row(_("Sales Account:"), 'default_inv_sales_act', $_POST['default_inv_sales_act']); @@ -229,11 +251,18 @@ gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'default_assembly_ac //---------------- +table_section_title(_("Fixed Assets Defaults")); + +gl_all_accounts_list_row(_("Loss On Asset Disposal Account:"), 'default_loss_on_asset_disposal_act', $_POST['default_loss_on_asset_disposal_act']); + +array_selector_row (_("Depreciation Period:"), 'depreciation_period', $_POST['depreciation_period'], array(FA_MONTHLY => _("Monthly"), FA_YEARLY => _("Yearly"))); + +//---------------- + table_section_title(_("Manufacturing Defaults")); text_row(_("Work Order Required By After:"), 'default_workorder_required', $_POST['default_workorder_required'], 6, 6, '', "", _("days")); - //---------------- end_outer_table(1); @@ -246,4 +275,3 @@ end_form(2); end_page(); -?>