openerp-dev-web team mailing list archive

["tfr \(Openerp\)" <tfr@xxxxxxxxxxx>]

tfr (Openerp) has proposed merging lp:~openerp-dev/openobject-addons/trunk-crm-imp-geoassign-tfr into lp:~openerp-dev/openobject-addons/addons1-crm-imp.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-crm-imp-geoassign-tfr/+merge/48590
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-crm-imp-geoassign-tfr/+merge/48590
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-crm-imp-geoassign-tfr into lp:~openerp-dev/openobject-addons/addons1-crm-imp.

=== modified file 'crm_partner_assign/partner_geo_assign.py'
--- crm_partner_assign/partner_geo_assign.py	2011-01-14 00:11:01 +0000
+++ crm_partner_assign/partner_geo_assign.py	2011-02-04 10:45:00 +0000
@@ -105,7 +105,12 @@
         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

=== modified file 'crm_partner_assign/wizard/crm_forward_to_partner.py'
--- crm_partner_assign/wizard/crm_forward_to_partner.py	2011-01-14 00:11:01 +0000
+++ crm_partner_assign/wizard/crm_forward_to_partner.py	2011-02-04 10:45:00 +0000
@@ -151,9 +151,15 @@
         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 "[]"}