From 382f6fc8c55cb866c4bc8d54c7a4b13694648d46 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Fri, 26 Nov 2010 16:14:46 +0100
Subject: [PATCH] [FIX] account: statement reconciliaiton improved

bzr revid: qdp-launchpad@tinyerp.com-20101126151446-72q1m6qc9efqqga0
---
 addons/account/account_bank_statement.py | 12 +++++++-----
 addons/account/account_view.xml          |  5 +++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 173f0651a90..93d2a6fb00d 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -149,6 +149,7 @@ class account_bank_statement(osv.osv):
             \n* And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
         'currency': fields.function(_currency, method=True, string='Currency',
             type='many2one', relation='res.currency'),
+        'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'),
     }
 
     _defaults = {
@@ -369,14 +370,15 @@ class account_bank_statement(osv.osv):
             done.append(st.id)
         return self.write(cr, uid, done, {'state':'draft'}, context=context)
 
-    def onchange_journal_id(self, cursor, user, statement_id, journal_id, context=None):
-        cursor.execute('SELECT balance_end_real \
+    def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
+        cr.execute('SELECT balance_end_real \
                 FROM account_bank_statement \
                 WHERE journal_id = %s AND NOT state = %s \
                 ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
-        res = cursor.fetchone()
+        res = cr.fetchone()
         balance_start = res and res[0] or 0.0
-        return {'value': {'balance_start': balance_start}}
+        account_id = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id'], context=context)['default_debit_account_id']
+        return {'value': {'balance_start': balance_start, 'account_id': account_id}}
 
     def unlink(self, cr, uid, ids, context=None):
         stat = self.read(cr, uid, ids, ['state'])
@@ -454,4 +456,4 @@ class account_bank_statement_line(osv.osv):
 
 account_bank_statement_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c4a1d447ad9..f2b4da6ea23 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -609,16 +609,17 @@
                     <group col="7" colspan="4">
                         <field name="name" select="1"/>
                         <field name="date" select="1" on_change="onchange_date(date)"/>
-                        <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" select="1"/>
+                        <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
                         <newline/>
                         <field name="period_id"/>
                         <field name="balance_start"/>
                         <field name="balance_end_real"/>
                         <field name="currency" invisible="1"/>
+                        <field name="account_id" invisible="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Journal Entries">
-                            <field colspan="4" name="move_line_ids" nolabel="1" widget="many2many" domain="[('statement_id', '=', False)]">
+                            <field colspan="4" name="move_line_ids" nolabel="1" widget="many2many" domain="[('account_id','=',account_id),('statement_id', '=', False)]">
                                 <tree string="Statement lines">
                                     <field name="date"/>
                                     <field name="period_id"/>