diff --git a/bt5/erp5_accounting_simulation_legacy/DocumentTemplateItem/portal_components/document.erp5.AccountingRuleCell.py b/bt5/erp5_accounting_simulation_legacy/DocumentTemplateItem/portal_components/document.erp5.AccountingRuleCell.py
new file mode 100644
index 0000000000000000000000000000000000000000..f6100846888c1496d1d56f668c1cf6fe2d4ce709
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/DocumentTemplateItem/portal_components/document.erp5.AccountingRuleCell.py
@@ -0,0 +1,62 @@
+##############################################################################
+#
+# Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+#from Products.ERP5Type.Globals import InitializeClass, PersistentMapping
+#from Products.CMFCore.utils import getToolByName
+from AccessControl import ClassSecurityInfo
+from Products.ERP5Type import Permissions, PropertySheet
+from Products.ERP5Type.Core.Predicate import Predicate
+from Products.ERP5.Document.Invoice import Invoice
+
+
+class AccountingRuleCell(Predicate, Invoice):
+  """
+An AccountingRuleCell object allows to add SaleInvoiceTransactionLines into a Matrix
+    """
+  # Default Properties
+  property_sheets = (
+      PropertySheet.Base,
+      PropertySheet.XMLObject,
+      PropertySheet.CategoryCore,
+      PropertySheet.DublinCore,
+      PropertySheet.Delivery,
+      PropertySheet.Task,
+      PropertySheet.Arrow,
+      PropertySheet.Movement,
+      PropertySheet.Amount,
+      PropertySheet.Reference,
+      PropertySheet.PaymentCondition,
+      PropertySheet.Predicate,
+      PropertySheet.MappedValue,
+  )
+  # CMF Type Definition
+  meta_type = 'ERP5 Accounting Rule Cell'
+  portal_type = 'Accounting Rule Cell'
+  add_permission = Permissions.AddPortalContent
+  # Declarative security
+  security = ClassSecurityInfo()
+  security.declareObjectProtected(Permissions.AccessContentsInformation)
diff --git a/bt5/erp5_accounting_simulation_legacy/DocumentTemplateItem/portal_components/document.erp5.AccountingRuleCell.xml b/bt5/erp5_accounting_simulation_legacy/DocumentTemplateItem/portal_components/document.erp5.AccountingRuleCell.xml
new file mode 100644
index 0000000000000000000000000000000000000000..11fd9213004c7587c316828daaa6edc94d110817
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/DocumentTemplateItem/portal_components/document.erp5.AccountingRuleCell.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </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>AccountingRuleCell</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.AccountingRuleCell</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <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>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <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>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/bt5/erp5_accounting_simulation_legacy/bt/template_document_id_list b/bt5/erp5_accounting_simulation_legacy/bt/template_document_id_list
new file mode 100644
index 0000000000000000000000000000000000000000..cfe6b4928dbbbdb6e69966fb2ff72c8e0cd139de
--- /dev/null
+++ b/bt5/erp5_accounting_simulation_legacy/bt/template_document_id_list
@@ -0,0 +1 @@
+document.erp5.AccountingRuleCell
\ No newline at end of file
diff --git a/bt5/erp5_banking_inventory/bt/skip_coding_style_test b/bt5/erp5_banking_inventory/bt/skip_coding_style_test
new file mode 100644
index 0000000000000000000000000000000000000000..56a6051ca2b02b04ef92d5150c9ef600403cb1de
--- /dev/null
+++ b/bt5/erp5_banking_inventory/bt/skip_coding_style_test
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/PositionOpportunity_view/my_description.xml b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/PositionOpportunity_view/my_description.xml
index e073eb8c2045c4ef5ff85531b4ba14c6a1606cb6..2bb9eb58dd1e7612eefe9ca6bb629be1ef6a1dc4 100644
--- a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/PositionOpportunity_view/my_description.xml
+++ b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/PositionOpportunity_view/my_description.xml
@@ -81,7 +81,7 @@
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>BaseCrm_FieldLibrary</string> </value>
+                    <value> <string>Base_viewCRMFieldLibrary</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/PositionOpportunity_view/my_destination_section_title.xml b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/PositionOpportunity_view/my_destination_section_title.xml
index af5b1ffd728b6af07968aaf3d45374a0e0b2c9c1..8ebf54cd3f8aa696cbf21d9767948cd7e26a06fd 100644
--- a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/PositionOpportunity_view/my_destination_section_title.xml
+++ b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/PositionOpportunity_view/my_destination_section_title.xml
@@ -84,7 +84,7 @@
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>BaseCrm_FieldLibrary</string> </value>
+                    <value> <string>Base_viewCRMFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>portal_type</string> </key>
diff --git a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/PositionOpportunity_view/my_source_section_title.xml b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/PositionOpportunity_view/my_source_section_title.xml
index 9b87396885dc830f715f0e0a73bfc6370c951e18..46b7306fa408e0aa3a5e9d9d68875620c39a8662 100644
--- a/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/PositionOpportunity_view/my_source_section_title.xml
+++ b/bt5/erp5_hr/SkinTemplateItem/portal_skins/erp5_hr/PositionOpportunity_view/my_source_section_title.xml
@@ -83,7 +83,7 @@
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
-                    <value> <string>BaseCrm_FieldLibrary</string> </value>
+                    <value> <string>Base_viewCRMFieldLibrary</string> </value>
                 </item>
                 <item>
                     <key> <string>title</string> </key>
