From df8055970c82c2037f029f85c9062f5c310f5c3c Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Tue, 10 Nov 2009 00:23:28 +0000 Subject: [PATCH] disallow bank accounts in accounts list in Bank Deposits/Payments. It produces double records in bank inquiry otherwise. --- CHANGELOG.txt | 8 ++++++++ gl/includes/ui/gl_bank_ui.inc | 2 +- gl/manage/gl_quick_entries.php | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index f008ff57..66034b16 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,14 @@ Legend: ! -> Note $ -> Affected files +10-Nov-2009 Joe Hunt +# disallow bank accounts in accounts list in Bank Deposits/Payments. + It produces double records in bank inquiry otherwise.. +$ /gl/includes/ui/gl_bank_ui.inc +# disallow bank accounts in accounts list when type is Bank Deposits + or Payments. See above. +$ /gl/manage/gl_quick_entries.php + 09-Nov-2009 Janusz Dobrowolski ! Fixed help link to provide ctxhelp switch and clean the page context string. $ /includes/page/header.inc diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc index 48c82392..aa101c4e 100644 --- a/gl/includes/ui/gl_bank_ui.inc +++ b/gl/includes/ui/gl_bank_ui.inc @@ -232,7 +232,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null) $_POST['code_id'] = get_company_pref($payment ? 'default_cogs_act':'default_inv_sales_act'); } - gl_all_accounts_list('code_id', null, false, true); + gl_all_accounts_list('code_id', null, true, true); if ($dim >= 1) dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1); if ($dim > 1) diff --git a/gl/manage/gl_quick_entries.php b/gl/manage/gl_quick_entries.php index f1f49536..a9ad9b55 100644 --- a/gl/manage/gl_quick_entries.php +++ b/gl/manage/gl_quick_entries.php @@ -307,7 +307,7 @@ if ($selected_id != -1) } else { - gl_all_accounts_list_row(_("Account").":", 'dest_id', null); + gl_all_accounts_list_row(_("Account").":", 'dest_id', null, $_POST['type'] == QE_DEPOSIT || $_POST['type'] == QE_PAYMENT); if ($actn != '=') { if ($actn == '%') -- 2.30.2