Merge lp:~jfb-tempo-consulting/unifield-wm/sync_uf-2534 into lp:unifield-wm/sync

[jftempo]

=== modified file 'msf_sync_data_server/data/sync_server.sync_rule.csv'
--- msf_sync_data_server/data/sync_server.sync_rule.csv	2014-11-21 10:34:41 +0000
+++ msf_sync_data_server/data/sync_server.sync_rule.csv	2014-11-21 13:23:29 +0000
@@ -122,6 +122,7 @@
 msf_sync_data_server.access_rights_header,TRUE,TRUE,TRUE,bidirectional,Down,[],"['active', 'comment', 'domain_id/id', 'domain_text', 'family_model_ids/id', 'group_ids/id', 'instance_level', 'model_id/id', 'model_name', 'name', 'status']",OC,msf_field_access_rights.field_access_rule,,Field Access Rules,Valid,,703
 msf_sync_data_server.access_rights_lines,TRUE,TRUE,TRUE,bidirectional,Down,[],"['field/id', 'field_access_rule/id', 'field_access_rule_model_id', 'field_name', 'value_not_synchronized_on_create', 'value_not_synchronized_on_write', 'write_access']",OC,msf_field_access_rights.field_access_rule_line,,Field Access Rule Lines,Valid,,704
 msf_sync_data_server.button_access_rules,TRUE,TRUE,FALSE,bidirectional,Down,[],"['active', 'comment', 'group_ids/id', 'group_names', 'label', 'model_id/id', 'name', 'type', 'view_id/id']",OC,msf_button_access_rights.button_access_rule,,Button Access Rules,Valid,,705
+msf_sync_data_server.window_actions,TRUE,TRUE,FALSE,bidirectional,Down,"[('res_model','!=','audittrail.log.line')]",['groups_id/id'],OC,ir.actions.act_window,,Window Action groups,Valid,,706
 msf_usb_sync_data_server.cp_res_groups,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['comment', 'from_file_import_res_groups', 'name', 'visible_res_groups', 'is_an_admin_profile']",USB,res.groups,,[CONFIG] Group,Valid,,1000
 msf_usb_sync_data_server.cp_res_users,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,"[('active', '=', True)]","['email', 'login', 'name', 'user_email']",USB,res.users,,[CONFIG] Res Users,Valid,,1001
 msf_usb_sync_data_server.cp_ir_model_data,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['group_id/id', 'model_id/id', 'name', 'perm_create', 'perm_read', 'perm_unlink', 'perm_write']",USB,ir.model.access,,[CONFIG] Access Control List,Valid,,1010

=== modified file 'sync_common/common.py'
--- sync_common/common.py	2014-09-08 12:59:55 +0000
+++ sync_common/common.py	2014-11-21 13:23:29 +0000
@@ -28,7 +28,7 @@
                     'ir.property',
                     'ir.actions.todo',
                     'ir.sequence.type',
-                    'ir.actions.act_window',
+                    #'ir.actions.act_window',
                     'ir.module.module',
                     'ir.ui.view',
                     'ir.module.repository',

=== modified file 'sync_so/specific_xml_id.py'
--- sync_so/specific_xml_id.py	2014-10-28 15:55:55 +0000
+++ sync_so/specific_xml_id.py	2014-11-21 13:23:29 +0000
@@ -40,6 +40,26 @@
 
 account_journal()
 
+class ir_actions_act_window(osv.osv):
+    _inherit = 'ir.actions.act_window'
+
+    def get_unique_xml_name(self, cr, uid, uuid, table_name, res_id):
+        model_data_obj = self.pool.get('ir.model.data')
+        sdref_ids = model_data_obj.search(cr, uid, [('model','=',self._name),('res_id','=',res_id),('module','!=','sd')])
+        if not sdref_ids:
+            return super(ir_actions_act_window, self).get_unique_xml_name(cr, uid, uuid, table_name, res_id)
+        origin_xmlid = model_data_obj.read(cr, uid, sdref_ids[0], ['module', 'name'])
+        return get_valid_xml_name(origin_xmlid['module'], origin_xmlid['name'])
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
+        if context.get('sync_update_execution') and 'groups_id/id' in context.get('fields', []) and 'groups_id' not in vals:
+            vals['groups_id'] = [(6, 0, [])]
+        return super(ir_actions_act_window, self).write(cr, uid, ids, vals, context)
+
+ir_actions_act_window()
+
 class bank_statement(osv.osv):
 
     _inherit = 'account.bank.statement'