diff --git a/bt5/erp5_hr/bt/dependency_list b/bt5/erp5_hr/bt/dependency_list
index 44b7a8676852ff12962171eac61c877555df67c8..bfc0df70b803017840a3b0b6deee9aaa68a064f1 100644
--- a/bt5/erp5_hr/bt/dependency_list
+++ b/bt5/erp5_hr/bt/dependency_list
@@ -1,2 +1,3 @@
 erp5_base
-erp5_web
\ No newline at end of file
+erp5_web
+erp5_crm
\ No newline at end of file
diff --git a/bt5/erp5_ingestion/bt/template_skin_id_list b/bt5/erp5_ingestion/bt/template_skin_id_list
index 588ee38811f5eec9dfdbeda3b48a420da9afa977..84fd43167e34d56add1cf83e101e90f859f27d23 100644
--- a/bt5/erp5_ingestion/bt/template_skin_id_list
+++ b/bt5/erp5_ingestion/bt/template_skin_id_list
@@ -1,2 +1 @@
-erp5_ingestion
-erp5_ingestion_test
\ No newline at end of file
+erp5_ingestion
\ No newline at end of file
diff --git a/bt5/erp5_ingestion/bt/test_dependency_list b/bt5/erp5_ingestion/bt/test_dependency_list
index 2f97a2f2c2a74b0bb95ce5088fd6e3c213a3a931..e69c00e96596a707d04d1138961feb743e3bd047 100644
--- a/bt5/erp5_ingestion/bt/test_dependency_list
+++ b/bt5/erp5_ingestion/bt/test_dependency_list
@@ -1,5 +1,3 @@
 erp5_full_text_mroonga_catalog
 erp5_ingestion_mysql_innodb_catalog
