summaryrefslogtreecommitdiff
path: root/addons/mail
diff options
context:
space:
mode:
authorJigar Amin - OpenERP <jam@tinyerp.com>2011-09-30 13:49:38 +0530
committerJigar Amin - OpenERP <jam@tinyerp.com>2011-09-30 13:49:38 +0530
commit07d867c8ba7d00a86eea0fabc188679c6d735bcb (patch)
tree49b2896d77104fb9ad67ebb5d648222faf54f713 /addons/mail
parent1a4a2b4dd8feb0e7d861eae0656b60e0d6e4cdcf (diff)
parent8507f7cc4a446da13a83abf5ff711a730bc60e8c (diff)
[MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20110930081938-038gqqc9km9u2l98
Diffstat (limited to 'addons/mail')
-rw-r--r--addons/mail/wizard/mail_compose_message.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 0bfaf06890a..93bf0b004d8 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -82,9 +82,9 @@ class mail_compose_message(osv.osv_memory):
else:
# default mode
result['model'] = context.get('active_model', False)
- if vals:
- for field in fields:
- result.update({field : vals.get(field, False)})
+ for field in vals:
+ if field in fields:
+ result.update({field : vals[field]})
# link to model and record if not done yet
if not result.get('model') or not result.get('res_id'):