Merge lp:~openerp-dev/openobject-addons/trunk-bug-1168388-jar into lp:openobject-addons

Proposed by Jaydeep Barot(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1168388-jar
Merge into: lp:openobject-addons
Diff against target: 13 lines (+2/-1)
1 file modified
mail/mail_followers.py (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1168388-jar
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+199931@code.launchpad.net

Description of the change

Hello,

[trunk/7.0]blank lines in signature and body are erased if you send a message

     --> I have fix this problem add blank lines in signature and body when send a mail or add a followers time send a message.

Thanks,
Jaydeep Barot(jar).

To post a comment you must log in.

Unmerged revisions

9023. By Jaydeep Barot(OpenERP)

[FIX] replace '\n' into text and convert into html taq and remove plaintext2html method

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-10-27 12:31:04 +0000
3+++ mail/mail_followers.py 2013-12-23 04:39:15 +0000
4@@ -126,7 +126,8 @@
5 # add user signature
6 user = self.pool.get("res.users").browse(cr, SUPERUSER_ID, [user_id], context=context)[0]
7 if user.signature:
8- signature = plaintext2html(user.signature)
9+ text = user.signature
10+ signature = text.replace('\n','<br/>') + '<br/>'
11 else:
12 signature = "--<br />%s" % user.name
13 footer = tools.append_content_to_html(footer, signature, plaintext=False, container_tag='p')

Subscribers

People subscribed via source and target branches

to all changes: