[MERGE] improvement geoassign
bzr revid: tfr@openerp.com-20110204151427-jph6qduupj5gsyo0
This commit is contained in:
commit
84fece6cf2
|
@ -105,7 +105,12 @@ class crm_lead(osv.osv):
|
||||||
if not partner_assigned_id:
|
if not partner_assigned_id:
|
||||||
return {'value':{'date_assign': False}}
|
return {'value':{'date_assign': False}}
|
||||||
else:
|
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):
|
def assign_partner(self, cr, uid, ids, context=None):
|
||||||
ok = False
|
ok = False
|
||||||
|
|
|
@ -151,9 +151,15 @@ class crm_lead_forward_to_partner(osv.osv_memory):
|
||||||
if not partner_id:
|
if not partner_id:
|
||||||
return {'value' : {'email_to' : False, 'address_id': False}}
|
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 = {'address_id': addr['contact']}
|
||||||
data.update(self.on_change_address(cr, uid, ids, addr['contact'])['value'])
|
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 {
|
return {
|
||||||
'value' : data,
|
'value' : data,
|
||||||
'domain' : {'address_id' : partner_id and "[('partner_id', '=', partner_id)]" or "[]"}
|
'domain' : {'address_id' : partner_id and "[('partner_id', '=', partner_id)]" or "[]"}
|
||||||
|
|
Loading…
Reference in New Issue