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

* Changes in to the python code remove comment 

bzr revid: mga@tinyerp.com-20080825090322-w7qe36114gltz7iv
This commit is contained in:
mga@tinyerp.com 2008-08-25 14:33:22 +05:30
parent f89f8c3c2d
commit 476f91a116
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/addons/base/ir/ir.xml
View File

@ -1058,7 +1058,7 @@
<page string="Email / SMS" attrs="{'invisible':[('state','=','python'),('state','=','dummy'),('state','=','trigger'), ('state','=','object_create'), ('state','=','object_write'), ('state','=','client_action'), ('state','=','other')]}">
<separator colspan="4" string="Email Configuration"/>
<field name="address" domain="[('model_id','=',model_id)]"/>
<field name="message" select="2" colspan="4"/>
<field name="message" select="2" colspan="4" widget="html_tag"/>
<newline/>
<label colspan="4" string="Access all the fields related to the current object easily just by defining name of the attribute, i.e. [[partner_id.name]] for Invoice Object"/>
</page>

1
bin/addons/base/ir/ir_actions.py
View File

@ -454,7 +454,6 @@ class actions_server(osv.osv):
address = self.get_field_value(cr, uid, action, context)
body = self.merge_message(cr, uid, action, context)
#TODO : Apply Mail merge in to the Content of the Email
if tools.email_send_attach(user, address, subject, body, debug=False) == True:
logger.notifyChannel('email', netsvc.LOG_INFO, 'Email successfully send to : %s' % (address))