From 51974205b02bcff383d8e46e65b63c98b04cc683 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Tue, 18 Jun 2013 13:06:49 +0530 Subject: [PATCH] [IMP] improve code bzr revid: fka@tinyerp.com-20130618073649-roiu4qko1ye380r4 --- addons/account/account_cash_statement.py | 30 ++++++++++++++---------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index f340c9379aa..69060345c86 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -147,21 +147,27 @@ class account_cash_statement(osv.osv): return result def onchange_journal_id(self, cr, uid, ids, journal_id, context=None): - result = {} - if journal_id: - result = super(account_cash_statement, self).onchange_journal_id(cr, uid, ids, journal_id) - statement_ids = self.search(cr, uid, - [('journal_id', '=', journal_id),('state', '=', 'confirm')], - order='create_date desc', - limit=1, - context=context - ) - if statement_ids: - st = self.browse(cr, uid, statement_ids[0], context=context) - result.setdefault('value', {}).update({'last_closing_balance' : st.balance_end_real}) + result = super(account_cash_statement, self).onchange_journal_id(cr, uid, ids, journal_id) + + if not journal_id: + return result + + statement_ids = self.search(cr, uid, + [('journal_id', '=', journal_id),('state', '=', 'confirm')], + order='create_date desc', + limit=1, + context=context + ) + opening_details_ids = self._get_cash_open_box_lines(cr, uid, journal_id, context) if opening_details_ids: result['value']['opening_details_ids'] = opening_details_ids + + if statement_ids: + return result + + st = self.browse(cr, uid, statement_ids[0], context=context) + result.setdefault('value', {}).update({'last_closing_balance' : st.balance_end_real}) return result _columns = {