From 424d0c6b1a4e996e148ece2075e5b30fb341e76c Mon Sep 17 00:00:00 2001 From: Yusei Tahara <yusei@nexedi.com> Date: Thu, 26 Nov 2009 03:10:44 +0000 Subject: [PATCH] 2009-11-26 yusei * Update xml format. xmlPickler has changed the behavior. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30866 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_categories/agent.xml | 24 +-- .../portal_categories/agent_privilege.xml | 24 +-- .../currency_exchange_type.xml | 24 +-- .../portal_categories/delivery_builder.xml | 24 +-- .../portal_categories/destination_region.xml | 24 +-- .../portal_categories/economical_class.xml | 24 +-- .../portal_categories/follow_up.xml | 24 +-- .../portal_categories/insurance_coverage.xml | 24 +-- .../portal_categories/legal_parent.xml | 24 +-- .../portal_categories/natural_parent.xml | 24 +-- .../portal_categories/order_builder.xml | 24 +-- .../portal_categories/predecessor.xml | 24 +-- .../portal_categories/price_currency.xml | 24 +-- .../portal_categories/source_region.xml | 24 +-- .../portal_categories/specialise.xml | 24 +-- .../portal_categories/subordination.xml | 24 +-- .../portal_categories/successor.xml | 24 +-- .../allowed_content_types.xml | 72 ++++----- .../base_category_list.xml | 2 +- .../property_sheet_list.xml | 2 +- .../portal_types/Image.xml | 4 - .../portal_types/Person.xml | 137 ++++++++++++++++++ .../workflow_chain_type.xml | 10 +- .../erp5_base/MovementGroup_view/my_id.xml | 4 - .../MovementGroup_view/my_int_index.xml | 4 - .../my_id.xml | 4 - .../my_int_index.xml | 4 - .../PropertyMovementGroup_view/my_id.xml | 4 - .../my_int_index.xml | 4 - bt5/erp5_base/bt/change_log | 3 + bt5/erp5_base/bt/revision | 2 +- 31 files changed, 235 insertions(+), 429 deletions(-) diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml index 0addcd0cc7..166988f23c 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml @@ -176,25 +176,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -202,13 +190,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml index b2d1d21cf5..bbd0452609 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml @@ -176,25 +176,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -202,13 +190,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml index c8175b7d65..22d4edca65 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml @@ -176,25 +176,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -202,13 +190,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml index 838a29b2d3..3c8ddf8376 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/delivery_builder.xml @@ -182,25 +182,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -208,13 +196,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_region.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_region.xml index 981a011748..e7d8fcc70e 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_region.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/destination_region.xml @@ -185,25 +185,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -211,13 +199,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml index 48b92ae24f..18c88332ae 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml @@ -177,25 +177,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -203,13 +191,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/follow_up.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/follow_up.xml index 53ca3882ff..e5660098d6 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/follow_up.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/follow_up.xml @@ -174,25 +174,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -200,13 +188,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml index 448a974675..f22b6b4f8f 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml @@ -177,25 +177,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -203,13 +191,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml index add747a568..180e265f7f 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml @@ -176,25 +176,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -202,13 +190,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml index 041c7f8576..4b4960fdf3 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml @@ -176,25 +176,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -202,13 +190,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml index 7747b49c81..35910fdcc0 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/order_builder.xml @@ -183,25 +183,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -209,13 +197,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/predecessor.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/predecessor.xml index e333ef43e2..837b7a663f 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/predecessor.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/predecessor.xml @@ -176,25 +176,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -202,13 +190,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml index 8ac91535fa..7837495881 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml @@ -178,25 +178,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -204,13 +192,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_region.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_region.xml index 39dbea62e3..c45abdf6de 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_region.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/source_region.xml @@ -185,25 +185,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -211,13 +199,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/specialise.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/specialise.xml index e0901210ba..2f66e4d792 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/specialise.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/specialise.xml @@ -174,25 +174,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -200,13 +188,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml index b4bf637bf7..25c5f57301 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml @@ -176,25 +176,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -202,13 +190,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/successor.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/successor.xml index 3ccaed2cf2..a0db5811db 100644 --- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/successor.xml +++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/successor.xml @@ -176,25 +176,13 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -202,13 +190,7 @@ </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> diff --git a/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml index 1e1ea2e1b0..db95168ab7 100644 --- a/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml +++ b/bt5/erp5_base/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml @@ -15,27 +15,27 @@ <item>Currency</item> </portal_type> <portal_type id="Delivery Builder"> - <item>Parent Explanation Movement Group</item> - <item>Nested Line Movement Group</item> - <item>Title Movement Group</item> - <item>Predicate</item> - <item>Property Movement Group</item> - <item>Causality Movement Group</item> - <item>Category Movement Group</item> - <item>Variant Movement Group</item> <item>Base Variant Movement Group</item> + <item>Category Movement Group</item> + <item>Causality Assignment Movement Group</item> + <item>Causality Movement Group</item> + <item>Day Movement Group</item> + <item>Delivery Causality Assignment Movement Group</item> + <item>Monthly Range Movement Group</item> + <item>Nested Line Movement Group</item> <item>Order Movement Group</item> + <item>Parent Explanation Movement Group</item> + <item>Predicate</item> <item>Property Assignment Movement Group</item> - <item>Root Applied Rule Causality Movement Group</item> - <item>Variation Property Movement Group</item> - <item>Delivery Causality Assignment Movement Group</item> + <item>Property Movement Group</item> <item>Quantity Sign Movement Group</item> - <item>Day Movement Group</item> <item>Requirement Movement Group</item> - <item>Monthly Range Movement Group</item> - <item>Tax Line Delivery Movement Group</item> - <item>Causality Assignment Movement Group</item> + <item>Root Applied Rule Causality Movement Group</item> <item>Split Movement Group</item> + <item>Tax Line Delivery Movement Group</item> + <item>Title Movement Group</item> + <item>Variant Movement Group</item> + <item>Variation Property Movement Group</item> </portal_type> <portal_type id="Delivery Tool"> <item>Delivery Builder</item> @@ -47,55 +47,55 @@ <item>Notification Message</item> </portal_type> <portal_type id="Order Builder"> - <item>Order Movement Group</item> - <item>Nested Line Movement Group</item> - <item>Variant Movement Group</item> - <item>Predicate</item> <item>Base Variant Movement Group</item> + <item>Category Movement Group</item> + <item>Causality Assignment Movement Group</item> + <item>Causality Movement Group</item> + <item>Nested Line Movement Group</item> + <item>Order Movement Group</item> <item>Parent Explanation Movement Group</item> + <item>Predicate</item> + <item>Property Movement Group</item> + <item>Quantity Sign Movement Group</item> + <item>Requirement Movement Group</item> <item>Root Applied Rule Causality Movement Group</item> <item>Split Movement Group</item> - <item>Causality Assignment Movement Group</item> - <item>Variation Property Movement Group</item> - <item>Requirement Movement Group</item> - <item>Quantity Sign Movement Group</item> - <item>Category Movement Group</item> <item>Title Movement Group</item> - <item>Property Movement Group</item> - <item>Causality Movement Group</item> + <item>Variant Movement Group</item> + <item>Variation Property Movement Group</item> </portal_type> <portal_type id="Order Tool"> <item>Order Builder</item> </portal_type> <portal_type id="Organisation"> <item>Address</item> - <item>Link</item> <item>Bank Account</item> - <item>Fax</item> <item>Chat Address</item> - <item>Telephone</item> <item>Credit Card</item> <item>Document</item> - <item>Image</item> <item>Email</item> + <item>Fax</item> <item>File</item> + <item>Image</item> + <item>Link</item> + <item>Telephone</item> </portal_type> <portal_type id="Organisation Module"> <item>Organisation</item> </portal_type> <portal_type id="Person"> - <item>Chat Address</item> <item>Address</item> <item>Assignment</item> - <item>Telephone</item> + <item>Bank Account</item> + <item>Career</item> + <item>Chat Address</item> <item>Credit Card</item> <item>Email</item> - <item>File</item> <item>Fax</item> - <item>Link</item> - <item>Bank Account</item> - <item>Career</item> + <item>File</item> <item>Image</item> + <item>Link</item> + <item>Telephone</item> </portal_type> <portal_type id="Person Module"> <item>Person</item> diff --git a/bt5/erp5_base/PortalTypeBaseCategoryTemplateItem/base_category_list.xml b/bt5/erp5_base/PortalTypeBaseCategoryTemplateItem/base_category_list.xml index de4a750e59..f05c1e8752 100644 --- a/bt5/erp5_base/PortalTypeBaseCategoryTemplateItem/base_category_list.xml +++ b/bt5/erp5_base/PortalTypeBaseCategoryTemplateItem/base_category_list.xml @@ -1,7 +1,7 @@ <base_category_list> <portal_type id="Currency Exchange Cell"> - <item>price_currency</item> <item>currency_exchange_type</item> + <item>price_currency</item> </portal_type> <portal_type id="Currency Exchange Line"> <item>price_currency</item> diff --git a/bt5/erp5_base/PortalTypePropertySheetTemplateItem/property_sheet_list.xml b/bt5/erp5_base/PortalTypePropertySheetTemplateItem/property_sheet_list.xml index 0c8b20b58a..ad353190ca 100644 --- a/bt5/erp5_base/PortalTypePropertySheetTemplateItem/property_sheet_list.xml +++ b/bt5/erp5_base/PortalTypePropertySheetTemplateItem/property_sheet_list.xml @@ -1,7 +1,7 @@ <property_sheet_list> <portal_type id="Notification Message"> - <item>Reference</item> <item>ItemAggregation</item> + <item>Reference</item> </portal_type> <portal_type id="Organisation"> <item>DefaultImage</item> diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml index d657158b06..3c5b62e4c3 100644 --- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml +++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Image.xml @@ -70,10 +70,6 @@ <key> <string>init_script</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>isIndexable</string> </key> - <value> <int>0</int> </value> - </item> <item> <key> <string>permission</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person.xml b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person.xml index f15f13fbb9..4647f809cf 100644 --- a/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person.xml +++ b/bt5/erp5_base/PortalTypeTemplateItem/portal_types/Person.xml @@ -9,6 +9,43 @@ </pickle> <pickle> <dictionary> + <item> + <key> <string>_property_domain_dict</string> </key> + <value> + <dictionary> + <item> + <key> <string>first_name</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>last_name</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>middle_name</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>short_title</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent> + </value> + </item> + <item> + <key> <string>title</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> + </value> + </item> + </dictionary> + </value> + </item> <item> <key> <string>acquire_local_roles</string> </key> <value> <int>0</int> </value> @@ -60,4 +97,104 @@ </dictionary> </pickle> </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>domain_name</string> </key> + <value> <string>content_translation</string> </value> + </item> + <item> + <key> <string>property_name</string> </key> + <value> <string>first_name</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>domain_name</string> </key> + <value> <string>content_translation</string> </value> + </item> + <item> + <key> <string>property_name</string> </key> + <value> <string>last_name</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <tuple> + <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>domain_name</string> </key> + <value> <string>content_translation</string> </value> + </item> + <item> + <key> <string>property_name</string> </key> + <value> <string>middle_name</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="5" aka="AAAAAAAAAAU="> + <pickle> + <tuple> + <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>domain_name</string> </key> + <value> <string>erp5_content</string> </value> + </item> + <item> + <key> <string>property_name</string> </key> + <value> <string>short_title</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="6" aka="AAAAAAAAAAY="> + <pickle> + <tuple> + <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>domain_name</string> </key> + <value> <string>erp5_content</string> </value> + </item> + <item> + <key> <string>property_name</string> </key> + <value> <string>title</string> </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index 5fa2ff0363..3545822d02 100644 --- a/bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -9,11 +9,11 @@ </chain> <chain> <type>Assignment</type> - <workflow>edit_workflow, assignment_workflow</workflow> + <workflow>assignment_workflow, edit_workflow</workflow> </chain> <chain> <type>Bank Account</type> - <workflow>validation_workflow, edit_workflow</workflow> + <workflow>edit_workflow, validation_workflow</workflow> </chain> <chain> <type>Career</type> @@ -33,11 +33,11 @@ </chain> <chain> <type>Currency</type> - <workflow>validation_workflow, edit_workflow</workflow> + <workflow>edit_workflow, validation_workflow</workflow> </chain> <chain> <type>Currency Exchange Line</type> - <workflow>validation_workflow, currency_exchange_line_interaction_workflow, edit_workflow</workflow> + <workflow>currency_exchange_line_interaction_workflow, edit_workflow, validation_workflow</workflow> </chain> <chain> <type>Email</type> @@ -85,7 +85,7 @@ </chain> <chain> <type>Role Definition</type> - <workflow>local_permission_interaction_workflow, edit_workflow</workflow> + <workflow>edit_workflow, local_permission_interaction_workflow</workflow> </chain> <chain> <type>Simulation Movement</type> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_id.xml index a7ec9e8691..4509299fba 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_id.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_id.xml @@ -19,10 +19,6 @@ <key> <string>id</string> </key> <value> <string>my_id</string> </value> </item> - <item> - <key> <string>isIndexable</string> </key> - <value> <int>0</int> </value> - </item> <item> <key> <string>message_values</string> </key> <value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_int_index.xml index 81b139de4f..a10c6dba22 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_int_index.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MovementGroup_view/my_int_index.xml @@ -19,10 +19,6 @@ <key> <string>id</string> </key> <value> <string>my_int_index</string> </value> </item> - <item> - <key> <string>isIndexable</string> </key> - <value> <int>0</int> </value> - </item> <item> <key> <string>message_values</string> </key> <value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_id.xml index a7ec9e8691..4509299fba 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_id.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_id.xml @@ -19,10 +19,6 @@ <key> <string>id</string> </key> <value> <string>my_id</string> </value> </item> - <item> - <key> <string>isIndexable</string> </key> - <value> <int>0</int> </value> - </item> <item> <key> <string>message_values</string> </key> <value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_int_index.xml index 81b139de4f..a10c6dba22 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_int_index.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyAssignmentMovementGroup_view/my_int_index.xml @@ -19,10 +19,6 @@ <key> <string>id</string> </key> <value> <string>my_int_index</string> </value> </item> - <item> - <key> <string>isIndexable</string> </key> - <value> <int>0</int> </value> - </item> <item> <key> <string>message_values</string> </key> <value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_id.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_id.xml index a7ec9e8691..4509299fba 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_id.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_id.xml @@ -19,10 +19,6 @@ <key> <string>id</string> </key> <value> <string>my_id</string> </value> </item> - <item> - <key> <string>isIndexable</string> </key> - <value> <int>0</int> </value> - </item> <item> <key> <string>message_values</string> </key> <value> diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_int_index.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_int_index.xml index 81b139de4f..a10c6dba22 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_int_index.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/PropertyMovementGroup_view/my_int_index.xml @@ -19,10 +19,6 @@ <key> <string>id</string> </key> <value> <string>my_int_index</string> </value> </item> - <item> - <key> <string>isIndexable</string> </key> - <value> <int>0</int> </value> - </item> <item> <key> <string>message_values</string> </key> <value> diff --git a/bt5/erp5_base/bt/change_log b/bt5/erp5_base/bt/change_log index 3d08da3931..380898d0b4 100644 --- a/bt5/erp5_base/bt/change_log +++ b/bt5/erp5_base/bt/change_log @@ -1,3 +1,6 @@ +2009-11-26 yusei +* Update xml format. xmlPickler has changed the behavior. + 2009-10-16 yusei * Update for the changes of new portal types of portal types. diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index f874bfc9fc..7383593264 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -651 \ No newline at end of file +652 \ No newline at end of file -- 2.30.9