Sync with trunk@29550

Conflicts: products/ERP5/Document/RoleDefinition.py products/ERP5Type/Tool/MemcachedTool.py products/ERP5Type/__init__.py git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/portal_types@29552 20353a03-c40f-0410-a6d1-a30d3c3de9de

Sync with trunk@29550
Conflicts: products/ERP5/Document/RoleDefinition.py products/ERP5Type/Tool/MemcachedTool.py products/ERP5Type/__init__.py git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/portal_types@29552 20353a03-c40f-0410-a6d1-a30d3c3de9de
58cc2610 · Julien Muchembled · 021ee41d · d8ddd367 · 021ee41d · 021ee41d
Commit 58cc2610 authored Oct 12, 2009 by Julien Muchembled
97 changed files
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformationModule_viewApparelTransformationList/listbox.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformationModule_viewApparelTransformationList/listbox.xml
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_view/listbox.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_view/listbox.xml
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_view/my_description.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_view/my_description.xml
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_view/my_resource_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_view/my_resource_title.xml
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_view/my_template_transformation_title_list.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_view/my_template_transformation_title_list.xml
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_view/my_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_view/my_title.xml
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_view/my_translated_validation_state_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_view/my_translated_validation_state_title.xml
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_view/my_variation_base_category_list.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_view/my_variation_base_category_list.xml
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_viewApparelTransformationOperationList/listbox.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_viewApparelTransformationOperationList/listbox.xml
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_viewApparelTransformationOperationList/my_resource_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_viewApparelTransformationOperationList/my_resource_title.xml
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_viewApparelTransformationOperationList/my_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_viewApparelTransformationOperationList/my_title.xml
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_viewApparelTransformationTransformedResourceList/listbox.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_viewApparelTransformationTransformedResourceList/listbox.xml
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_viewApparelTransformationTransformedResourceList/my_resource_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_viewApparelTransformationTransformedResourceList/my_resource_title.xml
--- a/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_viewApparelTransformationTransformedResourceList/my_title.xml
+++ b/bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelTransformation_viewApparelTransformationTransformedResourceList/my_title.xml
--- a/bt5/erp5_apparel/bt/revision
+++ b/bt5/erp5_apparel/bt/revision
-98
+100
\ No newline at end of file
--- a/bt5/erp5_apparel/bt/template_property_sheet_id_list
+++ b/bt5/erp5_apparel/bt/template_property_sheet_id_list
@@ -7,7 +7,6 @@ ApparelComponent
 ApparelModel
 ApparelLabel
 ApparelModelMorphologyVariation
-ApparelTransformation
 ApparelColourRangeVariation
 ApparelAssortment
 ApparelFabricColourVariation

