From 8895e752e0fce23a5abc7903179eaf2210b6dffe Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Mon, 18 Jan 2010 05:40:34 +0000 Subject: [PATCH] revert r31213 thanks to 31791. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31792 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../view_periodicity.xml | 0 .../view_periodicity.xml | 0 .../{BPMOrderBuilder.py => DeliveryBuilder.py} | 6 +++--- .../{BPMDeliveryBuilder.py => OrderBuilder.py} | 6 +++--- .../portal_deliveries/bpm_sale_invoice_builder.xml | 2 +- .../portal_deliveries/bpm_sale_packing_list_builder.xml | 2 +- ...{BPM%20Delivery%20Builder.xml => Delivery%20Builder.xml} | 6 +++--- .../{BPM%20Order%20Builder.xml => Order%20Builder.xml} | 6 +++--- bt5/erp5_bpm/bt/revision | 2 +- bt5/erp5_bpm/bt/template_action_path_list | 4 ++-- bt5/erp5_bpm/bt/template_document_id_list | 4 ++-- .../bt/template_portal_type_allowed_content_type_list | 2 -- bt5/erp5_bpm/bt/template_portal_type_id_list | 4 ++-- 13 files changed, 21 insertions(+), 23 deletions(-) rename bt5/erp5_bpm/ActionTemplateItem/portal_types/{BPM%20Delivery%20Builder => Delivery%20Builder}/view_periodicity.xml (100%) rename bt5/erp5_bpm/ActionTemplateItem/portal_types/{BPM%20Order%20Builder => Order%20Builder}/view_periodicity.xml (100%) rename bt5/erp5_bpm/DocumentTemplateItem/{BPMOrderBuilder.py => DeliveryBuilder.py} (93%) rename bt5/erp5_bpm/DocumentTemplateItem/{BPMDeliveryBuilder.py => OrderBuilder.py} (92%) rename bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/{BPM%20Delivery%20Builder.xml => Delivery%20Builder.xml} (96%) rename bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/{BPM%20Order%20Builder.xml => Order%20Builder.xml} (95%) diff --git a/bt5/erp5_bpm/ActionTemplateItem/portal_types/BPM%20Delivery%20Builder/view_periodicity.xml b/bt5/erp5_bpm/ActionTemplateItem/portal_types/Delivery%20Builder/view_periodicity.xml similarity index 100% rename from bt5/erp5_bpm/ActionTemplateItem/portal_types/BPM%20Delivery%20Builder/view_periodicity.xml rename to bt5/erp5_bpm/ActionTemplateItem/portal_types/Delivery%20Builder/view_periodicity.xml diff --git a/bt5/erp5_bpm/ActionTemplateItem/portal_types/BPM%20Order%20Builder/view_periodicity.xml b/bt5/erp5_bpm/ActionTemplateItem/portal_types/Order%20Builder/view_periodicity.xml similarity index 100% rename from bt5/erp5_bpm/ActionTemplateItem/portal_types/BPM%20Order%20Builder/view_periodicity.xml rename to bt5/erp5_bpm/ActionTemplateItem/portal_types/Order%20Builder/view_periodicity.xml diff --git a/bt5/erp5_bpm/DocumentTemplateItem/BPMOrderBuilder.py b/bt5/erp5_bpm/DocumentTemplateItem/DeliveryBuilder.py similarity index 93% rename from bt5/erp5_bpm/DocumentTemplateItem/BPMOrderBuilder.py rename to bt5/erp5_bpm/DocumentTemplateItem/DeliveryBuilder.py index 50bf094274..62fd0f8a49 100644 --- a/bt5/erp5_bpm/DocumentTemplateItem/BPMOrderBuilder.py +++ b/bt5/erp5_bpm/DocumentTemplateItem/DeliveryBuilder.py @@ -30,7 +30,7 @@ from Products.ERP5Type.Document.BPMBuilder import BPMBuilder -class BPMOrderBuilder(BPMBuilder): +class DeliveryBuilder(BPMBuilder): # CMF Type Definition - meta_type = 'ERP5 BPM Order Builder' - portal_type = 'BPM Order Builder' + meta_type = 'ERP5 Delivery Builder' + portal_type = 'Delivery Builder' diff --git a/bt5/erp5_bpm/DocumentTemplateItem/BPMDeliveryBuilder.py b/bt5/erp5_bpm/DocumentTemplateItem/OrderBuilder.py similarity index 92% rename from bt5/erp5_bpm/DocumentTemplateItem/BPMDeliveryBuilder.py rename to bt5/erp5_bpm/DocumentTemplateItem/OrderBuilder.py index 49789237c9..b23d93c262 100644 --- a/bt5/erp5_bpm/DocumentTemplateItem/BPMDeliveryBuilder.py +++ b/bt5/erp5_bpm/DocumentTemplateItem/OrderBuilder.py @@ -30,7 +30,7 @@ from Products.ERP5Type.Document.BPMBuilder import BPMBuilder -class BPMDeliveryBuilder(BPMBuilder): +class OrderBuilder(BPMBuilder): # CMF Type Definition - meta_type = 'ERP5 BPM Delivery Builder' - portal_type = 'BPM Delivery Builder' + meta_type = 'ERP5 Order Builder' + portal_type = 'Order Builder' diff --git a/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_invoice_builder.xml b/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_invoice_builder.xml index 435bd912c3..d03e3ab75e 100644 --- a/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_invoice_builder.xml +++ b/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_invoice_builder.xml @@ -3,7 +3,7 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <global name="BPMDeliveryBuilder" module="Products.ERP5Type.Document.BPMDeliveryBuilder"/> + <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/> <tuple/> </tuple> </pickle> diff --git a/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_packing_list_builder.xml b/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_packing_list_builder.xml index d0d07ba014..53073da249 100644 --- a/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_packing_list_builder.xml +++ b/bt5/erp5_bpm/PathTemplateItem/portal_deliveries/bpm_sale_packing_list_builder.xml @@ -3,7 +3,7 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <global name="BPMDeliveryBuilder" module="Products.ERP5Type.Document.BPMDeliveryBuilder"/> + <global name="DeliveryBuilder" module="Products.ERP5Type.Document.DeliveryBuilder"/> <tuple/> </tuple> </pickle> diff --git a/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/BPM%20Delivery%20Builder.xml b/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml similarity index 96% rename from bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/BPM%20Delivery%20Builder.xml rename to bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml index c1bb324125..fc1cbabb5d 100644 --- a/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/BPM%20Delivery%20Builder.xml +++ b/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml @@ -68,7 +68,7 @@ </item> <item> <key> <string>content_meta_type</string> </key> - <value> <string>ERP5 BPM Delivery Builder</string> </value> + <value> <string>ERP5 Delivery Builder</string> </value> </item> <item> <key> <string>description</string> </key> @@ -106,7 +106,7 @@ to Simulation Movements related to a limited set of existing Deliveries.</string </item> <item> <key> <string>factory</string> </key> - <value> <string>addBPMDeliveryBuilder</string> </value> + <value> <string>addDeliveryBuilder</string> </value> </item> <item> <key> <string>filter_content_types</string> </key> @@ -128,7 +128,7 @@ to Simulation Movements related to a limited set of existing Deliveries.</string </item> <item> <key> <string>id</string> </key> - <value> <string>BPM Delivery Builder</string> </value> + <value> <string>Delivery Builder</string> </value> </item> <item> <key> <string>init_script</string> </key> diff --git a/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/BPM%20Order%20Builder.xml b/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/Order%20Builder.xml similarity index 95% rename from bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/BPM%20Order%20Builder.xml rename to bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/Order%20Builder.xml index 417cf6152d..71e4a8c677 100644 --- a/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/BPM%20Order%20Builder.xml +++ b/bt5/erp5_bpm/PortalTypeTemplateItem/portal_types/Order%20Builder.xml @@ -49,7 +49,7 @@ </item> <item> <key> <string>content_meta_type</string> </key> - <value> <string>ERP5 BPM Order Builder</string> </value> + <value> <string>ERP5 Order Builder</string> </value> </item> <item> <key> <string>description</string> </key> @@ -91,7 +91,7 @@ </item> <item> <key> <string>factory</string> </key> - <value> <string>addBPMOrderBuilder</string> </value> + <value> <string>addOrderBuilder</string> </value> </item> <item> <key> <string>filter_content_types</string> </key> @@ -113,7 +113,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>BPM Order Builder</string> </value> + <value> <string>Order Builder</string> </value> </item> <item> <key> <string>init_script</string> </key> diff --git a/bt5/erp5_bpm/bt/revision b/bt5/erp5_bpm/bt/revision index 34251f6b24..030d25b286 100644 --- a/bt5/erp5_bpm/bt/revision +++ b/bt5/erp5_bpm/bt/revision @@ -1 +1 @@ -247 \ No newline at end of file +248 \ No newline at end of file diff --git a/bt5/erp5_bpm/bt/template_action_path_list b/bt5/erp5_bpm/bt/template_action_path_list index 8b981de3fc..b13b0b7cc6 100644 --- a/bt5/erp5_bpm/bt/template_action_path_list +++ b/bt5/erp5_bpm/bt/template_action_path_list @@ -1,3 +1,3 @@ -BPM Delivery Builder | view_periodicity +Delivery Builder | view_periodicity Delivery Tool | view -BPM Order Builder | view_periodicity \ No newline at end of file +Order Builder | view_periodicity \ No newline at end of file diff --git a/bt5/erp5_bpm/bt/template_document_id_list b/bt5/erp5_bpm/bt/template_document_id_list index 4fdbe5d5da..bb50cf04d2 100644 --- a/bt5/erp5_bpm/bt/template_document_id_list +++ b/bt5/erp5_bpm/bt/template_document_id_list @@ -1,2 +1,2 @@ -BPMOrderBuilder -BPMDeliveryBuilder \ No newline at end of file +OrderBuilder +DeliveryBuilder \ No newline at end of file diff --git a/bt5/erp5_bpm/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_bpm/bt/template_portal_type_allowed_content_type_list index a570d04344..e69de29bb2 100644 --- a/bt5/erp5_bpm/bt/template_portal_type_allowed_content_type_list +++ b/bt5/erp5_bpm/bt/template_portal_type_allowed_content_type_list @@ -1,2 +0,0 @@ -Delivery Tool | BPM Delivery Builder -Delivery Tool | BPM Order Builder \ No newline at end of file diff --git a/bt5/erp5_bpm/bt/template_portal_type_id_list b/bt5/erp5_bpm/bt/template_portal_type_id_list index 5aca5e5c89..65ac9ad3bb 100644 --- a/bt5/erp5_bpm/bt/template_portal_type_id_list +++ b/bt5/erp5_bpm/bt/template_portal_type_id_list @@ -1,2 +1,2 @@ -BPM Delivery Builder -BPM Order Builder \ No newline at end of file +Delivery Builder +Order Builder \ No newline at end of file -- 2.30.9