diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.xml b/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.xml
index 0d15b79c1c7fccffd1323e52e0255f8a2948946a..70029022a2f73d81a37eba38a3b280183ff93585 100644
--- a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.xml
+++ b/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_accounting_transaction.xml
@@ -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>
diff --git a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.xml b/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.xml
index 7cbffbaa2d5f8d746d944c528a2d7ff38be6e392..818e440659d55d8ce8a20d49b91da8efb9ccdb4f 100644
--- a/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.xml
+++ b/bt5/erp5_accounting/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_accounting_transaction_list.xml
@@ -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>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_resetGroupingReference.py b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_resetGroupingReference.py
index e181f5b3a446f5d2f456fb25672dbecd6ca54362..59a0c3811df66a58a971d314ce461e3fd4ba5b41 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_resetGroupingReference.py
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_resetGroupingReference.py
@@ -36,4 +36,3 @@ for (section_value, node_uid, mirror_section_uid) in (
           grouping_reference=grouping_reference
       ) or [])
 return list(ungrouped_line_set)
-
diff --git a/bt5/erp5_api_style/TestTemplateItem/portal_components/test.erp5.testJioApiStyle.xml b/bt5/erp5_api_style/TestTemplateItem/portal_components/test.erp5.testJioApiStyle.xml
index 6a794747a1324ff9a3684d93c9d62088b4380615..d47deed9b75679090c2d03c267c345c71bd7ae6a 100644
--- a/bt5/erp5_api_style/TestTemplateItem/portal_components/test.erp5.testJioApiStyle.xml
+++ b/bt5/erp5_api_style/TestTemplateItem/portal_components/test.erp5.testJioApiStyle.xml
@@ -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>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentList.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentList.xml
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentList/listbox.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList/listbox.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentList/listbox.xml
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList/listbox_download.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentList/listbox_download.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList/listbox_download.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentList/listbox_download.xml
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList/listbox_thumbnail.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentList/listbox_thumbnail.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList/listbox_thumbnail.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentList/listbox_thumbnail.xml
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList/my_title.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentList/my_title.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentList/my_title.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentList/my_title.xml
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentSearchableList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentSearchableList.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentSearchableList.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentSearchableList.xml
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentSearchableList/listbox.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentSearchableList/listbox.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentSearchableList/listbox.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentSearchableList/listbox.xml
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentSearchableList/listbox_download.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentSearchableList/listbox_download.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentSearchableList/listbox_download.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentSearchableList/listbox_download.xml
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentSearchableList/listbox_thumbnail.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentSearchableList/listbox_thumbnail.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewDocumentSearchableList/listbox_thumbnail.xml
rename to bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_viewDocumentSearchableList/listbox_thumbnail.xml
diff --git a/bt5/erp5_base/bt/template_document_id_list b/bt5/erp5_base/bt/template_document_id_list
index 9343b0630e2855d66f303eacacf157ae38d54692..b86fc380a0bf2890b85feb4a77e24d232c52269b 100644
--- a/bt5/erp5_base/bt/template_document_id_list
+++ b/bt5/erp5_base/bt/template_document_id_list
@@ -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
diff --git a/bt5/erp5_base/bt/template_interface_id_list b/bt5/erp5_base/bt/template_interface_id_list
index f06ba1b85cc9a466e9c01e8c0cfcd3498ca0dc3d..a5bdcea694bbc08f9032b3f8ed385a7ace12189d 100644
--- a/bt5/erp5_base/bt/template_interface_id_list
+++ b/bt5/erp5_base/bt/template_interface_id_list
@@ -1,5 +1,4 @@
 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
diff --git a/bt5/erp5_base/bt/template_keep_path_list b/bt5/erp5_base/bt/template_keep_path_list
index 315021836eb545f46f16f65e7ab47633e91fc248..5fa3381c6649773f423d7fc0e9926f39317ddbf6 100644
--- a/bt5/erp5_base/bt/template_keep_path_list
+++ b/bt5/erp5_base/bt/template_keep_path_list
@@ -1,3 +1,6 @@
+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
diff --git a/bt5/erp5_base/bt/template_tool_component_id_list b/bt5/erp5_base/bt/template_tool_component_id_list
deleted file mode 100644
index 3d3768420b430e82d4c9e3ae7f996d192580ceba..0000000000000000000000000000000000000000
--- a/bt5/erp5_base/bt/template_tool_component_id_list
+++ /dev/null
@@ -1 +0,0 @@
-tool.erp5.RoundingTool
\ No newline at end of file
diff --git a/bt5/erp5_certificate_authority/bt/template_portal_type_id_list b/bt5/erp5_certificate_authority/bt/template_portal_type_id_list
index 3b2e14c9601f61d3af71a16c0610776fc7271cbb..4d790e3fbef7f5e1b0734c165dbb1da12a553a10 100644
--- a/bt5/erp5_certificate_authority/bt/template_portal_type_id_list
+++ b/bt5/erp5_certificate_authority/bt/template_portal_type_id_list
@@ -1,2 +1,2 @@
 Certificate Authority Tool
-Certificate Login
+Certificate Login
\ No newline at end of file
diff --git a/bt5/erp5_configurator/PortalTypePropertySheetTemplateItem/property_sheet_list.xml b/bt5/erp5_configurator/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
index 5303e60e1e2f3b6c8e7b36994f745454024ed8ed..269c3a99de2ba220a1f84edcfd102aefed247f6a 100644
--- a/bt5/erp5_configurator/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
+++ b/bt5/erp5_configurator/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
@@ -1,9 +1,9 @@
 <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
diff --git a/bt5/erp5_configurator/bt/template_action_path_list b/bt5/erp5_configurator/bt/template_action_path_list
index 84240ec166c2ae6a306d1da4332684c30b495a0c..0ac65b4ebd901fcb439e1ca3008d510a8eb39b05 100644
--- a/bt5/erp5_configurator/bt/template_action_path_list
+++ b/bt5/erp5_configurator/bt/template_action_path_list
@@ -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
diff --git a/bt5/erp5_configurator/bt/template_portal_type_property_sheet_list b/bt5/erp5_configurator/bt/template_portal_type_property_sheet_list
index 6fb343402b5c3c1094a11ede8e77a15e4dc1bbbc..9578bc4c6da0b3db6ccd9e4f690863e313479f8f 100644
--- a/bt5/erp5_configurator/bt/template_portal_type_property_sheet_list
+++ b/bt5/erp5_configurator/bt/template_portal_type_property_sheet_list
@@ -1,3 +1,3 @@
+Workflow Transition | ConfiguratorWorkflowTransition
 Workflow | ConfiguratorWorkflow
