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

[MERGE] improvement geoassign 

bzr revid: tfr@openerp.com-20110204151427-jph6qduupj5gsyo0
This commit is contained in:
Thibault Francois 2011-02-04 16:14:27 +01:00
parent 8b012aaad0 b578de61c0
commit 84fece6cf2
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/crm_partner_assign/partner_geo_assign.py
View File

@ -105,7 +105,12 @@ class crm_lead(osv.osv):
if not partner_assigned_id:
return {'value':{'date_assign': False}}
else:
return {'value':{'date_assign': time.strftime('%Y-%m-%d')}}
partners = self.pool.get('res.partner').browse(cr, uid, [partner_assigned_id], context=context)
user_id = partners[0] and partners[0].user_id.id or False
return {'value':
{'date_assign': time.strftime('%Y-%m-%d'),
'user_id' : user_id}
}
def assign_partner(self, cr, uid, ids, context=None):
ok = False

8
addons/crm_partner_assign/wizard/crm_forward_to_partner.py
View File

@ -151,9 +151,15 @@ class crm_lead_forward_to_partner(osv.osv_memory):
if not partner_id:
return {'value' : {'email_to' : False, 'address_id': False}}
addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['contact'])
partner_obj = self.pool.get('res.partner')
addr = partner_obj.address_get(cr, uid, [partner_id], ['contact'])
data = {'address_id': addr['contact']}
data.update(self.on_change_address(cr, uid, ids, addr['contact'])['value'])
partner = partner_obj.browse(cr, uid, [partner_id])
user_id = partner and partner[0].user_id or False
email = user_id and user_id.user_email or ''
data.update({'email_cc' : email})
return {
'value' : data,
'domain' : {'address_id' : partner_id and "[('partner_id', '=', partner_id)]" or "[]"}