diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypePropertySheetTemplateItem/property_sheet_list.xml b/product/ERP5/bootstrap/erp5_core/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
index ccdd9086a27ebe5433e9293585eaa26be95cf5f9..75d44d947437d6c38b58183b6f7590c7947fa65b 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
@@ -1,27 +1,4 @@
 <property_sheet_list>
- <portal_type id="Acquired Property">
-  <item>AcquiredProperty</item>
-  <item>SimpleItem</item>
-  <item>StandardProperty</item>
-  <item>TranslatableProperty</item>
- </portal_type>
- <portal_type id="Category Existence Constraint">
-  <item>CategoryExistenceConstraint</item>
-  <item>Predicate</item>
-  <item>SimpleItem</item>
- </portal_type>
- <portal_type id="Dynamic Category Property">
-  <item>DynamicCategoryProperty</item>
- </portal_type>
- <portal_type id="Property Existence Constraint">
-  <item>Predicate</item>
-  <item>PropertyExistenceConstraint</item>
-  <item>SimpleItem</item>
- </portal_type>
- <portal_type id="Standard Property">
-  <item>StandardProperty</item>
-  <item>TranslatableProperty</item>
- </portal_type>
  <portal_type id="Trash Bin">
   <item>Base</item>
   <item>SimpleItem</item>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Property.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Property.xml
index 56a58345dc481c5b3ccd54180825d841fbac4d22..29547c7d9bfb08329a98cdb7847f316cd960b216 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Property.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeTemplateItem/portal_types/Category%20Property.xml
@@ -37,7 +37,7 @@
         </item>
         <item>
             <key> <string>factory</string> </key>
-            <value> <string>addXMLObject</string> </value>
+            <value> <string>addCategoryProperty</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -59,6 +59,10 @@
             <key> <string>portal_type</string> </key>
             <value> <string>Base Type</string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>CategoryProperty</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/product/ERP5/bootstrap/erp5_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/product/ERP5/bootstrap/erp5_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index 2379e1e15212a92ce45021e5ecc0f4c0e8303788..9d80f3f7f690854d772254eaf87496e430a520bf 100644
--- a/product/ERP5/bootstrap/erp5_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/product/ERP5/bootstrap/erp5_core/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -1,7 +1,7 @@
 <workflow_chain>
  <chain>
   <type>Acquired Property</type>
-  <workflow>portal_type_class_interaction_workflow</workflow>
+  <workflow>dynamic_class_generation_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Action Information</type>
@@ -13,11 +13,11 @@
  </chain>
  <chain>
   <type>Base Category</type>
-  <workflow>edit_workflow, portal_type_class_interaction_workflow</workflow>
+  <workflow>dynamic_class_generation_interaction_workflow, edit_workflow</workflow>
  </chain>
  <chain>
   <type>Base Type</type>
-  <workflow>base_type_interaction_workflow, portal_type_class_interaction_workflow</workflow>
+  <workflow>base_type_interaction_workflow, dynamic_class_generation_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Category</type>
@@ -25,11 +25,11 @@
  </chain>
  <chain>
   <type>Category Property</type>
-  <workflow>portal_type_class_interaction_workflow</workflow>
+  <workflow>dynamic_class_generation_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Category Tool</type>
-  <workflow>portal_type_class_interaction_workflow</workflow>
+  <workflow>dynamic_class_generation_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Distributed Ram Cache</type>
@@ -41,7 +41,7 @@
  </chain>
  <chain>
   <type>Dynamic Category Property</type>
-  <workflow>portal_type_class_interaction_workflow</workflow>
+  <workflow>dynamic_class_generation_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Mapped Value</type>
@@ -61,11 +61,11 @@
  </chain>
  <chain>
   <type>Property Sheet</type>
-  <workflow>portal_type_class_interaction_workflow</workflow>
+  <workflow>dynamic_class_generation_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Standard Property</type>
-  <workflow>portal_type_class_interaction_workflow</workflow>
+  <workflow>dynamic_class_generation_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>System Preference</type>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AcquiredProperty_view/my_reference.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AcquiredProperty_view/my_reference.xml
index 48b69640ab29fd5be43a8675bfe9686836350776..7589adfa0f89f5f8c4358155b76e6f73d42ee7c0 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AcquiredProperty_view/my_reference.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/AcquiredProperty_view/my_reference.xml
@@ -95,7 +95,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Reference</string> </value>
+                    <value> <string>Name</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view.xml
index c892e105ebdda881ba270d9eac0d902f303dadca..6d0124340f72b399e1f1f598df383f495636c2bf 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view.xml
@@ -85,7 +85,7 @@
                     <key> <string>left</string> </key>
                     <value>
                       <list>
