From c73e1bd3cfe2231278d5749f87657bcae429ddf0 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Fri, 4 Jul 2008 21:34:00 +0000 Subject: [PATCH] Fixed dflt sales account for customer branch. --- admin/gl_setup.php | 55 ++++++++++++++---------------- sales/manage/customer_branches.php | 5 +-- 2 files changed, 26 insertions(+), 34 deletions(-) diff --git a/admin/gl_setup.php b/admin/gl_setup.php index e61bb8d6..97206794 100644 --- a/admin/gl_setup.php +++ b/admin/gl_setup.php @@ -44,9 +44,7 @@ function 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'], + $_POST['creditors_act'], $_POST['freight_act'], $_POST['default_sales_act'], $_POST['default_sales_discount_act'], $_POST['default_prompt_payment_act'], @@ -54,7 +52,7 @@ 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'), @@ -76,12 +74,7 @@ $myrow = get_company_prefs(); $_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['default_sales_act'] = $myrow["default_sales_act"]; @@ -93,7 +86,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']; @@ -106,38 +98,40 @@ $_POST['default_credit_limit'] = $myrow['default_credit_limit']; $_POST['default_workorder_required'] = $myrow['default_workorder_required']; $_POST['default_dim_required'] = $myrow['default_dim_required']; -//echo ""; - //--------------- 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")); //--------------- 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']); +// Not used in FA2.0. +//gl_all_accounts_list_row(_("Sales Exchange Variances Account:"), 'exchange_diff_act', $_POST['exchange_diff_act']); 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(_("Accounts Receivable Account:"), 'debtors_act', $_POST['debtors_act']); +gl_all_accounts_list_row(_("Sales Account:"), 'default_sales_act', null, + false, false, false, true); -gl_all_accounts_list_row(_("Sales Account:"), 'default_sales_act', $_POST['default_sales_act']); +gl_all_accounts_list_row(_("Sales Discount Account:"), 'default_sales_discount_act'); -gl_all_accounts_list_row(_("Sales Discount Account:"), 'default_sales_discount_act', $_POST['default_sales_discount_act']); - -gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'default_prompt_payment_act', $_POST['default_prompt_payment_act']); +gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'default_prompt_payment_act'); //--------------- @@ -146,27 +140,28 @@ table_section_title(_("Suppliers and Purchasing")); 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']); +// 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. +//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']); @@ -177,13 +172,13 @@ 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")); +text_row(_("Work Order Required By After:"), 'default_workorder_required', $_POST['default_workorder_required'], 6, 6, '', "", _("days")); //---------------- table_section_title(_("Dimension Defaults")); -text_row(_("Default Dimension Required By After:"), 'default_dim_required', $_POST['default_dim_required'], 6, 6, '', "", _("days")); +text_row(_("Dimension Required By After:"), 'default_dim_required', $_POST['default_dim_required'], 6, 6, '', "", _("days")); //---------------- diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php index de40042e..1478e63b 100644 --- a/sales/manage/customer_branches.php +++ b/sales/manage/customer_branches.php @@ -255,10 +255,7 @@ else { $company_record = get_company_prefs(); - // $_POST['sales_account'] = $company_record["default_sales_act"]; - // 2008-06-14. Changed so if no account here the Item Sales Account is taken - // Will be set if it should override the item sales account - $_POST['sales_account'] = ''; + $_POST['sales_account'] = $company_record["default_sales_act"]; $_POST['sales_discount_account'] = $company_record['default_sales_discount_act']; $_POST['receivables_account'] = $company_record['debtors_act']; $_POST['payment_discount_account'] = $company_record['default_prompt_payment_act']; -- 2.30.2