-Workflow | DefaultImage
-Workflow Transition | ConfiguratorWorkflowTransition
\ No newline at end of file
+Workflow | DefaultImage
\ No newline at end of file
diff --git a/bt5/erp5_configurator_standard/PathTemplateItem/business_configuration_module/default_standard_configuration.xml b/bt5/erp5_configurator_standard/PathTemplateItem/business_configuration_module/default_standard_configuration.xml
index 4dc3e6f947b86151c55be00e21a0e91fe8478499..9682c7d35eb988f485809042b1f9711da63a50ba 100644
--- a/bt5/erp5_configurator_standard/PathTemplateItem/business_configuration_module/default_standard_configuration.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/business_configuration_module/default_standard_configuration.xml
@@ -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>
diff --git a/bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/classification/collaborative.xml b/bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/classification/collaborative.xml
index 915e57aa2ef7069520ca9dd481208576e1516dfc..bb6f5370078115e6bfa7c0bd4ab8431dac83a476 100644
--- a/bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/classification/collaborative.xml
+++ b/bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/classification/collaborative.xml
@@ -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>
diff --git a/bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/trade_state/trade.xml b/bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/trade_state/trade.xml
index ce37e6e962550abd4bc0474c8b36929b0b1d501f..049b6be69325d098af470441080ba74ab8cb2a18 100644
--- a/bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/trade_state/trade.xml
+++ b/bt5/erp5_configurator_standard_categories/PathTemplateItem/portal_categories/trade_state/trade.xml
@@ -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>
diff --git a/bt5/erp5_configurator_standard_categories/PathTemplateItem/quantity_unit_conversion_module/area_conversion_group.xml b/bt5/erp5_configurator_standard_categories/PathTemplateItem/quantity_unit_conversion_module/area_conversion_group.xml
index aa37c4b83bdfd41e561c35a632097f73363a463d..52f1a95e61ed9974503f0bfaad406ad5d1762b54 100644
--- a/bt5/erp5_configurator_standard_categories/PathTemplateItem/quantity_unit_conversion_module/area_conversion_group.xml
+++ b/bt5/erp5_configurator_standard_categories/PathTemplateItem/quantity_unit_conversion_module/area_conversion_group.xml
@@ -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>
diff --git a/bt5/erp5_configurator_standard_categories/PathTemplateItem/quantity_unit_conversion_module/energy_conversion_group.xml b/bt5/erp5_configurator_standard_categories/PathTemplateItem/quantity_unit_conversion_module/energy_conversion_group.xml
index f0797a13b717fc8a4d5ab31cc30f4121a1b3c471..8b97bac969276e42108b53cd7036d44f4376764e 100644
--- a/bt5/erp5_configurator_standard_categories/PathTemplateItem/quantity_unit_conversion_module/energy_conversion_group.xml
+++ b/bt5/erp5_configurator_standard_categories/PathTemplateItem/quantity_unit_conversion_module/energy_conversion_group.xml
@@ -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>
diff --git a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Accept%20Solver.xml b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Accept%20Solver.xml
index 6706b3caab7aef890a97f42063ecd1a410531554..85a0410278d6767d9166787e29aedd950b09b912 100644
--- a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Accept%20Solver.xml
+++ b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Accept%20Solver.xml
@@ -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>
diff --git a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Adopt%20Solver.xml b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Adopt%20Solver.xml
index eeba3dfc17712665ecdfdc85322e5beb311c8e8c..83c68ad04cb53ef9851e08bce59efeec699c08dc 100644
--- a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Adopt%20Solver.xml
+++ b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Adopt%20Solver.xml
@@ -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>
diff --git a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Automatic%20Accept%20Solver.xml b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Automatic%20Accept%20Solver.xml
index ce0bbb858d8531d2a31021c6582ddf51b682ecd7..0651e495daa46323e9bf82f44a8c30e45a98a5ca 100644
--- a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Automatic%20Accept%20Solver.xml
+++ b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Automatic%20Accept%20Solver.xml
@@ -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>
diff --git a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Production%20Reduction%20Solver.xml b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Production%20Reduction%20Solver.xml
index 1ea68657ff45f7b0192bcbcfba1b67e1fd1ac864..8313e24f01436bdb82e050b9074f2c76a104546a 100644
--- a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Production%20Reduction%20Solver.xml
+++ b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Production%20Reduction%20Solver.xml
@@ -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>
diff --git a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Quantity%20Cancel%20Solver.xml b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Quantity%20Cancel%20Solver.xml
index eab836ecd9248e4f39e5b8e2329ea465a8c91963..86a085dd7d47a4addd10177f8d6607c04d6b9fa4 100644
--- a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Quantity%20Cancel%20Solver.xml
+++ b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Quantity%20Cancel%20Solver.xml
@@ -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>
diff --git a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Quantity%20Split%20Solver.xml b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Quantity%20Split%20Solver.xml
index c1a1b0d707947b56284ece1c80dd705108372417..aede3b46e8a1e3482ac3ef60ca545df5d9487cd5 100644
--- a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Quantity%20Split%20Solver.xml
+++ b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Quantity%20Split%20Solver.xml
@@ -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>
diff --git a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Simple%20Quantity%20Split%20Solver.xml b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Simple%20Quantity%20Split%20Solver.xml
index 1a99c5c834a8f29ca15381a994bd41f496e942c0..15820964289eecbe10a8cd56c2868688b94ed308 100644
--- a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Simple%20Quantity%20Split%20Solver.xml
+++ b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Simple%20Quantity%20Split%20Solver.xml
@@ -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>
diff --git a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Trade%20Model%20Solver.xml b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Trade%20Model%20Solver.xml
index c9ad896087a6b4152d095c4768fa7c96b983291f..5aed7c1803a4a1980e3b43010ef60c46c6ae9ca0 100644
--- a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Trade%20Model%20Solver.xml
+++ b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Trade%20Model%20Solver.xml
@@ -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>
diff --git a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Unify%20Solver.xml b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Unify%20Solver.xml
index 16e8b54e17bc332423cef0e599e034a4020227d5..2824c29d49a6a78380ccfa607bb3aaf5f3f56730 100644
--- a/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Unify%20Solver.xml
+++ b/bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Unify%20Solver.xml
@@ -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>
diff --git a/bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testWorkflowHistoryList.py b/bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testWorkflowHistoryList.py
index 03275a124239d825eba7f7afbdee951f7a840c71..631f4987dd501cbf59d3118ba178fdf15b4e87f1 100644
--- a/bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testWorkflowHistoryList.py
+++ b/bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testWorkflowHistoryList.py
@@ -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)
diff --git a/bt5/erp5_credential/PathTemplateItem/notification_message_module/credential_request-subscription.xml b/bt5/erp5_credential/PathTemplateItem/notification_message_module/credential_request-subscription.xml
index bcd9671159db95c6430ebf4c4486e4995559c00d..bc76fdf346c704d63af37dfc1e419978e73ca06d 100644
--- a/bt5/erp5_credential/PathTemplateItem/notification_message_module/credential_request-subscription.xml
+++ b/bt5/erp5_credential/PathTemplateItem/notification_message_module/credential_request-subscription.xml
@@ -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>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList.xml
index 852dd7304558497a4151fb4bd33dd01b1aa10d1c..113c7ac363a5e68ffe378b805fcc516dcf9a8c55 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList.xml
@@ -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>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox.xml
index 216c5a48a4312846be13e6b26dac5398657617f1..2c846114c6d4a3d98c5163eca3b1c278c46e0286 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox.xml
@@ -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>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox_delivery_stop_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox_delivery_stop_date.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c01765591bc501148d3e94ecef2c0dcee92f5e9e
--- /dev/null
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_viewEventList/listbox_delivery_stop_date.xml
@@ -0,0 +1,2402 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>listbox_delivery_stop_date</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>datetime_out_of_range</string> </key>
+                    <value> <string>The date and time you entered were out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_datetime</string> </key>
+                    <value> <string>You did not enter a valid date and time.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>allow_empty_time</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>ampm_time_style</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>date_only</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>date_separator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default_now</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end_datetime</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden_day_is_last_day</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hide_day</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>input_order</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>input_style</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start_datetime</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>time_separator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>timezone_style</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>sub_form</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>allow_empty_time</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>ampm_time_style</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>date_only</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>date_separator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>default_now</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default_timezone</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end_datetime</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden_day_is_last_day</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hide_day</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>input_order</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>input_style</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start_datetime</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>time_separator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>timezone_style</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>allow_empty_time</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>ampm_time_style</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string>date_field</string> </value>
+                </item>
+                <item>
+                    <key> <string>date_only</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>date_separator</string> </key>
+                    <value> <string>/</string> </value>
+                </item>
+                <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>description</string> </key>
+                    <value> <string>The Date</string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end_datetime</string> </key>
+                    <value>
+                      <none/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>hidden_day_is_last_day</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>hide_day</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>input_order</string> </key>
+                    <value> <string>ymd</string> </value>
+                </item>
+                <item>
+                    <key> <string>input_style</string> </key>
+                    <value> <string>text</string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start_datetime</string> </key>
+                    <value>
+                      <none/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>time_separator</string> </key>
+                    <value> <string>:</string> </value>
+                </item>
+                <item>
+                    <key> <string>timezone_style</string> </key>
+                    <value> <int>0</int> </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>
+      <tuple>
+        <global name="BasicForm" module="Products.Formulator.Form"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>action</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>encoding</string> </key>
+            <value> <string>UTF-8</string> </value>
+        </item>
+        <item>
+            <key> <string>enctype</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fields</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>ampm</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>day</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>hour</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>minute</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>month</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>timezone</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>year</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <list>
+                <string>Default</string>
+                <string>date</string>
+                <string>time</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>Default</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>date</string> </key>
+                    <value>
+                      <list>
+                        <string>year</string>
+                        <string>month</string>
+                        <string>day</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>time</string> </key>
+                    <value>
+                      <list>
+                        <string>hour</string>
+                        <string>minute</string>
+                        <string>ampm</string>
+                        <string>timezone</string>
+                      </list>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>method</string> </key>
+            <value> <string>POST</string> </value>
+        </item>
+        <item>
+            <key> <string>name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>stored_encoding</string> </key>
+            <value> <string>ISO-8859-1</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Basic Form</string> </value>
+        </item>
+        <item>
+            <key> <string>unicode_mode</string> </key>
+            <value> <int>0</int> </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: cell.hasStopDate() and cell.getStopDate() or None</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>preferences/getPreferredDateOrder | string:ymd</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="5" aka="AAAAAAAAAAU=">
+    <pickle>
+      <tuple>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>ampm</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>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+                <item>
+                    <key> <string>too_long</string> </key>
+                    <value> <string>Too much input was given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>max_length</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>am/pm</string> </value>
+                </item>
+                <item>
+                    <key> <string>truncate</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="6" aka="AAAAAAAAAAY=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>day</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>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Day</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="7" aka="AAAAAAAAAAc=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>hour</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>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Hour</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="8" aka="AAAAAAAAAAg=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>minute</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>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Minute</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="9" aka="AAAAAAAAAAk=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>month</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>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>2</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Month</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="10" aka="AAAAAAAAAAo=">
+    <pickle>
+      <tuple>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>timezone</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>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+                <item>
+                    <key> <string>unknown_selection</string> </key>
+                    <value> <string>You selected an item that was not in the list.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra_item</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>first_item</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>size</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra_item</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>first_item</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>size</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string>GMT</string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra_item</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>first_item</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>GMT-12</string>
+                          <string>GMT-12</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT-11</string>
+                          <string>GMT-11</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT-10</string>
+                          <string>GMT-10</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT-9</string>
+                          <string>GMT-9</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT-8</string>
+                          <string>GMT-8</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT-7</string>
+                          <string>GMT-7</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT-6</string>
+                          <string>GMT-6</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT-5</string>
+                          <string>GMT-5</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT-4</string>
+                          <string>GMT-4</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT-3</string>
+                          <string>GMT-3</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT-2</string>
+                          <string>GMT-2</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT-1</string>
+                          <string>GMT-1</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT</string>
+                          <string>GMT</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT+1</string>
+                          <string>GMT+1</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT+2</string>
+                          <string>GMT+2</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT+3</string>
+                          <string>GMT+3</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT+4</string>
+                          <string>GMT+4</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT+5</string>
+                          <string>GMT+5</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT+6</string>
+                          <string>GMT+6</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT+7</string>
+                          <string>GMT+7</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT+8</string>
+                          <string>GMT+8</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT+9</string>
+                          <string>GMT+9</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT+10</string>
+                          <string>GMT+10</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT+11</string>
+                          <string>GMT+11</string>
+                        </tuple>
+                        <tuple>
+                          <string>GMT+12</string>
+                          <string>GMT+12</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>size</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Timezone</string> </value>
+                </item>
+                <item>
+                    <key> <string>unicode</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="11" aka="AAAAAAAAAAs=">
+    <pickle>
+      <tuple>
+        <global name="IntegerField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>year</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>
+                <item>
+                    <key> <string>integer_out_of_range</string> </key>
+                    <value> <string>The integer you entered was out of range.</string> </value>
+                </item>
+                <item>
+                    <key> <string>not_integer</string> </key>
+                    <value> <string>You did not enter an integer.</string> </value>
+                </item>
+                <item>
+                    <key> <string>required_not_found</string> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>alternate_name</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>css_class</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>display_maxwidth</string> </key>
+                    <value> <int>4</int> </value>
+                </item>
+                <item>
+                    <key> <string>display_width</string> </key>
+                    <value> <int>4</int> </value>
+                </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>end</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>extra</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>start</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Year</string> </value>
+                </item>
+                <item>
+                    <key> <string>whitespace_preserve</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_hasDuration.py b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_hasDuration.py
new file mode 100644
index 0000000000000000000000000000000000000000..ab92203fb8ec5727c71f8279aebf1fac21cd66df
--- /dev/null
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_hasDuration.py
@@ -0,0 +1 @@
+return False
diff --git a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_updateReferenceImage.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_hasDuration.xml
similarity index 93%
rename from bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_updateReferenceImage.xml
rename to bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_hasDuration.xml
index b813bbd2bc67e9260c60aea8f07b2ab8860f5525..2c0536a6f030ac27d8046f62d1f0c654aabb0025 100644
--- a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_updateReferenceImage.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_hasDuration.xml
@@ -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>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view.xml
index b27fb0aeee7c0287059bddd6224aad036c674611..4e02edb4d13b1358cc20bae99ade7baa4b3574ac 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view.xml
@@ -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>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_start_date.xml
index 94c47a79ac40cd8e8adae37a248c180dbcf9e0d1..86ce108b1cc0d30681dd9ed8c792dff0fb87603f 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_start_date.xml
@@ -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>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_stop_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_stop_date.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b09f778c21e09c7313d63135b3dcac23b4f957d9
--- /dev/null
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_view/my_stop_date.xml
@@ -0,0 +1,159 @@
+<?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>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PhoneCall_hasDuration.py b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PhoneCall_hasDuration.py
new file mode 100644
index 0000000000000000000000000000000000000000..f10c530716dd8ce727581153bddab5f939149424
--- /dev/null
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PhoneCall_hasDuration.py
@@ -0,0 +1 @@
+return True
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PhoneCall_hasDuration.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PhoneCall_hasDuration.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c29043bcdd0b33d930a6e4616548168628330a7d
--- /dev/null
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PhoneCall_hasDuration.xml
@@ -0,0 +1,62 @@
+<?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>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Visit_hasDuration.py b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Visit_hasDuration.py
new file mode 100644
index 0000000000000000000000000000000000000000..f10c530716dd8ce727581153bddab5f939149424
--- /dev/null
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Visit_hasDuration.py
@@ -0,0 +1 @@
+return True
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Visit_hasDuration.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Visit_hasDuration.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c7038cd41f5f298bc612e107fb2980055e8ffbb1
--- /dev/null
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Visit_hasDuration.xml
@@ -0,0 +1,62 @@
+<?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>
diff --git a/bt5/erp5_crm/TestTemplateItem/portal_components/test.erp5.testCRM.py b/bt5/erp5_crm/TestTemplateItem/portal_components/test.erp5.testCRM.py
index ea52f5fa7a3836b20e44f35b78a3125abd50d774..abf1a9f19db5e72cc7e2b9be1e1ff16f07110467 100644
--- a/bt5/erp5_crm/TestTemplateItem/portal_components/test.erp5.testCRM.py
+++ b/bt5/erp5_crm/TestTemplateItem/portal_components/test.erp5.testCRM.py
@@ -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
diff --git a/bt5/erp5_crm/TestTemplateItem/portal_components/test.erp5.testCRM.xml b/bt5/erp5_crm/TestTemplateItem/portal_components/test.erp5.testCRM.xml
index e782e346685b36d838e3f1fd5967126011f322ed..1bb7dfebcdc1796d85b3f432e2ad5d73dfae4b03 100644
--- a/bt5/erp5_crm/TestTemplateItem/portal_components/test.erp5.testCRM.xml
+++ b/bt5/erp5_crm/TestTemplateItem/portal_components/test.erp5.testCRM.xml
@@ -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>
diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variable_error_message.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variable_error_message.xml
new file mode 100644
index 0000000000000000000000000000000000000000..817188b439facc45ba777b1b87c0357379fe52dd
--- /dev/null
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variable_error_message.xml
@@ -0,0 +1,44 @@
+<?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>
diff --git a/bt5/erp5_crm_ui_test/SkinTemplateItem/portal_skins/erp5_crm_ui_test/Zuite_CommonTemplateForCRMUiTest.zpt b/bt5/erp5_crm_ui_test/SkinTemplateItem/portal_skins/erp5_crm_ui_test/Zuite_CommonTemplateForCRMUiTest.zpt
index b79a1f5e5a643c8c6b2b4ccc57a8e883b06990f0..43e6627705ab4124ca11f8173d7d0109cc457ffe 100644
--- a/bt5/erp5_crm_ui_test/SkinTemplateItem/portal_skins/erp5_crm_ui_test/Zuite_CommonTemplateForCRMUiTest.zpt
+++ b/bt5/erp5_crm_ui_test/SkinTemplateItem/portal_skins/erp5_crm_ui_test/Zuite_CommonTemplateForCRMUiTest.zpt
@@ -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>
diff --git a/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_computeReportSection.py b/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_computeReportSection.py
index a35607a216aa8b354df030adf8f60ae460053f21..474f0b478dfaad26695d77785afe1b46565897fa 100644
--- a/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_computeReportSection.py
+++ b/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_computeReportSection.py
@@ -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(),
diff --git a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_deleteObject.py b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_deleteObject.py
index 3825fd0d7f105f8d244d7a4f022609fc997f7c60..463e12ebbaca1b6acd71fddf495612a3c4b2a239 100644
--- a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_deleteObject.py
+++ b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_deleteObject.py
@@ -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'
+  }
+)
diff --git a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
index f786a43beabeddce1a08327acef64c3033da6b45..ce377f0a07a11208f99480b4805569ce5c9bb99f 100644
--- a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
+++ b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
@@ -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"),
diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml
index d1c50796d6ed528fef8a80ffee62b287947614d1..227b18d1233770117f6f3816ce8fc30e8841185a 100644
--- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml
+++ b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_email.xml
@@ -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>
diff --git a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml
index 83d5d05b428eb227e8e00c7169816accd293c043..65f892cd07011646ff46591ac9d89217078d6842 100644
--- a/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml
+++ b/bt5/erp5_ingestion_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_email_list.xml
@@ -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>
diff --git a/bt5/erp5_inotify/TestTemplateItem/portal_components/test.erp5.testInotifyTool.xml b/bt5/erp5_inotify/TestTemplateItem/portal_components/test.erp5.testInotifyTool.xml
index 837db47098dee540e604787467224bbfc18b4d66..569031f94992dc3cb2115a93c03f2ff44ca52783 100644
--- a/bt5/erp5_inotify/TestTemplateItem/portal_components/test.erp5.testInotifyTool.xml
+++ b/bt5/erp5_inotify/TestTemplateItem/portal_components/test.erp5.testInotifyTool.xml
@@ -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>
diff --git a/bt5/erp5_inotify/ToolTemplateItem/portal_inotify.xml b/bt5/erp5_inotify/ToolTemplateItem/portal_inotify.xml
index f64482467cd8e04b13442cf36ac7781b63ecab3e..47960c8a0fe6fa8ede1d4ac6503949a2fab4a370 100644
--- a/bt5/erp5_inotify/ToolTemplateItem/portal_inotify.xml
+++ b/bt5/erp5_inotify/ToolTemplateItem/portal_inotify.xml
@@ -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>
diff --git a/bt5/erp5_km/PathTemplateItem/web_page_module/minimal_km_footer.xml b/bt5/erp5_km/PathTemplateItem/web_page_module/minimal_km_footer.xml
index d1cf8dde582c47d726e29f68138edbca293465c2..dbb52e86383deb89d079a21af3aa64f4001bda7e 100644
--- a/bt5/erp5_km/PathTemplateItem/web_page_module/minimal_km_footer.xml
+++ b/bt5/erp5_km/PathTemplateItem/web_page_module/minimal_km_footer.xml
@@ -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=">
diff --git a/bt5/erp5_km_ui_test_data/PathTemplateItem/knowledge_pad_module/erp5_km_public_front_pad/6.xml b/bt5/erp5_km_ui_test_data/PathTemplateItem/knowledge_pad_module/erp5_km_public_front_pad/6.xml
index 1409ed9ce77f4dfb7b3001ad5bdb5850537d57e6..a7e23c6d1c70f21b9b1a0c465067847467223410 100644
--- a/bt5/erp5_km_ui_test_data/PathTemplateItem/knowledge_pad_module/erp5_km_public_front_pad/6.xml
+++ b/bt5/erp5_km_ui_test_data/PathTemplateItem/knowledge_pad_module/erp5_km_public_front_pad/6.xml
@@ -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>
diff --git a/bt5/erp5_km_ui_test_data/PathTemplateItem/portal_categories/classification/collaborative.xml b/bt5/erp5_km_ui_test_data/PathTemplateItem/portal_categories/classification/collaborative.xml
index 219e517ed51feecab6dd8481862ffb2805b7b3dd..2edf328450fb56b32db2d1def9a582efb5748d2c 100644
--- a/bt5/erp5_km_ui_test_data/PathTemplateItem/portal_categories/classification/collaborative.xml
+++ b/bt5/erp5_km_ui_test_data/PathTemplateItem/portal_categories/classification/collaborative.xml
@@ -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>
diff --git a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site.xml b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site.xml
index 19b53f5dd337f4a712006885636d582fa3db56e5..aa52d5d8882f0f8865770037780d171c1238bd4e 100644
--- a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site.xml
+++ b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site.xml
@@ -638,1335 +638,1371 @@
   </record>
   <record id="10" aka="AAAAAAAAAAo=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent>
-        <list>
-          <dictionary>
-            <item>
-                <key> <string>action</string> </key>
-                <value> <string>edit</string> </value>
-            </item>
-            <item>
-                <key> <string>actor</string> </key>
-                <value> <string>zope</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>924.52176.27319.64955</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="10.1" name="DateTime" module="DateTime.DateTime"/>
-                    </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361534818.82</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>zope</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>924.52182.64257.10478</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="10.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361536205.82</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>zope</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>924.52206.6369.7389</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="10.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361536368.44</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>zope</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>924.52208.52920.45875</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="10.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361537014.9</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>zope</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>924.52219.38128.62020</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="10.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361537021.13</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>zope</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>924.52219.44933.15377</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="10.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361537457.76</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>zope</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>924.52226.63092.10222</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="10.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361537534.86</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>zope</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>924.52228.16233.27033</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="10.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361537784.33</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>zope</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>924.52232.26577.25617</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="10.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361537878.02</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>zope</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>924.52233.63382.28552</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="10.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361538492.77</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>zope</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>924.52244.13959.33348</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="10.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361539487.54</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>zope</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>924.52260.51932.61337</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="10.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361541170.72</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>zope</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>924.52288.55403.20087</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="10.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361542837.08</float>
-                        <string>GMT+2</string>
-                      </tuple>
-                    </state>
-                  </object>
-                </value>
-            </item>
-          </dictionary>
-        </list>
-      </tuple>
-    </pickle>
-  </record>
-  <record id="11" aka="AAAAAAAAAAs=">
-    <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
-    </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>zope</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.62168.55841.18944</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="11.1" name="DateTime" module="DateTime.DateTime"/>
-                    </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1323330785.61</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>zope</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.62169.6178.55620</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1323333175.0</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>zope</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>924.11905.28782.40294</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361526330.31</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>zope</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>924.52041.33124.13687</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361526993.51</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>zope</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>924.52052.36608.15598</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361527429.9</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>zope</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>924.52059.54512.50432</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361531403.32</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>zope</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>924.52126.3644.52002</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361532398.33</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>zope</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>924.52142.41884.61900</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361532927.94</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>zope</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>924.52151.30525.62259</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361532963.01</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>zope</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>924.52152.3292.36864</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361533498.19</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>zope</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>924.52160.63565.40686</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361533599.53</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>zope</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>924.52162.43185.21742</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361533624.21</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>zope</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>924.52163.4608.15104</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361533863.24</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>zope</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>924.52167.3548.22766</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361534255.32</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>zope</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>924.52173.38589.58931</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361534343.7</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>zope</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>924.52175.4047.55961</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="11.1"/> </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1361534425.01</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>zope</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>924.52176.27319.64955</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="10.1" name="DateTime" module="DateTime.DateTime"/>
+                          </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361534818.82</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>zope</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>924.52182.64257.10478</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="10.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361536205.82</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>zope</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>924.52206.6369.7389</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="10.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361536368.44</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>zope</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>924.52208.52920.45875</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="10.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361537014.9</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>zope</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>924.52219.38128.62020</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="10.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361537021.13</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>zope</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>924.52219.44933.15377</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="10.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361537457.76</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>zope</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>924.52226.63092.10222</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="10.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361537534.86</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>zope</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>924.52228.16233.27033</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="10.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361537784.33</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>zope</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>924.52232.26577.25617</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="10.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361537878.02</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>zope</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>924.52233.63382.28552</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="10.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361538492.77</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>zope</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>924.52244.13959.33348</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="10.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361539487.54</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>zope</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>924.52260.51932.61337</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="10.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361541170.72</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>zope</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>924.52288.55403.20087</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="10.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361542837.08</float>
+                              <string>GMT+2</string>
+                            </tuple>
+                          </state>
+                        </object>
+                      </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_next</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_prev</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tail_count</string> </key>
+            <value> <int>16</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="11" aka="AAAAAAAAAAs=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <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>zope</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.62168.55841.18944</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="11.1" name="DateTime" module="DateTime.DateTime"/>
+                          </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1323330785.61</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>zope</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.62169.6178.55620</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1323333175.0</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>zope</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>924.11905.28782.40294</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361526330.31</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>zope</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>924.52041.33124.13687</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361526993.51</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>zope</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>924.52052.36608.15598</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361527429.9</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>zope</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>924.52059.54512.50432</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361531403.32</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>zope</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>924.52126.3644.52002</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361532398.33</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>zope</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>924.52142.41884.61900</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361532927.94</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>zope</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>924.52151.30525.62259</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361532963.01</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>zope</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>924.52152.3292.36864</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361533498.19</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>zope</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>924.52160.63565.40686</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361533599.53</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>zope</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>924.52162.43185.21742</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361533624.21</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>zope</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>924.52163.4608.15104</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361533863.24</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>zope</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>924.52167.3548.22766</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361534255.32</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>zope</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>924.52173.38589.58931</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361534343.7</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>zope</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>924.52175.4047.55961</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="11.1"/> </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1361534425.01</float>
+                              <string>GMT+2</string>
+                            </tuple>
+                          </state>
+                        </object>
+                      </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>_next</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_prev</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>
diff --git a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1.xml b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1.xml
index e00f6818ab7ed9f0ab4e19801fbe765c97c0adbf..4b67851a3b0f4643655b71b5a46846ede5e08b17 100644
--- a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1.xml
+++ b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1.xml
@@ -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>
diff --git a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1/1.xml b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1/1.xml
index 3d27f97f605cf9a328b3c6540c71518f036384b5..bba863001d8eb5c6c7139f8f4a59e3e0e21ec725 100644
--- a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1/1.xml
+++ b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1/1.xml
@@ -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>
diff --git a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1/2.xml b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1/2.xml
index 25babf34f5039b323fd29fa52bf632350e1e97b3..b3241aabcefe9b4376211f6dbce1550793a3d33b 100644
--- a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1/2.xml
+++ b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/1/2.xml
@@ -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>
diff --git a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2.xml b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2.xml
index c1bd1b927c66275d85ce610bac3f3cc8d743117d..ea0aa22d051b85253f1126d295bdd988c374b21b 100644
--- a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2.xml
+++ b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2.xml
@@ -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>
diff --git a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2/1.xml b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2/1.xml
index 4560ab3d4abded8c5e2445684192306564059f99..083c5bc8912796bb1255c7ed518dd29bc9cdd9cf 100644
--- a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2/1.xml
+++ b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2/1.xml
@@ -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>
diff --git a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2/2.xml b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2/2.xml
index 3396e867cdec035336c966c647aaf4dedbea5b26..4d8049da844f3c4daf419a4251ba34be5166de73 100644
--- a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2/2.xml
+++ b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/2/2.xml
@@ -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>
diff --git a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3.xml b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3.xml
index c0f156923b56d7f4775181f2a4c70e41626fcd48..96ef71452bd3fae73fa0ef2f6d07cb0dda1cf216 100644
--- a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3.xml
+++ b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3.xml
@@ -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>
diff --git a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3/1.xml b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3/1.xml
index e1da5759f922e11a7e9bd4200d8968ef0e86e1a7..761e745ab9da5ea5e804370f5bcbbcefda7a3feb 100644
--- a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3/1.xml
+++ b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3/1.xml
@@ -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>
diff --git a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3/2.xml b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3/2.xml
index e7452e022b0499966f44c5b7adefdec4ab0e796d..f40f330320ff7b3fadd5638fd17de3b53bf41313 100644
--- a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3/2.xml
+++ b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/3/2.xml
@@ -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>
diff --git a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/forum.xml b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/forum.xml
index 7e86f5290813cbe6259876653cab8b7478be5417..e552b433109dee5f9fa6f4b1d48ed29722912ab9 100644
--- a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/forum.xml
+++ b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/km_test_web_site/forum.xml
@@ -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/forum</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,13 +117,13 @@
         <item>
             <key> <string>_identity_criterion</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
         <item>
             <key> <string>_range_criterion</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
