[FIX]Set priority for bank statement form and import coda wizard returned action copy action in account_view.xml

bzr revid: dle@openerp.com-20121220173532-c7ecxa1d5x48a288
This commit is contained in:
dle@openerp.com 2012-12-20 18:35:32 +01:00
parent eed9b471ad
commit 512687db8a
2 changed files with 11 additions and 6 deletions

View File

@ -537,6 +537,7 @@
<record id="view_bank_statement_form" model="ir.ui.view"> <record id="view_bank_statement_form" model="ir.ui.view">
<field name="name">account.bank.statement.form</field> <field name="name">account.bank.statement.form</field>
<field name="model">account.bank.statement</field> <field name="model">account.bank.statement</field>
<field name="priority">1</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Bank Statement" version="7.0"> <form string="Bank Statement" version="7.0">
<header> <header>
@ -2232,6 +2233,7 @@
<record id="view_bank_statement_form2" model="ir.ui.view"> <record id="view_bank_statement_form2" model="ir.ui.view">
<field name="name">account.bank.statement.form</field> <field name="name">account.bank.statement.form</field>
<field name="model">account.bank.statement</field> <field name="model">account.bank.statement</field>
<field name="priority">2</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Statement" version="7.0"> <form string="Statement" version="7.0">
<header> <header>

View File

@ -388,14 +388,17 @@ class account_coda_import(osv.osv_memory):
self.pool.get('account.bank.statement.line').create(cr, uid, data, context=context) self.pool.get('account.bank.statement.line').create(cr, uid, data, context=context)
if statement['coda_note'] != '': if statement['coda_note'] != '':
self.pool.get('account.bank.statement').write(cr, uid, [statement['id']], {'coda_note': statement['coda_note']}, context=context) self.pool.get('account.bank.statement').write(cr, uid, [statement['id']], {'coda_note': statement['coda_note']}, context=context)
model, action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'action_bank_statement_tree')
action = self.pool.get(model).browse(cr, uid, action_id, context=context)
return { return {
'name': 'Bank Statements', 'name': action.name,
'view_type': 'form', 'view_type': action.view_type,
'view_mode': 'tree,form', 'view_mode': action.view_mode,
'res_model': 'account.bank.statement', 'res_model': action.res_model,
'view_id': False, 'domain': action.domain,
'context': context, 'context': action.context,
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
'search_view_id': action.search_view_id.id,
} }