-erp5_web
-erp5_crm
-erp5_dms
\ No newline at end of file
+erp5_ingestion_test
\ No newline at end of file
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFile.txt.py b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFile.txt.py
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFile.txt.py
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFile.txt.py
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFile.txt.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFile.txt.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFile.txt.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFile.txt.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileName.py b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileName.py
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileName.py
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileName.py
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileName.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileName.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileName.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileName.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileNameAndRedirection.py b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileNameAndRedirection.py
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileNameAndRedirection.py
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileNameAndRedirection.py
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileNameAndRedirection.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileNameAndRedirection.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileNameAndRedirection.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithFileNameAndRedirection.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutContentType.txt.py b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutContentType.txt.py
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutContentType.txt.py
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutContentType.txt.py
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutContentType.txt.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutContentType.txt.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutContentType.txt.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutContentType.txt.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutFileNameButHTMLContentType.py b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutFileNameButHTMLContentType.py
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutFileNameButHTMLContentType.py
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutFileNameButHTMLContentType.py
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutFileNameButHTMLContentType.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutFileNameButHTMLContentType.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutFileNameButHTMLContentType.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/ERP5Site_getTextFileWithoutFileNameButHTMLContentType.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test/applicable_layout.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test/applicable_layout.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test/applicable_layout.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test/applicable_layout.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test/section_content_list.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test/section_content_list.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test/section_content_list.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test/section_content_list.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test/subsection_list.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test/subsection_list.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test/subsection_list.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_content_layout_test/subsection_list.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/applicable_layout.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/applicable_layout.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/applicable_layout.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/applicable_layout.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/language_selector.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/language_selector.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/language_selector.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/language_selector.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/section_content_list.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/section_content_list.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/section_content_list.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/section_content_list.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/subsection_list.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/subsection_list.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/subsection_list.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/erp5_web_layout_test/subsection_list.xml
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/text_file.txt b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/text_file.txt
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/text_file.txt
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/text_file.txt
diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/text_file.xml b/bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/text_file.xml
similarity index 100%
rename from bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion_test/text_file.xml
rename to bt5/erp5_ingestion_test/SkinTemplateItem/portal_skins/erp5_ingestion_test/text_file.xml
diff --git a/bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.py b/bt5/erp5_ingestion_test/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.py
similarity index 97%
rename from bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.py
rename to bt5/erp5_ingestion_test/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.py
index da9df9550c5238388fbacd30867c96ae73811d74..b2360e61f25f98b41d4e20038aaa4759b06f389b 100644
--- a/bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.py
+++ b/bt5/erp5_ingestion_test/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.py
@@ -34,7 +34,7 @@ import random
 import string
 
 # test files' home
-FILE_NAME_REGULAR_EXPRESSION = "(?P<reference>[A-Z&é@{]{3,7})-(?P<language>[a-z]{2})-(?P<version>[0-9]{3})"
+FILENAME_REGULAR_EXPRESSION = "(?P<reference>[A-Z&é@{]{3,7})-(?P<language>[a-z]{2})-(?P<version>[0-9]{3})"
 REFERENCE_REGULAR_EXPRESSION = "(?P<reference>[A-Z&é@{]{3,7})(-(?P<language>[a-z]{2}))?(-(?P<version>[0-9]{3}))?"
 
 class TestIngestion(ERP5TypeLiveTestCase):
@@ -82,7 +82,7 @@ class TestIngestion(ERP5TypeLiveTestCase):
     portal = self.portal
     contribution_tool = getToolByName(portal, 'portal_contributions')
     # seed parameter is here to ensure entropy for document id generation
-    seed = ''.join([random.choice(string.ascii_letters) for i in xrange(20)])
+    seed = ''.join([random.choice(string.ascii_letters) for _ in xrange(20)])
     url = portal.absolute_url()
     url += '/%s?seed=%s' % (script_id, seed)
     if filename:
diff --git a/bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.xml b/bt5/erp5_ingestion_test/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.xml
similarity index 76%
rename from bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.xml
rename to bt5/erp5_ingestion_test/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.xml
index 404a32555daadc95390c668716f3897bdb3a5566..4fbbf4c19d09d581b81d62d757cd1fd0b5ea7719 100644
--- a/bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.xml
+++ b/bt5/erp5_ingestion_test/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.xml
@@ -61,24 +61,28 @@
   </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</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/bt5/erp5_ingestion_test/bt/dependency_list b/bt5/erp5_ingestion_test/bt/dependency_list