@@ -138,13 +193,21 @@
         <item>
             <key> <string>workflow_history</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
             </value>
         </item>
       </dictionary>
     </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="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
@@ -168,7 +231,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="3" aka="AAAAAAAAAAM=">
+  <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
       <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
@@ -183,7 +246,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
+  <record id="5" aka="AAAAAAAAAAU=">
     <pickle>
       <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
@@ -196,7 +259,7 @@
                 <item>
                     <key> <string>edit_workflow</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -205,7 +268,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="5" aka="AAAAAAAAAAU=">
+  <record id="6" aka="AAAAAAAAAAY=">
     <pickle>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
@@ -247,7 +310,7 @@
                       <value>
                         <object>
                           <klass>
-                            <global id="5.1" name="DateTime" module="DateTime.DateTime"/>
+                            <global id="6.1" name="DateTime" module="DateTime.DateTime"/>
                           </klass>
                           <tuple>
                             <none/>
@@ -293,7 +356,7 @@
                       <key> <string>time</string> </key>
                       <value>
                         <object>
-                          <klass> <reference id="5.1"/> </klass>
+                          <klass> <reference id="6.1"/> </klass>
                           <tuple>
                             <none/>
                           </tuple>
@@ -338,7 +401,7 @@
                       <key> <string>time</string> </key>
                       <value>
                         <object>
-                          <klass> <reference id="5.1"/> </klass>
+                          <klass> <reference id="6.1"/> </klass>
                           <tuple>
                             <none/>
                           </tuple>
diff --git a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/predecessor_test_web_site/discussions.xml b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/predecessor_test_web_site/discussions.xml
index 1aeaf0b39667ab0e03ab3a7a6aa68d28857ae968..d1b8ea1e3bbf86401c926ce47896dc3e1e80cb77 100644
--- a/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/predecessor_test_web_site/discussions.xml
+++ b/bt5/erp5_km_ui_test_data/PathTemplateItem/web_site_module/predecessor_test_web_site/discussions.xml
@@ -164,7 +164,7 @@
             <key> <string>membership_criterion_category</string> </key>
             <value>
               <tuple>
-                <string/>
+                <string></string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_maileva_connector/SkinTemplateItem/portal_skins/erp5_maileva_connector/maileva_connection_request.zpt b/bt5/erp5_maileva_connector/SkinTemplateItem/portal_skins/erp5_maileva_connector/maileva_connection_request.zpt
index b008c40a562f3e41499236266619b5189d9a1757..4a1359d0e0e7f55566ec1beac25e0a1a503d53d5 100644
--- a/bt5/erp5_maileva_connector/SkinTemplateItem/portal_skins/erp5_maileva_connector/maileva_connection_request.zpt
+++ b/bt5/erp5_maileva_connector/SkinTemplateItem/portal_skins/erp5_maileva_connector/maileva_connection_request.zpt
@@ -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>
diff --git a/bt5/erp5_movement_table_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_list.xml b/bt5/erp5_movement_table_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_list.xml
index 09903fae1721272b3fd1ed9569cbf20580cb284b..c41b4f43e5dcb15144691f226e51a3650d863f7e 100644
--- a/bt5/erp5_movement_table_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_list.xml
+++ b/bt5/erp5_movement_table_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_list.xml
@@ -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>
diff --git a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variable_error_message.xml b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variable_error_message.xml
new file mode 100644
index 0000000000000000000000000000000000000000..817188b439facc45ba777b1b87c0357379fe52dd
--- /dev/null
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variable_error_message.xml
@@ -0,0 +1,44 @@
+<?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>
diff --git a/bt5/erp5_mrp_item/bt/template_action_path_list b/bt5/erp5_mrp_item/bt/template_action_path_list
index 4890dd64f2e96a2799827898ee35eb7143cba443..39d3b78acc75ca1c0ded4476766e5802aa5874f3 100644
--- a/bt5/erp5_mrp_item/bt/template_action_path_list
+++ b/bt5/erp5_mrp_item/bt/template_action_path_list
@@ -1,9 +1,9 @@
+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
diff --git a/bt5/erp5_oauth/bt/dependency_list b/bt5/erp5_oauth/bt/dependency_list
new file mode 100644
index 0000000000000000000000000000000000000000..1037d15c20e7753f9373ed1ccc68c378db21498d
--- /dev/null
+++ b/bt5/erp5_oauth/bt/dependency_list
@@ -0,0 +1 @@
+erp5_base
\ No newline at end of file
diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_query_view_html.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_query_view_html.xml
index 7a5eb5a4c61264d0840417153efa898008b9e36b..1afac3b9b21ac8a364db571ab7d6a0e90866f125 100644
--- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_query_view_html.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_query_view_html.xml
@@ -163,171 +163,183 @@
   </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>publish</string> </value>
-            </item>
-            <item>
-                <key> <string>actor</string> </key>
-                <value> <string>zope</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 name="DateTime" module="DateTime.DateTime"/>
-                    </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1565796736.47</float>
-                        <string>UTC</string>
-                      </tuple>
-                    </state>
-                  </object>
-                </value>
-            </item>
-            <item>
-                <key> <string>validation_state</string> </key>
-                <value> <string>published</string> </value>
-            </item>
-          </dictionary>
-        </list>
-      </tuple>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>publish</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>actor</string> </key>
+                      <value> <string>zope</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 name="DateTime" module="DateTime.DateTime"/>
+                          </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1565796736.47</float>
+                              <string>UTC</string>
+                            </tuple>
+                          </state>
+                        </object>
+                      </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>published</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </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>zope</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>977.53611.10439.54545</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 name="DateTime" module="DateTime.DateTime"/>
-                    </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1566050622.69</float>
-                        <string>UTC</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>zope</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>977.53611.10439.54545</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 name="DateTime" module="DateTime.DateTime"/>
+                          </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1566050622.69</float>
+                              <string>UTC</string>
+                            </tuple>
+                          </state>
+                        </object>
+                      </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <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>detect_converted_file</string> </value>
-            </item>
-            <item>
-                <key> <string>actor</string> </key>
-                <value> <string>zope</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>external_processing_state</string> </key>
-                <value> <string>converted</string> </value>
-            </item>
-            <item>
-                <key> <string>serial</string> </key>
-                <value> <string>0.0.0.0</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>1565712912.59</float>
-                        <string>UTC</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>detect_converted_file</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>actor</string> </key>
+                      <value> <string>zope</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>external_processing_state</string> </key>
+                      <value> <string>converted</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>serial</string> </key>
+                      <value> <string>0.0.0.0</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>1565712912.59</float>
+                              <string>UTC</string>
+                            </tuple>
+                          </state>
+                        </object>
+                      </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>
diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_smart_assistant_router_html.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_smart_assistant_router_html.xml
index 652ff07e6b51f6181b45f88aea90bc7730070658..3a332be5abb6bfab7f4aebc31a300a8889470093 100644
--- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_smart_assistant_router_html.xml
+++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_smart_assistant_router_html.xml
@@ -223,58 +223,62 @@
       <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>zope</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>977.57825.44431.51217</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 name="DateTime" module="DateTime.DateTime"/>
-                    </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1566303568.38</float>
-                        <string>UTC</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>zope</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>977.57825.44431.51217</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 name="DateTime" module="DateTime.DateTime"/>
+                          </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1566303568.38</float>
+                              <string>UTC</string>
+                            </tuple>
+                          </state>
+                        </object>
+                      </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
diff --git a/bt5/erp5_officejs_jquery_app/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_officejs_jquery_app/bt/template_keep_last_workflow_history_only_path_list
index ced62c3bb5048b8bef5d7fcd2ee17cf458e35416..043d7b2369a35d3a8644e06dd077b79ccca7eaac 100644
--- a/bt5/erp5_officejs_jquery_app/bt/template_keep_last_workflow_history_only_path_list
+++ b/bt5/erp5_officejs_jquery_app/bt/template_keep_last_workflow_history_only_path_list
@@ -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
diff --git a/bt5/erp5_officejs_jquery_app/bt/template_keep_workflow_path_list b/bt5/erp5_officejs_jquery_app/bt/template_keep_workflow_path_list
index ced62c3bb5048b8bef5d7fcd2ee17cf458e35416..043d7b2369a35d3a8644e06dd077b79ccca7eaac 100644
--- a/bt5/erp5_officejs_jquery_app/bt/template_keep_workflow_path_list
+++ b/bt5/erp5_officejs_jquery_app/bt/template_keep_workflow_path_list
@@ -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
diff --git a/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_001/1.xml b/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_001/1.xml
index 53812b4a854f9f2cdd9bff751597a16b4e56c474..7461c47f0f3cb6e836dd17bc635eeb254e696aef 100644
--- a/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_001/1.xml
+++ b/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_001/1.xml
@@ -49,6 +49,7 @@
                 <string>non_discountable_additional_price</string>
                 <string>priced_quantity</string>
                 <string>base_unit_price</string>
+                <string>quantity_unit</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_001/2.xml b/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_001/2.xml
index 228ba9e2ea192e4f1d01142382f05843ba4e797d..04a97654d17160b83fd6c60dfaa26cc4e2fd852c 100644
--- a/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_001/2.xml
+++ b/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_001/2.xml
@@ -55,6 +55,7 @@
                 <string>non_discountable_additional_price</string>
                 <string>priced_quantity</string>
                 <string>base_unit_price</string>
+                <string>quantity_unit</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_002/1.xml b/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_002/1.xml
index a5904deb0e0c74b935f65f122f757b9416ced227..d98cb24b00fec388d575afa1584d9ad5d857fc57 100644
--- a/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_002/1.xml
+++ b/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_002/1.xml
@@ -49,6 +49,7 @@
                 <string>non_discountable_additional_price</string>
                 <string>priced_quantity</string>
                 <string>base_unit_price</string>
+                <string>quantity_unit</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_002/2.xml b/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_002/2.xml
index 40c988bf1e767d6f1ca85ef477f2f813fcdfcf61..9cdb1f11855cc7d22deb3ea2c7ff236b9bc24b3f 100644
--- a/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_002/2.xml
+++ b/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_002/2.xml
@@ -49,6 +49,7 @@
                 <string>non_discountable_additional_price</string>
                 <string>priced_quantity</string>
                 <string>base_unit_price</string>
+                <string>quantity_unit</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_002/3.xml b/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_002/3.xml
index 71464cb40e7e9e9564215e8bce14870ceb124f6c..3ee56cbf9836f206606c1bb3b0748066c52b3b66 100644
--- a/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_002/3.xml
+++ b/bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/sale_supply_module/erp5_officejs_support_request_ui_test_sale_supply_002/3.xml
@@ -49,6 +49,7 @@
                 <string>non_discountable_additional_price</string>
                 <string>priced_quantity</string>
                 <string>base_unit_price</string>
+                <string>quantity_unit</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_paypal_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PaypalService.xml b/bt5/erp5_paypal_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PaypalService.xml
index df845b66b324dc2255a1ef0cc916481935a150ea..371d4d7f6a0771ff90548a7f5bd89b8050ac12db 100644
--- a/bt5/erp5_paypal_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PaypalService.xml
+++ b/bt5/erp5_paypal_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PaypalService.xml
@@ -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>1377844561.74</float>
-                              <string>GMT+9</string>
-                            </tuple>
-                          </state>
-                        </object>
-                      </value>
-                  </item>
                   <item>
                       <key> <string>validation_state</string> </key>
                       <value> <string>validated</string> </value>
diff --git a/bt5/erp5_paypal_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PaypalSecurePayment.xml b/bt5/erp5_paypal_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PaypalSecurePayment.xml
index 8feaaded1af0239240bc7f7546b7def945f542c7..a6a45bfd03d27b8d18321235872b3b760b56730c 100644
--- a/bt5/erp5_paypal_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PaypalSecurePayment.xml
+++ b/bt5/erp5_paypal_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PaypalSecurePayment.xml
@@ -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>1377844561.74</float>
-                              <string>GMT+9</string>
-                            </tuple>
-                          </state>
-                        </object>
-                      </value>
-                  </item>
                   <item>
                       <key> <string>validation_state</string> </key>
                       <value> <string>validated</string> </value>
diff --git a/bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/service_module/abondement_pee/default_isl.xml b/bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/service_module/abondement_pee/default_isl.xml
index 6ec7064421ff6d7b2e41f3da95cd3389dffb10e9..bd5838a27b9b5158c71795dda2228a470b8b4923 100644
--- a/bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/service_module/abondement_pee/default_isl.xml
+++ b/bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/service_module/abondement_pee/default_isl.xml
@@ -56,6 +56,7 @@
                 <string>non_discountable_additional_price</string>
                 <string>priced_quantity</string>
                 <string>base_unit_price</string>
+                <string>quantity_unit</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/service_module/abondement_pee/default_psl.xml b/bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/service_module/abondement_pee/default_psl.xml
index a407f131edb410840e7eb9d14d6e72d9dc03fb1f..7b601e141240ce300d444245c72624df4e166ce1 100644
--- a/bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/service_module/abondement_pee/default_psl.xml
+++ b/bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/service_module/abondement_pee/default_psl.xml
@@ -55,6 +55,7 @@
                 <string>non_discountable_additional_price</string>
                 <string>priced_quantity</string>
                 <string>base_unit_price</string>
+                <string>quantity_unit</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/service_module/ticket_restaurant/default_isl.xml b/bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/service_module/ticket_restaurant/default_isl.xml
index 0b73e1b8f8d76c25aa988902a712994cf13f6508..dd49990ee03f8a0f0c8d3b146b06981d1df09097 100644
--- a/bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/service_module/ticket_restaurant/default_isl.xml
+++ b/bt5/erp5_payroll_l10n_fr_test/PathTemplateItem/service_module/ticket_restaurant/default_isl.xml
@@ -45,6 +45,7 @@
                 <string>non_discountable_additional_price</string>
                 <string>priced_quantity</string>
                 <string>base_unit_price</string>
