From b572c50c6ab1f7e7c7ec095247fdea99acb43dba Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Sun, 15 Jan 2012 04:33:49 -0200
Subject: [PATCH] Unify Scripts on boths workflows

---
 .../erp5_consulting_workflow/14.xml           |  2 +-
 ...onfiguration_displayConsultingDownload.xml | 97 -------------------
 .../BusinessConfiguration_displayDownload.xml |  1 -
 bt5/erp5_configurator_standard/bt/revision    |  2 +-
 4 files changed, 2 insertions(+), 100 deletions(-)
 delete mode 100644 bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_consulting/BusinessConfiguration_displayConsultingDownload.xml

diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/14.xml b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/14.xml
index 561c7f3b63..504d41083a 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/14.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/14.xml
@@ -26,7 +26,7 @@
         </item>
         <item>
             <key> <string>after_script_id</string> </key>
-            <value> <string>BusinessConfiguration_displayConsultingDownload</string> </value>
+            <value> <string>BusinessConfiguration_displayDownload</string> </value>
         </item>
         <item>
             <key> <string>categories</string> </key>
diff --git a/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_consulting/BusinessConfiguration_displayConsultingDownload.xml b/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_consulting/BusinessConfiguration_displayConsultingDownload.xml
deleted file mode 100644
index 6aacf2438a..0000000000
--- a/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_consulting/BusinessConfiguration_displayConsultingDownload.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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>configuration_save = context.restrictedTraverse(configuration_save_url)\n
-group_id = context.getGlobalConfigurationAttr(\'group_id\')\n
-function_id = \'company/manager\'\n
-\n
-# this configuration save must be executed at the end\n
-configuration_save.setIntIndex(2000)\n
-\n
-# web site module security\n
-# we will not provide web_site_module for now.\n
-configuration_save.addConfigurationItem("Permission Configurator Item",\n
-                                        filename="standard_module_permission_access.ods")\n
-\n
-# Catalog Keyword Search Keys are for now hardcoded.\n
-configuration_save.addConfigurationItem("Catalog Keyword Key Configurator Item",\n
-                                        key_list=(\'description\', \'title\', \'catalog.description\', \'catalog.title\'))\n
-\n
-# Customize portal type information.\n
-# this is nice, maybe we want to add more constraint during this configuration ?\n
-configuration_save.addConfigurationItem("Portal Type Configurator Item",\n
-                                        target_portal_type=\'Purchase Order\',\n
-                                        add_propertysheet_list=(\'TradeOrder\',))\n
-configuration_save.addConfigurationItem("Portal Type Configurator Item",\n
-                                        target_portal_type=\'Sale Order\',\n
-                                        add_propertysheet_list=(\'TradeOrder\',))\n
-configuration_save.addConfigurationItem("Portal Type Configurator Item",\n
-                                        target_portal_type=\'Inventory\',\n
-                                        add_propertysheet_list=(\'InventoryConstraint\',))\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>configuration_save_url=None, **kw</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>BusinessConfiguration_displayConsultingDownload</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_displayDownload.xml b/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_displayDownload.xml
index b6823efe6d..7c2dc76cc4 100644
--- a/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_displayDownload.xml
+++ b/bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_displayDownload.xml
@@ -51,7 +51,6 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>configuration_save = context.restrictedTraverse(configuration_save_url)\n
-group_id = context.getGlobalConfigurationAttr(\'group_id\')\n
 \n
 # setup Rules\n
 configuration_save.addConfigurationItem("Rule Configurator Item")\n
diff --git a/bt5/erp5_configurator_standard/bt/revision b/bt5/erp5_configurator_standard/bt/revision
index 60ac764e93..7e1aa32192 100644
--- a/bt5/erp5_configurator_standard/bt/revision
+++ b/bt5/erp5_configurator_standard/bt/revision
@@ -1 +1 @@
-620
+621
-- 
2.30.9