odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] email_template, emails:- improve default set value. context pass on onchange method and check in method if mail is reply then donot change the value in send mail wizard. 

bzr revid: ysa@tinyerp.com-20110223162249-ruiaknvx0i9o4xec
This commit is contained in:
Yogesh (OpenERP) 2011-02-23 21:52:49 +05:30
parent 174534ff5e
commit bf37d84341
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/email_template/wizard/email_compose_message.py
View File

@ -56,6 +56,8 @@ class email_compose_message(osv.osv_memory):
def on_change_template(self, cr, uid, ids, model, resource_id, template_id, context=None):
if context is None:
context = {}
if context.get('mail') == 'reply':
return {'value':{}}
email_temp_previ_pool = self.pool.get('email_template.preview')
result = self.on_change_referred_doc(cr, uid, [], model, resource_id, context=context)
vals = result.get('value',{})

4
addons/email_template/wizard/email_compose_message_view.xml
View File

@ -10,10 +10,10 @@
<field name="arch" type="xml">
<field name="res_id" position="replace">
<field name="template_id" colspan="4"
on_change="on_change_template(model, res_id, template_id)"/>
on_change="on_change_template(model, res_id, template_id, context)"/>
<field name="res_id"
invisible="context.get('active_model','') != 'ir.ui.menu'"
colspan="4" on_change="on_change_template(model, res_id, template_id)"/>
colspan="4" on_change="on_change_template(model, res_id, template_id, context)"/>
</field>
</field>
</record>

2
addons/emails/wizard/email_compose_message_view.xml
View File

@ -11,7 +11,7 @@
<group col="6" colspan="4">
<field name="model" invisible="1"/>
<field name="res_id" invisible="context.get('active_model','') != 'ir.ui.menu'"
colspan="4" on_change="on_change_referred_doc(model, res_id)"/>
colspan="4" on_change="on_change_referred_doc(model, res_id, context)"/>
<field name="smtp_server_id" widget="selection" colspan="4"/>
<field name="email_from" colspan="4" required="1"/>
<field name="email_to" colspan="4" required="1"/>

2
addons/hr_evaluation/wizard/email_compose_message.py
View File

@ -56,6 +56,8 @@ class email_compose_message(osv.osv_memory):
def on_change_referred_doc(self, cr, uid, ids, model, resource_id, context=None):
if context is None:
context = {}
if context.get('mail') == 'reply':
return {'value':{}}
result = super(email_compose_message, self).on_change_referred_doc(cr, uid, ids, model, resource_id, context=context)
value = {}
if not result.get('value'):