Merge lp:~openerp-dev/openobject-addons/trunk-bug-1111499-cga into lp:openobject-addons

Proposed by Chandni Gandhi(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1111499-cga
Merge into: lp:openobject-addons
Diff against target: 12 lines (+1/-1)
1 file modified
mail/mail_message.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1111499-cga
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+146397@code.launchpad.net

Description of the change

Hello,

Change from to sender in mail.message.

Thanks

To post a comment you must log in.
8532. By Chandni Gandhi(OpenERP)

[MERGE]:With latest code

Unmerged revisions

8532. By Chandni Gandhi(OpenERP)

[MERGE]:With latest code

8531. By Chandni Gandhi(OpenERP)

[FIX]:Change from to sender for mail.message object

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mail/mail_message.py'
2--- mail/mail_message.py 2013-01-15 11:39:20 +0000
3+++ mail/mail_message.py 2013-02-08 11:33:22 +0000
4@@ -137,7 +137,7 @@
5 ], 'Type',
6 help="Message type: email for email message, notification for system "\
7 "message, comment for other messages such as user replies"),
8- 'email_from': fields.char('From',
9+ 'email_from': fields.char('Sender',
10 help="Email address of the sender. This field is set when no matching partner is found for incoming emails."),
11 'author_id': fields.many2one('res.partner', 'Author', select=1,
12 ondelete='set null',

Subscribers

People subscribed via source and target branches

to all changes: