Merge lp:~openerp-dev/openobject-addons/trunk-bug-907261-mdi into lp:openobject-addons

[DJ Patel (OpenERP)]

Hello Sir,

I have fix the issue: https://bugs.launchpad.net/openobject-addons/+bug/907261 "Account:-problem with passing of 'journal_id' in context while creating Journal Items in gtk".

I remove the 'readonly' attribute from 'journal_id' field.
Because Gtk does not send the value of read-only field to Server.

Thanks and Regards,

Divyesh Makwana(MDI)

[Purnendu Singh (OpenERP) (purnendu-singh)]

Hello Divyesh,

This fix is not good!!!

Counterpart line is not created with right values. Say for e.g:

-Accounting/Customers/Journal Items.In search view select journal other than 'Sales Journal-(test)'
-Create a new journal item in tree view and press enter.
-It creates counterpart entries but line is not having right values!!!

Thanks,
Purnendu Singh

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-907261-mdi]

6204. By DJ Patel (OpenERP) on 2012-02-01

[Merge] Merge with main addons

Unmerged revisions

6204. By DJ Patel (OpenERP) on 2012-02-01

[Merge] Merge with main addons

6203. By DJ Patel (OpenERP) on 2012-01-06

[FIX] account : problem with passing of 'journal_id' in context while creating Journal Items in gtk.

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2012-01-30 11:18:03 +0000
+++ account/account_move_line.py	2012-02-01 05:11:26 +0000
@@ -494,7 +494,7 @@
         'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
         'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
         'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
-        'journal_id': fields.related('move_id', 'journal_id', string='Journal', type='many2one', relation='account.journal', required=True, select=True, readonly=True,
+        'journal_id': fields.related('move_id', 'journal_id', string='Journal', type='many2one', relation='account.journal', required=True, select=True,
                                 store = {
                                     'account.move': (_get_move_lines, ['journal_id'], 20)
                                 }),
@@ -1250,8 +1250,6 @@
             if len(period_candidate_ids) != 1:
                 raise osv.except_osv(_('Encoding error'), _('No period found or more than one period found for the given date.'))
             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)