Merge lp:~akretion-team/ocb-server/fix-user-creation-in-multi-company into lp:ocb-server

[arthru]

I propose to merge https://code.launchpad.net/~openerp-dev/openobject-server/7.0-opw-591308-jam/+merge/158311 to OCB as there is no update on merging it in main branch despite many approval.

I've tested it on revno 5061 of lp:ocb-server and it works just fine (res_users and its res_partner have the same company_id) and there is no more Access Denied error (as described in https://bugs.launchpad.net/openobject-server/+bug/1073087).

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks! I tested the original fix and as far as I can see this is the exact same change.

review: Approve (core review, testing)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve

[Holger Brunn (Therp) (hbrunn)]

I think the error message in 17 sounds weird. Wouldn't "You cannot change the company as the partner has multiple users linked with different companies." be better?

review: Approve

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2013-06-12 09:53:00 +0000
+++ openerp/addons/base/res/res_partner.py	2013-08-12 18:04:04 +0000
@@ -489,6 +489,16 @@
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
+        #res.partner must only allow to set the company_id of a partner if it
+        #is the same as the company of all users that inherit from this partner
+        #(this is to allow the code from res_users to write to the partner!) or
+        #if setting the company_id to False (this is compatible with any user company)
+        if vals.get('company_id'):
+            for partner in self.browse(cr, uid, ids, context=context):
+                if partner.user_ids:
+                    user_companies = set([user.company_id.id for user in partner.user_ids])
+                    if len(user_companies) > 1 or vals['company_id'] not in user_companies:
+                        raise osv.except_osv(_("Warning"),_("You can not change the company as the partner/user has multiple user linked with different companies."))
         result = super(res_partner,self).write(cr, uid, ids, vals, context=context)
         for partner in self.browse(cr, uid, ids, context=context):
             self._fields_sync(cr, uid, partner, vals, context)
 
=== modified file 'openerp/addons/base/res/res_users.py'
--- openerp/addons/base/res/res_users.py	2013-06-07 09:30:57 +0000
+++ openerp/addons/base/res/res_users.py	2013-08-12 18:04:04 +0000
@@ -279,6 +279,13 @@
 
         return result
 
+    def create(self, cr, uid, vals, context=None):
+        user_id = super(res_users, self).create(cr, uid, vals, context=context)
+        user = self.browse(cr, uid, user_id, context=context)
+        if user.partner_id.company_id: 
+            user.partner_id.write({'company_id': user.company_id.id})
+        return user_id
+
     def write(self, cr, uid, ids, values, context=None):
         if not hasattr(ids, '__iter__'):
             ids = [ids]
@@ -293,7 +300,11 @@
                 uid = 1 # safe fields only, so we write as super-user to bypass access rights
 
         res = super(res_users, self).write(cr, uid, ids, values, context=context)
-
+        if 'company_id' in values:
+            for user in self.browse(cr, uid, ids, context=context):
+                # if partner is global we keep it that way
+                if user.partner_id.company_id and user.partner_id.company_id.id != values['company_id']: 
+                    user.partner_id.write({'company_id': user.company_id.id})
         # clear caches linked to the users
         self.pool.get('ir.model.access').call_cache_clearing_methods(cr)
         clear = partial(self.pool.get('ir.rule').clear_cache, cr)