diff options
| author | Antonin Bourguignon <abo@openerp.com> | 2012-10-30 16:46:47 +0100 |
|---|---|---|
| committer | Antonin Bourguignon <abo@openerp.com> | 2012-10-30 16:46:47 +0100 |
| commit | 5be9d20a0bb33cc7d85bf26ade2628f8affbbdfd (patch) | |
| tree | 10cfc4c9f9de428aede7ad533222d5261730b5c4 /addons/mail/wizard | |
| parent | 614768508725c766e37702ff0fa3b47c411b680d (diff) | |
| parent | 87d3caa50f8598eda05b1638edf46491ef01d27a (diff) | |
[MERGE] trunk
bzr revid: abo@openerp.com-20121030154647-6acbljvitcmphriz
Diffstat (limited to 'addons/mail/wizard')
| -rw-r--r-- | addons/mail/wizard/mail_compose_message.py | 7 | ||||
| -rw-r--r-- | addons/mail/wizard/mail_compose_message_view.xml | 18 |
2 files changed, 6 insertions, 19 deletions
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index b68aae14521..1bcbb0c2efc 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -156,12 +156,6 @@ class mail_compose_message(osv.TransientModel): reply_subject = tools.ustr(message_data.subject or '') if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)) and message_data.subject: reply_subject = "%s %s" % (re_prefix, reply_subject) - # create the reply in the body - reply_body = _('<div>On %(date)s, %(sender_name)s wrote:<blockquote>%(body)s</blockquote></div>') % { - 'date': message_data.date if message_data.date else '', - 'sender_name': message_data.author_id.name, - 'body': message_data.body, - } # get partner_ids from original message partner_ids = [partner.id for partner in message_data.partner_ids] if message_data.partner_ids else [] @@ -170,7 +164,6 @@ class mail_compose_message(osv.TransientModel): 'model': message_data.model, 'res_id': message_data.res_id, 'parent_id': message_data.id, - 'body': reply_body, 'subject': reply_subject, 'partner_ids': partner_ids, 'content_subtype': 'html', diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index 255954e31c1..1f00ed419a2 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -14,22 +14,16 @@ <field name="parent_id" invisible="1"/> <field name="content_subtype" invisible="1"/> <!-- visible wizard --> - <field name="subject" placeholder="Subject..." - attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>/> <field name="partner_ids" widget="many2many_tags" placeholder="Add contacts to notify..." context="{'force_email':True}" - on_change="onchange_partner_ids(partner_ids)"/> + on_change="onchange_partner_ids(partner_ids)" required="1"/> + <field name="subject" placeholder="Subject..." + attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/> </group> - <notebook> - <page string="Body"> - <field name="body" nolabel="1"/> - </page> - <page string="Attachments"> - <field name="attachment_ids" colspan="4" nolabel="1"/> - </page> - </notebook> + <field name="body"/> + <field name="attachment_ids" widget="one2many_binary" blockui="0"/> <footer> - <button string="Send" name="send_mail" type="object" class="oe_highlight" /> + <button string="Send" name="send_mail" type="object" class="oe_highlight"/> or <button string="Cancel" class="oe_link" special="cancel" /> </footer> |