Merge lp:~fabien-morin/unifield-server/fm-us-3081 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/base/ir/ir_model.py'
--- bin/addons/base/ir/ir_model.py	2017-05-12 15:07:08 +0000
+++ bin/addons/base/ir/ir_model.py	2017-09-26 07:32:18 +0000
@@ -524,6 +524,10 @@
             # TODO: exclude xml-rpc requests
             return True
 
+        if uid== self.pool.get('res.users')._get_sync_user_id(cr):
+            # User for sync have all accesses
+            return True
+
         assert mode in ['read','write','create','unlink'], 'Invalid access mode'
 
         if isinstance(model, browse_record):

=== modified file 'bin/addons/base/res/res_user.py'
--- bin/addons/base/res/res_user.py	2017-06-22 14:27:28 +0000
+++ bin/addons/base/res/res_user.py	2017-09-26 07:32:18 +0000
@@ -233,6 +233,7 @@
 
 class users(osv.osv):
     __admin_ids = {}
+    __sync_user_ids = {}
     _uid_cache = {}
     _name = "res.users"
     _order = 'name'
@@ -544,6 +545,13 @@
             self.__admin_ids[cr.dbname] = ir_model_data_obj.read(cr, 1, [mdid], ['res_id'])[0]['res_id']
         return self.__admin_ids[cr.dbname]
 
+    def _get_sync_user_id(self, cr):
+        if self.__sync_user_ids.get(cr.dbname) is None:
+            ir_model_data_obj = self.pool.get('ir.model.data')
+            mdid = ir_model_data_obj._get_id(cr, 1, 'base', 'user_sync')
+            self.__sync_user_ids[cr.dbname] = ir_model_data_obj.read(cr, 1, [mdid], ['res_id'])[0]['res_id']
+        return self.__sync_user_ids[cr.dbname]
+
     def _get_company(self,cr, uid, context=None, uid2=False):
         if not uid2:
             uid2 = uid

=== modified file 'bin/addons/msf_profile/data.xml'
--- bin/addons/msf_profile/data.xml	2017-08-21 10:09:52 +0000
+++ bin/addons/msf_profile/data.xml	2017-09-26 07:32:18 +0000
@@ -43,6 +43,13 @@
     	<field name="context_lang">en_MF</field>
     </record>
 
+    <record model="res.users" id="base.user_sync">
+        <field name="signature">Synch</field>
+        <field name="name">Synch</field>
+        <field name="login">synch</field>
+    	<field name="context_lang">en_MF</field>
+    </record>
+
     <record id="sale.shop" model="sale.shop">
         <field name="name">MSF</field>
     </record>

=== modified file 'bin/addons/sync_client/sync_client.py'
--- bin/addons/sync_client/sync_client.py	2017-09-04 07:28:47 +0000
+++ bin/addons/sync_client/sync_client.py	2017-09-26 07:32:18 +0000
@@ -1059,6 +1059,9 @@
     def execute_message(self, cr, uid, context=None):
         context = context or {}
         logger = context.get('logger')
+        # force user to user_sync
+        uid = self.pool.get('res.users')._get_sync_user_id(cr)
+
         messages = self.pool.get(context.get('message_received_model', 'sync.client.message_received'))
 
         # Get the whole list of messages to execute

=== modified file 'bin/addons/sync_client/update.py'
--- bin/addons/sync_client/update.py	2017-08-18 10:05:40 +0000
+++ bin/addons/sync_client/update.py	2017-09-26 07:32:18 +0000
@@ -434,6 +434,10 @@
     def execute_update(self, cr, uid, ids=None, priorities=None, context=None):
         context = dict(context or {}, sync_update_execution=True)
         context['lang'] = 'en_US'
+
+        # force user to user_sync
+        uid = self.pool.get('res.users')._get_sync_user_id(cr)
+
         local_entity = self.pool.get('sync.client.entity').get_entity(
             cr, uid, context=context)
 

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2017-08-18 14:26:52 +0000
+++ bin/osv/orm.py	2017-09-26 07:32:18 +0000
@@ -2240,8 +2240,9 @@
         self.check_id = 0
         cr.execute('delete from wkf_instance where res_type=%s', (self._name,))
 
-    def _check_access(self, uid, object_id, mode):
-        if uid != 1 and self.datas[object_id]['internal.create_uid'] != uid:
+    def _check_access(self, cr, uid, object_id, mode):
+        user_obj = self.pool.get('res.users')
+        if uid != 1 and uid != user_obj._get_sync_user_id(cr) and self.datas[object_id]['internal.create_uid'] != uid:
             raise except_orm(_('AccessError'), '%s access is only allowed on your own records for osv_memory objects except for the super-user' % mode.capitalize())
 
     def vaccum(self, cr, uid, force=False):
@@ -2293,7 +2294,7 @@
                 for f in fields_to_read:
                     record = self.datas.get(id)
                     if record:
-                        self._check_access(user, id, 'read')
+                        self._check_access(cr, user, id, 'read')
                         r[f] = record.get(f, False)
                         if r[f] and isinstance(self._columns[f], fields.binary) and context.get('bin_size', False):
                             r[f] = len(r[f])
@@ -2347,7 +2348,7 @@
             else:
                 upd_todo.append(field)
         for object_id in ids:
-            self._check_access(user, object_id, mode='write')
+            self._check_access(cr, user, object_id, mode='write')
             try:
                 self.datas[object_id].update(vals2)
             except KeyError:
@@ -2557,7 +2558,7 @@
 
     def unlink(self, cr, uid, ids, context=None):
         for id in ids:
-            self._check_access(uid, id, 'unlink')
+            self._check_access(cr, uid, id, 'unlink')
             self.datas.pop(id, None)
         if len(ids):
             cr.execute('delete from wkf_instance where res_type=%s and res_id IN %s', (self._name, tuple(ids)))
@@ -2568,7 +2569,7 @@
         credentials = self.pool.get('res.users').name_get(cr, user, [user])[0]
         create_date = time.strftime('%Y-%m-%d %H:%M:%S')
         for id in ids:
-            self._check_access(user, id, 'read')
+            self._check_access(cr, user, id, 'read')
             result.append({
                 'create_uid': credentials,
                 'create_date': create_date,