2005-12-13 aurel

* Update way of install Business Template
- add Trash type
- modify Workflow_statusModiify
- add Forms and Scripts in erp5_core
* Change in script of rule_interraction_workflow

2005-12-13 romain
* Fix Base_edit (when displaying multiple matrixbox)


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4639 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Address.xml

@@ -337,7 +337,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Agent.xml

@@ -295,7 +295,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Alarm%20Tool.xml

@@ -150,8 +150,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
         </tuple>
         <none/>
       </tuple>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Alarm.xml

@@ -231,8 +231,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
         </tuple>
         <none/>
       </tuple>
@@ -265,7 +265,7 @@
             <key> <string>permissions</string> </key>
             <value>
               <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
               </tuple>
             </value>
         </item>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Applied%20Rule.xml

@@ -362,7 +362,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Assignment.xml

@@ -247,8 +247,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
         </tuple>
         <none/>
       </tuple>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Bank%20Account.xml

@@ -256,7 +256,9 @@
         </item>
         <item>
             <key> <string>condition</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent>
+            </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -312,7 +314,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent>
             </value>
         </item>
         <item>
@@ -377,7 +379,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAw=</string> </persistent>
             </value>
         </item>
         <item>
@@ -408,7 +410,7 @@
             <key> <string>permissions</string> </key>
             <value>
               <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
               </tuple>
             </value>
         </item>