-                        <string>my_id</string>
+                        <string>my_reference</string>
                         <string>my_constraint_base_category_list</string>
                         <string>my_constraint_portal_type_list</string>
                       </list>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_id.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_reference.xml
similarity index 96%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_id.xml
rename to product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_reference.xml
index c6baa37309c09a8074a338f0b883492fe817f887..fcf6a920e912b4202a9694b1742b73865379b97d 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_id.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryExistenceConstraint_view/my_reference.xml
@@ -17,7 +17,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_id</string> </value>
+            <value> <string>my_reference</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -90,7 +90,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>ID</string> </value>
+                    <value> <string>Name</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryProperty_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryProperty_view.xml
index 8dd1365a3cb23dc900624ab91815e1bdb048f0ee..61ae26a6c67019d6d1390ca3cb393fd98a31a126 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryProperty_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryProperty_view.xml
@@ -93,7 +93,7 @@
                     <key> <string>left</string> </key>
                     <value>
                       <list>
-                        <string>my_id</string>
+                        <string>my_reference</string>
                       </list>
                     </value>
                 </item>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryProperty_view/my_id.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryProperty_view/my_reference.xml
similarity index 96%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryProperty_view/my_id.xml
rename to product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryProperty_view/my_reference.xml
index c6baa37309c09a8074a338f0b883492fe817f887..fcf6a920e912b4202a9694b1742b73865379b97d 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryProperty_view/my_id.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/CategoryProperty_view/my_reference.xml
@@ -17,7 +17,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_id</string> </value>
+            <value> <string>my_reference</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -90,7 +90,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>ID</string> </value>
+                    <value> <string>Name</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DynamicCategoryProperty_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DynamicCategoryProperty_view.xml
index d48a0c074d30f9a1553da95d27a85d9628a2f870..14a0733e4cd7342c33fcc4ecf791b1e7f99a76fb 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DynamicCategoryProperty_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DynamicCategoryProperty_view.xml
@@ -93,7 +93,7 @@
                     <key> <string>left</string> </key>
                     <value>
                       <list>
-                        <string>my_title</string>
+                        <string>my_reference</string>
                         <string>my_category_expression</string>
                       </list>
                     </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DynamicCategoryProperty_view/my_title.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DynamicCategoryProperty_view/my_reference.xml
similarity index 89%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DynamicCategoryProperty_view/my_title.xml
rename to product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DynamicCategoryProperty_view/my_reference.xml
index 2beac09264dce853c911ddabc7fff868a7a31560..741494d93867e15a9f02b271e9b7939ae274f317 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DynamicCategoryProperty_view/my_title.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/DynamicCategoryProperty_view/my_reference.xml
@@ -12,12 +12,13 @@
               <list>
                 <string>description</string>
                 <string>display_width</string>
+                <string>title</string>
               </list>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_title</string> </value>
+            <value> <string>my_reference</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -74,7 +75,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Category title</string> </value>
+                    <value> <string>Category name</string> </value>
                 </item>
                 <item>
                     <key> <string>display_width</string> </key>
@@ -82,7 +83,7 @@
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
-                    <value> <string>my_title</string> </value>
+                    <value> <string>my_string_field</string> </value>
                 </item>
                 <item>
                     <key> <string>form_id</string> </key>
@@ -92,6 +93,10 @@
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Name</string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PropertyExistenceConstraint_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PropertyExistenceConstraint_view.xml
index 7fbd1a33d95e613466c30bd734e8b578b12a4436..420cc8cf464213874ce6643574aadf57aba20791 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PropertyExistenceConstraint_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PropertyExistenceConstraint_view.xml
@@ -85,7 +85,7 @@
                     <key> <string>left</string> </key>
                     <value>
                       <list>
-                        <string>my_id</string>
+                        <string>my_reference</string>
                         <string>my_constraint_property_list</string>
                       </list>
                     </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PropertyExistenceConstraint_view/my_id.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PropertyExistenceConstraint_view/my_reference.xml
