diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-08-15 21:56:52 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-08-15 21:56:52 +0200 |
| commit | 61274acd896f72e6bec98deca8faa93d9895b118 (patch) | |
| tree | cd839020bde7def97753e5dd890d1012dde456b7 /addons/email_template/wizard/mail_compose_message_view.xml | |
| parent | a6482fe07c57805976529eebd48225b060a9a49c (diff) | |
| parent | 9958acdc3286f761b6ce76142598d628736a5540 (diff) | |
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120815195652-839w3fyumomq0ubf
Diffstat (limited to 'addons/email_template/wizard/mail_compose_message_view.xml')
| -rw-r--r-- | addons/email_template/wizard/mail_compose_message_view.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml index a2f38a890c2..0d4362d350e 100644 --- a/addons/email_template/wizard/mail_compose_message_view.xml +++ b/addons/email_template/wizard/mail_compose_message_view.xml @@ -5,7 +5,6 @@ <record model="ir.ui.view" id="email_compose_message_wizard_inherit_form"> <field name="name">mail.compose.message.form</field> <field name="model">mail.compose.message</field> - <field name="type">form</field> <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/> <field name="arch" type="xml"> <data> @@ -29,7 +28,6 @@ <record model="ir.ui.view" id="email_compose_message_wizard_inherit_form_chatter"> <field name="name">mail.compose.message.form</field> <field name="model">mail.compose.message</field> - <field name="type">form</field> <field name="inherit_id" ref="mail.email_compose_message_wizard_form_chatter"/> <field name="arch" type="xml"> <data> |