diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 33c33390030..1c8d0648c82 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -910,7 +910,7 @@ class account_move_line(osv.osv): elif field == 'account_tax_id': attrs.append('domain="[(\'parent_id\',\'=\',False)]"') attrs.append("context=\"{'journal_id':journal_id}\"") - + elif field == 'account_id' and journal.id: attrs.append('domain="[(\'journal_id\', \'=\', '+str(journal.id)+'),(\'type\',\'<>\',\'view\'), (\'type\',\'<>\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"') diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index d4c294c76a0..31d4b39e5b1 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1059,9 +1059,8 @@ - - + @@ -1070,10 +1069,20 @@ - - + + + + + + + + + + + + - + diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py index 92e8f23da49..0187cfc7b9b 100644 --- a/addons/account/wizard/account_move_journal.py +++ b/addons/account/wizard/account_move_journal.py @@ -155,10 +155,10 @@ class account_move_journal(osv.osv_memory): # 'domain': str([('journal_id', '=', journal_id), ('period_id', '=', period_id)]), 'name': name, 'view_type': 'form', - 'view_mode': 'tree,form,graph', + 'view_mode': 'tree,graph,form', 'res_model': 'account.move.line', 'view_id': False, - 'context': "{'journal_id': %d, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (journal_id, journal_id, period_id), + 'context': "{'visible_id':%s, 'journal_id': %d, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (journal_id, journal_id, journal_id, period_id), 'type': 'ir.actions.act_window', 'search_view_id': res_id }