Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-mail_issues-fix-adh-1168388 into lp:openobject-addons/7.0

  1. 7.0-mail_issues-fix-adh-1168388
  2. Merge into 7.0
Proposed by Anand Dharampuriya(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-mail_issues-fix-adh-1168388
Merge into: lp:openobject-addons/7.0
Diff against target: 25 lines (+2/-2)
2 files modified
mail/mail_followers.py (+1/-1)
mail/wizard/invite.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-mail_issues-fix-adh-1168388
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+222138@code.launchpad.net

Description of the change

Hello,
Here I had solved signature problem.
When you send a message with signature of multiple lines then linespace between two lines from signature were removed.

To post a comment you must log in.

Unmerged revisions

10064. By Anand Dharampuriya(OpenERP)

[FIX] Mail: Solve Blank lines in signature and body are erased if you send a message

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mail/mail_followers.py'
2--- mail/mail_followers.py 2013-05-13 14:26:33 +0000
3+++ mail/mail_followers.py 2014-06-05 09:06:05 +0000
4@@ -151,7 +151,7 @@
5 # body_html = tools.append_content_to_html(body_html, quote_context, plaintext=False)
6 signature = msg.author_id and msg.author_id.user_ids and msg.author_id.user_ids[0].signature or ''
7 if signature:
8- body_html = tools.append_content_to_html(body_html, signature, plaintext=True, container_tag='div')
9+ body_html = tools.append_content_to_html(body_html, signature, plaintext=True, preserve=True, container_tag='div')
10
11 # email_from: partner-user alias or partner email or mail.message email_from
12 if msg.author_id and msg.author_id.user_ids and msg.author_id.user_ids[0].alias_domain and msg.author_id.user_ids[0].alias_name:
13
14=== modified file 'mail/wizard/invite.py'
15--- mail/wizard/invite.py 2014-02-11 10:51:03 +0000
16+++ mail/wizard/invite.py 2014-06-05 09:06:05 +0000
17@@ -65,7 +65,7 @@
18 user_id = self.pool.get("res.users").read(cr, uid, [uid], fields=["signature"], context=context)[0]
19 signature = user_id and user_id["signature"] or ''
20 if signature:
21- wizard.message = tools.append_content_to_html(wizard.message, signature, plaintext=True, container_tag='div')
22+ wizard.message = tools.append_content_to_html(wizard.message, signature, plaintext=True, preserve=True, container_tag='div')
23 # FIXME 8.0: use notification_email_send, send a wall message and let mail handle email notification + message box
24 for follower_id in new_follower_ids:
25 mail_mail = self.pool.get('mail.mail')