Merge lp:~openerp-dev/openobject-addons/6.1-opw-574367-dhs into lp:openobject-addons/6.1

[Dhruti Shastri(OpenERP)]

To reproduce:
 - install SALE and CRM
 - create a user and assigned the default team to him
 - enable extended view
 - go to Sales > Configuration > Sales > Sales Teams
 - open the default team

 Expected behaviour:
 - the team members list should contain the new user

 Current behaviour:
 - the team members is empty

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Not Relevant on Trunk (means that architecture on trunk has changed and so this bug has no meaning anymore). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,

Unmerged revisions

6833. By Dhruti Shastri(OpenERP) on 2012-06-06

[crm] : User having with Sales Team is shown as member in SalesTeam (Case:574367)

=== modified file 'crm/crm.py'
--- crm/crm.py	2012-03-08 15:58:35 +0000
+++ crm/crm.py	2012-06-06 12:13:23 +0000
@@ -125,6 +125,24 @@
         (osv.osv._check_recursion, 'Error ! You cannot create recursive Sales team.', ['parent_id'])
     ]
 
+    def write(self, cr, uid, ids, vals, context=None):
+        new_users = vals.get('member_ids',[])
+        if new_users:
+            user_obj = self.pool.get('res.users')
+            old_users_ids = {}
+            map(lambda x:old_users_ids.setdefault(x.id, x.member_ids), self.browse(cr, uid, ids, context=context))
+            new_user = []
+            if new_users[0][0] == 6 and new_users[0][2]:
+                new_user = new_users[0][2]
+            elif new_users[0][0] == 4 and new_users[0][1]:
+                new_user = [new_users[0][1]]
+            for id in ids:
+                users = list (set(old_users_ids[id]).difference(set(new_user)))
+                user_to_modify = map(lambda x:x.id, users)
+                user_obj.write(cr, uid, user_to_modify, {'context_section_id':False}, context)
+
+        return super(crm_case_section, self).write(cr, uid, ids, vals, context=context)
+    
     def name_get(self, cr, uid, ids, context=None):
         """Overrides orm name_get method"""
         if not isinstance(ids, list) : 
@@ -576,6 +594,15 @@
         if vals.get('context_section_id'):
             section_obj.write(cr, uid, [vals['context_section_id']], {'member_ids':[(4, res)]}, context)
         return res
+    
+    def write (self, cr, uid, ids, vals, context=None):
+        res = super(users, self).write(cr, uid, ids, vals, context=context)
+        section_obj=self.pool.get('crm.case.section')
+        section_id = vals.get('context_section_id', False)
+        if section_id:
+            for id in ids:
+                section_obj.write(cr, uid, [section_id], {'member_ids':[(4,id)]}, context)
+        return res
 
 users()