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

[jftempo]

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2017-02-15 16:30:46 +0000
+++ bin/addons/msf_profile/data/patches.xml	2017-04-18 15:00:37 +0000
@@ -5,6 +5,10 @@
             <field name="method">remove_not_synchronized_data</field>
         </record>
 
+        <record id="us_2632_patch" model="patch.scripts">
+            <field name="method">us_2632_patch</field>
+        </record>
+
         <record id="us_2110_patch" model="patch.scripts">
             <field name="method">us_2110_patch</field>
         </record>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2017-03-03 16:47:07 +0000
+++ bin/addons/msf_profile/msf_profile.py	2017-04-18 15:00:37 +0000
@@ -46,6 +46,16 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+    def us_2632_patch(self, cr, uid, *a, **b):
+        '''fix ir.model.data entries on sync_server instances
+        '''
+        update_module = self.pool.get('sync.server.update')
+        if update_module:
+            cr.execute("""
+            UPDATE ir_model_data SET module='msf_sync_data_server' WHERE
+            model='sync_server.message_rule' AND module='';
+            """)
+
     def remove_not_synchronized_data(self, cr, uid, *a, **b):
         '''
         The list of models to synchronize was wrong. It is now build
@@ -166,7 +176,7 @@
     def setup_security_on_sync_server(self, cr, uid, *a, **b):
         update_module = self.pool.get('sync.server.update')
         if not update_module:
-            # this script is exucuted on server side, update the first delete
+            # this script is executed on server side, update the first delete
             return
 
         data_obj = self.pool.get('ir.model.data')