@@ -498,12 +500,31 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
+            <value> <string>python:portal.restrictedTraverse(\'accounting_module\', None) is not None</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
   <record id="11" aka="AAAAAAAAAAs=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="12" aka="AAAAAAAAAAw=">
     <pickle>
       <tuple>
         <tuple>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Career.xml

@@ -228,7 +228,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/ChatAddress.xml

@@ -274,8 +274,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
         </tuple>
         <none/>
       </tuple>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Credit%20Card.xml

@@ -266,7 +266,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Currency%20Exchange%20Line.xml

@@ -304,7 +304,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>
@@ -346,7 +346,7 @@
             <key> <string>permissions</string> </key>
             <value>
               <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
               </tuple>
             </value>
         </item>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Currency.xml

@@ -307,7 +307,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Delivery%20Builder.xml

@@ -364,8 +364,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
         </tuple>
         <none/>
       </tuple>
@@ -398,7 +398,7 @@
             <key> <string>permissions</string> </key>
             <value>
               <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
               </tuple>
             </value>
         </item>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Document.xml

@@ -248,8 +248,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
         </tuple>
         <none/>
       </tuple>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Email.xml

@@ -271,7 +271,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Favorite.xml

@@ -188,8 +188,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
         </tuple>
         <none/>
       </tuple>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Fax.xml

@@ -429,7 +429,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/File.xml

@@ -337,7 +337,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Image.xml

@@ -404,7 +404,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Link.xml

@@ -188,8 +188,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
         </tuple>
         <none/>
       </tuple>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Mapped%20Value.xml

@@ -272,8 +272,8 @@ identify a bank account.</string> </value>
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
         </tuple>
         <none/>
       </tuple>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/News%20Item.xml

@@ -188,8 +188,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
         </tuple>
         <none/>
       </tuple>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Order%20Builder.xml

@@ -396,7 +396,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>
@@ -438,7 +438,7 @@
             <key> <string>permissions</string> </key>
             <value>
               <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
               </tuple>
             </value>
         </item>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Person.xml

@@ -674,7 +674,9 @@
         </item>
         <item>
             <key> <string>condition</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAABs=</string> </persistent>
+            </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -730,7 +732,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAABs=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAABw=</string> </persistent>
             </value>
         </item>
         <item>
@@ -795,7 +797,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAABw=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAB0=</string> </persistent>
             </value>
         </item>
         <item>
@@ -860,7 +862,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAB0=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAB4=</string> </persistent>
             </value>
         </item>
         <item>
@@ -925,7 +927,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAB4=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAB8=</string> </persistent>
             </value>
         </item>
         <item>
@@ -990,7 +992,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAB8=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAACA=</string> </persistent>
             </value>
         </item>
         <item>
@@ -1055,7 +1057,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAACA=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAACE=</string> </persistent>
             </value>
         </item>
         <item>
@@ -1120,7 +1122,7 @@
         <item>
             <key> <string>action</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAACE=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAACI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -1355,7 +1357,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Entity_viewFinancialInformationList</string> </value>
+            <value> <string>python:portal.restrictedTraverse(\'accounting_module\', None) is not None</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -1374,7 +1376,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewDocumentList</string> </value>
+            <value> <string>string:${object_url}/Entity_viewFinancialInformationList</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -1393,7 +1395,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
+            <value> <string>string:${object_url}/Base_viewDocumentList</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -1412,7 +1414,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
+            <value> <string>string:${object_url}/Base_viewHistory</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -1431,7 +1433,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Career_shiftDefault</string> </value>
+            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -1450,12 +1452,31 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/translation_template_view</string> </value>
+            <value> <string>string:${object_url}/Career_shiftDefault</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
   <record id="33" aka="AAAAAAAAACE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${object_url}/translation_template_view</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="34" aka="AAAAAAAAACI=">
     <pickle>
       <tuple>
         <tuple>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Preference.xml

@@ -364,7 +364,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Simulation%20Movement.xml

@@ -240,7 +240,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Telephone.xml

@@ -249,8 +249,8 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
         </tuple>
         <none/>
       </tuple>
@@ -283,7 +283,7 @@
             <key> <string>permissions</string> </key>
             <value>
               <tuple>
-                <string>Modify portal content</string>
+                <string>Manage properties</string>
               </tuple>
             </value>
         </item>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Template%20Tool.xml

@@ -144,7 +144,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
           <string>PatchedActionInformation</string>
         </tuple>
         <none/>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Bin.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.ERP5Type</string>
+          <string>ERP5TypeInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_actions</string> </key>
+            <value>
+              <tuple>
+                <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquire_local_roles</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>allowed_content_types</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple>
+                <string>causality</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>content_icon</string> </key>
+            <value> <string>order_line_icon.gif</string> </value>
+        </item>
+        <item>
+            <key> <string>content_meta_type</string> </key>
+            <value> <string>ERP5 Folder</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Trash Bin represents objects removed by the upgrade of a Business Template</string> </value>
+        </item>
+        <item>
+            <key> <string>factory</string> </key>
+            <value> <string>addFolder</string> </value>
+        </item>
+        <item>
+            <key> <string>filter_content_types</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Trash Bin</string> </value>
+        </item>
+        <item>
+            <key> <string>init_script</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple>
+                <string>Base</string>
+                <string>SimpleItem</string>
+                <string>Task</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Trash Bin</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>view</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <int>10</int> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>View</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>metadata</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>Manage properties</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <int>10</int> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Metadata</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${object_url}/TrashBin_viewTrashObject</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="5" aka="AAAAAAAAAAU=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${object_url}/Base_viewMetadata</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Folder.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.ERP5Type</string>
+          <string>ERP5TypeInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_actions</string> </key>
+            <value>
+              <tuple>
+                <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquire_local_roles</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>allowed_content_types</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>content_icon</string> </key>
+            <value> <string>folder_icon.gif</string> </value>
+        </item>
+        <item>
+            <key> <string>content_meta_type</string> </key>
+            <value> <string>ERP5 Folder</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Folders allow to store a large number of documents (1,000,000 should not\n
+be a problem).</string> </value>
+        </item>
+        <item>
+            <key> <string>factory</string> </key>
+            <value> <string>addFolder</string> </value>
+        </item>
+        <item>
+            <key> <string>filter_content_types</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Trash Folder</string> </value>
+        </item>
+        <item>
+            <key> <string>init_script</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Trash Folder</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>view</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <int>10</int> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>View</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>list</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <int>10</int> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>List</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${object_url}/Folder_viewContentList</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="5" aka="AAAAAAAAAAU=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${object_url}/Folder_viewContentList</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Trash%20Tool.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.ERP5Type</string>
+          <string>ERP5TypeInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_actions</string> </key>
+            <value>
+              <tuple>
+                <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquire_local_roles</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>allowed_content_types</string> </key>
+            <value>
+              <tuple>
+                <string>Trash Bin</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>base_category_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>content_icon</string> </key>
+            <value> <string>folder_icon.gif</string> </value>
+        </item>
+        <item>
+            <key> <string>content_meta_type</string> </key>
+            <value> <string>ERP5 Folder</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Trash Tool contains Trahs Items</string> </value>
+        </item>
+        <item>
+            <key> <string>factory</string> </key>
+            <value> <string>addFolder</string> </value>
+        </item>
+        <item>
+            <key> <string>filter_content_types</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>hidden_content_type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Trash Tool</string> </value>
+        </item>
+        <item>
+            <key> <string>init_script</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>property_sheet_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Trash Tool</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>action</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>category</string> </key>
+            <value> <string>object_view</string> </value>
+        </item>
+        <item>
+            <key> <string>condition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>view</string> </value>
+        </item>
+        <item>
+            <key> <string>optional</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>permissions</string> </key>
+            <value>
+              <tuple>
+                <string>View</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>priority</string> </key>
+            <value> <int>10</int> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>View</string> </value>
+        </item>
+        <item>
+            <key> <string>visible</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.CMFCore.Expression</string>
+          <string>Expression</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>text</string> </key>
+            <value> <string>string:${object_url}/TrashTool_viewTrashBinList</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/workflow_chain_type.xml

@@ -175,4 +175,16 @@
   <type>Template Tool</type>
   <workflow></workflow>
  </chain>
+ <chain>
+  <type>Trash Bin</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Trash Folder</type>
+  <workflow>(Default)</workflow>
+ </chain>
+ <chain>
+  <type>Trash Tool</type>
+  <workflow>(Default)</workflow>
+ </chain>
 </workflow_chain>
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml

@@ -119,7 +119,7 @@ try:\n
   matrixbox = request.get(matrixbox_field_id)\n
 #   if matrixbox is not None:\n
   while matrixbox is not None:\n
-    matrixbox_field = form.get_field(\'matrixbox\')\n
+    matrixbox_field = form.get_field(matrixbox_field_id)\n
     cell_base_id = matrixbox_field.get_value(\'cell_base_id\')\n
     portal_type = matrixbox_field.get_value(\'cell_portal_type\')\n
     getter_method = matrixbox_field.get_value(\'getter_method\')\n
@@ -294,7 +294,7 @@ RF27AH0SAHQDAHwSAGQOAIMCAH0TAHQOAHwJAHwTAHwMAIMDAH0UAHQVAHwUAGQPAIMCAG8XAAF0
 AwB8FABkDwCDAgB0BACDAQABcQUBAXwUAHwMAGoJAG9gAAF0CgB8EwBkEABkEQCFAgCDAgBkEgBq
 AgBvQAABdAoAfBMAZBEAZAAAhQIAgwIAfRMAfBQAZAsAagIAbwoAAXQNAH0UAG4BAAF8FAB0FgB8
 EACDAQB8EwA8ccABAXEFAQFxBQFXZBMAfRcAZBAAfRgAdAMAfAkAZBQAgwIAfBcAgwEAfRkAeFEE
-fBkAdA0AagkAb0MEAXQDAHwPAGQVAIMCAGQTAIMBAH0aAHQDAHwaAGQWAIMCAGQXAIMBAH0bAHQD
+fBkAdA0AagkAb0MEAXQDAHwPAGQVAIMCAHwXAIMBAH0aAHQDAHwaAGQWAIMCAGQXAIMBAH0bAHQD
 AHwaAGQWAIMCAGQYAIMBAH0cAHQDAHwaAGQWAIMCAGQZAIMBAH0dAHwdAHQNAGQLAGYCAGoHAG8W
 AAF0DgB0BAB8HQCDAgCDAAB9HgBuBwABdAQAfR4AfB4AdA0AagkAb4YDAWgAAH0fAHwcAHQWAHwf
 AIMBAGQaADx8GwB0FgB8HwCDAQBkGwA8aAAAfSAAdAMAfBoAZBwAgwIAZB0AgwEAb1gAAXQhAGQe
@@ -340,23 +340,23 @@ ZWxsX3BvcnRhbF90eXBlcw0AAABnZXR0ZXJfbWV0aG9kcwsAAABwb3J0YWxfdHlwZXMHAAAAYmFz
 ZV9pZHMJAAAAaGFzX3ZhbHVlcxEAAABnbG9iYWxfYXR0cmlidXRlc2MBAAAAAgAAAAMAAABDAAAA
 cw0AAAB0AAB8AABkAQCDAgBTKAIAAABOaQAAAAAoAgAAAHMJAAAAX2dldGl0ZW1fcwEAAAB4KAIA
 AABzAQAAAHhzCQAAAF9nZXRpdGVtXygAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMLAAAA
-PGxhbWJkYS4zNT5DAAAAcwAAAABzEQAAAHVwZGF0ZV9jZWxsX3JhbmdlcwUAAABsaW5lc3MHAAAA
+PGxhbWJkYS4yMj5DAAAAcwAAAABzEQAAAHVwZGF0ZV9jZWxsX3JhbmdlcwUAAABsaW5lc3MHAAAA
 Y29sdW1uc3MEAAAAdGFic2MBAAAAAgAAAAMAAABDAAAAcw0AAAB0AAB8AABkAQCDAgBTKAIAAABO
 aQAAAAAoAgAAAHMJAAAAX2dldGl0ZW1fcwEAAAB4KAIAAABzAQAAAHhzCQAAAF9nZXRpdGVtXygA
-AAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMLAAAAPGxhbWJkYS4zNj5OAAAAcwAAAABjAQAA
+AAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMLAAAAPGxhbWJkYS4yMz5OAAAAcwAAAABjAQAA
 AAIAAAADAAAAQwAAAHMNAAAAdAAAfAAAZAEAgwIAUygCAAAATmkAAAAAKAIAAABzCQAAAF9nZXRp
 dGVtX3MBAAAAeCgCAAAAcwEAAAB4cwkAAABfZ2V0aXRlbV8oAAAAACgAAAAAcw8AAABTY3JpcHQg
-KFB5dGhvbilzCwAAADxsYW1iZGEuMzc+TwAAAHMAAAAAYwEAAAACAAAAAwAAAEMAAABzDQAAAHQA
+KFB5dGhvbilzCwAAADxsYW1iZGEuMjQ+TwAAAHMAAAAAYwEAAAACAAAAAwAAAEMAAABzDQAAAHQA
 AHwAAGQBAIMCAFMoAgAAAE5pAAAAACgCAAAAcwkAAABfZ2V0aXRlbV9zAQAAAHgoAgAAAHMBAAAA
 eHMJAAAAX2dldGl0ZW1fKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwsAAAA8bGFtYmRh
-LjM4PlAAAABzAAAAAHMMAAAAZ2V0Q2VsbFJhbmdlcwwAAABzZXRDZWxsUmFuZ2VzBQAAAGl0ZW1z
+LjI1PlAAAABzAAAAAHMMAAAAZ2V0Q2VsbFJhbmdlcwwAAABzZXRDZWxsUmFuZ2VzBQAAAGl0ZW1z
 cwoAAABoYXNJblJhbmdlcwcAAABuZXdDZWxscwcAAABoYXNfa2V5cxEAAAB2YXJpYXRlZF9wcm9w
 ZXJ0eXMaAAAAbWFwcGVkX3ZhbHVlX3Byb3BlcnR5X2xpc3RzGAAAAENvdWxkIG5vdCBjcmVhdGUg
 Y2VsbCAlc3MWAAAAQ2VsbCAlcyBkb2VzIG5vdCBleGlzdGkBAAAAcwsAAABtYXRyaXhib3glc3MM
 AAAAcGxhbm5pbmdfYm94cwcAAABsaXN0Ym94cw4AAABzZWxlY3Rpb25fbmFtZWMBAAAAAgAAAAMA
 AABDAAAAcw0AAAB0AAB8AABkAQCDAgBTKAIAAABOaQAAAAAoAgAAAHMJAAAAX2dldGl0ZW1fcwEA
 AAB4KAIAAABzAQAAAHhzCQAAAF9nZXRpdGVtXygAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9u
-KXMLAAAAPGxhbWJkYS4zOT6QAAAAcwAAAABzEgAAAHJlc3RyaWN0ZWRUcmF2ZXJzZXMGAAAAdXBk
+KXMLAAAAPGxhbWJkYS4yNj6QAAAAcwAAAABzEgAAAHJlc3RyaWN0ZWRUcmF2ZXJzZXMGAAAAdXBk
 YXRlcwsAAABFcnJvckZpZWxkc3MDAAAAc2V0cwwAAABmaWVsZF9lcnJvcnNzCAAAACVzLyVzPyVz
 cyMAAABwb3J0YWxfc3RhdHVzX21lc3NhZ2U9RGF0YStVcGRhdGVkLig9AAAAcxoAAABQcm9kdWN0
 cy5Gb3JtdWxhdG9yLkVycm9yc3MPAAAAVmFsaWRhdGlvbkVycm9ycxMAAABGb3JtVmFsaWRhdGlv

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewWorkflowHistory/listbox.xml

@@ -359,6 +359,10 @@
                           <string>comment</string>
                           <string>Comment</string>
                         </tuple>
+                        <tuple>
+                          <string>error_message</string>
+                          <string>Error Message</string>
+                        </tuple>
                       </list>
                     </value>
                 </item>
@@ -554,6 +558,10 @@
                           <string>comment</string>
                           <string encoding="base64">Jyc=</string>
                         </tuple>
+                        <tuple>
+                          <string>error_message</string>
+                          <string encoding="base64">Jyc=</string>
+                        </tuple>
                       </list>
                     </value>
                 </item>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_diffTwoObjects.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Form.Form</string>
+          <string>ERP5Form</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </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/>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <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>group_list</string> </key>
+            <value>
+              <list>
+                <string>left</string>
+                <string>right</string>
+                <string>center</string>
+                <string>bottom</string>
+                <string>hidden</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>bottom</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>center</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>left</string> </key>
+                    <value>
+                      <list>
+                        <string>diffview</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>right</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>BusinessTemplate_diffTwoObjects</string> </value>
+        </item>
+        <item>
+            <key> <string>method</string> </key>
+            <value> <string>POST</string> </value>
+        </item>
+        <item>
+            <key> <string>name</string> </key>
+            <value> <string>BusinessTemplate_diffTwoObjects</string> </value>
+        </item>
+        <item>
+            <key> <string>pt</string> </key>
+            <value> <string>form_dialog</string> </value>
+        </item>
+        <item>
+            <key> <string>row_length</string> </key>
+            <value> <int>4</int> </value>
+        </item>
+        <item>
+            <key> <string>stored_encoding</string> </key>
+            <value> <string>UTF-8</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Diff Two Object At Installation</string> </value>
+        </item>
+        <item>
+            <key> <string>unicode_mode</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>update_action</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getDiffUrl.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.PythonScripts.PythonScript</string>
+          <string>PythonScript</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Python_magic</string> </key>
+            <value> <string encoding="base64">O/INCg==</string> </value>
+        </item>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </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>_body</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+if brain.object_state == \'Modified\':\n
+  return \'/\'.join(brain.getPhysicalPath()[:-1])+\'/BusinessTemplate_diffTwoObjects?object_id=\'+brain.object_id+\'&object_class=\'+brain.object_class\n
+else:\n
+  return None\n
+
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAgAAAAUAAAAHAAAAQwAA
+AHNzAAAAdAAAfAAAZAEAgwIAZAIAagIAb1UAAXQAAGQDAGQEAIMCAHQCAHQAAHwAAGQFAIMCAIMA
+AGQAAGQGAAuFAgCDAgCDAQBkBwAXdAAAfAAAZAgAgwIAF2QJABd0AAB8AABkCgCDAgAXU24FAAF0
+AwBTZAAAUygLAAAATnMMAAAAb2JqZWN0X3N0YXRlcwgAAABNb2RpZmllZHMBAAAAL3MEAAAAam9p
+bnMPAAAAZ2V0UGh5c2ljYWxQYXRoaQEAAABzKwAAAC9CdXNpbmVzc1RlbXBsYXRlX2RpZmZUd29P
+YmplY3RzP29iamVjdF9pZD1zCQAAAG9iamVjdF9pZHMOAAAAJm9iamVjdF9jbGFzcz1zDAAAAG9i
+amVjdF9jbGFzcygEAAAAcwkAAABfZ2V0YXR0cl9zBQAAAGJyYWlucwkAAABfZ2V0aXRlbV9zBAAA
+AE5vbmUoBQAAAHMFAAAAYnJhaW5zCQAAAHNlbGVjdGlvbnMJAAAAX2dldGF0dHJfcwkAAABfZ2V0
+aXRlbV9zBAAAAE5vbmUoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzGwAAAEJ1c2luZXNz
+VGVtcGxhdGVfZ2V0RGlmZlVybAEAAABzBAAAABYBVQIoAQAAAHMbAAAAQnVzaW5lc3NUZW1wbGF0
+ZV9nZXREaWZmVXJsKAEAAABzGwAAAEJ1c2luZXNzVGVtcGxhdGVfZ2V0RGlmZlVybCgAAAAAKAAA
+AABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+        </item>
+        <item>
+            <key> <string>_filepath</string> </key>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_core/BusinessTemplate_getDiffUrl</string> </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>brain, selection</string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>2</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>brain</string>
+                            <string>selection</string>
+                            <string>_getattr_</string>
+                            <string>_getitem_</string>
+                            <string>None</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>BusinessTemplate_getDiffUrl</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_installationChoice.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Form.Form</string>
+          <string>ERP5Form</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </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/>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value> <string>Workflow_statusModify</string> </value>
+        </item>
+        <item>
+            <key> <string>encoding</string> </key>
+            <value> <string>UTF-8</string> </value>
+        </item>
+        <item>
+            <key> <string>enctype</string> </key>
+            <value> <string>multipart/form-data</string> </value>
+        </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <list>
+                <string>left</string>
+                <string>right</string>
+                <string>center</string>
+                <string>bottom</string>
+                <string>hidden</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>bottom</string> </key>
+                    <value>
+                      <list>
+                        <string>listbox</string>
+                        <string>my_workflow_action</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>center</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value>
+                      <list>
+                        <string>listbox_choice</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>left</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>right</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>BusinessTemplate_installationChoice</string> </value>
+        </item>
+        <item>
+            <key> <string>method</string> </key>
+            <value> <string>POST</string> </value>
+        </item>
+        <item>
+            <key> <string>name</string> </key>
+            <value> <string>BusinessTemplate_installationChoice</string> </value>
+        </item>
+        <item>
+            <key> <string>pt</string> </key>
+            <value> <string>form_view_dialog</string> </value>
+        </item>
+        <item>
+            <key> <string>row_length</string> </key>
+            <value> <int>4</int> </value>
+        </item>
+        <item>
+            <key> <string>stored_encoding</string> </key>
+            <value> <string>UTF-8</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Validate installation</string> </value>
+        </item>
+        <item>
+            <key> <string>unicode_mode</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>update_action</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_viewContentList/listbox.xml

@@ -382,6 +382,10 @@
                           <string>description</string>
                           <string encoding="base64">Jyc=</string>
                         </tuple>
+                        <tuple>
+                          <string>portal_type</string>
+                          <string encoding="base64">Jyc=</string>
+                        </tuple>
                       </list>
                     </value>
                 </item>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml

@@ -207,7 +207,7 @@ FROM\n
 </dtml-in>\n
   <dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
   <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
-  , catalog as node, catalog as resource, movement as inventory_movement\n
+  , catalog as node, catalog as resource\n
 \n
 WHERE\n
   1 = 1\n
@@ -217,7 +217,6 @@ WHERE\n
 \n
   AND node.uid = stock.node_uid\n
   AND resource.uid = stock.resource_uid\n
-  AND inventory_movement.uid = stock.uid\n
 \n
 <dtml-comment>\n
 XXX Do we want or need this ?\n
@@ -230,14 +229,14 @@ XXX How to deal with standardize ?\n
 </dtml-if>\n
 <dtml-if omit_input>\n
   AND stock.quantity < 0\n
-  AND ( inventory_movement.source_uid <> inventory_movement.destination_uid\n
+  AND (  stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR inventory_movement.destination_uid IS NULL\n
         OR stock.mirror_section_uid IS NULL )\n
 </dtml-if>\n
 <dtml-if omit_output>\n
   AND stock.quantity > 0\n
-  AND ( inventory_movement.source_uid <> inventory_movement.destination_uid\n
+  AND (  stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR inventory_movement.destination_uid IS NULL\n
         OR stock.mirror_section_uid IS NULL )\n
@@ -346,7 +345,7 @@ FROM\n
 </dtml-in>\n
   <dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
   <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
-  , catalog as node, catalog as resource, movement as inventory_movement\n
+  , catalog as node, catalog as resource\n
 \n
 WHERE\n
   1 = 1\n
@@ -356,7 +355,6 @@ WHERE\n
 \n
   AND node.uid = stock.node_uid\n
   AND resource.uid = stock.resource_uid\n
-  AND inventory_movement.uid = stock.uid\n
 \n
 <dtml-comment>\n
 XXX Do we want or need this ?\n
@@ -369,14 +367,14 @@ XXX How to deal with standardize ?\n
 </dtml-if>\n
 <dtml-if omit_input>\n
   AND stock.quantity < 0\n
-  AND ( inventory_movement.source_uid <> inventory_movement.destination_uid\n
+  AND (  stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR inventory_movement.destination_uid IS NULL\n
         OR stock.mirror_section_uid IS NULL )\n
 </dtml-if>\n
 <dtml-if omit_output>\n
   AND stock.quantity > 0\n
-  AND ( inventory_movement.source_uid <> inventory_movement.destination_uid\n
+  AND (  stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR inventory_movement.destination_uid IS NULL\n
         OR stock.mirror_section_uid IS NULL )\n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml

@@ -247,7 +247,7 @@ FROM\n
 </dtml-in>\n
   <dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
   <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
-  , catalog as node, catalog as resource, movement as inventory_movement\n
+  , catalog as node, catalog as resource\n
 \n
 WHERE\n
   1 = 1\n
@@ -257,7 +257,6 @@ WHERE\n
 \n
   AND node.uid = stock.node_uid\n
   AND resource.uid = stock.resource_uid\n
-  AND inventory_movement.uid = stock.uid\n
 \n
 <dtml-comment>\n
 XXX How to deal with standardize ?\n
@@ -268,14 +267,14 @@ XXX How to deal with standardize ?\n
 </dtml-if>\n
 <dtml-if omit_input>\n
   AND stock.quantity < 0\n
-  AND ( inventory_movement.source_uid <> inventory_movement.destination_uid\n
+  AND ( stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR inventory_movement.destination_uid IS NULL\n
         OR stock.mirror_section_uid IS NULL )\n
 </dtml-if>\n
 <dtml-if omit_output>\n
   AND stock.quantity > 0\n
-  AND ( inventory_movement.source_uid <> inventory_movement.destination_uid\n
+  AND ( stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR inventory_movement.destination_uid IS NULL\n
         OR stock.mirror_section_uid IS NULL )\n
@@ -387,7 +386,7 @@ FROM\n
 </dtml-in>\n
   <dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
   <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
-  , catalog as node, catalog as resource, movement as inventory_movement\n
+  , catalog as node, catalog as resource\n
 \n
 WHERE\n
   1 = 1\n
@@ -397,7 +396,6 @@ WHERE\n
 \n
   AND node.uid = stock.node_uid\n
   AND resource.uid = stock.resource_uid\n
-  AND inventory_movement.uid = stock.uid\n
 \n
 <dtml-comment>\n
 XXX How to deal with standardize ?\n
@@ -408,14 +406,14 @@ XXX How to deal with standardize ?\n
 </dtml-if>\n
 <dtml-if omit_input>\n
   AND stock.quantity < 0\n
-  AND ( inventory_movement.source_uid <> inventory_movement.destination_uid\n
+  AND ( stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR inventory_movement.destination_uid IS NULL\n
         OR stock.mirror_section_uid IS NULL )\n
 </dtml-if>\n
 <dtml-if omit_output>\n
   AND stock.quantity > 0\n
-  AND ( inventory_movement.source_uid <> inventory_movement.destination_uid\n
+  AND ( stock.node_uid <> stock.mirror_node_uid\n
         OR stock.section_uid <> stock.mirror_section_uid\n
         OR inventory_movement.destination_uid IS NULL\n
         OR stock.mirror_section_uid IS NULL )\n

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_getTrashObjectList.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.PythonScripts.PythonScript</string>
+          <string>PythonScript</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Python_magic</string> </key>
+            <value> <string encoding="base64">O/INCg==</string> </value>
+        </item>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </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>_body</string> </key>
+            <value> <string>return context.portal_trash.getTrashBinObjectsList(context)\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAMAAAAFAAAASwAA
+AHMgAAAAdAAAdAAAdAEAZAEAgwIAZAIAgwIAdAEAgwEAU2QAAFMoAwAAAE5zDAAAAHBvcnRhbF90
+cmFzaHMWAAAAZ2V0VHJhc2hCaW5PYmplY3RzTGlzdCgCAAAAcwkAAABfZ2V0YXR0cl9zBwAAAGNv
+bnRleHQoAwAAAHMCAAAAa3dzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dCgAAAAAKAAAAABzDwAA
+AFNjcmlwdCAoUHl0aG9uKXMbAAAAVHJhc2hCaW5fZ2V0VHJhc2hPYmplY3RMaXN0AQAAAHMAAAAA
+KAEAAABzGwAAAFRyYXNoQmluX2dldFRyYXNoT2JqZWN0TGlzdCgBAAAAcxsAAABUcmFzaEJpbl9n
+ZXRUcmFzaE9iamVjdExpc3QoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1
+bGU+AQAAAHMAAAAA</string> </value>
+        </item>
+        <item>
+            <key> <string>_filepath</string> </key>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_core/TrashBin_getTrashObjectList</string> </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>**kw</string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>kw</string>
+                            <string>_getattr_</string>
+                            <string>context</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>TrashBin_getTrashObjectList</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_getTrashObjectUrl.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.PythonScripts.PythonScript</string>
+          <string>PythonScript</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Python_magic</string> </key>
+            <value> <string encoding="base64">O/INCg==</string> </value>
+        </item>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </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>_body</string> </key>
+            <value> <string>return \'/\'.join(brain.getPhysicalPath()[4:])+\'/manage_workspace\'\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAgAAAAQAAAAGAAAAQwAA
+AHM2AAAAdAAAZAEAZAIAgwIAdAEAdAAAfAAAZAMAgwIAgwAAZAQAZAAAhQIAgwIAgwEAZAUAF1Nk
+AABTKAYAAABOcwEAAAAvcwQAAABqb2lucw8AAABnZXRQaHlzaWNhbFBhdGhpBAAAAHMRAAAAL21h
+bmFnZV93b3Jrc3BhY2UoAwAAAHMJAAAAX2dldGF0dHJfcwkAAABfZ2V0aXRlbV9zBQAAAGJyYWlu
+KAQAAABzBQAAAGJyYWlucwkAAABzZWxlY3Rpb25zCQAAAF9nZXRhdHRyX3MJAAAAX2dldGl0ZW1f
+KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcxoAAABUcmFzaEJpbl9nZXRUcmFzaE9iamVj
+dFVybAEAAABzAAAAACgBAAAAcxoAAABUcmFzaEJpbl9nZXRUcmFzaE9iamVjdFVybCgBAAAAcxoA
+AABUcmFzaEJpbl9nZXRUcmFzaE9iamVjdFVybCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9u
+KXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
+        </item>
+        <item>
+            <key> <string>_filepath</string> </key>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_core/TrashBin_getTrashObjectUrl</string> </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>brain, selection</string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>2</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>brain</string>
+                            <string>selection</string>
+                            <string>_getattr_</string>
+                            <string>_getitem_</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>TrashBin_getTrashObjectUrl</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TrashBin_viewTrashObject.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Form.Form</string>
+          <string>ERP5Form</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </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/>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <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>application/x-www-form-urlencoded</string> </value>
+        </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <list>
+                <string>left</string>
+                <string>right</string>
+                <string>center</string>
+                <string>bottom</string>
+                <string>hidden</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>bottom</string> </key>
+                    <value>
+                      <list>
+                        <string>listbox</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>center</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value>
+                      <list>
+                        <string>listbox_url</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>left</string> </key>
+                    <value>
+                      <list>
+                        <string>my_id</string>
+                        <string>my_causality_business_template_id</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>right</string> </key>
+                    <value>
+                      <list>
+                        <string>my_start_date</string>
+                        <string>my_causality_business_template_title</string>
+                      </list>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>TrashBin_viewTrashObject</string> </value>
+        </item>
+        <item>
+            <key> <string>method</string> </key>
+            <value> <string>POST</string> </value>
+        </item>
+        <item>
+            <key> <string>name</string> </key>
+            <value> <string>TrashBin_viewTrashObject</string> </value>
+        </item>
+        <item>
+            <key> <string>pt</string> </key>
+            <value> <string>form_view</string> </value>
+        </item>
+        <item>
+            <key> <string>row_length</string> </key>
+            <value> <int>5</int> </value>
+        </item>
+        <item>
+            <key> <string>stored_encoding</string> </key>
+            <value> <string>UTF-8</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>List Objects In Trash Bin</string> </value>
+        </item>
+        <item>
+            <key> <string>unicode_mode</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>update_action</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml

@@ -104,23 +104,23 @@ cwYAAABvYmplY3RzCQAAAGdldFBvcnRhbGMBAAAAAwAAAAMAAAADAAAAcxoAAAB0AACIAABkAQCD
 AgBkAgCIAAAWfAAAgwIAUygDAAAATnMDAAAAbG9nczAAAABQcmVmZXJlbmNlV29ya2Zsb3cuZGlz
 YWJsZU90aGVyUHJlZmVyZW5jZXMgb24gJXMoAwAAAHMJAAAAX2dldGF0dHJfcwQAAABwcmVmcwMA
 AABtc2coAwAAAHMDAAAAbXNncwkAAABfZ2V0YXR0cl9zBAAAAHByZWYoAQAAAHMEAAAAcHJlZigA
-AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCwAAADxsYW1iZGEuNzI+BQAAAHMAAAAAcxIAAABwb3J0
-YWxfcHJlZmVyZW5jZXNzDAAAAHNlYXJjaEZvbGRlcnMEAAAAc3BlY3MPAAAARVJQNSBQcmVmZXJl
-bmNlcwkAAABnZXRPYmplY3RzEQAAAHBvcnRhbF9tZW1iZXJzaGlwcxYAAABnZXRBdXRoZW50aWNh
-dGVkTWVtYmVycwcAAABhbGxvd2VkcwUAAABPd25lcnMIAAAAQXNzaWdub3JzEgAAAGdldFByZWZl
-cmVuY2VTdGF0ZXMHAAAAZW5hYmxlZHMLAAAAZ2V0UHJpb3JpdHlzDwAAAHBvcnRhbF93b3JrZmxv
-d3MLAAAAZG9BY3Rpb25Gb3JzDgAAAGRpc2FibGVfYWN0aW9ucwUAAAB3Zl9pZHMTAAAAcHJlZmVy
-ZW5jZV93b3JrZmxvd3MOAAAARGVhY3RpdmF0ZWQgJXNzDAAAAFVuYXV0aG9yaXplZHMfAAAAbm90
-IGF1dGhvcml6ZWQgdG8gZGVhY3RpdmF0ZSAlcygKAAAAcx4AAABQcm9kdWN0cy5EQ1dvcmtmbG93
-LkRDV29ya2Zsb3dzEAAAAFZhbGlkYXRpb25GYWlsZWRzCQAAAF9nZXRhdHRyX3MDAAAAc2NpcwQA
-AABwcmVmcwYAAABwb3J0YWxzAwAAAExPR3MJAAAAX2dldGl0ZXJfcwEAAABwcwEAAABhKAoAAABz
-AwAAAHNjaXMeAAAAUHJvZHVjdHMuRENXb3JrZmxvdy5EQ1dvcmtmbG93cxAAAABWYWxpZGF0aW9u
-RmFpbGVkcwkAAABfZ2V0YXR0cl9zBAAAAHByZWZzBgAAAHBvcnRhbHMDAAAATE9HcwkAAABfZ2V0
-aXRlcl9zAQAAAHBzAQAAAGEoAAAAACgBAAAAcwQAAABwcmVmcw8AAABTY3JpcHQgKFB5dGhvbilz
-FwAAAGRpc2FibGVPdGhlclByZWZlcmVuY2VzAQAAAHMeAAAADQIPARIBDAMrAAYBEgEMASsBEAEZ
-ASgBHwMaARABKAEAAABzFwAAAGRpc2FibGVPdGhlclByZWZlcmVuY2VzKAEAAABzFwAAAGRpc2Fi
-bGVPdGhlclByZWZlcmVuY2VzKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9k
-dWxlPgEAAABzAAAAAA==</string> </value>
+AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCgAAADxsYW1iZGEuNT4FAAAAcwAAAABzEgAAAHBvcnRh
+bF9wcmVmZXJlbmNlc3MMAAAAc2VhcmNoRm9sZGVycwQAAABzcGVjcw8AAABFUlA1IFByZWZlcmVu
+Y2VzCQAAAGdldE9iamVjdHMRAAAAcG9ydGFsX21lbWJlcnNoaXBzFgAAAGdldEF1dGhlbnRpY2F0
+ZWRNZW1iZXJzBwAAAGFsbG93ZWRzBQAAAE93bmVycwgAAABBc3NpZ25vcnMSAAAAZ2V0UHJlZmVy
+ZW5jZVN0YXRlcwcAAABlbmFibGVkcwsAAABnZXRQcmlvcml0eXMPAAAAcG9ydGFsX3dvcmtmbG93
+cwsAAABkb0FjdGlvbkZvcnMOAAAAZGlzYWJsZV9hY3Rpb25zBQAAAHdmX2lkcxMAAABwcmVmZXJl
+bmNlX3dvcmtmbG93cw4AAABEZWFjdGl2YXRlZCAlc3MMAAAAVW5hdXRob3JpemVkcx8AAABub3Qg
+YXV0aG9yaXplZCB0byBkZWFjdGl2YXRlICVzKAoAAABzHgAAAFByb2R1Y3RzLkRDV29ya2Zsb3cu
+RENXb3JrZmxvd3MQAAAAVmFsaWRhdGlvbkZhaWxlZHMJAAAAX2dldGF0dHJfcwMAAABzY2lzBAAA
+AHByZWZzBgAAAHBvcnRhbHMDAAAATE9HcwkAAABfZ2V0aXRlcl9zAQAAAHBzAQAAAGEoCgAAAHMD
+AAAAc2Npcx4AAABQcm9kdWN0cy5EQ1dvcmtmbG93LkRDV29ya2Zsb3dzEAAAAFZhbGlkYXRpb25G
+YWlsZWRzCQAAAF9nZXRhdHRyX3MEAAAAcHJlZnMGAAAAcG9ydGFscwMAAABMT0dzCQAAAF9nZXRp
+dGVyX3MBAAAAcHMBAAAAYSgAAAAAKAEAAABzBAAAAHByZWZzDwAAAFNjcmlwdCAoUHl0aG9uKXMX
+AAAAZGlzYWJsZU90aGVyUHJlZmVyZW5jZXMBAAAAcx4AAAANAg8BEgEMAysABgESAQwBKwEQARkB
+KAEfAxoBEAEoAQAAAHMXAAAAZGlzYWJsZU90aGVyUHJlZmVyZW5jZXMoAQAAAHMXAAAAZGlzYWJs
+ZU90aGVyUHJlZmVyZW5jZXMoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1
+bGU+AQAAAHMAAAAA</string> </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>

product/ERP5/bootstrap/erp5_core/bt/change_log

+2005-12-13 aurel
+* Update way of install Business Template
+- add Trash type
+- modify Workflow_statusModiify
+- add Forms and Scripts in erp5_core
+* Change in script of rule_interraction_workflow
+
+2005-12-13 romain
+* Fix Base_edit (when displaying multiple matrixbox)
+
 2005-12-08 yo
 * Fix the LEFT JOIN syntax in Resource_zGetInventory and Resource_zGetInventoryList.
 
@@ -329,4 +339,4 @@ variation
 * Add base categorie from erp5_apparel_depend: origin.
 
 2005-04-06
-* Add base categories from erp5_trade, erp5_accounting: destination_administration, destination_decision, destination_payment, source_administration, source_decision, source_payment.
+* Add base categories from erp5_trade, erp5_accounting: destination_administration, destination_decision, destination_payment, source_administration, source_decision, source_payment.
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/bt/revision

-None
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/bt/template_portal_type_id_list

@@ -41,4 +41,7 @@ Rule Tool
 Simulation Movement
 Simulation Tool
 Telephone
-Template Tool
\ No newline at end of file
+Template Tool
+Trash Bin
+Trash Folder
+Trash Tool
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/bt/version

-1.0rc4
\ No newline at end of file
+1.0rc5
\ No newline at end of file