Skip to content

erp5
erp5
Commit 5b20c274 authored by Arnaud Fontaine's avatar Arnaud Fontaine
1 Browse files
Options

Merge remote-tracking branch 'origin/master' into zope4py2

parents cb7680fe 1c57528b
Pipeline #20852 failed with stage
    in 0 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 6923 additions and 3227 deletions
    bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.xml
    View file @ 5b20c274
    ......@@ -50,12 +50,6 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>expression_instance</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>filtered</string> </key>
    <value> <int>1</int> </value>
    ......@@ -89,17 +83,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Expression" module="Products.CMFCore.Expression"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>python: context.isAccountingTransactionType()</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.xml
    View file @ 5b20c274
    ......@@ -65,12 +65,6 @@ InternalInvoiceTransaction_statInternalTransactionLineList\n
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>expression_instance</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>filtered</string> </key>
    <value> <int>1</int> </value>
    ......@@ -104,17 +98,4 @@ InternalInvoiceTransaction_statInternalTransactionLineList\n
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Expression" module="Products.CMFCore.Expression"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>python: context.isAccountingTransactionType()</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_resetGroupingReference.py
    View file @ 5b20c274
    ......@@ -36,4 +36,3 @@ for (section_value, node_uid, mirror_section_uid) in (
    grouping_reference=grouping_reference
    ) or [])
    return list(ungrouped_line_set)
    bt5/erp5_api_style/TestTemplateItem/portal_components/test.erp5.testJioApiStyle.xml
    View file @ 5b20c274
    ......@@ -113,14 +113,6 @@
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value>
    <list>
    <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
    </list>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    ......@@ -132,36 +124,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="Message" module="Products.ERP5Type.Message"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string>ID is invalid, should be \'${id_prefix}.VERSION.REFERENCE\'</string> </value>
    </item>
    <item>
    <key> <string>domain</string> </key>
    <value> <string>erp5_ui</string> </value>
    </item>
    <item>
    <key> <string>mapping</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>id_prefix</string> </key>
    <value> <string>test</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>message</string> </key>
    <value> <string>ID is invalid, should be \'${id_prefix}.VERSION.REFERENCE\'</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_base/bt/template_document_id_list
    View file @ 5b20c274
    ......@@ -39,7 +39,6 @@ document.erp5.QuantitySignMovementGroup
    document.erp5.RequirementMovementGroup
    document.erp5.RoleDefinition
    document.erp5.RootAppliedRuleCausalityMovementGroup
    document.erp5.RoundingModel
    document.erp5.SimulatedDeliveryBuilder
    document.erp5.SplitMovementGroup
    document.erp5.Supply
    ......
    bt5/erp5_base/bt/template_interface_id_list
    View file @ 5b20c274
    interface.erp5.ICoordinate
    interface.erp5.IEncryptedPassword
    interface.erp5.ILoginAccountProvider
    interface.erp5.IMovementGroup
    interface.erp5.IRoundingTool
    \ No newline at end of file
    interface.erp5.IMovementGroup
    \ No newline at end of file
    bt5/erp5_base/bt/template_keep_path_list
    View file @ 5b20c274
    portal_components/document.erp5.RoundingModel
    portal_components/document.erp5.RoundingTool
    portal_components/interface.erp5.IRoundingTool
    portal_introspections
    portal_memcached/persistent_memcached_plugin
    portal_solver_processes
    ......
    bt5/erp5_base/bt/template_tool_component_id_list deleted 100644 → 0
    View file @ cb7680fe
    tool.erp5.RoundingTool
    \ No newline at end of file
    bt5/erp5_certificate_authority/bt/template_portal_type_id_list
    View file @ 5b20c274
    Certificate Authority Tool
    Certificate Login
    Certificate Login
    \ No newline at end of file
    bt5/erp5_configurator/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
    View file @ 5b20c274
    <property_sheet_list>
    <portal_type id="Workflow Transition">
    <item>ConfiguratorWorkflowTransition</item>
    </portal_type>
    <portal_type id="Workflow">
    <item>ConfiguratorWorkflow</item>
    <item>DefaultImage</item>
    </portal_type>
    <portal_type id="Workflow Transition">
    <item>ConfiguratorWorkflowTransition</item>
    </portal_type>
    </property_sheet_list>
    \ No newline at end of file
    bt5/erp5_configurator/bt/template_action_path_list
    View file @ 5b20c274
    ......@@ -27,7 +27,7 @@ Site Property Configurator Item | view
    Solver Configurator Item | view
    Standard BT5 Configurator Item | view
    System Preference Configurator Item | view
    Workflow Transition | configurator_settings
    Workflow | configurator_settings
    Workflow | launch_configuration
    Workflow Transition | configurator_settings
    portal_actions | use_configurator
    \ No newline at end of file
    bt5/erp5_configurator/bt/template_portal_type_property_sheet_list
    View file @ 5b20c274
    Workflow Transition | ConfiguratorWorkflowTransition
    Workflow | ConfiguratorWorkflow
    Workflow | DefaultImage
    Workflow Transition | ConfiguratorWorkflowTransition
    \ No newline at end of file
    Workflow | DefaultImage
    \ No newline at end of file
    bt5/erp5_configurator_standard/PathTemplateItem/business_configuration_module/default_standard_configuration.xml
    View file @ 5b20c274
    ......@@ -184,10 +184,6 @@
    <none/>
    </value>
    </item>
    <item>
    <key> <string>last_id</string> </key>
    <value> <string>3</string> </value>
    </item>
    <item>
    <key> <string>modification_date</string> </key>
    <value>
    ......
    bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/classification/collaborative.xml
    View file @ 5b20c274
    ......@@ -99,10 +99,6 @@
    <key> <string>int_index</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>last_id</string> </key>
    <value> <string>1</string> </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Category</string> </value>
    ......
    bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/trade_state/trade.xml
    View file @ 5b20c274
    ......@@ -89,10 +89,6 @@
    <key> <string>id</string> </key>
    <value> <string>trade</string> </value>
    </item>
    <item>
    <key> <string>last_id</string> </key>
    <value> <string>5</string> </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Category</string> </value>
    ......
    bt5/erp5_configurator_standard_categories/PathTemplateItem/quantity_unit_conversion_module/area_conversion_group.xml
    View file @ 5b20c274
    ......@@ -52,6 +52,24 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>_count</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>_mt_index</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>_tree</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    ......@@ -71,13 +89,35 @@
    <item>
    <key> <string>workflow_history</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Length" module="BTrees.Length"/>
    </pickle>
    <pickle> <int>0</int> </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="OOBTree" module="BTrees.OOBTree"/>
    </pickle>
    <pickle>
    <none/>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="OOBTree" module="BTrees.OOBTree"/>
    </pickle>
    <pickle>
    <none/>
    </pickle>
    </record>
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    ......@@ -90,13 +130,13 @@
    <item>
    <key> <string>edit_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>validation_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
    </value>
    </item>
    </dictionary>
    ......@@ -105,7 +145,7 @@
    </dictionary>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <record id="6" aka="AAAAAAAAAAY=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    ......@@ -168,7 +208,7 @@
    </dictionary>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <record id="7" aka="AAAAAAAAAAc=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    ......
    bt5/erp5_configurator_standard_categories/PathTemplateItem/quantity_unit_conversion_module/energy_conversion_group.xml
    View file @ 5b20c274
    ......@@ -52,6 +52,24 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>_count</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>_mt_index</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>_tree</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    ......@@ -71,13 +89,35 @@
    <item>
    <key> <string>workflow_history</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Length" module="BTrees.Length"/>
    </pickle>
    <pickle> <int>0</int> </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="OOBTree" module="BTrees.OOBTree"/>
    </pickle>
    <pickle>
    <none/>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="OOBTree" module="BTrees.OOBTree"/>
    </pickle>
    <pickle>
    <none/>
    </pickle>
    </record>
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    ......@@ -90,13 +130,13 @@
    <item>
    <key> <string>edit_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>validation_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
    </value>
    </item>
    </dictionary>
    ......@@ -105,7 +145,7 @@
    </dictionary>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <record id="6" aka="AAAAAAAAAAY=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    ......@@ -168,7 +208,7 @@
    </dictionary>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <record id="7" aka="AAAAAAAAAAc=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    ......
    bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Accept%20Solver.xml
    View file @ 5b20c274
    ......@@ -162,6 +162,14 @@
    <key> <string>type_class</string> </key>
    <value> <string>AcceptSolver</string> </value>
    </item>
    <item>
    <key> <string>workflow_list</string> </key>
    <value>
    <list>
    <string>solver_workflow</string>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    ......
    bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Adopt%20Solver.xml
    View file @ 5b20c274
    ......@@ -155,6 +155,14 @@
    <key> <string>type_class</string> </key>
    <value> <string>AdoptSolver</string> </value>
    </item>
    <item>
    <key> <string>workflow_list</string> </key>
    <value>
    <list>
    <string>solver_workflow</string>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    ......
    bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Automatic%20Accept%20Solver.xml
    View file @ 5b20c274
    ......@@ -220,6 +220,14 @@
    <key> <string>type_class</string> </key>
    <value> <string>AcceptSolver</string> </value>
    </item>
    <item>
    <key> <string>workflow_list</string> </key>
    <value>
    <list>
    <string>solver_workflow</string>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    ......
    bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Production%20Reduction%20Solver.xml
    View file @ 5b20c274
    ......@@ -169,6 +169,14 @@
    <none/>
    </value>
    </item>
    <item>
    <key> <string>workflow_list</string> </key>
    <value>
    <list>
    <string>solver_workflow</string>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    ......
    bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Quantity%20Cancel%20Solver.xml
    View file @ 5b20c274
    ......@@ -124,10 +124,6 @@
    <none/>
    </value>
    </item>
    <item>
    <key> <string>last_id</string> </key>
    <value> <string>2</string> </value>
    </item>
    <item>
    <key> <string>line_exclusive</string> </key>
    <value> <int>0</int> </value>
    ......@@ -150,6 +146,14 @@
    <key> <string>solver_action_title</string> </key>
    <value> <string>Cancel Quantity</string> </value>
    </item>
    <item>
    <key> <string>workflow_list</string> </key>
    <value>
    <list>
    <string>solver_workflow</string>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    ......
    bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Quantity%20Split%20Solver.xml
    View file @ 5b20c274
    ......@@ -178,6 +178,14 @@
    <key> <string>type_class</string> </key>
    <value> <string>QuantitySplitSolver</string> </value>
    </item>
    <item>
    <key> <string>workflow_list</string> </key>
    <value>
    <list>
    <string>solver_workflow</string>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    ......
    bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Simple%20Quantity%20Split%20Solver.xml
    View file @ 5b20c274
    ......@@ -231,6 +231,14 @@
    <key> <string>type_class</string> </key>
    <value> <string>QuantitySplitSolver</string> </value>
    </item>
    <item>
    <key> <string>workflow_list</string> </key>
    <value>
    <list>
    <string>solver_workflow</string>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    ......
    bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Trade%20Model%20Solver.xml
    View file @ 5b20c274
    ......@@ -155,10 +155,6 @@
    <none/>
    </value>
    </item>
    <item>
    <key> <string>last_id</string> </key>
    <value> <string>2</string> </value>
    </item>
    <item>
    <key> <string>line_exclusive</string> </key>
    <value> <int>0</int> </value>
    ......@@ -193,6 +189,14 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>workflow_list</string> </key>
    <value>
    <list>
    <string>solver_workflow</string>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    ......
    bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Unify%20Solver.xml
    View file @ 5b20c274
    ......@@ -159,10 +159,6 @@
    <none/>
    </value>
    </item>
    <item>
    <key> <string>last_id</string> </key>
    <value> <string>2</string> </value>
    </item>
    <item>
    <key> <string>line_exclusive</string> </key>
    <value> <int>0</int> </value>
    ......@@ -189,6 +185,14 @@
    <key> <string>solver_action_title</string> </key>
    <value> <string>Unify value</string> </value>
    </item>
    <item>
    <key> <string>workflow_list</string> </key>
    <value>
    <list>
    <string>solver_workflow</string>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    ......
    bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testWorkflowHistoryList.py
    View file @ 5b20c274
    ......@@ -225,5 +225,5 @@ class TestDedup(ERP5TypeTestCase):
    new_obj_length, = deduped # pylint: disable=unbalanced-tuple-unpacking
    # The exact boundary does not matter much, but it should be greater than
    # some arbitrary value considered satisfying.
    self.assertGreaterEqual(new_obj_length, 24)
    self.assertGreaterEqual(new_obj_length, 30)
    self.assertEqual(len(list(whl)), new_obj_length + 1)
    bt5/erp5_credential/PathTemplateItem/notification_message_module/credential_request-subscription.xml
    View file @ 5b20c274
    ......@@ -145,94 +145,98 @@ Thank you
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate_action</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>superi</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global id="3.1" name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1322558336.86</float>
    <string>GMT+2</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>draft</string> </value>
    </item>
    </dictionary>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>superi</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass> <reference id="3.1"/> </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1322558336.86</float>
    <string>GMT+2</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    </item>
    </dictionary>
    </list>
    </tuple>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate_action</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>superi</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global id="3.1" name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1322558336.86</float>
    <string>GMT+2</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>draft</string> </value>
    </item>
    </dictionary>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>superi</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass> <reference id="3.1"/> </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1322558336.86</float>
    <string>GMT+2</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList.xml
    View file @ 5b20c274
    ......@@ -81,6 +81,7 @@
    <list>
    <string>listbox_destination_title</string>
    <string>listbox_delivery_start_date</string>
    <string>listbox_delivery_stop_date</string>
    </list>
    </value>
    </item>
    ......
    bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox.xml
    View file @ 5b20c274
    ......@@ -357,6 +357,10 @@
    <string>delivery.start_date</string>
    <string>Date</string>
    </tuple>
    <tuple>
    <string>delivery.stop_date</string>
    <string>End Date</string>
    </tuple>
    <tuple>
    <string>source_title</string>
    <string>Sender or Caller</string>
    ......@@ -524,6 +528,10 @@
    <list/>
    </value>
    </item>
    <item>
    <key> <string>global_search_column</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>hidden</string> </key>
    <value> <int>0</int> </value>
    ......@@ -556,6 +564,10 @@
    <key> <string>page_navigation_mode</string> </key>
    <value> <string>slider</string> </value>
    </item>
    <item>
    <key> <string>page_navigation_template</string> </key>
    <value> <string>ListBox_viewSliderPageNavigationRenderer</string> </value>
    </item>
    <item>
    <key> <string>page_template</string> </key>
    <value> <string></string> </value>
    ......
    bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_updateReferenceImage.xml → bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_hasDuration.xml
    View file @ 5b20c274
    ......@@ -50,11 +50,11 @@
    </item>
    <item>
    <key> <string>_params</string> </key>
    <value> <string>image_data, image_path</string> </value>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>Zuite_updateReferenceImage</string> </value>
    <value> <string>Event_hasDuration</string> </value>
    </item>
    </dictionary>
    </pickle>
    ......
    bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view.xml
    View file @ 5b20c274
    ......@@ -100,6 +100,7 @@
    <string>my_title</string>
    <string>my_reference</string>
    <string>my_start_date</string>
    <string>my_stop_date</string>
    <string>my_translated_portal_type</string>
    <string>my_resource</string>
    <string>my_causality_title</string>
    ......
    bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_start_date.xml
    View file @ 5b20c274
    ......@@ -9,7 +9,9 @@
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list/>
    <list>
    <string>title</string>
    </list>
    </value>
    </item>
    <item>
    ......@@ -62,6 +64,12 @@
    <key> <string>target</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    ......@@ -81,10 +89,27 @@
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Date</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: context.getTypeBasedMethod(\'hasDuration\')() and context.Base_translateString("Begin Date") or context.Base_translateString("Date")</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_stop_date.xml 0 → 100644
    View file @ 5b20c274
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    <string>default_now</string>
    <string>enabled</string>
    <string>title</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>my_stop_date</string> </value>
    </item>
    <item>
    <key> <string>message_values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>external_validator_failed</string> </key>
    <value> <string>The input failed the external validator.</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>overrides</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>default_now</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>enabled</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>default_now</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>enabled</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_event_start_date</string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewCRMFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>End Date</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: context.hasStopDate() and context.getStopDate() or None</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="TALESMethod" module="Products.Formulator.TALESField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>python: context.getTypeBasedMethod(\'hasDuration\')()</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PhoneCall_hasDuration.xml 0 → 100644
    View file @ 5b20c274
    <?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>_params</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>PhoneCall_hasDuration</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Visit_hasDuration.xml 0 → 100644
    View file @ 5b20c274
    <?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>_params</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>Visit_hasDuration</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_crm/TestTemplateItem/portal_components/test.erp5.testCRM.py
    View file @ 5b20c274
    ......@@ -109,6 +109,20 @@ class TestCRM(BaseTestCRM):
    self.assertTrue(event.isMovement(),
    "%s is not a movement" % portal_type)
    def test_Event_stop_date_field_enabled(self):
    """
    Checks if Event_view display stop_date to Phone calls and visits
    """
    phone_call = self.portal.event_module.newContent(
    portal_type="Phone Call", temp_object=True)
    self.assertTrue(phone_call.Event_view.my_stop_date.get_value("enabled"))
    visit = self.portal.event_module.newContent(
    portal_type="Visit", temp_object=True)
    self.assertTrue(visit.Event_view.my_stop_date.get_value("enabled"))
    mail_message = self.portal.event_module.newContent(
    portal_type="Mail Message", temp_object=True)
    self.assertFalse(mail_message.Event_view.my_stop_date.get_value("enabled"))
    def test_Event_CreateRelatedEvent(self):
    # test workflow to create a related event from responded event
    event_module = self.portal.event_module
    ......
    bt5/erp5_crm/TestTemplateItem/portal_components/test.erp5.testCRM.xml
    View file @ 5b20c274
    ......@@ -6,6 +6,12 @@
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_recorded_property_dict</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>default_reference</string> </key>
    <value> <string>testCRM</string> </value>
    ......@@ -53,13 +59,28 @@
    <item>
    <key> <string>workflow_history</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>data</string> </key>
    <value>
    <dictionary/>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    ......@@ -72,7 +93,7 @@
    <item>
    <key> <string>component_validation_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    </value>
    </item>
    </dictionary>
    ......@@ -81,7 +102,7 @@
    </dictionary>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    ......
    bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variable_error_message.xml 0 → 100644
    View file @ 5b20c274
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Workflow Variable" module="erp5.portal_type"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>automatic_update</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>for_catalog</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>variable_error_message</string> </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Workflow Variable</string> </value>
    </item>
    <item>
    <key> <string>status_included</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value>
    <none/>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_crm_ui_test/SkinTemplateItem/portal_skins/erp5_crm_ui_test/Zuite_CommonTemplateForCRMUiTest.zpt
    View file @ 5b20c274
    ......@@ -472,6 +472,19 @@
    <td tal:content="python: response_configuration['field_my_portal_type']"></td>
    <td></td>
    </tr>
    <tal:block tal:condition="python: response_configuration['field_my_portal_type'] not in ('Visit', 'Phone Call')">
    <tr>
    <td>assertElementPresent</td>
    <td>//div[@class="field date_field"]/label[contains(text(),"Date")]</td>
    <td></td>
    </tr>
    <tr>
    <td>assertElementNotPresent</td>
    <td>//label[contains(text(),"Stop Date")]</td>
    <td></td>
    </tr>
    </tal:block>
    <tr>
    <td>verifyValue</td>
    <td>field_my_resource</td>
    ......
    bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_computeReportSection.py
    View file @ 5b20c274
    ......@@ -25,6 +25,7 @@ with portal.Localizer.translationContext(localizer_language):
    report_request = portal.ERP5Site_filterRequestForDeferredStyle(request)
    active_process = portal.portal_activities.newActiveProcess()
    inner_tag = tag + '-render'
    for idx, report_section in enumerate(report_section_list):
    if report_section.getPath():
    ......@@ -34,7 +35,7 @@ for idx, report_section in enumerate(report_section_list):
    doc.activate(activity='SQLQueue',
    node=portal.portal_preferences.getPreferredDeferredReportActivityFamily(),
    active_process=active_process,
    tag=tag,
    tag=inner_tag,
    priority=priority,
    ).Base_renderReportSection(skin_name=skin_name,
    localizer_language=localizer_language,
    ......@@ -51,7 +52,8 @@ if activity_context == portal:
    activity_context.activate(
    activity='SQLQueue',
    node=portal.portal_preferences.getPreferredDeferredReportActivityFamily(),
    after_tag=tag,
    after_tag=inner_tag,
    tag=tag,
    priority=priority,
    ).Base_report(
    active_process_url=active_process.getRelativeUrl(),
    ......
    bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_deleteObject.py
    View file @ 5b20c274
    ......@@ -5,7 +5,7 @@ The code is a modified version of Folder_delete. We split into two files not to
    further complicate the mentioned script.
    """
    from ZODB.POSException import ConflictError
    from Products.ERP5Type.Errors import UnsupportedWorkflowMethod
    portal = context.getPortalObject()
    translate = portal.Base_translateString
    ......@@ -31,13 +31,15 @@ if context.isDeletable(check_relation=True):
    "portal_status_message": translate("Document deleted")
    })
    except ConflictError:
    raise
    except Exception:
    # XXX Catch-them-all expression is never a good idea
    except UnsupportedWorkflowMethod:
    pass
    request = portal.REQUEST
    request.RESPONSE.setStatus(400)
    form = getattr(context,form_id)
    return context.ERP5Document_getHateoas(form=form, REQUEST=request, mode='form')
    return context.Base_renderForm(
    dialog_id,
    keep_items={
    'portal_status_message': translate("You are not authorised to delete the document"),
    'portal_status_level': 'warning'
    }
    )
    bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
    View file @ 5b20c274
    ......@@ -551,6 +551,10 @@ def renderField(traversed_document, field, form, value=MARKER, meta_type=None,
    if meta_type in ("StringField", "FloatField", "EmailField", "TextAreaField",
    "LinesField", "ImageField", "FileField", "IntegerField",
    "PasswordField", "EditorField", "HyperLinkField", "LinkField"):
    if meta_type in ("StringField", "EmailField"):
    result.update({
    "maxlength": field.get_value("display_maxwidth"),
    })
    if meta_type == "FloatField":
    result.update({
    "precision": field.get_value("precision"),
    ......
    bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml
    View file @ 5b20c274
    ......@@ -26,12 +26,6 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>expression_instance</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>filtered</string> </key>
    <value> <int>1</int> </value>
    ......@@ -57,17 +51,4 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Expression" module="Products.CMFCore.Expression"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>python: context.getPortalType() in (\'Email\', \'Fax\', \'Telephone\',)</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml
    View file @ 5b20c274
    ......@@ -28,12 +28,6 @@ getPortalType</string> </value>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>expression_instance</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>filtered</string> </key>
    <value> <int>1</int> </value>
    ......@@ -59,17 +53,4 @@ getPortalType</string> </value>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Expression" module="Products.CMFCore.Expression"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>python: context.getPortalType() in (\'Email\', \'Fax\', \'Telephone\')</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_inotify/TestTemplateItem/portal_components/test.erp5.testInotifyTool.xml
    View file @ 5b20c274
    ......@@ -74,33 +74,6 @@
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>ERP5TypeTestCase</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1377844632.42</float>
    <string>GMT+9</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    ......
    bt5/erp5_inotify/ToolTemplateItem/portal_inotify.xml
    View file @ 5b20c274
    ......@@ -6,6 +6,24 @@
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_count</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>_mt_index</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>_tree</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>portal_inotify</string> </value>
    ......@@ -13,4 +31,26 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Length" module="BTrees.Length"/>
    </pickle>
    <pickle> <int>0</int> </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="OOBTree" module="BTrees.OOBTree"/>
    </pickle>
    <pickle>
    <none/>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="OOBTree" module="BTrees.OOBTree"/>
    </pickle>
    <pickle>
    <none/>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_km/PathTemplateItem/web_page_module/minimal_km_footer.xml
    View file @ 5b20c274
    ......@@ -335,106 +335,110 @@
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <tuple>
    <none/>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>edit</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>superi</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>914.39230.56686.47530</string> </value>
    </item>
    <item>
    <key> <string>state</string> </key>
    <value> <string>current</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global id="4.1" name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1322041267.83</float>
    <string>GMT+2</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>edit</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>superi</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>914.39237.25917.63402</string> </value>
    </item>
    <item>
    <key> <string>state</string> </key>
    <value> <string>current</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass> <reference id="4.1"/> </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1322041294.72</float>
    <string>GMT+2</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    </tuple>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>edit</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>superi</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>914.39230.56686.47530</string> </value>
    </item>
    <item>
    <key> <string>state</string> </key>
    <value> <string>current</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global id="4.1" name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1322041267.83</float>
    <string>GMT+2</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>edit</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>superi</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>914.39237.25917.63402</string> </value>
    </item>
    <item>
    <key> <string>state</string> </key>
    <value> <string>current</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass> <reference id="4.1"/> </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1322041294.72</float>
    <string>GMT+2</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="5" aka="AAAAAAAAAAU=">
    ......
    bt5/erp5_km_ui_test_data/PathTemplateItem/knowledge_pad_module/erp5_km_public_front_pad/6.xml
    View file @ 5b20c274
    ......@@ -131,7 +131,7 @@
    </item>
    <item>
    <key> <string>preferred_password</string> </key>
    <value> <string/> </value>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>preferred_rss_feed</string> </key>
    ......@@ -139,7 +139,7 @@
    </item>
    <item>
    <key> <string>preferred_username</string> </key>
    <value> <string/> </value>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    ......
    bt5/erp5_km_ui_test_data/PathTemplateItem/portal_categories/classification/collaborative.xml
    View file @ 5b20c274
    ......@@ -53,6 +53,24 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>_count</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>_mt_index</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>_tree</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    ......@@ -82,4 +100,26 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Length" module="BTrees.Length"/>
    </pickle>
    <pickle> <int>0</int> </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="OOBTree" module="BTrees.OOBTree"/>
    </pickle>
    <pickle>
    <none/>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="OOBTree" module="BTrees.OOBTree"/>
    </pickle>
    <pickle>
    <none/>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1.xml
    View file @ 5b20c274
    ......@@ -53,6 +53,61 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>__before_publishing_traverse__</string> </key>
    <value>
    <object>
    <klass>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
    </klass>
    <tuple/>
    <state>
    <dictionary>
    <item>
    <key> <string>_defined_in_class</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>_hookname</string> </key>
    <value> <string>__before_publishing_traverse__</string> </value>
    </item>
    <item>
    <key> <string>_list</string> </key>
    <value>
    <list>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </list>
    </value>
    </item>
    <item>
    <key> <string>_prior</string> </key>
    <value>
    <none/>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>__before_traverse__</string> </key>
    <value>
    <dictionary>
    <item>
    <key>
    <tuple>
    <int>99</int>
    <string>ERP5 Web Section/1</string>
    </tuple>
    </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>__translation_dict</string> </key>
    <value>
    ......@@ -62,7 +117,7 @@
    <item>
    <key> <string>_count</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    ......@@ -74,7 +129,7 @@
    <item>
    <key> <string>_mt_index</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    </value>
    </item>
    <item>
    ......@@ -86,7 +141,7 @@
    <item>
    <key> <string>_tree</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
    </value>
    </item>
    <item>
    ......@@ -165,12 +220,20 @@
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="WebSectionTraversalHook" module="Products.ERP5.Document.WebSection"/>
    </pickle>
    <pickle>
    <dictionary/>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="Length" module="BTrees.Length"/>
    </pickle>
    <pickle> <int>0</int> </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="OOBTree" module="BTrees.OOBTree"/>
    </pickle>
    ......@@ -178,7 +241,7 @@
    <none/>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="OOBTree" module="BTrees.OOBTree"/>
    </pickle>
    ......
    bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1/1.xml
    View file @ 5b20c274
    ......@@ -53,6 +53,61 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>__before_publishing_traverse__</string> </key>
    <value>
    <object>
    <klass>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
    </klass>
    <tuple/>
    <state>
    <dictionary>
    <item>
    <key> <string>_defined_in_class</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>_hookname</string> </key>
    <value> <string>__before_publishing_traverse__</string> </value>
    </item>
    <item>
    <key> <string>_list</string> </key>
    <value>
    <list>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </list>
    </value>
    </item>
    <item>
    <key> <string>_prior</string> </key>
    <value>
    <none/>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>__before_traverse__</string> </key>
    <value>
    <dictionary>
    <item>
    <key>
    <tuple>
    <int>99</int>
    <string>ERP5 Web Section/1</string>
    </tuple>
    </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>__translation_dict</string> </key>
    <value>
    ......@@ -136,4 +191,12 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="WebSectionTraversalHook" module="Products.ERP5.Document.WebSection"/>
    </pickle>
    <pickle>
    <dictionary/>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1/2.xml
    View file @ 5b20c274
    ......@@ -53,6 +53,61 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>__before_publishing_traverse__</string> </key>
    <value>
    <object>
    <klass>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
    </klass>
    <tuple/>
    <state>
    <dictionary>
    <item>
    <key> <string>_defined_in_class</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>_hookname</string> </key>
    <value> <string>__before_publishing_traverse__</string> </value>
    </item>
    <item>
    <key> <string>_list</string> </key>
    <value>
    <list>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </list>
    </value>
    </item>
    <item>
    <key> <string>_prior</string> </key>
    <value>
    <none/>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>__before_traverse__</string> </key>
    <value>
    <dictionary>
    <item>
    <key>
    <tuple>
    <int>99</int>
    <string>ERP5 Web Section/2</string>
    </tuple>
    </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>__translation_dict</string> </key>
    <value>
    ......@@ -136,4 +191,12 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="WebSectionTraversalHook" module="Products.ERP5.Document.WebSection"/>
    </pickle>
    <pickle>
    <dictionary/>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2.xml
    View file @ 5b20c274
    ......@@ -53,6 +53,61 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>__before_publishing_traverse__</string> </key>
    <value>
    <object>
    <klass>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
    </klass>
    <tuple/>
    <state>
    <dictionary>
    <item>
    <key> <string>_defined_in_class</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>_hookname</string> </key>
    <value> <string>__before_publishing_traverse__</string> </value>
    </item>
    <item>
    <key> <string>_list</string> </key>
    <value>
    <list>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </list>
    </value>
    </item>
    <item>
    <key> <string>_prior</string> </key>
    <value>
    <none/>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>__before_traverse__</string> </key>
    <value>
    <dictionary>
    <item>
    <key>
    <tuple>
    <int>99</int>
    <string>ERP5 Web Section/2</string>
    </tuple>
    </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>__translation_dict</string> </key>
    <value>
    ......@@ -62,7 +117,7 @@
    <item>
    <key> <string>_count</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    ......@@ -74,7 +129,7 @@
    <item>
    <key> <string>_mt_index</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    </value>
    </item>
    <item>
    ......@@ -86,7 +141,7 @@
    <item>
    <key> <string>_tree</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
    </value>
    </item>
    <item>
    ......@@ -159,12 +214,20 @@
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="WebSectionTraversalHook" module="Products.ERP5.Document.WebSection"/>
    </pickle>
    <pickle>
    <dictionary/>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="Length" module="BTrees.Length"/>
    </pickle>
    <pickle> <int>0</int> </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="OOBTree" module="BTrees.OOBTree"/>
    </pickle>
    ......@@ -172,7 +235,7 @@
    <none/>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="OOBTree" module="BTrees.OOBTree"/>
    </pickle>
    ......
    bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2/1.xml
    View file @ 5b20c274
    ......@@ -53,6 +53,61 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>__before_publishing_traverse__</string> </key>
    <value>
    <object>
    <klass>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
    </klass>
    <tuple/>
    <state>
    <dictionary>
    <item>
    <key> <string>_defined_in_class</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>_hookname</string> </key>
    <value> <string>__before_publishing_traverse__</string> </value>
    </item>
    <item>
    <key> <string>_list</string> </key>
    <value>
    <list>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </list>
    </value>
    </item>
    <item>
    <key> <string>_prior</string> </key>
    <value>
    <none/>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>__before_traverse__</string> </key>
    <value>
    <dictionary>
    <item>
    <key>
    <tuple>
    <int>99</int>
    <string>ERP5 Web Section/1</string>
    </tuple>
    </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>__translation_dict</string> </key>
    <value>
    ......@@ -136,4 +191,12 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="WebSectionTraversalHook" module="Products.ERP5.Document.WebSection"/>
    </pickle>
    <pickle>
    <dictionary/>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2/2.xml
    View file @ 5b20c274
    ......@@ -53,6 +53,61 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>__before_publishing_traverse__</string> </key>
    <value>
    <object>
    <klass>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
    </klass>
    <tuple/>
    <state>
    <dictionary>
    <item>
    <key> <string>_defined_in_class</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>_hookname</string> </key>
    <value> <string>__before_publishing_traverse__</string> </value>
    </item>
    <item>
    <key> <string>_list</string> </key>
    <value>
    <list>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </list>
    </value>
    </item>
    <item>
    <key> <string>_prior</string> </key>
    <value>
    <none/>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>__before_traverse__</string> </key>
    <value>
    <dictionary>
    <item>
    <key>
    <tuple>
    <int>99</int>
    <string>ERP5 Web Section/2</string>
    </tuple>
    </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>__translation_dict</string> </key>
    <value>
    ......@@ -136,4 +191,12 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="WebSectionTraversalHook" module="Products.ERP5.Document.WebSection"/>
    </pickle>
    <pickle>
    <dictionary/>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3.xml
    View file @ 5b20c274
    ......@@ -53,6 +53,61 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>__before_publishing_traverse__</string> </key>
    <value>
    <object>
    <klass>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
    </klass>
    <tuple/>
    <state>
    <dictionary>
    <item>
    <key> <string>_defined_in_class</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>_hookname</string> </key>
    <value> <string>__before_publishing_traverse__</string> </value>
    </item>
    <item>
    <key> <string>_list</string> </key>
    <value>
    <list>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </list>
    </value>
    </item>
    <item>
    <key> <string>_prior</string> </key>
    <value>
    <none/>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>__before_traverse__</string> </key>
    <value>
    <dictionary>
    <item>
    <key>
    <tuple>
    <int>99</int>
    <string>ERP5 Web Section/3</string>
    </tuple>
    </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>__translation_dict</string> </key>
    <value>
    ......@@ -62,7 +117,7 @@
    <item>
    <key> <string>_count</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    ......@@ -74,7 +129,7 @@
    <item>
    <key> <string>_mt_index</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    </value>
    </item>
    <item>
    ......@@ -86,7 +141,7 @@
    <item>
    <key> <string>_tree</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
    </value>
    </item>
    <item>
    ......@@ -159,12 +214,20 @@
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="WebSectionTraversalHook" module="Products.ERP5.Document.WebSection"/>
    </pickle>
    <pickle>
    <dictionary/>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="Length" module="BTrees.Length"/>
    </pickle>
    <pickle> <int>0</int> </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="OOBTree" module="BTrees.OOBTree"/>
    </pickle>
    ......@@ -172,7 +235,7 @@
    <none/>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="OOBTree" module="BTrees.OOBTree"/>
    </pickle>
    ......
    bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3/1.xml
    View file @ 5b20c274
    ......@@ -53,6 +53,61 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>__before_publishing_traverse__</string> </key>
    <value>
    <object>
    <klass>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
    </klass>
    <tuple/>
    <state>
    <dictionary>
    <item>
    <key> <string>_defined_in_class</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>_hookname</string> </key>
    <value> <string>__before_publishing_traverse__</string> </value>
    </item>
    <item>
    <key> <string>_list</string> </key>
    <value>
    <list>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </list>
    </value>
    </item>
    <item>
    <key> <string>_prior</string> </key>
    <value>
    <none/>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>__before_traverse__</string> </key>
    <value>
    <dictionary>
    <item>
    <key>
    <tuple>
    <int>99</int>
    <string>ERP5 Web Section/1</string>
    </tuple>
    </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>__translation_dict</string> </key>
    <value>
    ......@@ -136,4 +191,12 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="WebSectionTraversalHook" module="Products.ERP5.Document.WebSection"/>
    </pickle>
    <pickle>
    <dictionary/>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3/2.xml
    View file @ 5b20c274
    ......@@ -53,6 +53,61 @@
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>__before_publishing_traverse__</string> </key>
    <value>
    <object>
    <klass>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
    </klass>
    <tuple/>
    <state>
    <dictionary>
    <item>
    <key> <string>_defined_in_class</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>_hookname</string> </key>
    <value> <string>__before_publishing_traverse__</string> </value>
    </item>
    <item>
    <key> <string>_list</string> </key>
    <value>
    <list>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </list>
    </value>
    </item>
    <item>
    <key> <string>_prior</string> </key>
    <value>
    <none/>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>__before_traverse__</string> </key>
    <value>
    <dictionary>
    <item>
    <key>
    <tuple>
    <int>99</int>
    <string>ERP5 Web Section/2</string>
    </tuple>
    </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>__translation_dict</string> </key>
    <value>
    ......@@ -136,4 +191,12 @@
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="WebSectionTraversalHook" module="Products.ERP5.Document.WebSection"/>
    </pickle>
    <pickle>
    <dictionary/>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/predecessor_test_web_site/discussions.xml
    View file @ 5b20c274
    ......@@ -164,7 +164,7 @@
    <key> <string>membership_criterion_category</string> </key>
    <value>
    <tuple>
    <string/>
    <string></string>
    </tuple>
    </value>
    </item>
    ......
    bt5/erp5_maileva_connector/SkinTemplateItem/portal_skins/erp5_maileva_connector/maileva_connection_request.zpt
    View file @ 5b20c274
    ......@@ -18,7 +18,7 @@
    <com:AddressLine5 tal:content="python: recipient_address_line_list[4]" tal:condition="python: recipient_address_line_list[4]"></com:AddressLine5>
    <com:AddressLine6 tal:content="python: recipient_address_line_list[5]" tal:condition="python: recipient_address_line_list[5]"></com:AddressLine6>
    </com:AddressLines>
    <com:Country tal:content="recipient_region/getTitle"></com:Country>
    <com:Country tal:content="recipient_region/getTranslatedTitle"></com:Country>
    <com:CountryCode tal:content="recipient_region/getCodification"></com:CountryCode>
    </com:PaperAddress>
    <com:DigitalAddress>
    ......@@ -77,7 +77,7 @@
    <pjs:RequestOption>
    <spec:DigitalOption>
    <spec:FoldOption>
    <spec:PostageClass>ECOPLI_GRAND_COMPTE</spec:PostageClass>
    <spec:PostageClass tal:content="python: 'ECOPLI_GRAND_COMPTE' if recipient_region.getCodification() == 'FR' else 'STANDARD'"></spec:PostageClass>
    <spec:DepositTitle tal:content="here/getTitle"></spec:DepositTitle>
    <spec:DepositDescription tal:content="here/getTitle"></spec:DepositDescription>
    <spec:UseFlyLeaf>true</spec:UseFlyLeaf>
    ......
    bt5/erp5_movement_table_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_list.xml
    View file @ 5b20c274
    ......@@ -62,12 +62,6 @@ getVariationText</string> </value>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>expression_instance</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>filtered</string> </key>
    <value> <int>1</int> </value>
    ......@@ -101,17 +95,4 @@ getVariationText</string> </value>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Expression" module="Products.CMFCore.Expression"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>python: context.providesIMovement()</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_mrp_item/bt/template_action_path_list
    View file @ 5b20c274
    Manufacturing Execution Line | item_creation
    Manufacturing Execution Line | select_item_fast_input
    Manufacturing Execution | aggregate_item
    Production Order Line | item_creation
    Production Order Line | select_item_fast_input
    Production Order | aggregate_item
    Production Packing List Line | item_creation
    Production Packing List Line | select_item_fast_input
    Production Packing List | aggregate_item
    Manufacturing Execution Line | item_creation
    Manufacturing Execution Line | select_item_fast_input
    Manufacturing Execution | aggregate_item
    \ No newline at end of file
    Production Packing List | aggregate_item
    \ No newline at end of file
    bt5/erp5_oauth/bt/dependency_list 0 → 100644
    View file @ 5b20c274
    erp5_base
    \ No newline at end of file
    bt5/erp5_officejs_jquery_app/bt/template_keep_last_workflow_history_only_path_list
    View file @ 5b20c274
    ......@@ -7,4 +7,4 @@ image_module/web_table_app_logo_svg
    web_site_module/officejs_image_editor
    web_site_module/officejs_image_editor/**
    web_site_module/officejs_web_table_editor
    web_site_module/officejs_web_table_editor/**
    web_site_module/officejs_web_table_editor/**
    \ No newline at end of file
    bt5/erp5_officejs_jquery_app/bt/template_keep_workflow_path_list
    View file @ 5b20c274
    ......@@ -7,4 +7,4 @@ image_module/web_table_app_logo_svg
    web_site_module/officejs_image_editor
    web_site_module/officejs_image_editor/**
    web_site_module/officejs_web_table_editor
    web_site_module/officejs_web_table_editor/**
    web_site_module/officejs_web_table_editor/**
    \ No newline at end of file
    bt5/erp5_ui_test/bt/dependency_list
    View file @ 5b20c274
    This diff is collapsed.
    bt5/erp5_upgrader_test/bt/dependency_list
    View file @ 5b20c274
    This diff is collapsed.
    product/ERP5/Document/BusinessTemplate.py
    View file @ 5b20c274
    This diff is collapsed.
    product/ERP5Type/Core/Workflow.py
    View file @ 5b20c274
    This diff is collapsed.
    product/ERP5Type/tests/CodingStyleTest.py
    View file @ 5b20c274
    This diff is collapsed.
    product/Formulator/Widget.py
    View file @ 5b20c274
    This diff is collapsed.
    • Jérome Perrin @jerome ·
      Owner

      This merge will bring new failures in ERP5.CodingStyleTest-Zope4Py2, this is expected because !1575 (merged) . I'm working on unifying the business templates XML output

    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7