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

event bug fix 

bzr revid: mra@tinyerp.com-20081008052916-6cnvyt3ao9alfznl
This commit is contained in:
Mustufa Rangwala 2008-10-08 10:59:16 +05:30
parent 8e70f5d37f
commit 7725c67a76
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/event/event.py
View File

@ -137,7 +137,7 @@ class event(osv.osv):
#change the description of the registration linked to this event
if 'mail_auto_confirm' in vals:
if vals['mail_auto_confirm']:
if 'mail_confirm' not in vals:
if 'mail_confirm' not in vals:
for eve in self.browse(cr, uid, ids):
vals['mail_confirm'] = eve.mail_confirm
else:
@ -288,8 +288,9 @@ class event_registration(osv.osv):
data['badge_title'] = contact_id.title
if partner:
partner_addresses = self.pool.get('res.partner.address').search(cr, uid, [('partner_id','=',partner)])
job_id = self.pool.get('res.partner.job').search(cr, uid, [('contact_id','=',contact),('address_id','in',partner_addresses)])[0]
data['email_from'] = self.pool.get('res.partner.job').browse(cr, uid, job_id).email
job_ids = self.pool.get('res.partner.job').search(cr, uid, [('contact_id','=',contact),('address_id','in',partner_addresses)])
if job_ids:
data['email_from'] = self.pool.get('res.partner.job').browse(cr, uid, job_ids[0]).email
d = self.onchange_badge_name(cr, uid, ids,data['badge_name'])
data.update(d['value'])