diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-11-15 13:51:13 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-11-15 13:51:13 +0100 |
| commit | 3571ad2a70a8dcdbecd6d749fca6300f393362cc (patch) | |
| tree | 00c37bc493be57a13edf6b1d380d018c7ba5edb7 /addons/mail/static/src/xml/mail.xml | |
| parent | 6227e4b5c04b9ee861511a45f7b50806e27cf33c (diff) | |
| parent | da9951baf9e8631e97ae0b8bde69eb03e6f34fdf (diff) | |
[MERGE] Fixes some posting/email_template issues. Also cleans an old hack about res.users view redirected to its related res.partner.
Addons-side:
- res.users wraps the 2 posting methods, because mailboxes are still related to the user, not the partner, due to some technical issues
- mail.compose.message using email_template: _reopen is back, as the spec of a wizard should be that hitting a button close it. Therefore _reopen is necessaru to reopen the wizard with its previous value, to continue working on it.
bzr revid: tde@openerp.com-20121115125113-oxn2vwunsvkinxkd
Diffstat (limited to 'addons/mail/static/src/xml/mail.xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 2ba1733043a..89fbe45dc36 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -95,14 +95,6 @@ </t> </t> - <t t-name="mail.thread.message.private"> - <div> - <span class="oe_placeholder_checkbox_private"/> - <span class="oe_send_private">This email is private.</span> - <span class="oe_send_public">I wrote for contacts and all my followers.</span> - </div> - </t> - <!-- template to the recipients list --> |