new file mode 100644
index 0000000000000000000000000000000000000000..84fd43167e34d56add1cf83e101e90f859f27d23
--- /dev/null
+++ b/bt5/erp5_ingestion_test/bt/dependency_list
@@ -0,0 +1 @@
+erp5_ingestion
\ No newline at end of file
diff --git a/bt5/erp5_ingestion_test/bt/description b/bt5/erp5_ingestion_test/bt/description
new file mode 100644
index 0000000000000000000000000000000000000000..b3d27d5f9151d78811c7bfc8f1d6dd4dd0ee0be8
--- /dev/null
+++ b/bt5/erp5_ingestion_test/bt/description
@@ -0,0 +1 @@
+Tests for erp5_ingestion
\ No newline at end of file
diff --git a/bt5/erp5_ingestion_test/bt/template_format_version b/bt5/erp5_ingestion_test/bt/template_format_version
new file mode 100644
index 0000000000000000000000000000000000000000..56a6051ca2b02b04ef92d5150c9ef600403cb1de
--- /dev/null
+++ b/bt5/erp5_ingestion_test/bt/template_format_version
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/bt5/erp5_ingestion_test/bt/template_skin_id_list b/bt5/erp5_ingestion_test/bt/template_skin_id_list
new file mode 100644
index 0000000000000000000000000000000000000000..7dbee7f54e94bbd6d67c3964845e1d88ab22560b
--- /dev/null
+++ b/bt5/erp5_ingestion_test/bt/template_skin_id_list
@@ -0,0 +1 @@
+erp5_ingestion_test
\ No newline at end of file
diff --git a/bt5/erp5_ingestion/bt/template_test_id_list b/bt5/erp5_ingestion_test/bt/template_test_id_list
similarity index 100%
rename from bt5/erp5_ingestion/bt/template_test_id_list
rename to bt5/erp5_ingestion_test/bt/template_test_id_list
diff --git a/bt5/erp5_ingestion_test/bt/test_dependency_list b/bt5/erp5_ingestion_test/bt/test_dependency_list
new file mode 100644
index 0000000000000000000000000000000000000000..d7f5531b1b2540a96c37aad2d9ecb96cc347a8b4
--- /dev/null
+++ b/bt5/erp5_ingestion_test/bt/test_dependency_list
@@ -0,0 +1,4 @@
+erp5_web
+erp5_crm
+erp5_dms
+erp5_full_text_myisam_catalog
\ No newline at end of file
diff --git a/bt5/erp5_ingestion_test/bt/title b/bt5/erp5_ingestion_test/bt/title
new file mode 100644
index 0000000000000000000000000000000000000000..7dbee7f54e94bbd6d67c3964845e1d88ab22560b
--- /dev/null
+++ b/bt5/erp5_ingestion_test/bt/title
@@ -0,0 +1 @@
+erp5_ingestion_test
\ No newline at end of file
diff --git a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_codemirror/WebPageModule_viewWebPageListAsJioForCodemirror/listbox.xml b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_codemirror/WebPageModule_viewWebPageListAsJioForCodemirror/listbox.xml
index 843aeb7fbfe0ce9e1ca2d8b68827dab8e313665c..c3454d11fe463fbbced7ae7d4eb6f6722536c923 100644
--- a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_codemirror/WebPageModule_viewWebPageListAsJioForCodemirror/listbox.xml
+++ b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_codemirror/WebPageModule_viewWebPageListAsJioForCodemirror/listbox.xml
@@ -289,7 +289,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>web_page_module_view_web_page_list_selection</string> </value>
+                    <value> <string>web_page_module_view_document_list_as_jio_for_codemirror_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
diff --git a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_pdf_viewer/DocumentModule_viewDocumentListAsJioForPdfViewer/listbox.xml b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_pdf_viewer/DocumentModule_viewDocumentListAsJioForPdfViewer/listbox.xml
index 56319eace0cc598b26eb0ba5e8a07e97b49fcf35..eb73de7f79ed665865387eb1f618178f50d85ed2 100644
--- a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_pdf_viewer/DocumentModule_viewDocumentListAsJioForPdfViewer/listbox.xml
+++ b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_pdf_viewer/DocumentModule_viewDocumentListAsJioForPdfViewer/listbox.xml
@@ -289,7 +289,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>web_page_module_view_web_page_list_selection</string> </value>
+                    <value> <string>document_module_view_document_list_as_jio_for_pdf_viewer_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
diff --git a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_svg_editor/WebPageModule_viewWebPageListAsJioForSvgEditor/listbox.xml b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_svg_editor/WebPageModule_viewWebPageListAsJioForSvgEditor/listbox.xml
index 257a98dc9e8dc6059e3e2b44f0b33afcf207a055..0b1bdd0049dab3f1b6fdd1f18fb2a1c8b2b2c430 100644
--- a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_svg_editor/WebPageModule_viewWebPageListAsJioForSvgEditor/listbox.xml
+++ b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_svg_editor/WebPageModule_viewWebPageListAsJioForSvgEditor/listbox.xml
@@ -297,7 +297,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>image_selection</string> </value>
+                    <value> <string>web_page_module_view_document_list_as_jio_for_svg_editor_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
diff --git a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_text_editor/WebPageModule_viewWebPageListAsJioForTextEditor/listbox.xml b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_text_editor/WebPageModule_viewWebPageListAsJioForTextEditor/listbox.xml
index 6fdf65caea2cfad61d1cf8cf0d34400a90d91327..4742c583b3d9cf7f1665f8bc8442aeab0716fe21 100644
--- a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_text_editor/WebPageModule_viewWebPageListAsJioForTextEditor/listbox.xml
+++ b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_text_editor/WebPageModule_viewWebPageListAsJioForTextEditor/listbox.xml
@@ -289,7 +289,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>web_page_module_view_web_page_list_selection</string> </value>
+                    <value> <string>web_page_module_view_document_list_as_jio_for_text_editor_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
diff --git a/bt5/erp5_officejs_jquery_app/SkinTemplateItem/portal_skins/erp5_image_editor/ImageModule_viewImageListAsJioForImageEditor/listbox.xml b/bt5/erp5_officejs_jquery_app/SkinTemplateItem/portal_skins/erp5_image_editor/ImageModule_viewImageListAsJioForImageEditor/listbox.xml
index 4a27db536358e864e4c665b8d5ad2fa5ccb912d8..889840a37dded9a8ef2c9e6b0aa8a1866dae4205 100644
--- a/bt5/erp5_officejs_jquery_app/SkinTemplateItem/portal_skins/erp5_image_editor/ImageModule_viewImageListAsJioForImageEditor/listbox.xml
+++ b/bt5/erp5_officejs_jquery_app/SkinTemplateItem/portal_skins/erp5_image_editor/ImageModule_viewImageListAsJioForImageEditor/listbox.xml
@@ -297,7 +297,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>image_selection</string> </value>
+                    <value> <string>image_module_image_list_as_jio_for_image_editor_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
diff --git a/bt5/erp5_officejs_jquery_app/SkinTemplateItem/portal_skins/erp5_web_table_editor/WebPageModule_viewWebTableListAsJioForWebTableEditor/listbox.xml b/bt5/erp5_officejs_jquery_app/SkinTemplateItem/portal_skins/erp5_web_table_editor/WebPageModule_viewWebTableListAsJioForWebTableEditor/listbox.xml
index 04534ddb90591f77ad8092a998a3be9c8e90ca2b..99d8e2949ad80ba92e81e90abd09f39253d0f1ea 100644
--- a/bt5/erp5_officejs_jquery_app/SkinTemplateItem/portal_skins/erp5_web_table_editor/WebPageModule_viewWebTableListAsJioForWebTableEditor/listbox.xml
+++ b/bt5/erp5_officejs_jquery_app/SkinTemplateItem/portal_skins/erp5_web_table_editor/WebPageModule_viewWebTableListAsJioForWebTableEditor/listbox.xml
@@ -289,7 +289,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>web_page_module_view_web_page_list_selection</string> </value>
+                    <value> <string>web_page_module_document_list_as_jio_for_web_table_editor_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
diff --git a/bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_presentation_editor/DocumentModule_viewDocumentListAsJioForOofficePresentationEditor/listbox.xml b/bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_presentation_editor/DocumentModule_viewDocumentListAsJioForOofficePresentationEditor/listbox.xml
index 6af98a99146ea38c8a080ed4b3a2ce58f4871793..8e3f890a67a0f9709c057844b2a3c3ad591f9fdd 100644
--- a/bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_presentation_editor/DocumentModule_viewDocumentListAsJioForOofficePresentationEditor/listbox.xml
+++ b/bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_presentation_editor/DocumentModule_viewDocumentListAsJioForOofficePresentationEditor/listbox.xml
@@ -289,7 +289,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>web_page_module_view_web_page_list_selection</string> </value>
+                    <value> <string>document_module_document_list_as_jio_for_ooffice_presentation_editor_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
diff --git a/bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_spreadsheet_editor/DocumentModule_viewDocumentListAsJioForOofficeSpreadsheetEditor/listbox.xml b/bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_spreadsheet_editor/DocumentModule_viewDocumentListAsJioForOofficeSpreadsheetEditor/listbox.xml
index 14887b187ebba90653025c82cdaa5223a66d4784..dc58be9afc141ce861ce19769f8fd57def710b9e 100644
--- a/bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_spreadsheet_editor/DocumentModule_viewDocumentListAsJioForOofficeSpreadsheetEditor/listbox.xml
+++ b/bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_spreadsheet_editor/DocumentModule_viewDocumentListAsJioForOofficeSpreadsheetEditor/listbox.xml
@@ -289,7 +289,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>web_page_module_view_web_page_list_selection</string> </value>
+                    <value> <string>document_module_document_list_as_jio_for_ooffice_spreadsheet_editor_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
diff --git a/bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_text_editor/DocumentModule_viewDocumentListAsJioForOofficeTextEditor/listbox.xml b/bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_text_editor/DocumentModule_viewDocumentListAsJioForOofficeTextEditor/listbox.xml
index a60d2d42ac4f85d457bd8660d6fa2ee9ec1202a4..04b78798f488f08a4f21df3e3a174d3fb6e57f02 100644
--- a/bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_text_editor/DocumentModule_viewDocumentListAsJioForOofficeTextEditor/listbox.xml
+++ b/bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_text_editor/DocumentModule_viewDocumentListAsJioForOofficeTextEditor/listbox.xml
@@ -289,7 +289,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>web_page_module_view_web_page_list_selection</string> </value>
+                    <value> <string>document_module_document_list_as_jio_for_ooffice_text_editor_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
diff --git a/bt5/erp5_post/bt/dependency_list b/bt5/erp5_post/bt/dependency_list
index 5baeafc5b1227837c37fd3f0c8f296901189987c..7c4043201c3a7772f8cfdb2a41400b1394befaf8 100644
--- a/bt5/erp5_post/bt/dependency_list
+++ b/bt5/erp5_post/bt/dependency_list
@@ -1 +1,2 @@
-erp5_project
\ No newline at end of file
+erp5_project
+erp5_crm
\ No newline at end of file
diff --git a/bt5/erp5_research_item/SkinTemplateItem/portal_skins/erp5_research_item/ResearchItemModule_viewResearchSummaryReportData/listbox.xml b/bt5/erp5_research_item/SkinTemplateItem/portal_skins/erp5_research_item/ResearchItemModule_viewResearchSummaryReportData/listbox.xml
index 4cd4ad92792b68776452b5c31584bf50d42466ce..e1233158504252d625755565db3d8bb64a50b3da 100644
--- a/bt5/erp5_research_item/SkinTemplateItem/portal_skins/erp5_research_item/ResearchItemModule_viewResearchSummaryReportData/listbox.xml
+++ b/bt5/erp5_research_item/SkinTemplateItem/portal_skins/erp5_research_item/ResearchItemModule_viewResearchSummaryReportData/listbox.xml
@@ -546,7 +546,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>research_item_module_view_research_summary_report_data_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
diff --git a/bt5/erp5_tiosafe_core/bt/dependency_list b/bt5/erp5_tiosafe_core/bt/dependency_list
index 9127f89f80c54c3be59778c59df9137b9f0f0713..a009cde2daf27b46435989e410843795960ebcad 100644
--- a/bt5/erp5_tiosafe_core/bt/dependency_list
+++ b/bt5/erp5_tiosafe_core/bt/dependency_list
@@ -1,2 +1,3 @@
+erp5_accounting
 erp5_trade
 erp5_web_service
