disallow bank accounts in accounts list in Bank Deposits/Payments.

It produces double records in bank inquiry otherwise.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f008ff57bf7328ac8ca6226f5f4dd721349b7733..66034b1673c9ab38e3eb60c992d24a6b6766e9d6 100644 (file)
--- 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 48c823923774d0b6fbbe82a1c84f63d5005b674b..aa101c4e2548c95dc8b5e9587739b286813ccfdf 100644 (file)
--- 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 f1f49536863f6a7c797f89fdb03a279db4f5bc94..a9ad9b55db95f14f4910b2cadd6f5bc8a8f1ad07 100644 (file)
--- 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 == '%')