similarity index 96%
rename from product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PropertyExistenceConstraint_view/my_id.xml
rename to product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PropertyExistenceConstraint_view/my_reference.xml
index c6baa37309c09a8074a338f0b883492fe817f887..fcf6a920e912b4202a9694b1742b73865379b97d 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PropertyExistenceConstraint_view/my_id.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PropertyExistenceConstraint_view/my_reference.xml
@@ -17,7 +17,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>my_id</string> </value>
+            <value> <string>my_reference</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -90,7 +90,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>ID</string> </value>
+                    <value> <string>Name</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/StandardProperty_view/my_reference.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/StandardProperty_view/my_reference.xml
index 48b69640ab29fd5be43a8675bfe9686836350776..7589adfa0f89f5f8c4358155b76e6f73d42ee7c0 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/StandardProperty_view/my_reference.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/StandardProperty_view/my_reference.xml
@@ -95,7 +95,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Reference</string> </value>
+                    <value> <string>Name</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow.xml
similarity index 81%
rename from product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow.xml
rename to product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow.xml
index 340790d65751fcdf3f0d3e8f5911ef7adc32260a..ca2304eb01adc090e90084681547d9a569ded04a 100644
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow.xml
@@ -20,7 +20,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Define interactions meaningful for portal type classes, new-style property sheets and their properties.</string> </value>
+            <value> <string>Define interactions meaningful for portal type classes, ZODB property sheets and their properties.</string> </value>
         </item>
         <item>
             <key> <string>groups</string> </key>
@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>portal_type_class_interaction_workflow</string> </value>
+            <value> <string>dynamic_class_generation_interaction_workflow</string> </value>
         </item>
         <item>
             <key> <string>manager_bypass</string> </key>
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Portal Type Class Interaction Workflow</string> </value>
+            <value> <string>Dynamic class generation Interaction Workflow</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions.xml
rename to product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions.xml
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/BaseCategory_resetDynamicClasses.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/BaseCategory_resetDynamicClasses.xml
similarity index 92%
rename from product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/BaseCategory_resetDynamicClasses.xml
rename to product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/BaseCategory_resetDynamicClasses.xml
index c65315c6cb47309d7aeded96a00a2240fba5a8dd..72a33e8c3e607edeaea9f1141d006dc0190e5981 100644
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/BaseCategory_resetDynamicClasses.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/BaseCategory_resetDynamicClasses.xml
@@ -28,7 +28,7 @@
             <key> <string>after_script_name</string> </key>
             <value>
               <list>
-                <string>PortalTypeClass_resetDynamicDocuments</string>
+                <string>DynamicClassGeneration_resetDynamicDocuments</string>
               </list>
             </value>
         </item>
@@ -78,6 +78,10 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>temporary_document_disallowed</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/BaseType_resetDynamicClasses.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/BaseType_resetDynamicClasses.xml
similarity index 92%
rename from product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/BaseType_resetDynamicClasses.xml
rename to product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/BaseType_resetDynamicClasses.xml
index 9266f4c7db7198ae2c802de3edb60758e635684a..b3258c89ef27aec10cc31e1159531eac69ec9561 100644
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/BaseType_resetDynamicClasses.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/BaseType_resetDynamicClasses.xml
@@ -28,7 +28,7 @@
             <key> <string>after_script_name</string> </key>
             <value>
               <list>
-                <string>PortalTypeClass_resetDynamicDocuments</string>
+                <string>DynamicClassGeneration_resetDynamicDocuments</string>
               </list>
             </value>
         </item>
@@ -81,6 +81,10 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>temporary_document_disallowed</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/ChangeProperty_resetDynamicClasses.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/ChangeProperty_resetDynamicClasses.xml
similarity index 91%
rename from product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/ChangeProperty_resetDynamicClasses.xml
rename to product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/ChangeProperty_resetDynamicClasses.xml
index cbc6c1ae3ed64bc827f64a2ff45e6125065ea710..64a8f35ad1aa5ad3879b5ef226522996ac7438dc 100644
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/ChangeProperty_resetDynamicClasses.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/ChangeProperty_resetDynamicClasses.xml
@@ -28,7 +28,7 @@
             <key> <string>after_script_name</string> </key>
             <value>
               <list>
-                <string>PortalTypeClass_resetDynamicDocuments</string>
+                <string>DynamicClassGeneration_resetDynamicDocuments</string>
               </list>
             </value>
         </item>
