diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-07-11 09:52:57 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-07-11 09:52:57 +0200 |
| commit | 1daefb8fd5fb344f6e9ea0bce03b3ffbfbc8253d (patch) | |
| tree | b3a07be7bd960593df315512b5f471eebd497d03 /addons/mail | |
| parent | d43db51a02806d175079ce63b755502c05c50db1 (diff) | |
| parent | 6cbb04758af8d1e7056df3eadbf1b490b958b0b5 (diff) | |
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120711075257-1gldrjfxw8vgi7hx
Diffstat (limited to 'addons/mail')
| -rw-r--r-- | addons/mail/mail_thread.py | 2 | ||||
| -rw-r--r-- | addons/mail/wizard/mail_compose_message_view.xml | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 63fb98a4945..532cc8b3982 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -69,7 +69,7 @@ class mail_thread(osv.Model): subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context) res[id] = { 'message_ids': message_ids, - 'message_summary': "<span><span class='oe_e'>9</span> %d</span> . <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)), + 'message_summary': "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)), } return res diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index 86a9bd87c00..ee0c5a66e70 100644 --- a/addons/mail/wizard/mail_compose_message_view.xml +++ b/addons/mail/wizard/mail_compose_message_view.xml @@ -7,11 +7,6 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Compose Email" version="7.0"> - <header> - <button name="send_mail" string="Send" type="object" class="oe_highlight" /> - or - <button string="Cancel" class="oe_link" special="cancel" /> - </header> <group> <field name="model" invisible="1"/> <field name="res_id" invisible="1"/> @@ -33,6 +28,11 @@ <field name="attachment_ids" colspan="4" nolabel="1"/> </page> </notebook> + <footer> + <button name="send_mail" string="Send" type="object" class="oe_highlight" /> + or + <button string="Cancel" class="oe_link" special="cancel" /> + </footer> </form> </field> </record> |