+                <string>quantity_unit</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_payroll_l10n_fr_test/bt/dependency_list b/bt5/erp5_payroll_l10n_fr_test/bt/dependency_list
index 394e2c185471145eb544c043fc6fd2d357690565..5663427b9690a9a3022b2620ef78d14c1744d9da 100644
--- a/bt5/erp5_payroll_l10n_fr_test/bt/dependency_list
+++ b/bt5/erp5_payroll_l10n_fr_test/bt/dependency_list
@@ -1 +1 @@
-erp5_payroll_l10n_fr
+erp5_payroll_l10n_fr
\ No newline at end of file
diff --git a/bt5/erp5_pdf_merge/ExtensionTemplateItem/portal_components/extension.erp5.ERP5PDFMerge.xml b/bt5/erp5_pdf_merge/ExtensionTemplateItem/portal_components/extension.erp5.ERP5PDFMerge.xml
index 1d62758aa7b888c88426d092613f7dacde2b2016..98a5c0642bc68a8b1f3eb8b67744f76dffd96f0f 100644
--- a/bt5/erp5_pdf_merge/ExtensionTemplateItem/portal_components/extension.erp5.ERP5PDFMerge.xml
+++ b/bt5/erp5_pdf_merge/ExtensionTemplateItem/portal_components/extension.erp5.ERP5PDFMerge.xml
@@ -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>1377844535.24</float>
-                              <string>GMT+9</string>
-                            </tuple>
-                          </state>
-                        </object>
-                      </value>
-                  </item>
                   <item>
                       <key> <string>validation_state</string> </key>
                       <value> <string>validated</string> </value>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/Delivery_updateTaskFastInputDialog.py b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/Delivery_updateTaskFastInputDialog.py
