X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Faccount%2Faccount_bank_statement.py;h=f0f93db19c17dce2f1e2716d2f5c72cd78983a7b;hb=c5814d3e6f8e905211f15c67c2f4f4761d5ae08b;hp=e2ae46ad70b4ae1258e0446525cb35c66e86376e;hpb=b855aada49edacbb776cd60c8299f9d7b80c75d6;p=odoo%2Fodoo.git

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index e2ae46a..f0f93db 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -128,7 +128,7 @@ class account_bank_statement(osv.osv):
         'currency': fields.function(_currency, 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.'),
-        'cash_control': fields.related('journal_id', 'cash_control' , type='boolean', relation='account.journal',string='Cash control', store=True),
+        'cash_control': fields.related('journal_id', 'cash_control' , type='boolean', relation='account.journal',string='Cash control'),
     }
 
     _defaults = {
@@ -461,12 +461,16 @@ class account_bank_statement(osv.osv):
     def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
         if not journal_id:
             return {}
-        if context is None:
-           context = {}
+        res = {}
         balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
+        res['balance_start'] = balance_start 
         journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
+        res['company_id'] =  journal.company_id.id
         currency = journal.currency or journal.company_id.currency_id
-        return {'value': {'balance_start': balance_start, 'company_id': journal.company_id.id, 'currency': currency.id, 'cash_control': journal.cash_control}}
+        res['currency']  = currency.id
+        if journal.type == 'cash':
+            res['cash_control'] = journal.cash_control
+        return {'value': res}
 
     def unlink(self, cr, uid, ids, context=None):
         stat = self.read(cr, uid, ids, ['state'], context=context)