summaryrefslogtreecommitdiff
path: root/addons/mail
diff options
context:
space:
mode:
authorFabien Pinckaers <fp@tinyerp.com>2011-11-08 23:53:37 +0100
committerFabien Pinckaers <fp@tinyerp.com>2011-11-08 23:53:37 +0100
commit3d9b149dcccf932cff09bc4e1c3dbcb167348e5d (patch)
tree6f0a6e029d360c7a3aa1db849d1efe5bfbaa7eb6 /addons/mail
parent59ca0770d4c2e3e9a2399865101e7ac9936edee0 (diff)
parentb8519868a80cb76e0b18f021f134e3bc6105eb95 (diff)
[imp] merge + cleaning: contract managemeent, not perfect yet, but good enough -> to replace static email one day
bzr revid: fp@tinyerp.com-20111108225337-5muyehnvgqasv44i
Diffstat (limited to 'addons/mail')
-rw-r--r--addons/mail/mail_message.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 621eef59da5..b8d038b15c3 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -74,7 +74,7 @@ class mail_message_common(osv.osv_memory):
'model': fields.char('Related Document model', size=128, select=1, readonly=1),
'res_id': fields.integer('Related Document ID', select=1, readonly=1),
'date': fields.datetime('Date'),
- 'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences'),
+ 'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences. If empty, this is not a mail but a message.'),
'email_to': fields.char('To', size=256, help='Message recipients'),
'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'),