\ No newline at end of file
diff --git a/bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request/Tickect_viewRelatedRecordList/listbox.xml b/bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request/Tickect_viewRelatedRecordList/listbox.xml
index 4fe38d570c67eafefb2a0d656440804ee608f96f..387dff01c8513f89c0c9ab8893b7885de1520e29 100644
--- a/bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request/Tickect_viewRelatedRecordList/listbox.xml
+++ b/bt5/erp5_travel_expense/SkinTemplateItem/portal_skins/erp5_hr_request/Tickect_viewRelatedRecordList/listbox.xml
@@ -197,7 +197,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>ticket_view_selection</string> </value>
+                    <value> <string>ticket_view_related_record_list_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
diff --git a/bt5/erp5_video/SkinTemplateItem/portal_skins/erp5_video/Video_watch/my_file.xml b/bt5/erp5_video/SkinTemplateItem/portal_skins/erp5_video/Video_watch/my_file.xml
index a26dcae08507f83bfaa40ed6c04582905dad3067..876830a967e3dea2e55d9f2ec506c2cdb3773e2c 100644
--- a/bt5/erp5_video/SkinTemplateItem/portal_skins/erp5_video/Video_watch/my_file.xml
+++ b/bt5/erp5_video/SkinTemplateItem/portal_skins/erp5_video/Video_watch/my_file.xml
@@ -301,7 +301,7 @@
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-python: \'<video autoplay="true" controls="controls" src="\'+here.absolute_url()+\'?inline=True&format="></video>\'
+python: \'<video autoplay="autoplay" controls="controls" src="\'+here.absolute_url()+\'?inline=True&format="></video>\'
 
 ]]></string> </value>
         </item>