@@ -69,6 +69,7 @@
             <value>
               <list>
                 <string>Acquired Property</string>
+                <string>Category Property</string>
                 <string>Dynamic Category Property</string>
                 <string>Standard Property</string>
               </list>
@@ -80,6 +81,10 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>temporary_document_disallowed</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/PropertySheet_resetDynamicClasses.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/PropertySheet_resetDynamicClasses.xml
similarity index 92%
rename from product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/PropertySheet_resetDynamicClasses.xml
rename to product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/PropertySheet_resetDynamicClasses.xml
index 8afbe3aab62d610fb0f9e00b945b0196ff3fd991..2cf01ed6d1f3489f776740e882ed63d4d1eb467b 100644
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/PropertySheet_resetDynamicClasses.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/PropertySheet_resetDynamicClasses.xml
@@ -28,7 +28,7 @@
             <key> <string>after_script_name</string> </key>
             <value>
               <list>
-                <string>PortalTypeClass_resetDynamicDocuments</string>
+                <string>DynamicClassGeneration_resetDynamicDocuments</string>
               </list>
             </value>
         </item>
@@ -79,6 +79,10 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>temporary_document_disallowed</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/Tool_resetDynamicClasses.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/Tool_resetDynamicClasses.xml
similarity index 92%
rename from product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/Tool_resetDynamicClasses.xml
rename to product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/Tool_resetDynamicClasses.xml
index 268c5acfd2a1bd64088831a37ffb968f522febff..3efc16121e91ba4320df5313a5a2cfaf5ce82520 100644
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/Tool_resetDynamicClasses.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/interactions/Tool_resetDynamicClasses.xml
@@ -28,7 +28,7 @@
             <key> <string>after_script_name</string> </key>
             <value>
               <list>
-                <string>PortalTypeClass_resetDynamicDocuments</string>
+                <string>DynamicClassGeneration_resetDynamicDocuments</string>
               </list>
             </value>
         </item>
@@ -80,6 +80,10 @@
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>temporary_document_disallowed</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string></string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/scripts.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/scripts.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/scripts.xml
rename to product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/scripts.xml
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/scripts/PortalTypeClass_resetDynamicDocuments.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/scripts/DynamicClassGeneration_resetDynamicDocuments.xml
similarity index 97%
rename from product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/scripts/PortalTypeClass_resetDynamicDocuments.xml
rename to product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/scripts/DynamicClassGeneration_resetDynamicDocuments.xml
index 9cd26c4dd1f81e9277c41eace88a4df0411325eb..dc4403c0c1b5a05298454465adc11cabede2efd5 100644
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/scripts/PortalTypeClass_resetDynamicDocuments.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/scripts/DynamicClassGeneration_resetDynamicDocuments.xml
@@ -115,7 +115,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>PortalTypeClass_resetDynamicDocuments</string> </value>
+            <value> <string>DynamicClassGeneration_resetDynamicDocuments</string> </value>
         </item>
         <item>
             <key> <string>warnings</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/variables.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/variables.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/variables.xml
