Merge lp:~openerp-dev/openobject-addons/6.1-opw-577781-skh into lp:openobject-addons/6.1

[Somesh Khare]

Hello Sir,

[FIX] account_move_line: journal view on the journal form did not work.

Steps to Reproduce:
1. Create a Journal View "Test View" and select field as "move,ref,state,account" from menu "Accounting/Configuration/Financial Accounting/Journals/Journal Views".
2. Select any journal from "Accounting/Configuration/Financial Accounting/Journals/Journals" (eg: Sales Journal).
3. Now select the Display mode as "Test View" on the Journal form view.
4. From the action window select Journal Item.

Your selected display mode's (Journal Views) fields are not visible on the journal items from here.

Expected result:
It should display only the fields those are defined into the Journal View "Test View".

This branch fixes this issue, Kindly review the branch and please share your views on it.

Thanks,
Somesh Khare

[lp:~openerp-dev/openobject-addons/6.1-opw-577781-skh]

6947. By Launchpad Translations on behalf of openerp on 2012-08-15

Launchpad automatic translations update.

6948. By Somesh Khare on 2012-08-16

[FIX]account_move_line: journal view on the journal form did not work (Case: Ref 577781)

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Not Relevant on Trunk (means that architecture on trunk has changed and so this bug has no meaning anymore). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6948. By Somesh Khare on 2012-08-16

[FIX]account_move_line: journal view on the journal form did not work (Case: Ref 577781)

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2012-07-27 11:43:03 +0000
+++ account/account_move_line.py	2012-08-16 11:36:20 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import time
+import sys
 from datetime import datetime
 from operator import itemgetter
 
@@ -1016,8 +1017,11 @@
         fields = {}
         flds = []
         title = _("Accounting Entries") #self.view_header_get(cr, uid, view_id, view_type, context)
-
+        
         ids = journal_pool.search(cr, uid, [])
+        journal_id = context.get('active_model')=='account.journal' and context.get('active_id') or context.get('search_default_journal_id') or False
+        if journal_id:
+            ids = journal_pool.search(cr, uid, [('id','=',journal_id)])
         journals = journal_pool.browse(cr, uid, ids, context=context)
         all_journal = [None]
         common_fields = {}
@@ -1035,8 +1039,10 @@
                     common_fields[field.field] = common_fields[field.field] + 1
         fld.append(('period_id', 3))
         fld.append(('journal_id', 10))
+        fld.append(('state',sys.maxint))
         flds.append('period_id')
         flds.append('journal_id')
+        flds.append('state')
         fields['period_id'] = all_journal
         fields['journal_id'] = all_journal
         fld = sorted(fld, key=itemgetter(1))