Postpone deletion.

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/Delivery_migrateToCommonSaleTradeCondition.xml

@@ -54,12 +54,12 @@
 specialise_value = context.getSpecialiseValue()\n
 if specialise_value.getRelativeUrl() != common_specialise:\n
   context.setSpecialise(common_specialise)\n
-  specialise_value.getParentValue().deleteContent(specialise.getId())\n
+  specialise_value.getParentValue().activate(after_tag=tag).Module_deleteContentIfExists(specialise.getId())\n
 </string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string></string> </value>
+            <value> <string>tag</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/ERP5Site_migrateToCommonSaleTradeCondition.xml

@@ -50,9 +50,12 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>context.portal_catalog.searchAndActivate(\n
+            <value> <string>tag = \'Delivery_saleTradeConditionMigration\'\n
+context.portal_catalog.searchAndActivate(\n
   portal_type=[\'Sale Order\', \'Sale Packing List Line\'],\n
-  method_id=\'Delivery_migrateToCommonSaleTradeCondition\'\n
+  method_id=\'Delivery_migrateToCommonSaleTradeCondition\',\n
+  activity_kw={\'tag\': tag},\n
+  method_kw={\'tag\': tag}\n
 )\n
 </string> </value>
         </item>

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/Module_deleteContentIfExists.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>if id in context.objectIds():\n
+  context.deleteContent(id)\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>id</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Module_deleteContentIfExists</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

master/bt5/vifib_upgrader/bt/revision

-32
\ No newline at end of file
+33
\ No newline at end of file