diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewClassInspectionReport.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewClassInspectionReport.xml
index fca7c0af5075e6c442cb34b45eba5fc38d5eb440..fa71ba07c41c09e196cd1867c723f2707a3d9e6f 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewClassInspectionReport.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewClassInspectionReport.xml
@@ -69,7 +69,9 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>doc = context.getPortalObject().portal_classes.asDocumentationHelper(class_id)\n
-return doc.Documentation_view()\n
+if doc is not None:\n
+  return doc.Documentation_view()\n
+return "Class Tool is Disabled"\n
 </string> </value>
         </item>
         <item>
@@ -122,6 +124,7 @@ return doc.Documentation_view()\n
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>doc</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Documentation_view/inheritance_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Documentation_view/inheritance_list.xml
index d1282a60b332bdb1b24550627118082cd4c4cbe3..76530bd8a0a6a29a11501d072c4159a537e7549c 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Documentation_view/inheritance_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Documentation_view/inheritance_list.xml
@@ -5,7 +5,7 @@
       <tuple>
         <tuple>
           <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
+          <string>LabelField</string>
         </tuple>
         <none/>
       </tuple>
@@ -19,30 +19,13 @@
         <item>
             <key> <string>message_values</string> </key>
             <value>
-              <dictionary>
-                <item>
-                    <key> <string>external_validator_failed</string> </key>
-                    <value> <string>The input failed the external validator.</string> </value>
-                </item>
-                <item>
-                    <key> <string>required_not_found</string> </key>
-                    <value> <string>Input is required but no input given.</string> </value>
-                </item>
-                <item>
-                    <key> <string>too_long</string> </key>
-                    <value> <string>Too much input was given.</string> </value>
-                </item>
-              </dictionary>
+              <dictionary/>
             </value>
         </item>
         <item>
             <key> <string>overrides</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>alternate_name</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>css_class</string> </key>
                     <value> <string></string> </value>
@@ -55,14 +38,6 @@
                     <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>display_maxwidth</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>display_width</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <string></string> </value>
@@ -71,10 +46,6 @@
                     <key> <string>enabled</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>external_validator</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>extra</string> </key>
                     <value> <string></string> </value>
@@ -83,30 +54,10 @@
                     <key> <string>hidden</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>max_length</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>truncate</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>unicode</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</string> </key>
-                    <value> <string></string> </value>
-                </item>
               </dictionary>
             </value>
         </item>
@@ -114,10 +65,6 @@
             <key> <string>tales</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>alternate_name</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>css_class</string> </key>
                     <value> <string></string> </value>
@@ -132,14 +79,6 @@
                     <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>display_maxwidth</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>display_width</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <string></string> </value>
@@ -150,10 +89,6 @@
                       <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
-                <item>
-                    <key> <string>external_validator</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>extra</string> </key>
                     <value> <string></string> </value>
@@ -162,30 +97,10 @@
                     <key> <string>hidden</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>max_length</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>truncate</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>unicode</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</string> </key>
-                    <value> <string></string> </value>
-                </item>
               </dictionary>
             </value>
         </item>
@@ -193,10 +108,6 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>alternate_name</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>css_class</string> </key>
                     <value> <string></string> </value>
@@ -209,14 +120,6 @@
                     <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>display_maxwidth</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>display_width</string> </key>
-                    <value> <int>20</int> </value>
-                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
@@ -225,10 +128,6 @@
                     <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
                 </item>
-                <item>
-                    <key> <string>external_validator</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>extra</string> </key>
                     <value> <string></string> </value>
@@ -237,30 +136,10 @@
                     <key> <string>hidden</string> </key>
                     <value> <int>0</int> </value>
                 </item>
-                <item>
-                    <key> <string>max_length</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
                 <item>
                     <key> <string>title</string> </key>
                     <value> <string>Inheritance</string> </value>
                 </item>
-                <item>
-                    <key> <string>truncate</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>unicode</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
               </dictionary>
             </value>
         </item>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Documentation_view/my_description.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Documentation_view/my_description.xml
index 71e67a555faf7024121dd182ad7488f585e4d991..b01335ae6d2db698e47466ca5ea88ce11d447257 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Documentation_view/my_description.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Documentation_view/my_description.xml
@@ -223,7 +223,7 @@
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
-                    <value> <int>0</int> </value>
+                    <value> <int>1</int> </value>
                 </item>
                 <item>
                     <key> <string>enabled</string> </key>
