use tag for activities dependencies instead of method_id

product/ERP5SyncML/Document/SyncMLSubscription.py

@@ -1001,4 +1001,5 @@ class SyncMLSubscription(XMLObject):
                            method_kw={"no_conflict": True},
                            min_depth=1,
                            max_depth=1,
-                           activate_kw={'priority': ACTIVITY_PRIORITY})
+                           activate_kw={'priority': ACTIVITY_PRIORITY,
+                                        'tag' : "%s_reset" % self.getPath()})

product/ERP5SyncML/Engine/EngineMixin.py

@@ -453,8 +453,7 @@ class EngineMixin(object):
     if subscriber.getIsActivityEnabled():
       subscriber.activate(
         activity="SQLQueue",
-        after_method_id_list=("reset",
-                              "_recurseCallMethod"),
+        after_tag = "%s_reset" % subscriber.getPath(),
         # Wait for all reset to be done
         # before starting sync
         priority=ACTIVITY_PRIORITY,

product/ERP5SyncML/Tool/SynchronizationTool.py

@@ -379,8 +379,7 @@ class SynchronizationTool(BaseTool):
     # XXX This must depends on activity enables property, maybe use engine
     if subscription.getIsActivityEnabled():
       subscription.activate(
-        after_method_id_list=("reset",
-                              "_recurseCallMethod"),
+        after_tag="%s_reset" %(subscription.getPath(),),
         activity="SQLQueue",
         priority=ACTIVITY_PRIORITY,
         tag=subscription.getRelativeUrl()).sendMessage(str(syncml_response))