X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fgl_setup.php;h=6aea5d3b9db5ab3aee3fd80c71806ca2b84c06d9;hb=3ff9ed87cb909f19c8fe3e7dfda5df79d0c01a6c;hp=a0c99433fb3871de91470d9318c5699d7f3b30b9;hpb=de3a75773afa86df1739d14f24399d6f7a46f809;p=fa-stable.git
diff --git a/admin/gl_setup.php b/admin/gl_setup.php
index a0c99433..6aea5d3b 100644
--- a/admin/gl_setup.php
+++ b/admin/gl_setup.php
@@ -1,6 +1,15 @@
.
+***********************************************************************/
+$page_security = 'SA_GLSETUP';
$path_to_root="..";
include($path_to_root . "/includes/session.inc");
@@ -14,23 +23,26 @@ 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;
}
return true;
@@ -38,12 +50,12 @@ 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'],
+ 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'],
@@ -51,14 +63,17 @@ if (isset($_POST['submit']) && can_process())
$_POST['default_cogs_act'],
$_POST['default_adj_act'],
$_POST['default_inv_sales_act'],
- $_POST['default_assembly_act'], $_POST['payroll_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_dim_required'],
+ $_POST['default_delivery_required']);
display_notification(_("The general GL setup has been updated."));
@@ -67,20 +82,23 @@ 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();
+$_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['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"];
@@ -90,7 +108,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'];
@@ -99,20 +116,32 @@ $_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'];
-
-//echo "
";
+$_POST['default_delivery_required'] = $myrow['default_delivery_required'];
//---------------
table_section_title(_("General GL"));
-gl_all_accounts_list_row(_("Retained Earning Clearing Account:"), 'retained_earnings_act', $_POST['retained_earnings_act']);
-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"));
+// 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']);
+
+gl_all_accounts_list_row(_("Profit/Loss Year:"), 'profit_loss_year_act', $_POST['profit_loss_year_act']);
+
+gl_all_accounts_list_row(_("Exchange Variances Account:"), 'exchange_diff_act', $_POST['exchange_diff_act']);
+
+gl_all_accounts_list_row(_("Bank Charges Account:"), 'bank_charge_act', $_POST['bank_charge_act']);
//---------------
@@ -120,22 +149,34 @@ table_section_title(_("Customers and Sales"));
text_row(_("Default Credit Limit:"), 'default_credit_limit', $_POST['default_credit_limit'], 12, 12);
-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']);
//---------------
table_section_title(_("Customers and Sales Defaults"));
+// default for customer branch
+gl_all_accounts_list_row(_("Receivable Account:"), 'debtors_act');
+
+gl_all_accounts_list_row(_("Sales Account:"), 'default_sales_act', null,
+ false, false, true);
-gl_all_accounts_list_row(_("Accounts Receivable Account:"), 'debtors_act', $_POST['debtors_act']);
+gl_all_accounts_list_row(_("Sales Discount Account:"), 'default_sales_discount_act');
-gl_all_accounts_list_row(_("Sales Account:"), 'default_sales_act', $_POST['default_sales_act']);
+gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'default_prompt_payment_act');
-gl_all_accounts_list_row(_("Sales Discount Account:"), 'default_sales_discount_act', $_POST['default_sales_discount_act']);
+text_row(_("Delivery Required By:"), 'default_delivery_required', $_POST['default_delivery_required'], 6, 6, '', "", _("days"));
-gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'default_prompt_payment_act', $_POST['default_prompt_payment_act']);
+//----------------
+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"));
@@ -144,26 +185,21 @@ percent_row(_("Delivery Over-Receive Allowance:"), 'po_over_receive');
percent_row(_("Invoice Over-Charge Allowance:"), 'po_over_charge');
-gl_all_accounts_list_row(_("Purchases Exchange Variances Account:"), 'purch_exchange_diff_act', $_POST['purch_exchange_diff_act']);
-
-gl_all_accounts_list_row(_("Goods Received Clearing Account:"), 'grn_act', $_POST['grn_act']);
-
table_section_title(_("Suppliers and Purchasing Defaults"));
-gl_all_accounts_list_row(_("Accounts Payable Account:"), 'creditors_act', $_POST['creditors_act']);
+gl_all_accounts_list_row(_("Payable Account:"), 'creditors_act', $_POST['creditors_act']);
gl_all_accounts_list_row(_("Purchase Discount Account:"), 'pyt_discount_act', $_POST['pyt_discount_act']);
-//---------------
-
-table_section_title(_("Inventory Defaults"));
+table_section_title(_("Inventory"));
check_row(_("Allow Negative Inventory:"), 'allow_negative_stock', null);
+table_section_title(_("Items Defaults"));
gl_all_accounts_list_row(_("Sales Account:"), 'default_inv_sales_act', $_POST['default_inv_sales_act']);
gl_all_accounts_list_row(_("Inventory Account:"), 'default_inventory_act', $_POST['default_inventory_act']);
-
+// this one is default for items and suppliers (purchase account)
gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'default_cogs_act', $_POST['default_cogs_act']);
gl_all_accounts_list_row(_("Inventory Adjustments Account:"), 'default_adj_act', $_POST['default_adj_act']);
@@ -174,19 +210,14 @@ gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'default_assembly_ac
table_section_title(_("Manufacturing Defaults"));
-text_row(_("Default Work Order Required By After:"), 'default_workorder_required', $_POST['default_workorder_required'], 6, 6, "", _("days"));
-
-//----------------
-
-table_section_title(_("Dimension Defaults"));
+text_row(_("Work Order Required By After:"), 'default_workorder_required', $_POST['default_workorder_required'], 6, 6, '', "", _("days"));
-text_row(_("Default 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"));
+submit_center('submit', _("Update"), true, '', 'default');
end_form(2);