@@ -235,7 +235,7 @@
                 </item>
                 <item>
                     <key> <string>extra</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>readonly</string> </value>
                 </item>
                 <item>
                     <key> <string>height</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Documentation_view/my_type.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Documentation_view/my_type.xml
index a47bb760fc229f435f5cfaff7890f183aee77cf9..2a2b60930d3d251efee7228474ccc10c3e1a5335 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Documentation_view/my_type.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Documentation_view/my_type.xml
@@ -5,7 +5,7 @@
       <tuple>
         <tuple>
           <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
+          <string>LabelField</string>
         </tuple>
         <none/>
       </tuple>
@@ -19,30 +19,13 @@
         <item>
             <key> <string>message_values</string> </key>
             <value>
-              <dictionary>
-                <item>
-                    <key> <string>external_validator_failed</string> </key>
-                    <value> <string>The input failed the external validator.</string> </value>
-                </item>
-                <item>
-                    <key> <string>required_not_found</string> </key>
-                    <value> <string>Input is required but no input given.</string> </value>
-                </item>
-                <item>
-                    <key> <string>too_long</string> </key>
-                    <value> <string>Too much input was given.</string> </value>
-                </item>
-              </dictionary>
+              <dictionary/>
             </value>
         </item>
         <item>
             <key> <string>overrides</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>alternate_name</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>css_class</string> </key>
                     <value> <string></string> </value>
@@ -55,14 +38,6 @@
                     <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>display_maxwidth</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>display_width</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <string></string> </value>
@@ -71,10 +46,6 @@
                     <key> <string>enabled</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>external_validator</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>extra</string> </key>
                     <value> <string></string> </value>
@@ -83,30 +54,10 @@
                     <key> <string>hidden</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>max_length</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>truncate</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>unicode</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</string> </key>
-                    <value> <string></string> </value>
-                </item>
               </dictionary>
             </value>
         </item>
@@ -114,10 +65,6 @@
             <key> <string>tales</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>alternate_name</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>css_class</string> </key>
                     <value> <string></string> </value>
@@ -132,14 +79,6 @@
                     <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>display_maxwidth</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>display_width</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <string></string> </value>
@@ -148,10 +87,6 @@
                     <key> <string>enabled</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>external_validator</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>extra</string> </key>
                     <value> <string></string> </value>
@@ -160,30 +95,10 @@
                     <key> <string>hidden</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>max_length</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>title</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>truncate</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>unicode</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</string> </key>
-                    <value> <string></string> </value>
-                </item>
               </dictionary>
             </value>
         </item>
@@ -191,10 +106,6 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
-                <item>
-                    <key> <string>alternate_name</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>css_class</string> </key>
                     <value> <string></string> </value>
@@ -207,14 +118,6 @@
                     <key> <string>description</string> </key>
                     <value> <string></string> </value>
                 </item>
-                <item>
-                    <key> <string>display_maxwidth</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>display_width</string> </key>
-                    <value> <int>20</int> </value>
-                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <int>0</int> </value>
@@ -223,10 +126,6 @@
                     <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
                 </item>
-                <item>
-                    <key> <string>external_validator</string> </key>
-                    <value> <string></string> </value>
-                </item>
                 <item>
                     <key> <string>extra</string> </key>
                     <value> <string></string> </value>
@@ -235,30 +134,10 @@
                     <key> <string>hidden</string> </key>
                     <value> <int>0</int> </value>
                 </item>
-                <item>
-                    <key> <string>max_length</string> </key>
-                    <value> <string></string> </value>
-                </item>
-                <item>
-                    <key> <string>required</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
                 <item>
                     <key> <string>title</string> </key>
                     <value> <string>Type</string> </value>
                 </item>
-                <item>
-                    <key> <string>truncate</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>unicode</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
-                <item>
-                    <key> <string>whitespace_preserve</string> </key>
-                    <value> <int>0</int> </value>
-                </item>
               </dictionary>
             </value>
         </item>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index ef491079a37cc374abca2e517e35441c362236d2..4b74f2216dbbf61c34b833c71a1bf5ce78c85b6a 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-337
\ No newline at end of file
+338
\ No newline at end of file