--- a/bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_base/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_getRoleNameItemList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_getRoleNameItemList.xml
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_role_name.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/RoleDefinition_viewFieldLibrary/my_role_name.xml
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/currency_exchange_line_interaction_workflow.xml
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow.xml
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions.xml
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions/onDeleteCloseOpenAssignments.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/interactions/onDeleteCloseOpenAssignments.xml
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts.xml
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts/closeOpenAssignments.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/scripts/closeOpenAssignments.xml
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/variables.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/variables.xml
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/person_interaction_workflow/worklists.xml
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
-635
+638
\ No newline at end of file
--- a/bt5/erp5_base/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_base/bt/template_portal_type_workflow_chain_list
--- a/bt5/erp5_base/bt/template_workflow_id_list
+++ b/bt5/erp5_base/bt/template_workflow_id_list
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXCommon.js.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/ERP5Subversion_dhtmlXCommon.js.xml
--- a/bt5/erp5_forge/bt/revision
+++ b/bt5/erp5_forge/bt/revision
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testNotExistingSelection.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testNotExistingSelection.xml
--- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Base_checkSelectionExists.xml
+++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Base_checkSelectionExists.xml
--- a/bt5/erp5_ui_test/bt/revision
+++ b/bt5/erp5_ui_test/bt/revision
--- a/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/category_publication_workflow/scripts/expireAll.xml
+++ b/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/category_publication_workflow/scripts/expireAll.xml
--- a/bt5/erp5_web/bt/revision
+++ b/bt5/erp5_web/bt/revision
--- a/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_getTioLiveSiteRootUrl.xml
+++ b/bt5/tiolive_base/SkinTemplateItem/portal_skins/tiolive_base/ERP5Site_getTioLiveSiteRootUrl.xml
--- a/bt5/tiolive_base/bt/revision
+++ b/bt5/tiolive_base/bt/revision
--- a/product/ERP5/Converter/Converter.py
+++ b/product/ERP5/Converter/Converter.py
--- a/product/ERP5/Converter/OpenOffice.py
+++ b/product/ERP5/Converter/OpenOffice.py
--- a/product/ERP5/Converter/bin/openoffice.convert
+++ b/product/ERP5/Converter/bin/openoffice.convert
--- a/product/ERP5/Document/Document.py
+++ b/product/ERP5/Document/Document.py
--- a/product/ERP5/Document/Image.py
+++ b/product/ERP5/Document/Image.py
--- a/product/ERP5/Document/RoleDefinition.py
+++ b/product/ERP5/Document/RoleDefinition.py
--- a/product/ERP5/Document/Url.py
+++ b/product/ERP5/Document/Url.py
--- a/product/ERP5/Interactor/AqDynamicInteractor.py
+++ b/product/ERP5/Interactor/AqDynamicInteractor.py
--- a/product/ERP5/Tool/ConversionTool.py
+++ b/product/ERP5/Tool/ConversionTool.py
--- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_transforms/html_to_text.xml
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_transforms/html_to_text.xml
--- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_transforms/png_to_text.xml
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_transforms/png_to_text.xml
--- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_transforms/w3m_dump.xml
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_transforms/w3m_dump.xml
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_showFoundText.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_showFoundText.xml
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_copy.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_copy.xml
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_cut.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_cut.xml
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_paste.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_paste.xml
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_getModifiedObjectList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_getModifiedObjectList.xml
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installRepositoryBusinessTemplateList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installRepositoryBusinessTemplateList.xml
--- a/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml
+++ b/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ListBox_asStandardHTML.xml
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
--- a/product/ERP5/tests/testBase.py
+++ b/product/ERP5/tests/testBase.py
--- a/product/ERP5/tests/testERP5Base.py
+++ b/product/ERP5/tests/testERP5Base.py
--- a/product/ERP5/tests/testERP5Web.py
+++ b/product/ERP5/tests/testERP5Web.py
--- a/product/ERP5/tests/testInteractionWorkflow.py
+++ b/product/ERP5/tests/testInteractionWorkflow.py
--- a/product/ERP5/tests/testXHTML.py
+++ b/product/ERP5/tests/testXHTML.py
--- a/product/ERP5Catalog/tests/testERP5Catalog.py
+++ b/product/ERP5Catalog/tests/testERP5Catalog.py
--- a/product/ERP5Form/Form.py
+++ b/product/ERP5Form/Form.py
--- a/product/ERP5Form/Interactor/FieldValueCacheInteractor.py
+++ b/product/ERP5Form/Interactor/FieldValueCacheInteractor.py
--- a/product/ERP5Form/ListBox.py
+++ b/product/ERP5Form/ListBox.py
--- a/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelTransformation.py
+++ b/bt5/erp5_apparel/PropertySheetTemplateItem/ApparelTransformation.py
--- a/product/ERP5Form/tests/testPreferences.py
+++ b/product/ERP5Form/tests/testPreferences.py
--- a/product/ERP5OOo/tests/testDms.py
+++ b/product/ERP5OOo/tests/testDms.py
--- a/product/ERP5OOo/tests/testOOoImport.py
+++ b/product/ERP5OOo/tests/testOOoImport.py
--- a/product/ERP5OOo/tests/test_document/import_big_spreadsheet.ods
+++ b/product/ERP5OOo/tests/test_document/import_big_spreadsheet.ods
--- a/product/ERP5Security/tests/testERP5Security.py
+++ b/product/ERP5Security/tests/testERP5Security.py
--- a/product/ERP5SyncML/XMLSyncUtils.py
+++ b/product/ERP5SyncML/XMLSyncUtils.py
--- a/product/ERP5SyncML/tests/testERP5DocumentSyncML.py
+++ b/product/ERP5SyncML/tests/testERP5DocumentSyncML.py
--- a/product/ERP5Type/CachePlugins/DistributedRamCache.py
+++ b/product/ERP5Type/CachePlugins/DistributedRamCache.py
--- a/product/ERP5Type/InitGenerator.py
+++ b/product/ERP5Type/InitGenerator.py
--- a/product/ERP5Type/Interactor.py
+++ b/product/ERP5Type/Interactor.py
--- a/product/ERP5Type/Interactor/__init__.py
+++ b/product/ERP5Type/Interactor/__init__.py
--- a/product/ERP5Type/Tool/CacheTool.py
+++ b/product/ERP5Type/Tool/CacheTool.py
--- a/product/ERP5Type/Tool/MemcachedTool.py
+++ b/product/ERP5Type/Tool/MemcachedTool.py
--- a/product/ERP5Type/Utils.py
+++ b/product/ERP5Type/Utils.py
--- a/product/ERP5Type/__init__.py
+++ b/product/ERP5Type/__init__.py
--- a/product/ERP5Type/patches/DCWorkflow.py
+++ b/product/ERP5Type/patches/DCWorkflow.py
--- a/product/ERP5Type/patches/transforms/__init__.py
+++ b/product/ERP5Type/patches/transforms/__init__.py
--- a/product/ERP5Type/patches/transforms/html_to_text.py
+++ b/product/ERP5Type/patches/transforms/html_to_text.py
--- a/product/ERP5Type/tests/ERP5TypeTestCase.py
+++ b/product/ERP5Type/tests/ERP5TypeTestCase.py
--- a/product/ERP5Type/tests/testSessionTool.py
+++ b/product/ERP5Type/tests/testSessionTool.py
--- a/product/PortalTransforms/transforms/__init__.py
+++ b/product/PortalTransforms/transforms/__init__.py
--- a/product/PortalTransforms/transforms/html_to_text.py
+++ b/product/PortalTransforms/transforms/html_to_text.py
--- a/product/ERP5Type/patches/transforms/png_to_text.py
+++ b/product/ERP5Type/patches/transforms/png_to_text.py
--- a/product/ERP5Type/patches/transforms/w3m_dump.py
+++ b/product/ERP5Type/patches/transforms/w3m_dump.py