index 2caf6a788a6a47170e80e5ef4bfb69f0862346da..6da70a72d101f0f3a0e14b3e22774a343d9be642 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/Delivery_updateTaskFastInputDialog.py
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/Delivery_updateTaskFastInputDialog.py
@@ -1,16 +1,14 @@
-"""At first call, this script prefill values for all tasks that are
-going to be created. If values are already there, this script check if
-informations are correct.
+"""At first call, this script prefills values for all tasks that are
+going to be created. If values are already there, this script check that
+information is correct.
 """
-context.log('source_project_title', source_project_title)
 portal = context.getPortalObject()
 line_portal_type = "Sale Order Line"
 request = context.REQUEST
 from string import zfill
-from Products.ERP5Type.Document import newTempBase
+from Products.PythonScripts.standard import Object
 from Products.ERP5Type.Message import translateString
 
-context.log('original listbox', listbox)
 initial_value_dict = {}
 for line in (listbox or []):
   initial_value_dict[line['listbox_key']] = line
@@ -19,7 +17,7 @@ listbox = []
 validation_errors = {}
 def getRecursiveLineList(current, line_list):
   # We parse recursively all delivery line and we keep only ones
-  # without childs
+  # without child
   sub_line_list = current.objectValues(portal_type=line_portal_type)
   if len(sub_line_list) == 0:
     if current.getPortalType() == line_portal_type:
@@ -29,13 +27,10 @@ def getRecursiveLineList(current, line_list):
       getRecursiveLineList(sub_line, line_list)
 line_list = []
 getRecursiveLineList(context, line_list)
-context.log("line_list", line_list)
 i = 1
 project_search_dict = {}
-portal = context.getPortalObject()
 for line in line_list:
   line_dict = {}
-  #line_dict['listbox_key'] = "%s" % line_id
   key = zfill(i,3)
   for property_name in ('title', 'quantity_unit_title', 'quantity',
                         'resource_title', 'total_price', 'price',
@@ -65,13 +60,13 @@ for line in line_list:
     else:
       line_dict['source_project_relative_url'] = result[0].getRelativeUrl()
     if error_message:
-      error = newTempBase(context, key)
-      error.edit(error_text=error_message)
-      validation_errors['listbox_source_project_title_new_%s' % key] = error
+      validation_errors['listbox_source_project_title_new_%s' % key] = Object(
+          field_id='listbox_source_project_title_new_%s' % key,
+          getMessage=lambda translateString, message=error_message: translateString(message),
+      )
   listbox.append(line_dict)
   i += 1
 
-context.log('listbox', listbox)
 context.Base_updateDialogForm(listbox=listbox,update=1,kw=kw)
 
 if len(validation_errors):
@@ -101,6 +96,5 @@ if create and len(validation_errors) == 0:
               destination_section=delivery_line.getDestinationSection(),
               destination_decision=delivery_line.getDestinationDecision())
   return context.Base_redirect(form_id, keep_items=dict(
-        portal_status_message=translateString('%s Tasks Created.' %(len(listbox),))))
-
+        portal_status_message=translateString('${task_count} Tasks Created.', mapping={'task_count': len(listbox)})))
 return context.Delivery_viewTaskFastInputDialog(listbox=listbox, **kw)
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variable_error_message.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variable_error_message.xml
new file mode 100644
index 0000000000000000000000000000000000000000..817188b439facc45ba777b1b87c0357379fe52dd
--- /dev/null
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variable_error_message.xml
@@ -0,0 +1,44 @@
+<?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>
diff --git a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variable_error_message.xml b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variable_error_message.xml
new file mode 100644
index 0000000000000000000000000000000000000000..817188b439facc45ba777b1b87c0357379fe52dd
--- /dev/null
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variable_error_message.xml
@@ -0,0 +1,44 @@
+<?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>
diff --git a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.xml b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.xml
index 49a95cbd549a002ac2365621b3833db51ef1f4c7..24b4aea94bbd9febcbf74d8f5740471c87096f29 100644
--- a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.xml
+++ b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z0_uncatalog_reporting_outcome.xml
@@ -48,12 +48,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>
@@ -87,17 +81,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: getattr(context, \'getOutcomeDescription\', None) is not None</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.xml b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.xml
index 13c646bb07811500f169144b1cd42d23fe8f4c79..afb6b65326959474e715946d7e08cb9294f8f5ac 100644
--- a/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.xml
+++ b/bt5/erp5_project_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_reporting_outcome_list.xml
@@ -49,12 +49,6 @@ uid</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>
@@ -88,17 +82,4 @@ uid</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: getattr(context, \'getOutcomeDescription\', None) is not None</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_real_time_inventory_accounting/SkinTemplateItem/portal_skins/erp5_real_time_inventory_accounting/AccountingTransaction_postInventoryAssetPriceGeneration.py b/bt5/erp5_real_time_inventory_accounting/SkinTemplateItem/portal_skins/erp5_real_time_inventory_accounting/AccountingTransaction_postInventoryAssetPriceGeneration.py
index 19784451b20ebe83d7c328da8ffe6fca9c4fa8e8..32bd3327c4ce3d541e03bd1e6010ed2c9d5a21bd 100644
--- a/bt5/erp5_real_time_inventory_accounting/SkinTemplateItem/portal_skins/erp5_real_time_inventory_accounting/AccountingTransaction_postInventoryAssetPriceGeneration.py
+++ b/bt5/erp5_real_time_inventory_accounting/SkinTemplateItem/portal_skins/erp5_real_time_inventory_accounting/AccountingTransaction_postInventoryAssetPriceGeneration.py
@@ -29,4 +29,4 @@ accounting_transaction.setResource(resource)
 accounting_transaction.setLedger(ledger)
 
 # Posted to General Ledger
-accounting_transaction.stop()
\ No newline at end of file
+accounting_transaction.stop()
diff --git a/bt5/erp5_real_time_inventory_accounting_test/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_real_time_inventory_accounting_test/bt/template_keep_last_workflow_history_only_path_list
index a2765ea849d70393ddb3da979baaba248621d932..652425ed88a65604e01ad8744c24313ba3b904ae 100644
--- a/bt5/erp5_real_time_inventory_accounting_test/bt/template_keep_last_workflow_history_only_path_list
+++ b/bt5/erp5_real_time_inventory_accounting_test/bt/template_keep_last_workflow_history_only_path_list
@@ -1,4 +1,4 @@
 business_process_module/bpm_internal_hoge
 business_process_module/bpm_purchase_hoge
 business_process_module/bpm_sale_hoge
-portal_rules/default_delivery_root_simulation_rule
+portal_rules/default_delivery_root_simulation_rule
\ No newline at end of file
diff --git a/bt5/erp5_real_time_inventory_accounting_test/bt/template_path_list b/bt5/erp5_real_time_inventory_accounting_test/bt/template_path_list
index e30857e5763e9b8c5102dd72e5552da9e122725d..f598ad7cb47768b66ed0afac5e01bb2037b297fb 100644
--- a/bt5/erp5_real_time_inventory_accounting_test/bt/template_path_list
+++ b/bt5/erp5_real_time_inventory_accounting_test/bt/template_path_list
@@ -7,4 +7,4 @@ business_process_module/bpm_sale_hoge/**
 portal_categories/ledger/stock
 portal_categories/ledger/stock/**
 portal_rules/default_delivery_root_simulation_rule
-portal_rules/default_delivery_root_simulation_rule/**
+portal_rules/default_delivery_root_simulation_rule/**
\ No newline at end of file
diff --git a/bt5/erp5_report_renderjs_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalRJSReportLanguage.xml b/bt5/erp5_report_renderjs_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalRJSReportLanguage.xml
index 7f0fb4c13e300333f32c7136ba59db5571eac4e1..e1ebb78cb3630b11f9a9001b38cfc9e5e6a9ccae 100644
--- a/bt5/erp5_report_renderjs_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalRJSReportLanguage.xml
+++ b/bt5/erp5_report_renderjs_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalRJSReportLanguage.xml
@@ -119,14 +119,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>
@@ -138,36 +130,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>
diff --git a/bt5/erp5_research_item/TestTemplateItem/portal_components/test.erp5.testResearchItemSummaryReport.xml b/bt5/erp5_research_item/TestTemplateItem/portal_components/test.erp5.testResearchItemSummaryReport.xml
index 4de59f8f1aa57b8df69d499de45680476647612a..265e343f0d34f53ec3e6f3249c5e3b68a0de606a 100644
--- a/bt5/erp5_research_item/TestTemplateItem/portal_components/test.erp5.testResearchItemSummaryReport.xml
+++ b/bt5/erp5_research_item/TestTemplateItem/portal_components/test.erp5.testResearchItemSummaryReport.xml
@@ -113,33 +113,6 @@
                       <key> <string>action</string> </key>
                       <value> <string>validate</string> </value>
                   </item>
-                  <item>
-                      <key> <string>actor</string> </key>
-                      <value> <string>seb</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>1385030033.93</float>
-                              <string>GMT+1</string>
-                            </tuple>
-                          </state>
-                        </object>
-                      </value>
-                  </item>
                   <item>
                       <key> <string>validation_state</string> </key>
                       <value> <string>validated</string> </value>
diff --git a/bt5/erp5_scalability_test/SkinTemplateItem/portal_skins/erp5_scalability_test/ERP5Site_setIdGenerator.py b/bt5/erp5_scalability_test/SkinTemplateItem/portal_skins/erp5_scalability_test/ERP5Site_setIdGenerator.py
index 671efff3e8a3fc245d12698a649ad7c27defe084..b911176e3884278b309de81b4e1b9d7178484bff 100644
--- a/bt5/erp5_scalability_test/SkinTemplateItem/portal_skins/erp5_scalability_test/ERP5Site_setIdGenerator.py
+++ b/bt5/erp5_scalability_test/SkinTemplateItem/portal_skins/erp5_scalability_test/ERP5Site_setIdGenerator.py
@@ -2,4 +2,3 @@ portal = context.getPortalObject()
 
 portal.sale_order_module.setIdGenerator('_generatePerNodeId')
 portal.person_module.setIdGenerator('_generatePerNodeId')
-
diff --git a/bt5/erp5_social_contracts/TestTemplateItem/portal_components/test.erp5.testERP5SocialContracts.xml b/bt5/erp5_social_contracts/TestTemplateItem/portal_components/test.erp5.testERP5SocialContracts.xml
index 29ceaeaa1f492ab1eb99cc4a2c2f3da795e8ecf2..127cb193691101150cbd6bce7cb607bb643dcd9c 100644
--- a/bt5/erp5_social_contracts/TestTemplateItem/portal_components/test.erp5.testERP5SocialContracts.xml
+++ b/bt5/erp5_social_contracts/TestTemplateItem/portal_components/test.erp5.testERP5SocialContracts.xml
@@ -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>1377844663.46</float>
-                              <string>GMT+9</string>
-                            </tuple>
-                          </state>
-                        </object>
-                      </value>
-                  </item>
                   <item>
                       <key> <string>validation_state</string> </key>
                       <value> <string>validated</string> </value>
diff --git a/bt5/erp5_syncml_test_data/TestTemplateItem/portal_components/test.erp5.testSyncMLAsynchronousEngine.xml b/bt5/erp5_syncml_test_data/TestTemplateItem/portal_components/test.erp5.testSyncMLAsynchronousEngine.xml
index ff03e4bb1c5bdd668520b3a981894d5d833b11d9..1f2a171a5f7cbdef31646a32b4e736ca8f2836f6 100644
--- a/bt5/erp5_syncml_test_data/TestTemplateItem/portal_components/test.erp5.testSyncMLAsynchronousEngine.xml
+++ b/bt5/erp5_syncml_test_data/TestTemplateItem/portal_components/test.erp5.testSyncMLAsynchronousEngine.xml
@@ -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>1377844644.1</float>
-                              <string>GMT+9</string>
-                            </tuple>
-                          </state>
-                        </object>
-                      </value>
-                  </item>
                   <item>
                       <key> <string>validation_state</string> </key>
                       <value> <string>validated</string> </value>
diff --git a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/trade_state.xml b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/trade_state.xml
index 7c907cee06958847f0aa9ea9736cc3ba02d335e2..6e8eb732524ef8d778ad6fb4c936f4d3ede52110 100644
--- a/bt5/erp5_trade/CategoryTemplateItem/portal_categories/trade_state.xml
+++ b/bt5/erp5_trade/CategoryTemplateItem/portal_categories/trade_state.xml
@@ -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>description</string> </key>
             <value>
@@ -27,4 +45,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>
diff --git a/bt5/erp5_trade_renderjs_ui_test/PathTemplateItem/product_module/erp5_trade_renderjs_ui_test_product/default_ssl.xml b/bt5/erp5_trade_renderjs_ui_test/PathTemplateItem/product_module/erp5_trade_renderjs_ui_test_product/default_ssl.xml
index fca3c94a08d7020b921841371fe962f799454b88..b4ef36595c47471cf4c68e6453b38a493e0357ac 100644
--- a/bt5/erp5_trade_renderjs_ui_test/PathTemplateItem/product_module/erp5_trade_renderjs_ui_test_product/default_ssl.xml
+++ b/bt5/erp5_trade_renderjs_ui_test/PathTemplateItem/product_module/erp5_trade_renderjs_ui_test_product/default_ssl.xml
@@ -51,6 +51,7 @@
                 <string>non_discountable_additional_price</string>
                 <string>priced_quantity</string>
                 <string>base_unit_price</string>
+                <string>quantity_unit</string>
               </tuple>
             </value>
         </item>
diff --git a/bt5/erp5_ui_test/bt/dependency_list b/bt5/erp5_ui_test/bt/dependency_list
index 38f01a35f37fbbdbcb48b172deceb962b1e2f958..e8b44e289f5f41e260acd0a70c1d43ab59a4ed60 100644
--- a/bt5/erp5_ui_test/bt/dependency_list
+++ b/bt5/erp5_ui_test/bt/dependency_list
@@ -1,2 +1,3 @@
+erp5_base
 erp5_ui_test_core
 erp5_l10n_fa
\ No newline at end of file
diff --git a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_updateReferenceImage.py b/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_updateReferenceImage.py
deleted file mode 100644
index e0c7716e839cc4c70e9999d9f82f413fc2c7bc87..0000000000000000000000000000000000000000
--- a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_updateReferenceImage.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from StringIO import StringIO
-portal = context.getPortalObject()
-
-image_file = StringIO(image_data.replace('data:image/png;base64,', '').decode('base64'))
-
-image_path = [p for p in image_path.split('/') if p]
-existing = portal.restrictedTraverse(image_path, None)
-
-if existing is None:
-  container = portal.restrictedTraverse(image_path[:-1])
-  container.manage_addProduct['OFSP'].manage_addImage(
-    image_path[-1],
-    image_file,
-    '')
-
-else:
-  existing.manage_upload(image_file)
-
-return "reference image at {} updated".format('/'.join(image_path))
diff --git a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/user-extensions.js.js b/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/user-extensions.js.js
index c3f9882ce8d2aa06731260aa8cb0e5894d09859e..ad52507a19b41c72f4139c1c63e9f7612066d354 100644
--- a/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/user-extensions.js.js
+++ b/bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/user-extensions.js.js
@@ -209,74 +209,6 @@ function generateElement(tagName, childList, attributeDict, textContent) {
   return element;
 }
 
-/**
- * Generate an HTML form to update the reference snapshot
- *
- * @param {string} referenceImageURL relative URL of the reference image
- * @param {string} newImageData the new image data, base64 encoded
- * @return {Promise<string>} the base64 encoded html form
- */
-function generateUpdateForm(referenceImageURL, newImageData) {
-  return new Promise((resolve, reject) => {
-    var fr = new FileReader();
-    fr.onerror = reject;
-    fr.onload = () => resolve(fr.result);
-    fr.readAsDataURL(
-      new Blob(
-        [
-          generateElement('html', [
-            generateElement('body', [
-              generateElement('p', [
-                document.createTextNode('Replacing this old snapshot:'),
-                generateElement('br'),
-                generateElement('img', [], {
-                  src: location.origin + referenceImageURL,
-                  alt: 'reference image'
-                }),
-                generateElement('br'),
-                document.createTextNode('with this new snapshot:'),
-                generateElement('br'),
-                generateElement('img', [], {
-                  src: newImageData,
-                  alt: 'new image'
-                })
-              ]),
-              generateElement(
-                'form',
-                [
-                  generateElement('input', [], {
-                    type: 'hidden',
-                    name: 'image_data',
-                    value: newImageData
-                  }),
-                  generateElement('input', [], {
-                    type: 'hidden',
-                    name: 'image_path',
-                    value: referenceImageURL
-                  }),
-                  generateElement('input', [], {
-                    type: 'submit',
-                    value: 'Update Reference Snapshot'
-                  })
-                ],
-                {
-                  action:
-                    location.origin +
-                    '/' +
-                    referenceImageURL.split('/')[1] + // ERP5 portal
-                    '/Zuite_updateReferenceImage',
-                  method: 'POST'
-                }
-              )
-            ])
-          ]).innerHTML
-        ],
-        { type: 'text/html' }
-      )
-    );
-  });
-}
-
 /**
  * verify that the rendering of the element `locator` matches the previously saved reference.
  *
@@ -360,35 +292,33 @@ Selenium.prototype.doVerifyImageMatchSnapshot = (
           })
           .then(diff => {
             if (diff.rawMisMatchPercentage > misMatchToleranceFloat) {
-              return generateUpdateForm(referenceImageURL, actual).then(
-                updateReferenceImageForm => {
-                  htmlTestRunner.currentTest.currentRow.trElement
-                    .querySelector('td')
-                    .appendChild(
-                      generateElement('div', [
-                        document.createTextNode('Image differences:'),
-                        generateElement('br'),
-                        generateElement('img', [], {
-                          src: diff.getImageDataUrl(),
-                          alt: 'Image differences'
-                        }),
-                        generateElement('br'),
-                        document.createTextNode('Click '),
-                        generateElement(
-                          'a',
-                          [document.createTextNode('here')],
-                          {
-                            href: updateReferenceImageForm
-                          }
-                        ),
-                        document.createTextNode(
-                          ' to update reference snapshot.'
-                        )
-                      ])
-                    );
-                  throw new Error('Images are ' + diff.misMatchPercentage + '% different');
-                }
-              );
+              htmlTestRunner.currentTest.currentRow.trElement
+                .querySelector('td')
+                .appendChild(
+                  generateElement('div', [
+                    document.createTextNode('Image differences:'),
+                    generateElement('br'),
+                    generateElement('img', [], {
+                      src: diff.getImageDataUrl(),
+                      alt: 'Image differences'
+                    }),
+                    generateElement('br'),
+                    document.createTextNode('Click '),
+                    generateElement('a', [document.createTextNode('here')], {
+                      href: actual,
+                      download: referenceImageURL.split('/').pop(),
+                    }),
+                    document.createTextNode(' to download actual image for '),
+                    generateElement('code', [
+                      generateElement('a', [
+                        document.createTextNode(referenceImageURL),
+                      ],
+                        { href: referenceImageURL + '/manage_main' }
+                      )
+                    ])
+                  ])
+                );
+              throw new Error('Images are ' + diff.misMatchPercentage + '% different');
             }
           });
       }));
diff --git a/bt5/erp5_upgrader/bt/template_portal_type_property_sheet_list b/bt5/erp5_upgrader/bt/template_portal_type_property_sheet_list
index 5f1ba6b9f1ed112d1951bef8378dd33626f6561b..c8795fe78a0e3c9170cf77dfce84da46c5f4750f 100644
--- a/bt5/erp5_upgrader/bt/template_portal_type_property_sheet_list
+++ b/bt5/erp5_upgrader/bt/template_portal_type_property_sheet_list
@@ -1,3 +1,3 @@
 Template Tool | TemplateToolBusinessTemplateInstallationConstraint
 Template Tool | TemplateToolCategoryNameConstraint
-Template Tool | TemplateToolTableConsistencyConstraint
+Template Tool | TemplateToolTableConsistencyConstraint
\ No newline at end of file
diff --git a/bt5/erp5_upgrader/bt/template_property_sheet_id_list b/bt5/erp5_upgrader/bt/template_property_sheet_id_list
index 0de37b78e424ce845b444fd3fe4f66ecd3bc3fe5..42ed8e6dfe0228fd7d52bd861143a14bd5d14612 100644
--- a/bt5/erp5_upgrader/bt/template_property_sheet_id_list
+++ b/bt5/erp5_upgrader/bt/template_property_sheet_id_list
@@ -1,3 +1,3 @@
 TemplateToolBusinessTemplateInstallationConstraint
 TemplateToolCategoryNameConstraint
-TemplateToolTableConsistencyConstraint
+TemplateToolTableConsistencyConstraint
\ No newline at end of file
diff --git a/bt5/erp5_upgrader_test/bt/dependency_list b/bt5/erp5_upgrader_test/bt/dependency_list
index 2ff7275b85818c248141bb3157a5ec28d12e46d1..bdc7fdf506342c609fdd9b5108eecb947080caf7 100644
--- a/bt5/erp5_upgrader_test/bt/dependency_list
+++ b/bt5/erp5_upgrader_test/bt/dependency_list
@@ -1 +1,2 @@
+erp5_base
 erp5_upgrader
\ No newline at end of file
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_emailfield_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_emailfield_js.js
index bb3222e4189d05c1569efb0717548722b85b63c4..7b436a310df7f5e8642e7f5a59c7616a28ebbe6f 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_emailfield_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_emailfield_js.js
@@ -19,6 +19,7 @@
           error_text: field_json.error_text,
           type: 'email',
           hidden: field_json.hidden,
+          maxlength: field_json.maxlength,
           // Force calling subfield render
           // as user may have modified the input value
           render_timestamp: new Date().getTime()
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_matrixbox_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_matrixbox_js.js
index 906a0255d5c32ff5804ea9753bd14774992609f9..514c1818898fcd65770269f1a5cbd0a9bb7d3a87 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_matrixbox_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_matrixbox_js.js
@@ -1,5 +1,5 @@
 /*jslint indent: 2, maxerr: 3, nomen: true */
-/*global window, document, rJS, RSVP, domsugar, JSON*/
+/*global window, rJS, RSVP, domsugar, JSON*/
 /** MatrixBox renders a N-dimensional cube of editable values based on axes description.
  *
  * Example JSON returned from HATEOAS where cell_range format is
@@ -33,36 +33,15 @@
   see around https://lab.nexedi.com/nexedi/erp5/blob/feature/renderjs-matrixbox/product/ERP5Form/MatrixBox.py#L427
   *
   */
-(function (window, document, rJS, RSVP, domsugar, JSON) {
+(function (window, rJS, RSVP, domsugar, JSON) {
   "use strict";
 
-  /** Recursively introspect an object if it is empty */
-  function is_empty_recursive(data) {
-    var item;
-
-    if (typeof data === 'object') {
-      for (item in data) {
-        if (data.hasOwnProperty(item) && !item.startsWith("_")) {
-          if (is_empty_recursive(data[item]) === false) {return false; } // one non-empty element is enough
-        }
-      }
-      return true;
-    }
-    return !data && true; // convert basic types to boolean
-  }
-
   function copy(obj) {
     return JSON.parse(JSON.stringify(obj));
   }
 
   rJS(window)
 
-    .ready(function () {
-      this.props = {
-        gadget_dict: {}  // holds references to initialized gadgets
-      };
-    })
-
     .setState({
       data: '',
       template_field_dict: '',
@@ -71,178 +50,146 @@
       key: ''
     })
 
-
-    /** Render constructs and saves gadgets into `props.gadget_dict` if they don not exist yet. 
-     */
     .declareMethod('render', function (options) {
-      var gadget = this,
-        data = options.field_json.data,
-        // note we make COPY of data in their original form - important since
-        // data.shift used later modify the structure inplace!
-        new_state = {
-          'data': JSON.stringify(options.field_json.data),
-          'template_field_dict': JSON.stringify(options.field_json.template_field_dict),
-          'editable': options.field_json.editable,
-          'hidden': options.field_json.hidden,
-          'key': options.field_json.key
-        };
-
-      if (is_empty_recursive(data)) {
-        return;
-      }
-
-      if (!is_empty_recursive(gadget.props.gadget_dict)) {
-        return this.changeState(new_state);
-      }
-
-      return new RSVP.Queue()
-        .push(function () {
-          return RSVP.all(data.map(function (table, table_index) {
-            var header = table.shift(), // first item of table is the header
-              table_title = header.shift(); // first item of header is the table (tab) title
-
-            return new RSVP.Queue()
-              .push(function () {
-                return RSVP.all(table.map(function (row, row_index) {
-                  var row_element = document.createElement('tr'),
-                    row_id = new_state.key + "T" + table_index + "R" + row_index;
-
-                  row.shift(); // drop the row label definition because it is not usable now
-                  row_element.setAttribute('id', row_id);
-                  row_element.appendChild(document.createElement('th'));
-
-                  return new RSVP.Queue()
-                    .push(function () {
-
-                      return RSVP.all(row.map(function (column) {
-                        // transform all cell-definitions into actual gadgets
-                        return gadget.declareGadget('gadget_erp5_label_field.html', {
-                          scope: column.key,
-                          element: 'td',
-                          sandbox: "public"
-                        })
-                          .push(function (sub_gadget) {
-                            gadget.props.gadget_dict[column.key] = sub_gadget;
-                            return sub_gadget.element;
-                          });
-                      }));
-                    })
-                    .push(function (column_element_list) {
-                      column_element_list.forEach(function (column_element) {
-                        row_element.appendChild(column_element);
-                      });
-                      return row_element;
-                    });
-                }));
-              })
-              .push(function (row_element_list) {
-                var th_dom_list = [
-                  domsugar('th', {text: table_title})
-                ],
-                  i;
-                for (i = 0; i < header.length; i += 1) {
-                  th_dom_list.push(domsugar('th', {html: header[i]}));
-                }
-                return domsugar('table', [
-                  domsugar('thead', [
-                    domsugar('tr', th_dom_list)
-                  ]),
-                  domsugar('tbody', row_element_list)
-                ]);
-              });
-          }));
-        })
-        .push(function (table_element_list) {
-          domsugar(gadget.element.querySelector('div.document_table'),
-                   table_element_list);
-          return gadget.changeState(new_state);
-        });
-    })
-
-    /** Changes state of existing gadgets inside `props.gadget_dict`. */
-    .onStateChange(function (modification_dict) {
+      return this.changeState({
+        'table_list': JSON.stringify(options.field_json.data),
+        'template_field_dict': JSON.stringify(options.field_json.template_field_dict),
+        'editable': options.field_json.editable,
+        'hidden': options.field_json.hidden,
+        'key': options.field_json.key
+      });
+    }, {mutex: 'render'})
+
+    .onStateChange(function () {
       var gadget = this,
         template_field_dict = JSON.parse(gadget.state.template_field_dict),
-        promise_queue = new RSVP.Queue(),
-        data;
-
-      if (modification_dict.hasOwnProperty('data')) {
-        data = JSON.parse(modification_dict.data);
-        if (is_empty_recursive(data)) {
-          return;
-        }
-        data.forEach(function (table, table_index) {
-          table.shift(); // drop the header
-          table.forEach(function (row, row_index) {
-            var row_id = gadget.state.key + 'T' + table_index + 'R' + row_index,
-              row_label_element = gadget.element.querySelector('tr#' + row_id + ' th');
-            row_label_element.textContent = row.shift() || ''; // pop-up the row label from data
-
-            // then handle all inputs within the row
-            row.forEach(function (column) {
-              promise_queue
-                .push(function () {
-                  // Rendering of embedded field is prescribed by another field
-                  // in the form (usually in "hidden" group). Therefor we have a
-                  // reference for the template field included in state (field)
-                  var template_field = template_field_dict[column.field_id],
-                    field_json = copy(template_field),
-                    sub_gadget = gadget.props.gadget_dict[column.key];
-
-                  // we copy (unknown) structure of template_field and carefully
-                  // add known attributes from `column`
-                  field_json.default = column.value;
-                  field_json.key = "field_" + column.key;
-                  field_json.hidden = gadget.state.hidden || template_field.hidden; // any hidden will hide the element
-                  field_json.editable = gadget.state.editable && template_field.editable; // any non-editable will disable editation 
-                  field_json.error_text = column.error_text;
-
-                  return sub_gadget.render({
+        table_list = JSON.parse(gadget.state.table_list);
+
+      return new RSVP.Queue(RSVP.all(table_list.map(function (table,
+                                                              table_index) {
+        // first item of table is the header
+        var header_list = table.shift(),
+          // first item of header is the table (tab) title
+          table_title = header_list.shift();
+
+        return new RSVP.Queue(RSVP.all(table.map(function (row, row_index) {
+          // drop the row label definition because it is not usable now
+          var row_label = row.shift();
+
+          return new RSVP.Queue(RSVP.all(row.map(function (column) {
+            // transform all cell-definitions into actual gadgets
+            return gadget.declareGadget('gadget_erp5_label_field.html', {
+              scope: column.key,
+              element: 'td',
+              sandbox: "public"
+            })
+              .push(function (sub_gadget) {
+                // Rendering of embedded field is prescribed by another field
+                // in the form (usually in "hidden" group). Therefor we have a
+                // reference for the template field included in state (field)
+                var template_field = template_field_dict[column.field_id],
+                  field_json = copy(template_field);
+
+                // we copy (unknown) structure of template_field and carefully
+                // add known attributes from `column`
+                field_json['default'] = column.value;
+                field_json.key = "field_" + column.key;
+                field_json.hidden = gadget.state.hidden || template_field.hidden; // any hidden will hide the element
+                field_json.editable = gadget.state.editable && template_field.editable; // any non-editable will disable editation 
+                field_json.error_text = column.error_text;
+
+                return RSVP.hash({
+                  _: sub_gadget.render({
                     label: false,
                     development_link: false,
                     field_type: column.type,
                     field_json: field_json
-                  });
+                  }),
+                  sub_gadget: sub_gadget
                 });
+              })
+              .push(function (hash) {
+                return hash.sub_gadget.element;
+              });
+          })))
+            .push(function (column_element_list) {
+              // return row_element
+              return domsugar('tr', {
+                id: gadget.state.key + "T" + table_index + "R" + row_index
+              }, [
+                domsugar('th', {text: row_label}),
+                domsugar(null, column_element_list)
+              ]);
+
             });
+        })))
+          .push(function (row_element_list) {
+            var th_dom_list = [
+              domsugar('th', {text: table_title})
+            ],
+              i;
+            for (i = 0; i < header_list.length; i += 1) {
+              // XXX used to be html instead of text
+              // But as unsecure, try to restrict
+              th_dom_list.push(domsugar('th', {text: header_list[i]}));
+            }
+            return domsugar('table', [
+              domsugar('thead', [
+                domsugar('tr', th_dom_list)
+              ]),
+              domsugar('tbody', row_element_list)
+            ]);
           });
+      })))
+        .push(function (table_element_list) {
+          domsugar(gadget.element.querySelector('div.document_table'),
+                   table_element_list);
         });
-      } // end: if modification_dict.data
-      return promise_queue;
     })
 
     .declareMethod("getContent", function (options) {
       var gadget = this,
-        data = {},  // result dictionary with values
-        field_key_list = [],
-        field_key;
-
-      function extendData(field_data) {
-        var key;
-        for (key in field_data) {
-          if (field_data.hasOwnProperty(key) && !key.startsWith("_")) {
-            data[key] = field_data[key];
-          }
-        }
-      }
-
-      for (field_key in gadget.props.gadget_dict) {
-        if (gadget.props.gadget_dict.hasOwnProperty(field_key) && !field_key.startsWith("_")) {
-          field_key_list.push(field_key);
-        }
-      }
+        table_list = JSON.parse(gadget.state.table_list),
+        promise_list = [],
+        // result dictionary with values
+        result_dict = {};
+
+      table_list.map(function (table) {
+        // first item of table is the header
+        table.shift();
+
+        table.map(function (row) {
+          // drop the row label definition because it is not usable now
+          row.shift();
+
+          row.map(function (column) {
+            var field_key = column.key;
+            if (field_key.startsWith("_")) {
+              return;
+            }
+            promise_list.push(
+              gadget.getDeclaredGadget(field_key)
+                .push(function (sub_gadget) {
+                  return sub_gadget.getContent(options);
+                })
+                .push(function (field_data) {
+                  var key;
+                  for (key in field_data) {
+                    if (field_data.hasOwnProperty(key) && !key.startsWith("_")) {
+                      result_dict[key] = field_data[key];
+                    }
+                  }
+                })
+            );
+          });
+        });
+      });
 
-      return new RSVP.Queue()
+      return new RSVP.Queue(RSVP.all(promise_list))
         .push(function () {
-          return RSVP.all(field_key_list.map(function (field_key) {
-            return gadget.props.gadget_dict[field_key].getContent(options);
-          }));
-        })
-        .push(function (field_value_list) {
-          field_value_list.forEach(extendData);
-          return data;
+          return result_dict;
         });
-    })
+    }, {mutex: 'render'})
 
     .allowPublicAcquisition("notifyInvalid", function () {
       return;
@@ -254,6 +201,6 @@
 
     .declareMethod("checkValidity", function () {
       return true;
-    });
+    }, {mutex: 'render'});
 
-}(window, document, rJS, RSVP, domsugar, JSON));
+}(window, rJS, RSVP, domsugar, JSON));
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_matrixbox_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_matrixbox_js.xml
index 832ef249c88543d80037111654481f18a23a4e50..5736d571fee5d533a61d9544cdd7240b27ab12fe 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_matrixbox_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_field_matrixbox_js.xml
@@ -240,7 +240,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>990.15674.6574.27784</string> </value>
+                      <value> <string>999.25959.13616.26538</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -258,7 +258,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1614297317.85</float>
+                              <float>1649344500.27</float>
                               <string>UTC</string>
                             </tuple>
                           </state>
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_multilistfield_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_multilistfield_js.js
index 398b58e188b296f326b234436909b9b11774e406..07f17cb38cf7c8cb6c791689a0ed7fbab01d059d 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_multilistfield_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_multilistfield_js.js
@@ -145,7 +145,12 @@
 
       var gadget = this,
         sub_gadget;
-      return gadget.getDeclaredGadget(scope)
+      // Propage the notification before maybe dropping the subgadget
+      // which will cancel the current call
+      return gadget.notifyChange("change")
+        .push(function () {
+          return gadget.getDeclaredGadget(scope);
+        })
         .push(function (result) {
           sub_gadget = result;
           return sub_gadget.getContent();
@@ -162,9 +167,6 @@
               gadget.element.removeChild(sub_gadget.element);
             }
           }
-        })
-        .push(function () {
-          return gadget.notifyChange();
         });
     })
 
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_multilistfield_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_multilistfield_js.xml
index 75de8f4bbb486d5f1311e941d3191a47a91e8083..50b1ce6160a2688bbb66c30f5614c1308e962fcf 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_multilistfield_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_multilistfield_js.xml
@@ -234,7 +234,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>986.32404.49746.11571</string> </value>
+                      <value> <string>999.26016.41426.50124</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -252,7 +252,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1609253179.35</float>
+                              <float>1649347332.58</float>
                               <string>UTC</string>
                             </tuple>
                           </state>
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js
index 265b75b7263b7f143e8473e7ade623f6f2d00844..d063da7e66af6d0e828f5d02e2a48627819cde33 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js
@@ -1,10 +1,10 @@
-/*global window, document, rJS, URI, RSVP, jIO, Blob, URL, asBoolean, ensureArray */
+/*global window, document, rJS, URI, RSVP, jIO, Blob, URL, asBoolean, ensureArray, console */
 /*jslint nomen: true, indent: 2, maxerr: 3 */
 /**
 Page Form is a top-level gadget (a "Page") taking care of rendering form
 and handling data send&receive.
 */
-(function (window, document, rJS, URI, RSVP, jIO, Blob, URL, asBoolean, ensureArray) {
+(function (window, document, rJS, URI, RSVP, jIO, Blob, URL, asBoolean, ensureArray, console) {
   "use strict";
 
   /*jslint regexp: true*/
@@ -515,7 +515,7 @@ and handling data send&receive.
         .push(null, function (error) {
           /** Fail branch of the JIO call. */
           var error_text = 'Encountered an unknown error. Try to resubmit.';
-
+          console.warn(error_text, error);
           if (error instanceof RSVP.CancellationError) {
             // CancellationError is thrown on "redirect" to cancel any pending
             // promises. Since it is not a failure we rethrow.
@@ -666,4 +666,4 @@ and handling data send&receive.
     });
 
 
-}(window, document, rJS, URI, RSVP, jIO, Blob, URL, asBoolean, ensureArray));
\ No newline at end of file
+}(window, document, rJS, URI, RSVP, jIO, Blob, URL, asBoolean, ensureArray, console));
\ No newline at end of file
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml
index 00cb36219eaacd3da11118c672bfb1522cffd306..b818e102be5423faff031884a571da2d8d3ec853 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml
@@ -234,7 +234,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>991.63595.43060.43997</string> </value>
+                      <value> <string>999.25844.45625.48025</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -252,7 +252,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1620724931.09</float>
+                              <float>1649336938.64</float>
                               <string>UTC</string>
                             </tuple>
                           </state>
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_stringfield_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_stringfield_js.js
index 9e1a24b0cd04aae3f232c0c95536d26b07c42317..26be217006b95bc8db1da19a2a2c2ffcf4b45f23 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_stringfield_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_stringfield_js.js
@@ -20,6 +20,7 @@
           title: field_json.description,
           hidden: field_json.hidden,
           trim: true,
+          maxlength: field_json.maxlength,
           // Force calling subfield render
           // as user may have modified the input value
           render_timestamp: new Date().getTime()
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_html5_input_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_html5_input_js.js
index c046c58fe35f60acb97044a4af261a3581478c17..116b1c7a56551d5f9cb16e4d93c60a781a970d3e 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_html5_input_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_html5_input_js.js
@@ -33,6 +33,7 @@
         step: options.step,
         hidden: options.hidden,
         trim: options.trim || false,
+        maxlength: options.maxlength,
         multiple: options.multiple,
         accept: options.accept,
         capture: options.capture,
@@ -89,6 +90,9 @@
         if (this.state.accept) {
           textarea.setAttribute('accept', this.state.accept);
         }
+        if (this.state.maxlength) {
+          textarea.setAttribute('maxlength', this.state.maxlength);
+        }
 
         if (this.state.multiple) {
           textarea.multiple = true;
diff --git a/bt5/erp5_web_service/DocumentTemplateItem/portal_components/document.erp5.FTPConnector.xml b/bt5/erp5_web_service/DocumentTemplateItem/portal_components/document.erp5.FTPConnector.xml
index 8f7677c1ffe2767ed65daa0a0515ea415132679e..1358bf5fbe614873e4bf9ef3af534f3ea102adf8 100644
--- a/bt5/erp5_web_service/DocumentTemplateItem/portal_components/document.erp5.FTPConnector.xml
+++ b/bt5/erp5_web_service/DocumentTemplateItem/portal_components/document.erp5.FTPConnector.xml
@@ -86,33 +86,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>1384353676.1</float>
-                              <string>GMT+1</string>
-                            </tuple>
-                          </state>
-                        </object>
-                      </value>
-                  </item>
                   <item>
                       <key> <string>validation_state</string> </key>
                       <value> <string>validated</string> </value>
diff --git a/bt5/erp5_wechat_secure_payment/DocumentTemplateItem/portal_components/document.erp5.WechatService.xml b/bt5/erp5_wechat_secure_payment/DocumentTemplateItem/portal_components/document.erp5.WechatService.xml
index b2da700dc9b4c729bce261e3d391e13861969902..5d6a242e10f0b71f559db056b9032422ff158cc8 100644
--- a/bt5/erp5_wechat_secure_payment/DocumentTemplateItem/portal_components/document.erp5.WechatService.xml
+++ b/bt5/erp5_wechat_secure_payment/DocumentTemplateItem/portal_components/document.erp5.WechatService.xml
@@ -119,7 +119,7 @@
                   </item>
                 </dictionary>
               </list>
-              </value>
+            </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_wechat_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5WechatSecurePayment.xml b/bt5/erp5_wechat_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5WechatSecurePayment.xml
index b48167e71b6195eff20a945f67846a2fcdf125a8..5dba91428606e46606452eac0098f4ba9c45a306 100644
--- a/bt5/erp5_wechat_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5WechatSecurePayment.xml
+++ b/bt5/erp5_wechat_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5WechatSecurePayment.xml
@@ -119,7 +119,7 @@
                   </item>
                 </dictionary>
               </list>
-              </value>
+            </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper.xml b/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper.xml
index 13a61f452995f438c9a32fe1048fb330224c31a2..fcf2dab0b9aaa94c130d3ff53d927dbf04599a08 100644
--- a/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper.xml
+++ b/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper.xml
@@ -70,6 +70,10 @@
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>workflow_development</string> </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value>
@@ -98,10 +102,6 @@
             <key> <string>portal_type</string> </key>
             <value> <string>Person</string> </value>
         </item>
-        <item>
-            <key> <string>default_reference</string> </key>
-            <value> <string>workflow_development</string> </value>
-        </item>
         <item>
             <key> <string>user_id</string> </key>
             <value> <string>workflow_development</string> </value>
@@ -193,169 +193,181 @@
   </record>
   <record id="7" aka="AAAAAAAAAAc=">
     <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>zope</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>942.10105.41541.21230</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 name="DateTime" module="DateTime.DateTime"/>
-                    </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1437750445.1</float>
-                        <string>UTC</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>zope</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>942.10105.41541.21230</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 name="DateTime" module="DateTime.DateTime"/>
+                          </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1437750445.1</float>
+                              <string>UTC</string>
+                            </tuple>
+                          </state>
+                        </object>
+                      </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="8" aka="AAAAAAAAAAg=">
     <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>
-                  <none/>
-                </value>
-            </item>
-            <item>
-                <key> <string>actor</string> </key>
-                <value> <string>zope</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 name="DateTime" module="DateTime.DateTime"/>
-                    </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1428318888.26</float>
-                        <string>UTC</string>
-                      </tuple>
-                    </state>
-                  </object>
-                </value>
-            </item>
-            <item>
-                <key> <string>user_account_state</string> </key>
-                <value> <string>draft</string> </value>
-            </item>
-          </dictionary>
-        </list>
-      </tuple>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value>
+                        <none/>
+                      </value>
+                  </item>
+                  <item>
+                      <key> <string>actor</string> </key>
+                      <value> <string>zope</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 name="DateTime" module="DateTime.DateTime"/>
+                          </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1428318888.26</float>
+                              <string>UTC</string>
+                            </tuple>
+                          </state>
+                        </object>
+                      </value>
+                  </item>
+                  <item>
+                      <key> <string>user_account_state</string> </key>
+                      <value> <string>draft</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="9" aka="AAAAAAAAAAk=">
     <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</string> </value>
-            </item>
-            <item>
-                <key> <string>actor</string> </key>
-                <value> <string>zope</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 name="DateTime" module="DateTime.DateTime"/>
-                    </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1437734527.02</float>
-                        <string>UTC</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</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>actor</string> </key>
+                      <value> <string>zope</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 name="DateTime" module="DateTime.DateTime"/>
+                          </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1437734527.02</float>
+                              <string>UTC</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>
diff --git a/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/1.xml b/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/1.xml
index 13b31a1fcd6a304b8ab77af93800d4e7ea32e27b..c6de3b78690d64d60c3fa87d55c985efd6294894 100644
--- a/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/1.xml
+++ b/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/1.xml
@@ -144,116 +144,124 @@
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <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>
-                  <none/>
-                </value>
-            </item>
-            <item>
-                <key> <string>actor</string> </key>
-                <value> <string>zope</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 name="DateTime" module="DateTime.DateTime"/>
-                    </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1428318982.17</float>
-                        <string>UTC</string>
-                      </tuple>
-                    </state>
-                  </object>
-                </value>
-            </item>
-            <item>
-                <key> <string>validation_state</string> </key>
-                <value> <string>draft</string> </value>
-            </item>
-          </dictionary>
-        </list>
-      </tuple>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value>
+                        <none/>
+                      </value>
+                  </item>
+                  <item>
+                      <key> <string>actor</string> </key>
+                      <value> <string>zope</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 name="DateTime" module="DateTime.DateTime"/>
+                          </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1428318982.17</float>
+                              <string>UTC</string>
+                            </tuple>
+                          </state>
+                        </object>
+                      </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>draft</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="6" aka="AAAAAAAAAAY=">
     <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>zope</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>942.10090.25961.26606</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 name="DateTime" module="DateTime.DateTime"/>
-                    </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1433410985.17</float>
-                        <string>UTC</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>zope</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>942.10090.25961.26606</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 name="DateTime" module="DateTime.DateTime"/>
+                          </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1433410985.17</float>
+                              <string>UTC</string>
+                            </tuple>
+                          </state>
+                        </object>
+                      </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>
diff --git a/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/2.xml b/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/2.xml
index a6f8b10eb28e306e07677f38f578cb310825942f..5a601baeac9f56cfbf108b5313c48db82b88c6cc 100644
--- a/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/2.xml
+++ b/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/2.xml
@@ -179,114 +179,122 @@
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <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>open</string> </value>
-            </item>
-            <item>
-                <key> <string>actor</string> </key>
-                <value> <string>zope</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 name="DateTime" module="DateTime.DateTime"/>
-                    </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1428320244.8</float>
-                        <string>UTC</string>
-                      </tuple>
-                    </state>
-                  </object>
-                </value>
-            </item>
-            <item>
-                <key> <string>validation_state</string> </key>
-                <value> <string>open</string> </value>
-            </item>
-          </dictionary>
-        </list>
-      </tuple>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>open</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>actor</string> </key>
+                      <value> <string>zope</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 name="DateTime" module="DateTime.DateTime"/>
+                          </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1428320244.8</float>
+                              <string>UTC</string>
+                            </tuple>
+                          </state>
+                        </object>
+                      </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>open</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="6" aka="AAAAAAAAAAY=">
     <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>zope</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>942.10105.27094.39236</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 name="DateTime" module="DateTime.DateTime"/>
-                    </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1433410985.17</float>
-                        <string>UTC</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>zope</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>942.10105.27094.39236</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 name="DateTime" module="DateTime.DateTime"/>
+                          </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1433410985.17</float>
+                              <string>UTC</string>
+                            </tuple>
+                          </state>
+                        </object>
+                      </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>
diff --git a/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/3.xml b/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/3.xml
index 9fec5e5e6fd53d86dcf0510f8a39538b3c575943..fb330fb849ebf1e531ce7b3e77c42a6c03e1b5be 100644
--- a/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/3.xml
+++ b/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/3.xml
@@ -97,114 +97,122 @@
   </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>edit</string> </value>
-            </item>
-            <item>
-                <key> <string>actor</string> </key>
-                <value> <string>ERP5TypeTestCase</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>956.27221.25187.60262</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 name="DateTime" module="DateTime.DateTime"/>
-                    </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1483533511.11</float>
-                        <string>GMT</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>ERP5TypeTestCase</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>956.27221.25187.60262</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 name="DateTime" module="DateTime.DateTime"/>
+                          </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1483533511.11</float>
+                              <string>GMT</string>
+                            </tuple>
+                          </state>
+                        </object>
+                      </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </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>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>error_message</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>1483533770.62</float>
-                        <string>GMT</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</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>error_message</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>1483533770.62</float>
+                              <string>GMT</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>
diff --git a/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/default_career.xml b/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/default_career.xml
index 66e960f4596e72c05383ac3f33309129001a6fde..55f1c72cf89f689413c00df532eb7239c92f0fd8 100644
--- a/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/default_career.xml
+++ b/bt5/erp5_workflow_test/PathTemplateItem/person_module/test_workflow_developper/default_career.xml
@@ -130,57 +130,61 @@
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <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>
-                  <none/>
-                </value>
-            </item>
-            <item>
-                <key> <string>actor</string> </key>
-                <value> <string>zope</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 name="DateTime" module="DateTime.DateTime"/>
-                    </klass>
-                    <tuple>
-                      <none/>
-                    </tuple>
-                    <state>
-                      <tuple>
-                        <float>1428318915.53</float>
-                        <string>UTC</string>
-                      </tuple>
-                    </state>
-                  </object>
-                </value>
-            </item>
-            <item>
-                <key> <string>validation_state</string> </key>
-                <value> <string>draft</string> </value>
-            </item>
-          </dictionary>
-        </list>
-      </tuple>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value>
+                        <none/>
+                      </value>
+                  </item>
+                  <item>
+                      <key> <string>actor</string> </key>
+                      <value> <string>zope</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 name="DateTime" module="DateTime.DateTime"/>
+                          </klass>
+                          <tuple>
+                            <none/>
+                          </tuple>
+                          <state>
+                            <tuple>
+                              <float>1428318915.53</float>
+                              <string>UTC</string>
+                            </tuple>
+                          </state>
+                        </object>
+                      </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>draft</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>
diff --git a/bt5/erp5_workflow_test/PortalTypeTemplateItem/portal_types/Workflow%20Test%20Document.xml b/bt5/erp5_workflow_test/PortalTypeTemplateItem/portal_types/Workflow%20Test%20Document.xml
index 9a0e21a73394eafc6a97ba2e98c72ad15cdda47c..7b838a799a6111ad2be824d02f6fc17e61c792d7 100644
--- a/bt5/erp5_workflow_test/PortalTypeTemplateItem/portal_types/Workflow%20Test%20Document.xml
+++ b/bt5/erp5_workflow_test/PortalTypeTemplateItem/portal_types/Workflow%20Test%20Document.xml
@@ -78,16 +78,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>workflow_list</string> </key>
-            <value>
-              <tuple>
-                <string>testing_erp5_workflow</string>
-                <string>testing_erp5_interaction_workflow</string>
-                <string>edit_workflow</string>
-              </tuple>
-            </value>
-        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_workflow_test/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.xml b/bt5/erp5_workflow_test/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.xml
index 4505aac1aee7caf6df50435e8c2651e9f1289934..7215210bdbb84f1c322a2ce55a9b93beae0aae52 100644
--- a/bt5/erp5_workflow_test/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.xml
+++ b/bt5/erp5_workflow_test/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.xml
@@ -100,24 +100,28 @@
   </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>validate</string> </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</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>
diff --git a/product/ERP5/Document/BusinessTemplate.py b/product/ERP5/Document/BusinessTemplate.py
index d3c1bfd4ee24148abb058eccbc6a44a00544a76b..4d8d15cf80f63ca553afae9bf44f07067c2488c6 100644
--- a/product/ERP5/Document/BusinessTemplate.py
+++ b/product/ERP5/Document/BusinessTemplate.py
@@ -4256,10 +4256,11 @@ class _ZodbComponentTemplateItem(ObjectTemplateItem):
         continue
 
       wf_history = obj.workflow_history[wf_id][-1]
-      # Remove useless modifcation 'time' and 'actor' (conflicts with VCSs)
-      wf_history.pop('time', None)
+      # Remove useless workflow entries that are always different and cause conflicts with VCS
       wf_history.pop('actor', None)
       wf_history.pop('comment', None)
+      wf_history.pop('error_message', None)
+      wf_history.pop('time', None)
 
       obj.workflow_history[wf_id] = WorkflowHistoryList([wf_history])
 
diff --git a/bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.RoundingModel.py b/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.RoundingModel.py
similarity index 100%
rename from bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.RoundingModel.py
rename to product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.RoundingModel.py
diff --git a/bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.RoundingModel.xml b/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.RoundingModel.xml
similarity index 100%
rename from bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.RoundingModel.xml
rename to product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.RoundingModel.xml
diff --git a/bt5/erp5_base/InterfaceTemplateItem/portal_components/interface.erp5.IRoundingTool.py b/product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IRoundingTool.py
similarity index 100%
rename from bt5/erp5_base/InterfaceTemplateItem/portal_components/interface.erp5.IRoundingTool.py
rename to product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IRoundingTool.py
diff --git a/bt5/erp5_base/InterfaceTemplateItem/portal_components/interface.erp5.IRoundingTool.xml b/product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IRoundingTool.xml
similarity index 100%
rename from bt5/erp5_base/InterfaceTemplateItem/portal_components/interface.erp5.IRoundingTool.xml
rename to product/ERP5/bootstrap/erp5_core/InterfaceTemplateItem/portal_components/interface.erp5.IRoundingTool.xml
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getUserCaption.py b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getUserCaption.py
index 659b8c6475b97e2f7829cad1774fc34cdc2fe75f..8e2f7ae5b41da8a65a97397b7b921698be0c2bf5 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getUserCaption.py
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getUserCaption.py
@@ -1 +1 @@
-return context.getPortalObject().portal_membership.getAuthenticatedMember().getUserName()
\ No newline at end of file
+return context.getPortalObject().portal_membership.getAuthenticatedMember().getUserName()
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/WorkflowState_viewPermission/my_acquire_permission_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/WorkflowState_viewPermission/my_acquire_permission_list.xml
index 6bf3a8bf6f435e10ddab88d450f6ce40d02501b7..32ac8bc21e8508117958d46353839ee664815382 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/WorkflowState_viewPermission/my_acquire_permission_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/WorkflowState_viewPermission/my_acquire_permission_list.xml
@@ -110,9 +110,7 @@
                 </item>
                 <item>
                     <key> <string>default</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>description</string> </key>
@@ -141,7 +139,7 @@
                 <item>
                     <key> <string>items</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -246,19 +244,6 @@
     </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.getAcquirePermissionList() or [x for x in context.getWorkflowManagedPermissionList()]</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_activity_watcher.html.html b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_activity_watcher.html.html
index 28d18a10807c9800ee26f1acfa159a5d55372448..cc0f628a153135658d6876333ca046b86dff2cce 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_activity_watcher.html.html
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_activity_watcher.html.html
@@ -12,6 +12,6 @@
     <script src="gadget_activity_watcher.js" type="text/javascript"></script>
   </head>
   <body>
-    <div class="activity_watcher_gadget"></div>
+    <div data-gadget-url="gadget_html_viewer.html" data-gadget-scope="html_viewer"></div>
   </body>
 </html>
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_activity_watcher.js.js b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_activity_watcher.js.js
index 35ac434c364f5ca71e1cc4269c342fedd86c12f9..681a781b1a7970eb637b32c11338fed3cfa82336 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_activity_watcher.js.js
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_activity_watcher.js.js
@@ -9,11 +9,23 @@
       for (i = 0; i < data[string].line_list.length; i += 1) {
         array.push(domsugar('tr', [
           domsugar('td', {text: messagetype}),
-          domsugar('td', {text: data[string].line_list[i].count}),
+          domsugar('td', {
+            text: data[string].line_list[i].count,
+            style: 'text-align: right;'
+          }),
           domsugar('td', {text: data[string].line_list[i].method_id}),
-          domsugar('td', {text: data[string].line_list[i].node}),
-          domsugar('td', {text: data[string].line_list[i].min_pri}),
-          domsugar('td', {text: data[string].line_list[i].max_pri})
+          domsugar('td', {
+            text: data[string].line_list[i].node,
+            style: 'text-align: right;'
+          }),
+          domsugar('td', {
+            text: data[string].line_list[i].min_pri,
+            style: 'text-align: right;'
+          }),
+          domsugar('td', {
+            text: data[string].line_list[i].max_pri,
+            style: 'text-align: right;'
+          })
         ]));
       }
     }
@@ -25,10 +37,22 @@
       for (i = 0; i < data[string].line_list.length; i += 1) {
         array.push(domsugar('tr', [
           domsugar('td', {text: messagetype}),
-          domsugar('td', {text: data[string].line_list[i].pri}),
-          domsugar('td', {text: data[string].line_list[i].min}),
-          domsugar('td', {text: data[string].line_list[i].avg}),
-          domsugar('td', {text: data[string].line_list[i].max})
+          domsugar('td', {
+            text: data[string].line_list[i].pri,
+            style: 'text-align: right;'
+          }),
+          domsugar('td', {
+            text: data[string].line_list[i].min,
+            style: 'text-align: right;'
+          }),
+          domsugar('td', {
+            text: data[string].line_list[i].avg,
+            style: 'text-align: right;'
+          }),
+          domsugar('td', {
+            text: data[string].line_list[i].max,
+            style: 'text-align: right;'
+          })
         ]));
       }
     }
@@ -49,58 +73,66 @@
       }
       return new RSVP.Queue()
         .push(function () {
-          return jIO.util.ajax(
-            {
+          return RSVP.hash({
+            evt: jIO.util.ajax({
               "type": "GET",
               "url": form_gadget.state.read_activity_list_url,
               "xhrFields": {
                 withCredentials: true
               }
-            }
-          );
+            }),
+            html_viewer: form_gadget.getDeclaredGadget('html_viewer')
+          });
         })
-        .push(function (evt) {
-          var data = JSON.parse(evt.target.response),
+        .push(function (hash) {
+          var data = JSON.parse(hash.evt.target.response),
             tbody1_content_list = [],
             tbody2_content_list = [];
           putMessageType(data, 'dict', 'SQLDict', tbody1_content_list);
           putMessageType(data, 'queue', 'SQLQueue', tbody1_content_list);
           putMessageType2(data, 'dict', 'SQLDict2', tbody2_content_list);
           putMessageType2(data, 'queue', 'SQLQueue2', tbody2_content_list);
-          domsugar(form_gadget.element.querySelector(".activity_watcher_gadget"), [
-            'Date : ',
-            new Date().toTimeString(),
+          return hash.html_viewer.render({value: domsugar('div',
+                                                          {'class': 'page'}, [
+              'Date : ',
+              new Date().toTimeString(),
 
-            domsugar('table', [
-              domsugar('thead', [domsugar('tr', [
-                domsugar('th', {text: 'Type'}),
-                domsugar('th', {text: 'Count'}),
-                domsugar('th', {text: 'Method Id'}),
-                domsugar('th', {text: 'Processing Node'}),
-                domsugar('th', {text: 'Min pri'}),
-                domsugar('th', {text: 'Max pri'})
-              ])]),
-              domsugar('tbody', tbody1_content_list)
-            ]),
+              domsugar('table', [
+                domsugar('caption', {text: 'Current Activities'}),
+                domsugar('thead', [domsugar('tr', [
+                  domsugar('th', {text: 'Type'}),
+                  domsugar('th', {text: 'Count'}),
+                  domsugar('th', {text: 'Method Id'}),
+                  domsugar('th', {text: 'Processing Node'}),
+                  domsugar('th', {text: 'Min pri'}),
+                  domsugar('th', {text: 'Max pri'})
+                ])]),
+                domsugar('tbody', tbody1_content_list)
+              ]),
 
-            domsugar('table', [
-              domsugar('thead', [domsugar('tr', [
-                domsugar('th', {text: 'Type'}),
-                domsugar('th', {text: 'Priority'}),
-                domsugar('th', {text: 'Min'}),
-                domsugar('th', {text: 'Avg'}),
-                domsugar('th', {text: 'Max'})
-              ])]),
-              domsugar('tbody', tbody2_content_list)
-            ])
-          ]);
+              domsugar('table', [
+                domsugar('caption', {text: 'Statistics'}),
+                domsugar('thead', [domsugar('tr', [
+                  domsugar('th', {text: 'Type'}),
+                  domsugar('th', {text: 'Priority'}),
+                  domsugar('th', {text: 'Min'}),
+                  domsugar('th', {text: 'Avg'}),
+                  domsugar('th', {text: 'Max'})
+                ])]),
+                domsugar('tbody', tbody2_content_list)
+              ])
+            ]).outerHTML});
 
         }, function (error) {
           //Exception is raised if network is lost for some reasons,
           //in this case, try patiently until network is back.
           console.warn("Unable to fetch activities from ERP5", error);
-          form_gadget.element.querySelector(".activity_watcher_gadget")
-                     .textContent = "Unable to fetch activities from ERP5";
+          return form_gadget.getDeclaredGadget('html_viewer')
+            .push(function (html_viewer) {
+              return html_viewer.render({
+                value: "Unable to fetch activities from ERP5"
+              });
+            });
         });
 
     }, 1000);
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_html_viewer.js.js b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_html_viewer.js.js
index 411d19539e31efe95a75d6385bd4ac9f24b62fcc..49130cf81965f16fa75ceb0fb0c6bb83bbd651cd 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_html_viewer.js.js
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/gadget_html_viewer.js.js
@@ -96,7 +96,8 @@
       rowspan: true,
       align: true,
       scope: true,
-      summary: true
+      summary: true,
+      download: true
     },
     style_list: {
       background: true,
diff --git a/bt5/erp5_base/ToolComponentTemplateItem/portal_components/tool.erp5.RoundingTool.py b/product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.RoundingTool.py
similarity index 100%
rename from bt5/erp5_base/ToolComponentTemplateItem/portal_components/tool.erp5.RoundingTool.py
rename to product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.RoundingTool.py
diff --git a/bt5/erp5_base/ToolComponentTemplateItem/portal_components/tool.erp5.RoundingTool.xml b/product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.RoundingTool.xml
similarity index 100%
rename from bt5/erp5_base/ToolComponentTemplateItem/portal_components/tool.erp5.RoundingTool.xml
rename to product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.RoundingTool.xml
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/business_template_building_workflow/variable_error_message.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/business_template_building_workflow/variable_error_message.xml
new file mode 100644
index 0000000000000000000000000000000000000000..817188b439facc45ba777b1b87c0357379fe52dd
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/business_template_building_workflow/variable_error_message.xml
@@ -0,0 +1,44 @@
+<?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>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/business_template_installation_workflow/variable_error_message.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/business_template_installation_workflow/variable_error_message.xml
new file mode 100644
index 0000000000000000000000000000000000000000..817188b439facc45ba777b1b87c0357379fe52dd
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/business_template_installation_workflow/variable_error_message.xml
@@ -0,0 +1,44 @@
+<?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>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_validation_workflow/variable_error_message.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_validation_workflow/variable_error_message.xml
new file mode 100644
index 0000000000000000000000000000000000000000..817188b439facc45ba777b1b87c0357379fe52dd
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_validation_workflow/variable_error_message.xml
@@ -0,0 +1,44 @@
+<?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>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_document_id_list b/product/ERP5/bootstrap/erp5_core/bt/template_document_id_list
index 84045b4897923251eb51d7c2939e4fb217835842..b24980625f409e5d3462d0240b2ae837657973a0 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/template_document_id_list
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_document_id_list
@@ -31,6 +31,7 @@ document.erp5.Path
 document.erp5.PredicateGroup
 document.erp5.PredicateMatrix
 document.erp5.Project
+document.erp5.RoundingModel
 document.erp5.ScriptConstraint
 document.erp5.SimulationMovement
 document.erp5.TextDocument
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_interface_id_list b/product/ERP5/bootstrap/erp5_core/bt/template_interface_id_list
index 747f9696d79361ff5c698005a45e53d7ecd90d53..070272c87af30b8b0d1b2510e1f09dba5384caac 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/template_interface_id_list
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_interface_id_list
@@ -43,6 +43,7 @@ interface.erp5.IMovementList
 interface.erp5.IProductionMovement
 interface.erp5.IReferenceable
 interface.erp5.IRoundable
+interface.erp5.IRoundingTool
 interface.erp5.IRule
 interface.erp5.ISendable
 interface.erp5.ISimilarityProvider
diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_tool_component_id_list b/product/ERP5/bootstrap/erp5_core/bt/template_tool_component_id_list
index a0b0e927ef1a7c5ee3d0e2ae255e3cc86f488b34..a18561461c7719e0a0b2b414fc2809035e33b1ef 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/template_tool_component_id_list
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_tool_component_id_list
@@ -11,6 +11,7 @@ tool.erp5.NotificationTool
 tool.erp5.OrderTool
 tool.erp5.PasswordTool
 tool.erp5.RuleTool
+tool.erp5.RoundingTool
 tool.erp5.SessionTool
 tool.erp5.SimulationTool
 tool.erp5.TestTool
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.css b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.css
index fcf0afa24ca634a250346823dd4db4b006872f23..c5e555255a2aaf6cd2c41611cb4b32812d238f52 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.css
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.css
@@ -447,16 +447,16 @@ fieldset.bottom > .field > label {
   padding: revert;
 }
 
-.content .field label {
+.content .field > label {
   width: 30%;
 }
 
-.content .field label,
+.content .field > label,
 .content .field .input {
   float: left;
 }
 
-body[dir="rtl"] .content .field label,
+body[dir="rtl"] .content .field > label,
 body[dir="rtl"] .content .field .input {
   float: right;
 }
@@ -473,7 +473,7 @@ fieldset.bottom .field .input,
   vertical-align: middle;
 }
 
-.content .required label {
+.content .required > label {
   font-weight: bold;
 }
 
diff --git a/product/ERP5Type/Core/InteractionWorkflow.py b/product/ERP5Type/Core/InteractionWorkflow.py
index ccab8d94b1e08648350d554b57d72943fec28794..300b2ba083b867246e2e3143affd6556c2f6aaae 100644
--- a/product/ERP5Type/Core/InteractionWorkflow.py
+++ b/product/ERP5Type/Core/InteractionWorkflow.py
@@ -358,6 +358,9 @@ class InteractionWorkflow(Workflow):
   def getStateValueList(self):
     return []
 
+  def _checkConsistency(self, fixit=False):
+    return []
+
   security.declareProtected(Permissions.AccessContentsInformation, 'showAsXML')
   def showAsXML(self, root=None):
     from lxml import etree
diff --git a/product/ERP5Type/Core/Workflow.py b/product/ERP5Type/Core/Workflow.py
index 76c8b110487c08c7a3f400ce3bf4694b21a727bb..72b0ce3929a795969162648a29039d41e2a3422a 100644
--- a/product/ERP5Type/Core/Workflow.py
+++ b/product/ERP5Type/Core/Workflow.py
@@ -30,6 +30,7 @@
 ## Used in Products.ERP5Type.patches.DCWorkflow so this needs to go first...
 from Acquisition import aq_parent, aq_inner
 from Products.PageTemplates.Expressions import SecureModuleImporter
+from Products.ERP5Type.ConsistencyMessage import ConsistencyMessage
 from AccessControl import getSecurityManager
 from Products.PageTemplates.Expressions import getEngine
 from six import reraise
@@ -785,6 +786,17 @@ class Workflow(XMLObject):
 
     tool = self.getParentValue()
     state_var = self.getStateVariable()
+
+    # `status_dict` will hold the new status.
+    # Unlike DCWorkflow implementation, we don't start with an empty dict, but start
+    # by making a copy of the current status dict, this way the string used as keys
+    # will be the same string instances and this will reduce the pickle size:
+    # Copying existing dict saves space: when __setitem__(key, value) points at an
+    # existing key, python will just keep the existing string as key, which then
+    # means if both history entries are pickled together, the keys will be stored
+    # just once instead of once per dict.
+    # This is especially important with ERP5's WorkflowVariable implemented with
+    # IdAsReferenceMixin, because every call to getReference return a different string.
     status_dict = self.getCurrentStatusDict(ob)
 
     if tdef is None:
@@ -947,6 +959,26 @@ class Workflow(XMLObject):
       raise ObjectMoved(ex.getNewObject(), res)
     return res
 
+  def _checkConsistency(self, fixit=False):
+    """Checks the workflow definition.
+    """
+    consistency_message_list = []
+    # make sure we have necessary variables
+    variable_reference_set = {
+        v.getReference()
+        for v in self.contentValues(portal_type='Workflow Variable')
+    }
+    for variable_reference in 'error_message', :
+      if variable_reference not in variable_reference_set:
+        consistency_message_list.append(
+            ConsistencyMessage(
+                self,
+                object_relative_url=self.getRelativeUrl(),
+                message=
+                'Required variable {variable_reference} missing in workflow.'.
+                format(variable_reference=variable_reference)))
+    return consistency_message_list
+
   security.declareProtected(Permissions.AccessContentsInformation, 'showAsXML')
   def showAsXML(self, root=None):
     from lxml import etree
diff --git a/product/ERP5Type/tests/CodingStyleTest.py b/product/ERP5Type/tests/CodingStyleTest.py
index c1916e5251bd79696cbee3638f72400a728ba94d..802afadb0ad1e6325ce947f57b4c33b3b194c65b 100644
--- a/product/ERP5Type/tests/CodingStyleTest.py
+++ b/product/ERP5Type/tests/CodingStyleTest.py
@@ -32,6 +32,7 @@ import unittest
 from glob import glob
 
 from Products.ERP5.tests import testXHTML
+from Products.ERP5.Document.BusinessTemplate import BusinessTemplateMissingDependency
 from Products.ERP5Type.tests.utils import addUserToDeveloperRole
 from Products.ERP5Type.tests.CodingStyleTestCase import CodingStyleTestCase
 
@@ -43,23 +44,19 @@ class CodingStyleTest(CodingStyleTestCase, testXHTML.TestXHTMLMixin):
   """
 
   def getBusinessTemplateList(self):