diff --git a/bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/ProjectModule_viewProjectManagementList/listbox.xml b/bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/ProjectModule_viewProjectManagementList/listbox.xml
index 12e170ed8b85fc0d1513fc7b254a172211a2d495..8455ce572703a830c0d9812049cabde5ad63e2f1 100644
--- a/bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/ProjectModule_viewProjectManagementList/listbox.xml
+++ b/bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/ProjectModule_viewProjectManagementList/listbox.xml
@@ -225,7 +225,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>project_module_selection</string> </value>
+                    <value> <string>project_module_project_management_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/Project_viewDocumentList/listbox.xml b/bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/Project_viewDocumentList/listbox.xml
index 8c4ef08acdb55477bba58783a4983bfe555df6c6..e86d1256c7c1b454bdec6af84a792b514ec14fb9 100644
--- a/bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/Project_viewDocumentList/listbox.xml
+++ b/bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/Project_viewDocumentList/listbox.xml
@@ -250,7 +250,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>base_view_document_selection</string> </value>
+                    <value> <string>project_view_document_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
diff --git a/product/ERP5/tests/testWebCrawler.py b/product/ERP5/tests/testWebCrawler.py
index fbdf5ccc6f3759cdb8f4ac4f1bee7d58fd826efd..97f50b69d6d7f0164e643d54cb1b9b9abd985069 100644
--- a/product/ERP5/tests/testWebCrawler.py
+++ b/product/ERP5/tests/testWebCrawler.py
@@ -57,6 +57,7 @@ class TestWebCrawler(ERP5TypeTestCase):
     return ('erp5_core_proxy_field_legacy',
             'erp5_base',
             'erp5_ingestion',
+            'erp5_ingestion_test',
             'erp5_ingestion_mysql_innodb_catalog',
             'erp5_web',
             'erp5_dms')
