Reintroduce scripts for accounting removal.

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader_20120423/AccountingTransaction_delete.xml → master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/AccountingTransaction_delete.xml

@@ -51,8 +51,9 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>accounting_module = context.getParentValue()\n
-if accounting_module.getPortalType() != \'Accounting Transaction Module\':\n
-  raise ValueError(\'%s is not children of Accounting Transaction Module\')\n
+\n
+assert accounting_module.getPortalType() == \'Accounting Transaction Module\'\n
+\n
 accounting_module.deleteContent(context.getId())\n
 </string> </value>
         </item>

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader_20120423/AccountingModule_initiateDelete.xml → master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/ERP5Site_initiateAccountingModuleRemoval.xml

@@ -52,8 +52,11 @@
             <key> <string>_body</string> </key>
             <value> <string>context.getPortalObject().portal_catalog.searchAndActivate(\n
   parent_uid=context.getPortalObject().accounting_module.getUid(),\n
-  method_id=\'AccountingTransaction_delete\'\n
+  method_id=\'AccountingTransaction_delete\',\n
+  activate_kw={\'tag\': \'AccountingTransaction_delete\'}\n
 )\n
+\n
+return \'Deletion initiated.\'\n
 </string> </value>
         </item>
         <item>
@@ -62,7 +65,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>AccountingModule_initiateDelete</string> </value>
+            <value> <string>ERP5Site_initiateAccountingModuleRemoval</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader_20120423/RootAppliedRule_delete.xml → master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/ERP5Site_initiateInvoiceAppliedRuleDeletion.xml

@@ -50,10 +50,22 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>simulation_tool = context.getParentValue()\n
-if simulation_tool.getPortalType() != \'Simulation Tool\':\n
-  raise ValueError(\'%s is not children of Simulation Tool\')\n
-simulation_tool.deleteContent(context.getId())\n
+            <value> <string>portal = context.getPortalObject()\n
+\n
+rule_uid_list = [\n
+  portal.portal_rules.vifib_invoice_simulation_rule.getUid(),\n
+  portal.portal_rules.vifib_invoice_root_simulation_rule.getUid()\n
+]\n
+\n
+portal.portal_catalog.searchAndActivate(\n
+  portal_type=\'Applied Rule\',\n
+  specialise_uid=rule_uid_list,\n
+  method_id=\'InvoiceAppliedRule_delete\',\n
+  method_kw={\'rule_uid_list\': rule_uid_list},\n
+  activate_kw={\'tag\': \'InvoiceAppliedRule_delete\'}\n
+)\n
+\n
+return \'Invoice Applied Rule deletion initated.\'\n
 </string> </value>
         </item>
         <item>
@@ -62,7 +74,7 @@ simulation_tool.deleteContent(context.getId())\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>RootAppliedRule_delete</string> </value>
+            <value> <string>ERP5Site_initiateInvoiceAppliedRuleDeletion</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader_20120423/SimulationTool_initiateDelete.xml → master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/InvoiceAppliedRule_delete.xml

@@ -50,19 +50,18 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>context.getPortalObject().portal_catalog.searchAndActivate(\n
-  parent_uid=context.getPortalObject().portal_simulation.getUid(),\n
-  method_id=\'RootAppliedRule_delete\'\n
-)\n
+            <value> <string>assert context.getSpecialiseUid() in rule_uid_list\n
+\n
+context.getParentValue().deleteContent(context.getId())\n
 </string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string></string> </value>
+            <value> <string>rule_uid_list</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>SimulationTool_initiateDelete</string> </value>
+            <value> <string>InvoiceAppliedRule_delete</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/vifib_upgrader/bt/revision

-152
+153
\ No newline at end of file