-    # install erp5_upgrader for CodingStyleTestCase.test_run_upgrader
-    # XXX also install erp5_full_text_myisam_catalog to workaround missing test
-    # dependencies and the fact that test dependencies are not checked
-    # recursively.
-    return (
-        'erp5_upgrader',
-        'erp5_full_text_myisam_catalog',
-        self.tested_business_template)
+    # note: more business templates will be installed by
+    # _installBusinessTemplateList
+    return (self.tested_business_template, )
 
   def _installBusinessTemplateList(self,
                                    bt_list,
                                    update_repository_bt_list=True,
                                    *args,
                                    **kwargs):
-    """Install depencencies automatically
+    """Install dependencies automatically and also install erp5_upgrader,
+    which is needed for CodingStyleTestCase.test_run_upgrader
 
-    taken from runUnitTest._ZodbTestComponentBootstrapOnly.
+    the resolution approach is taken from runUnitTest._ZodbTestComponentBootstrapOnly.
     """
     template_tool = self.portal.portal_templates
 
@@ -74,11 +71,36 @@ class CodingStyleTest(CodingStyleTestCase, testXHTML.TestXHTMLMixin):
 
     template_tool.updateRepositoryBusinessTemplateList(bt5_path_list)
 
-    url_bt_tuple_list = [
-      ('%s/%s' % (repository, bt_title), bt_title) for repository, bt_title in
-      template_tool.resolveBusinessTemplateListDependency(
-        [x[1] for x in bt_list],
-        with_test_dependency_list=True)]
+    bt_to_install_title_set = set(x[1] for x in bt_list)
+    bt_to_install_title_set.add('erp5_core')
+    # Install the tested business template.
+    try:
+      url_bt_tuple_list = [
+        ('%s/%s' % (repository, bt_title), bt_title) for repository, bt_title in
+        template_tool.resolveBusinessTemplateListDependency(
+          bt_to_install_title_set,
+          with_test_dependency_list=True)]
+    except BusinessTemplateMissingDependency as e:
+      # it may have a virtual dependency on erp5_full_text_catalog, if that's
+      # the case, we choose erp5_full_text_mroonga_catalog
+      if str(e).startswith('Unable to resolve dependencies for erp5_full_text_catalog,'):
+        url_bt_tuple_list = [
+          ('%s/%s' % (repository, bt_title), bt_title) for repository, bt_title in
+          template_tool.resolveBusinessTemplateListDependency(
+            bt_to_install_title_set | set(('erp5_full_text_mroonga_catalog',)),
+            with_test_dependency_list=True)]
+
+    if 'erp5_upgrader' not in bt_to_install_title_set:
+      upgrader_url_bt_tuple_list = [
+        ('%s/%s' % (repository, bt_title), bt_title) for repository, bt_title in
+        template_tool.resolveBusinessTemplateListDependency(
+          ['erp5_upgrader'],
+          # We don't actually run erp5_upgrader test, so we don't want to install
+          # erp5_upgrader test dependencies
+          with_test_dependency_list=False)]
+      for url, bt in upgrader_url_bt_tuple_list:
+        if bt not in bt_to_install_title_set:
+          url_bt_tuple_list.append((url, bt))
 
     return super(CodingStyleTest,
                  self)._installBusinessTemplateList(url_bt_tuple_list,
diff --git a/product/ERP5Type/tests/CodingStyleTestCase.py b/product/ERP5Type/tests/CodingStyleTestCase.py
index 52ea1d574a865c0cf0f787a83e958d345e454ade..acc0a63cfd7b551056b661690a8f1bbc8dd80e28 100644
--- a/product/ERP5Type/tests/CodingStyleTestCase.py
+++ b/product/ERP5Type/tests/CodingStyleTestCase.py
@@ -28,9 +28,13 @@
 ##############################################################################
 
 import collections
+import difflib
+import filecmp
+import fnmatch
 import glob
 import os
-import tarfile
+import shutil
+import tempfile
 
 from Acquisition import aq_base
 from Testing import ZopeTestCase
@@ -105,29 +109,84 @@ class CodingStyleTestCase(ERP5TypeTestCase):
     for business_template in self._getTestedBusinessTemplateValueList():
       self.assertEqual(business_template.BusinessTemplate_getPythonSourceCodeMessageList(), [])
 
+
+  # Paths for which we ignore differences when re-exporting business templates
+  rebuild_business_template_ignored_path = """
+  # portal_transforms seem to be always different
+  erp5_core/ToolTemplateItem/portal_transforms.xml
+
+  # Empty messages are exported in message catalog, so they can be different because of
+  # empty messages. Reindexing during creation for example insert entries for all workflow
+  # states, so this change often.
+  */MessageTranslationTemplateItem/*/*/translation.po
+
+  # This seem to be a copy of
+  # bt5/erp5_configurator_standard/PathTemplateItem/business_configuration_module/default_standard_configuration.xml
+  # that was modified. When re-exporting it is different, but since this is test data we ignore it for now.
+  erp5_scalability_test/PathTemplateItem/business_configuration_module/default_standard_configuration.xml
+  erp5_scalability_test/PathTemplateItem/business_configuration_module/default_standard_configuration/*
+
+  # This is different for some unknown reason, because it's test data we ignore for now
+  erp5_payroll_l10n_fr_test/PathTemplateItem/accounting_module/trainee_january.xml
+  erp5_payroll_l10n_fr_test/PathTemplateItem/accounting_module/trainee_january/*
+  """
   def test_rebuild_business_template(self):
-    """Try to rebuild business template to catch packaging errors.
+    """Try to rebuild business template to catch packaging errors and make sur output is stable.
     """
+    self.maxDiff = None
     template_tool = self.portal.portal_templates
     for bt_title in self.getTestedBusinessTemplateList():
       bt = template_tool.getInstalledBusinessTemplate(bt_title, strict=True)
       # make sure we can rebuild
       bt.build()
 
-      # check we don't add or remove members.
-      # first, build a set of files that were on the original business template repository
-      base_path, local_path = self.portal.portal_templates.getLastestBTOnRepos(bt_title)
-      existing_files = set([os.path.relpath(y, base_path)
-        for x in os.walk(os.path.join(base_path, local_path))
-            for y in glob.glob(os.path.join(x[0], '*')) if os.path.isfile(y)])
+      # Compute the differences between the reference business template
+      # from the working copy and the newly exported business template.
+      bt_base_path, bt_local_path = self.portal.portal_templates.getLastestBTOnRepos(bt_title)
+      bt_dir = os.path.join(bt_base_path, bt_local_path)
+      export_base_path = tempfile.mkdtemp()
+      self.addCleanup(shutil.rmtree, export_base_path)
+      export_dir = os.path.join(export_base_path, bt_local_path)
+      bt.export(export_dir, local=True)
+
+      ignored_paths = {
+          p.strip() for p in self.rebuild_business_template_ignored_path.splitlines()
+          if p and not p.strip().startswith("#")}
+
+      diff_line_list = []
+      def get_differences(dcmp, base):
+        for name in dcmp.left_only:
+          yield 'removed: ' + os.path.join(base, name)
+        for name in dcmp.right_only:
+          yield 'added: ' + os.path.join(base, name)
+        for name in dcmp.funny_files:
+          yield 'funny: ' + os.path.join(base, name)
+        for name in dcmp.diff_files:
+          path = os.path.join(base, name)
+          if not any(fnmatch.fnmatch(path, ignored_path) for ignored_path in ignored_paths):
+            yield 'modified: ' + path
+            with open(os.path.join(bt_base_path, path)) as ff, \
+                open(os.path.join(export_base_path, path)) as tf:
+              diff_line_list.extend(
+                  difflib.unified_diff(
+                      ff.readlines(),
+                      tf.readlines(),
+                      os.path.join('git', path),
+                      os.path.join('bt5', path),
+                  ))
+              diff_line_list.append('\n')
+        for sub_path, sub_dcmp in dcmp.subdirs.iteritems():
+          for diff in get_differences(sub_dcmp, os.path.join(base, sub_path)):
+            yield diff
 
-      # then compare this with the files in the newly exported business template.
-      bt_file = bt.export()
-      bt_file.seek(0) # XXX this StringIO was already read...
-      new_files = set(tarfile.open(fileobj=bt_file, mode='r:gz').getnames())
+      diff_files = list(get_differences(filecmp.dircmp(bt_dir, export_dir), bt_local_path))
+      # dump a diff in log directory, to help debugging
+      from Products.ERP5Type.tests.runUnitTest import log_directory
+      if log_directory and diff_line_list:
+        with open(os.path.join(log_directory, '%s.diff' % self.id()), 'w') as f:
+          f.writelines(diff_line_list)
+      self.assertEqual(diff_files, [])
 
-      self.maxDiff = None
-      self.assertEqual(existing_files, new_files)
 
   def test_run_upgrader(self):
     # Check that pre and post upgrade do not raise problems.
@@ -195,3 +254,16 @@ class CodingStyleTestCase(ERP5TypeTestCase):
                   'action_name': action_name,
               })
       self.assertEqual(duplicate_action_list, [])
+
+  def test_workflow_consistency(self):
+    self.maxDiff = None
+    workflow_id_set = set()
+    for business_template in self._getTestedBusinessTemplateValueList():
+      workflow_id_set.update(business_template.getTemplateWorkflowIdList())
+
+    message_list = []
+    for workflow_id in workflow_id_set:
+      message_list.extend(
+          self.portal.portal_workflow[workflow_id].checkConsistency())
+
+    self.assertEqual(message_list, [])
diff --git a/product/ERP5Type/tests/testDynamicClassGeneration.py b/product/ERP5Type/tests/testDynamicClassGeneration.py
index acb410d66231f853711bcd4215005e8f9d1ed4a8..cdada8d2d2c900b312f9d3b549781fb4475112b7 100644
--- a/product/ERP5Type/tests/testDynamicClassGeneration.py
+++ b/product/ERP5Type/tests/testDynamicClassGeneration.py
@@ -1659,6 +1659,38 @@ class TestZodbModuleComponent(SecurityTestCase):
       self.tic()
       self.assertEqual(component.checkConsistency(), [])
 
+
+  def testWorkflowErrorMessage(self):
+    """Check that validation error messages are stored in workflow
+    """
+    component = self._newComponent(self._generateReference('WorkflowErrorMessage'))
+    valid_id = component.getId()
+    self.tic()
+    component.setId('wrong')
+    from Products.ERP5Type.Core.Workflow import ValidationFailed
+    with self.assertRaises(ValidationFailed):
+      self.portal.portal_workflow.doActionFor(component, 'validate_action')
+    last_error_message = str(
+        self.portal.portal_workflow.getInfoFor(
+            component, 'history',
+            wf_id='component_validation_workflow')[-1]['error_message'][0])
+    self.assertEqual(
+        last_error_message,
+        self.portal.Base_translateString(
+            ComponentMixin._message_invalid_id,
+            mapping={'id_prefix': self._document_class.getIdPrefix()}))
+    self.tic()
+
+    # non-regression test: when there is no error the error is no longer
+    # in workflow history
+    component.setId(valid_id)
+    component.validate()
+    self.tic()
+    last_error_message = self.portal.portal_workflow.getInfoFor(
+            component, 'history',
+            wf_id='component_validation_workflow')[-1]['error_message']
+    self.assertEqual(last_error_message, '')
+
   def testReferenceWithReservedKeywords(self):
     """
     Check whether checkConsistency has been properly implemented for checking
diff --git a/product/Formulator/Widget.py b/product/Formulator/Widget.py
index 4e5800cc8365dc68132087fdb773441189ed6aad..87a6d034fa877cfa5317820d8f809681725d3ec0 100644
--- a/product/Formulator/Widget.py
+++ b/product/Formulator/Widget.py
@@ -1277,21 +1277,25 @@ class RadioWidget(SingleItemsWidget):
       return string.join(rendered_items, "<br />")
 
   def render_item(self, text, value, key, css_class, extra_item):
-    return self.render_element('input',
-                          type="radio",
-                          css_class=css_class,
-                          name=key,
-                          value=value,
-                          extra=extra_item) + text
+    return render_element(
+        'label',
+        contents=self.render_element('input',
+            type="radio",
+            css_class=css_class,
+            name=key,
+            value=value,
+            extra=extra_item) + text)
 
   def render_selected_item(self, text, value, key, css_class, extra_item):
-    return self.render_element('input',
-                          type="radio",
-                          css_class=css_class,
-                          name=key,
-                          value=value,
-                          checked=None,
-                          extra=extra_item) + text
+    return render_element(
+        'label',
+        contents=self.render_element('input',
+            type="radio",
+            css_class=css_class,
+            name=key,
+            value=value,
+            checked=None,
+            extra=extra_item) + text)
 
 RadioWidgetInstance = RadioWidget()
 
@@ -1322,21 +1326,26 @@ class MultiCheckBoxWidget(MultiItemsWidget):
         return string.join(rendered_items, "<br />")
 
     def render_item(self, text, value, key, css_class, extra_item):
-        return self.render_element('input',
-                              type="checkbox",
-                              css_class=css_class,
-                              name=key,
-                              value=value,
-                              extra=extra_item) + text
+        return render_element(
+            'label',
+            contents=self.render_element('input',
+                type="checkbox",
+                css_class=css_class,
+                name=key,
+                value=value,
+                extra=extra_item) + text)
 
     def render_selected_item(self, text, value, key, css_class, extra_item):
-        return self.render_element('input',
-                              type="checkbox",
-                              css_class=css_class,
-                              name=key,
-                              value=value,
-                              checked=None,
-                              extra=extra_item) + text
+        return render_element(
+            'label',
+            contents=self.render_element('input',
+                type="checkbox",
+                css_class=css_class,
+                name=key,
+                value=value,
+                checked=None,
+                extra=extra_item) + text)
+
 
 MultiCheckBoxWidgetInstance = MultiCheckBoxWidget()