diff --git a/product/ERP5Form/VideoField.py b/product/ERP5Form/VideoField.py
index 2ba7f0defe0db9e18e98b909d0f8f798cf4a537f..78b10a21b25bc1b0f7834c9e6c6090e292612030 100644
--- a/product/ERP5Form/VideoField.py
+++ b/product/ERP5Form/VideoField.py
@@ -94,7 +94,7 @@ class VideoWidget(Widget.TextWidget):
       if field.get_value('video_loop'):
         extra_kw['loop']='loop'
       if field.get_value('video_preload'):
-        extra_kw['preload']='preload'
+        extra_kw['preload']='auto'
       return Widget.render_element("video",
                         src=value,
                         extra=field.get_value('extra'),
diff --git a/product/ERP5Form/tests/testVideoField.py b/product/ERP5Form/tests/testVideoField.py
index 9b230b8b58597b0577e7aadd84433ce0c9bf5cc9..75a992529e2ffbdbd7572f85df832f7a0115862e 100644
--- a/product/ERP5Form/tests/testVideoField.py
+++ b/product/ERP5Form/tests/testVideoField.py
@@ -43,7 +43,7 @@ class TestVideoField(ERP5TypeTestCase):
   def test_render_view(self):
     self.field.values['default'] = 'Video content'
 
-    self.assertEqual('<video preload="preload" src="Video content" controls="controls" height="85" width="160" >Your browser does not support video tag.</video>', \
+    self.assertEqual('<video preload="auto" src="Video content" controls="controls" height="85" width="160" >Your browser does not support video tag.</video>', \
                       self.field.render_view(value='Video content'))
 
     self.field.values['video_preload'] = False
diff --git a/product/ERP5Type/tests/CodingStyleTest.py b/product/ERP5Type/tests/CodingStyleTest.py
index 22ecb89a3757deb8f14906c6ff6c43414df935b0..fc5ffaca6c8214ef53a023f717dcca3057434ca4 100644
--- a/product/ERP5Type/tests/CodingStyleTest.py
+++ b/product/ERP5Type/tests/CodingStyleTest.py
@@ -31,9 +31,12 @@ import os
 import unittest
 from glob import glob
 
+from Products.ERP5.tests import testXHTML
+from Products.ERP5Type.tests.utils import addUserToDeveloperRole
 from Products.ERP5Type.tests.CodingStyleTestCase import CodingStyleTestCase
 
-class CodingStyleTest(CodingStyleTestCase):
+
+class CodingStyleTest(CodingStyleTestCase, testXHTML.TestXHTMLMixin):
   """Run a coding style test for business template defined by
   TESTED_BUSINESS_TEMPLATE environment variable, that is set by
   ERP5BusinessTemplateCodingStyleTestSuite in test/__init__.py
@@ -81,15 +84,29 @@ class CodingStyleTest(CodingStyleTestCase):
                  self)._installBusinessTemplateList(url_bt_tuple_list,
                                                     *args, **kwargs)
 
+
 def test_suite():
   suite = unittest.TestSuite()
   tested_business_template = os.environ['TESTED_BUSINESS_TEMPLATE']
 
   testclass = type(
       'CodingStyleTest %s' % tested_business_template,
-      (CodingStyleTest, ),
-      {'tested_business_template': tested_business_template})
+      (CodingStyleTest,),
+      {
+          'tested_business_template': tested_business_template,
+          # currently, jsl based test_javascript_lint report too many false positives.
+          'test_javascript_lint': None,
+      },
+  )
+
+  testXHTML.addTestMethodDynamically(
+      testclass,
+      testXHTML.validator,
+      (tested_business_template,),
+  )
+
+  # required to create content in portal_components
+  addUserToDeveloperRole('ERP5TypeTestCase')
 
   suite.addTest(unittest.makeSuite(testclass))
   return suite
-
diff --git a/tests/__init__.py b/tests/__init__.py
index 9f28f1a9f92c11eae0dffbe78327229b93c5762a..cfbd61061a071ddcb2aefbafdcb5b343f18788fb 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -80,8 +80,7 @@ class ERP5(_ERP5):
                    or full_test_case)
 
       # skip some tests
-      if test_case.startswith('testLive') or test_case.startswith('testVifib') \
-         or test_case.find('Performance') > 0 \
+      if test_case.find('Performance') > 0 \
          or test_case in ('testERP5LdapCatalog', # XXX (Ivan), until LDAP server is available this test will alway fail
                           # tests reading selenium tables from erp5.com
                           # not maintained