From d0e2178de09bc5dedb8debc80944ff21c49be0d5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 16 Aug 2010 10:31:06 +0200
Subject: [PATCH] fix

bzr revid: fp@tinyerp.com-20100816083106-j21kjwohpaqemjr5
---
 addons/account/account.py               |  2 +-
 addons/account/account_invoice_view.xml | 15 ++++++++++++++-
 addons/account/account_view.xml         |  6 +++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 17237211581..0dc079e2891 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -631,7 +631,7 @@ class account_journal(osv.osv):
         'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]", help="It acts as a default account for debit amount"),
         'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
         'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"),
-        'group_invoice_lines': fields.boolean('Group invoice lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
+        'group_invoice_lines': fields.boolean('Group Invoice Lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
         'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=False),
         'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
         'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 99575c08375..5bcd3b36815 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -507,7 +507,20 @@
 
         <act_window domain="[('account_analytic_id', '=', active_id)]" id="act_account_analytic_account_2_account_invoice_line" name="Invoice lines" res_model="account.invoice.line" src_model="account.analytic.account"/>
 
-        <act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Journal Items" res_model="account.move.line" src_model="account.invoice"/>
+        <act_window
+            domain="[('partner_id', '=', partner_id), ('account_id.reconcile', '=', True)]"
+            context="{'search_default_unreconciled':True}"
+            id="act_account_invoice_account_move_unreconciled"
+            name="Items to Reconcile"
+            res_model="account.move.line"
+            src_model="account.invoice"/>
+
+        <act_window
+            domain="[('move_id', '=', move_id)]"
+            id="act_account_invoice_account_move_invoice_link"
+            name="Invoice Items"
+            res_model="account.move.line"
+            src_model="account.invoice"/>
 
     </data>
 </openerp>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 67576d406da..d12fb7d11e6 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1057,7 +1057,11 @@
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>
                         <filter icon="terp-stock_symbol-selection" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Entry Lines"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-stock_symbol-selection" string="Unreconciled" domain="[('reconcile_id','=',False), ('account_id.type','in',['receivable', 'payable'])]" help="Unreconciled Entry Lines"/>
+                        <filter
+                            icon="terp-stock_symbol-selection"
+                            string="Unreconciled"
+                            domain="[('reconcile_id','=',False), ('account_id.type','in',['receivable', 'payable'])]" help="Unreconciled Journal Items"
+                            name="unreconciled"/>
                         <separator orientation="vertical"/>
                         <field name="move_id" select="1" string="Number (Move)"/>
                         <field name="date" select='1'/>