rename to product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/variables.xml
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/worklists.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/worklists.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/worklists.xml
rename to product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/dynamic_class_generation_interaction_workflow/worklists.xml
diff --git a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/CategoryProperty_resetDynamicClasses.xml b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/CategoryProperty_resetDynamicClasses.xml
deleted file mode 100644
index 3013cd952caa5ca34aa17838ba001793005bd8a4..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/portal_type_class_interaction_workflow/interactions/CategoryProperty_resetDynamicClasses.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>actbox_category</string> </key>
-            <value> <string>workflow</string> </value>
-        </item>
-        <item>
-            <key> <string>actbox_name</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>actbox_url</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>activate_script_name</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>after_script_name</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>before_commit_script_name</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value> <string>When an existing Category Property is changed on an existing property sheet, reload all the accessor holders.</string> </value>
-        </item>
-        <item>
-            <key> <string>guard</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>CategoryProperty_resetDynamicClasses</string> </value>
-        </item>
-        <item>
-            <key> <string>method_id</string> </key>
-            <value>
-              <list>
-                <string>setId</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>once_per_transaction</string> </key>
-            <value> <int>1</int> </value>
-        </item>
-        <item>
-            <key> <string>portal_type_filter</string> </key>
-            <value>
-              <list>
-                <string>Category Property</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>script_name</string> </key>
-            <value>
-              <list>
-                <string>PortalTypeClass_resetDynamicDocuments</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>trigger_type</string> </key>
-            <value> <int>2</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log
index 5cd609cf7f6c4e260c16a5573c09bda1a4e54592..cd0c490c031ca2e84ca2210637965e3b03737dcc 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/change_log
+++ b/product/ERP5/bootstrap/erp5_core/bt/change_log
@@ -1,3 +1,8 @@
+2010-10-21 arnaud.fontaine
+* rename portal_type_class_interaction_workflow to dynamic_class_generation_interaction_workflow.
+* use CategoryProperty document for Category Property portal type.
+* use reference for the views of properties for ZODB Property Sheets instead of id or title.
+
 2010-10-20 Kazuhiko
 * use objectValues instead of searchFolder for portal_caches and portal_memcached's view.
 
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index e6d1b728dafbd42142cc166b3453ad6dd905cdce..0504b068d9565c7b03b57c54648a8af0440e7b49 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-1747
\ No newline at end of file
+1748
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_property_sheet_list b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_property_sheet_list
index c0769a5b1e37d3f03d5908f750c307ae04be26e8..59afc64f143b788835aea110b604d85874e62ec9 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_property_sheet_list
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_property_sheet_list
@@ -1,16 +1,3 @@
-Acquired Property | AcquiredProperty
-Acquired Property | SimpleItem
-Acquired Property | StandardProperty
-Acquired Property | TranslatableProperty
-Category Existence Constraint | CategoryExistenceConstraint
-Category Existence Constraint | Predicate
-Category Existence Constraint | SimpleItem
-Dynamic Category Property | DynamicCategoryProperty
-Property Existence Constraint | Predicate
-Property Existence Constraint | PropertyExistenceConstraint
-Property Existence Constraint | SimpleItem
-Standard Property | StandardProperty
-Standard Property | TranslatableProperty
 Trash Bin | Base
 Trash Bin | SimpleItem
 Trash Bin | Task
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_workflow_chain_list b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_workflow_chain_list
index 0f075264db1296495922c64df6652946f579b0d8..8be4b60487d22deda696657ba5601a93a412eea4 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_workflow_chain_list
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_portal_type_workflow_chain_list
@@ -1,20 +1,20 @@
-Acquired Property | portal_type_class_interaction_workflow
+Acquired Property | dynamic_class_generation_interaction_workflow
 Action Information | base_type_interaction_workflow
 Alarm | edit_workflow
+Base Category | dynamic_class_generation_interaction_workflow
 Base Category | edit_workflow
-Base Category | portal_type_class_interaction_workflow
 Base Type | base_type_interaction_workflow
-Base Type | portal_type_class_interaction_workflow
-Category Property | portal_type_class_interaction_workflow
-Category Tool | portal_type_class_interaction_workflow
+Base Type | dynamic_class_generation_interaction_workflow
+Category Property | dynamic_class_generation_interaction_workflow
+Category Tool | dynamic_class_generation_interaction_workflow
 Category | edit_workflow
 Distributed Ram Cache | distributed_ram_cache_interaction_workflow
 Document | edit_workflow
-Dynamic Category Property | portal_type_class_interaction_workflow
+Dynamic Category Property | dynamic_class_generation_interaction_workflow
 Mapped Value | edit_workflow
 Memcached Plugin | memcached_plugin_interaction_workflow
 Predicate | rule_interaction_workflow
 Preference | preference_workflow
-Property Sheet | portal_type_class_interaction_workflow
-Standard Property | portal_type_class_interaction_workflow
+Property Sheet | dynamic_class_generation_interaction_workflow
+Standard Property | dynamic_class_generation_interaction_workflow
 System Preference | preference_workflow
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_workflow_id_list b/product/ERP5/bootstrap/erp5_core/bt/template_workflow_id_list
index e29f3f0cf38d640396680cf5c470a6426f65d22e..8a300878e26f92e9b45f9bcc71c8e38d87b63362 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/template_workflow_id_list
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_workflow_id_list
@@ -1,8 +1,8 @@
 base_type_interaction_workflow
 distributed_ram_cache_interaction_workflow
+dynamic_class_generation_interaction_workflow
 edit_workflow
 memcached_plugin_interaction_workflow
-portal_type_class_interaction_workflow
 preference_workflow
 pricing_interaction_workflow
 rule_interaction_workflow