Merge lp:~openerp-dev/openobject-addons/trunk-bug-834512-jap into lp:openobject-addons

[Jagdish Panchal (Open ERP)]

Hello,

Fixed key error of journal_id while creating journal items --fixes lp:834512

Thanks
JAP

[Meera Trambadia (OpenERP) (mtr-openerp)]

review: Approve

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

If there is not journal_id in context as well as there is no move_id in context then you use "search_default_journal_id" to replace in context['journal_id']. I think this is not correct. Each time if you change the journal from search view and try to create entries. It pass old search_default_journal_id in context always.

And if you use Accounting/Journal Entries/Journal Items menu to create journal entries, you can see it will not work with your code.

Thanks,
Mustufa

review: Needs Fixing

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

If I have tested using trunk webclient, I had journal_id key in context. it means somewhere gtk miss this key in its context.

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2011-11-14 11:34:05 +0000
+++ account/account_move_line.py	2011-12-15 06:34:26 +0000
@@ -1249,6 +1249,8 @@
             if len(period_candidate_ids) != 1:
                 raise osv.except_osv(_('Encoding error'), _('No period found or period given is ambigous.'))
             context['period_id'] = period_candidate_ids[0][0]
+        if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
+            context['journal_id'] = context.get('search_default_journal_id')            
         self._update_journal_check(cr, uid, context['journal_id'], context['period_id'], context)
         move_id = vals.get('move_id', False)
         journal = journal_obj.browse(cr, uid, context['journal_id'], context=context)