X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fgl_setup.php;h=1a7efae9b078d83620cc82d318f8ab4c78a230e0;hb=54d84ff9a67620ab38c676cdbcf87853632724f0;hp=044a111a19e851e98c3e2d7c55a6f0498b2a0279;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git diff --git a/admin/gl_setup.php b/admin/gl_setup.php index 044a111a..1a7efae9 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"); @@ -14,23 +23,23 @@ 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'); @@ -41,10 +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['freight_act'], + $_POST['exchange_diff_act'], $_POST['default_sales_act'], $_POST['default_sales_discount_act'], $_POST['default_prompt_payment_act'], @@ -56,6 +66,8 @@ if (isset($_POST['submit']) && can_process()) 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'], @@ -68,7 +80,11 @@ 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(); @@ -77,6 +93,7 @@ $_POST['creditors_act'] = $myrow["creditors_act"]; $_POST['freight_act'] = $myrow["freight_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"]; @@ -94,6 +111,8 @@ $_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']; @@ -109,14 +128,18 @@ table_section_title(_("General GL")); //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(_("Exchange Variances Account:"), 'exchange_diff_act', $_POST['exchange_diff_act']); + //--------------- table_section_title(_("Customers and Sales")); text_row(_("Default Credit Limit:"), 'default_credit_limit', $_POST['default_credit_limit'], 12, 12); -// Not used in FA2.0. -//gl_all_accounts_list_row(_("Sales Exchange Variances Account:"), 'exchange_diff_act', $_POST['exchange_diff_act']); +check_row(_("Accumulate batch shipping:"), 'accumulate_shipping', null); + +textarea_row(_("Legal Text on Invoice:"), 'legal_text', $_POST['legal_text'], 32, 3); gl_all_accounts_list_row(_("Shipping Charged Account:"), 'freight_act', $_POST['freight_act']); @@ -127,19 +150,27 @@ table_section_title(_("Customers and Sales Defaults")); gl_all_accounts_list_row(_("Receivable Account:"), 'debtors_act'); gl_all_accounts_list_row(_("Sales Account:"), 'default_sales_act', null, - false, false, false, true); + false, false, true); gl_all_accounts_list_row(_("Sales Discount Account:"), 'default_sales_discount_act'); gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'default_prompt_payment_act'); +//---------------- + +table_section_title(_("Dimension Defaults")); + +text_row(_("Dimension Required By After:"), 'default_dim_required', $_POST['default_dim_required'], 6, 6, '', "", _("days")); //--------------- +table_section(2); + table_section_title(_("Suppliers and Purchasing")); percent_row(_("Delivery Over-Receive Allowance:"), 'po_over_receive'); percent_row(_("Invoice Over-Charge Allowance:"), 'po_over_charge'); + // Not used in FA2.0. //gl_all_accounts_list_row(_("Purchases Exchange Variances Account:"), 'purch_exchange_diff_act', $_POST['purch_exchange_diff_act']); // Not used in FA2.0. @@ -151,8 +182,6 @@ 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']); -//--------------- - table_section_title(_("Inventory")); check_row(_("Allow Negative Inventory:"), 'allow_negative_stock', null); @@ -174,15 +203,10 @@ table_section_title(_("Manufacturing Defaults")); text_row(_("Work Order Required By After:"), 'default_workorder_required', $_POST['default_workorder_required'], 6, 6, '', "", _("days")); -//---------------- - -table_section_title(_("Dimension Defaults")); - -text_row(_("Dimension Required By After:"), 'default_dim_required', $_POST['default_dim_required'], 6, 6, '', "", _("days")); //---------------- -end_table(1); +end_outer_table(1); submit_center('submit', _("Update"), true, '', true);