Merge lp:~jfb-tempo-consulting/unifield-wm/UF-2462 into lp:unifield-wm/sync

[jftempo]

=== modified file 'sync_so/specific_xml_id.py'
--- sync_so/specific_xml_id.py	2014-09-26 13:31:31 +0000
+++ sync_so/specific_xml_id.py	2014-10-03 09:56:08 +0000
@@ -340,6 +340,8 @@
 
     # Generate delete message for AJI at Project
     def generate_delete_message_at_project(self, cr, uid, ids, vals, context):
+        if context is None:
+            context = {}
         # NEED REFACTORING FOR THIS METHOD, if the action write on Analytic.line happens often!
         msf_instance_obj = self.pool.get('msf.instance')
         msg_to_send_obj = self.pool.get("sync.client.message_to_send")
@@ -368,18 +370,20 @@
 
             # UF-1011: generate delete msg if correction is made on coordo CC coming from project
             old_destination_level = self.get_instance_level_from_cost_center(cr, uid, old_cost_center_id, context=context)
-            if old_destination_level == 'coordo' and not xml_id_record.name.startswith(instance_identifier) and instance_level == 'coordo':
+            if not context.get('sync_update_execution') and old_destination_level == 'coordo' and not xml_id_record.name.startswith(instance_identifier) and instance_level == 'coordo':
                 creation_instance_ids = msf_instance_obj.search(cr, uid, [('instance_identifier', '=', xml_id_record.name.split('/')[0]), ('level', '=', 'project')])
                 if creation_instance_ids:
                     msf_instance = msf_instance_obj.browse(cr, uid, creation_instance_ids[0])
-                    now = fields.datetime.now()
-                    message_data = {'identifier':'delete_%s' % (xml_id,),
-                        'sent':False,
-                        'generate_message':True,
-                        'remote_call':self._name + ".message_unlink_analytic_line",
-                        'arguments':"[{'model' :  '%s', 'xml_id' : '%s', 'correction_date' : '%s'}]" % (self._name, xml_id, now),
-                        'destination_name': msf_instance.name}
-                    msg_to_send_obj.create(cr, uid, message_data)
+                    new_destination_name = self.get_instance_name_from_cost_center(cr, uid, new_cost_center_id, context=context)
+                    if new_destination_name != msf_instance.name:
+                        now = fields.datetime.now()
+                        message_data = {'identifier':'delete_%s' % (xml_id,),
+                            'sent':False,
+                            'generate_message':True,
+                            'remote_call':self._name + ".message_unlink_analytic_line",
+                            'arguments':"[{'model' :  '%s', 'xml_id' : '%s', 'correction_date' : '%s'}]" % (self._name, xml_id, now),
+                            'destination_name': msf_instance.name}
+                        msg_to_send_obj.create(cr, uid, message_data)
 
             # UF-2342: only generate delete message if the instance is at Project level
             if old_destination_level == 'project':