[MERGE]

bzr revid: mra@mra-laptop-20100623120620-zy0im0qhpnelaijv

addons/account/account_move_line.py

@@ -790,7 +790,7 @@ class account_move_line(osv.osv):
         result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar, submenu=submenu)
         if view_type != 'tree':
             return result
-       
+
         fld = []
         fields = {}
         flds = []
@@ -800,12 +800,12 @@ class account_move_line(osv.osv):
         
         ids = journal_pool.search(cr, uid, [])
         journals = journal_pool.browse(cr, uid, ids)
-        all_journal = []
+        all_journal = [None]
         for journal in journals:
             all_journal.append(journal.id)
             for field in journal.view_id.columns_id:
                 if not field.field in fields:
-                    fields[field.field] = [journal.id]
+                    fields[field.field] = [None, journal.id]
                     fld.append((field.field, field.sequence))
                     flds.append(field.field)
                 else:

addons/account/account_view.xml

@@ -952,7 +952,7 @@
                     </group>
                     <newline/>
                     <group col="10" colspan="4">
-                        <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self or 0}"/>
+                        <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self or 0, 'normal_view':False}"/>
                         <field name="period_id" widget="selection" context="{'period_id':self}"/>
                     </group>
                 </search>