diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 4237a18c286..8b8beff894b 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -616,6 +616,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Views" version="7.0">
+                   <sheet>
                     <group>
                         <group>
                             <field name="name"/>
@@ -630,6 +631,7 @@
                         </group>
                     </group>
                     <field name="arch"/>
+                  </sheet>  
                 </form>
             </field>
         </record>
@@ -742,6 +744,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Attachments" version="7.0">
+                   <sheet>
                     <group col="4">
                         <field name="name" />
                         <field name="type"/>
@@ -770,6 +773,7 @@
                         <field name="description"/>
                     </page>
                     </notebook>
+                  </sheet>
                 </form>
             </field>
         </record>
@@ -843,6 +847,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Model Description" version="7.0">
+                  <sheet>
                     <group col="6">
                         <field name="name"/>
                         <field name="model"/>
@@ -916,6 +921,7 @@
                             <field name="view_ids"/>
                         </page>
                     </notebook>
+                  </sheet>
                 </form>
             </field>
         </record>
@@ -972,6 +978,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fields" version="7.0">
+                  <sheet>
                     <group colspan="4" col="6">
                         <field name="name" />
                         <field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
@@ -1004,6 +1011,7 @@
                             <field name="groups"/>
                         </page>
                     </notebook>
+                  </sheet>  
                 </form>
             </field>
         </record>
@@ -1168,6 +1176,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Translations" version="7.0">
+                   <sheet>
                     <group>
                         <group>
                             <field name="name"/>
@@ -1184,6 +1193,7 @@
                            <field name="value" nolabel="1" height="400"/>
                         </group>
                     </group>
+                   </sheet>
                 </form>
             </field>
         </record>
@@ -1260,6 +1270,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Menu" version="7.0">
+                  <sheet>
                     <group>
                         <group>
                             <field name="name"/>
@@ -1288,6 +1299,7 @@
                             </field>
                         </page>
                     </notebook>
+                   </sheet> 
                 </form>
             </field>
         </record>
@@ -1340,6 +1352,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scheduled Actions" version="7.0">
+                   <sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="active"/>
@@ -1366,6 +1379,7 @@
                         <field name="args"/>
                     </page>
                     </notebook>
+                   </sheet> 
                 </form>
             </field>
         </record>
@@ -1439,6 +1453,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Access Controls" version="7.0">
+                   <sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="model_id"/>
@@ -1450,6 +1465,7 @@
                         <field name="perm_create"/>
                         <field name="perm_unlink"/>
                     </group>
+                   </sheet> 
                 </form>
             </field>
         </record>
@@ -1496,6 +1512,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Record rules" version="7.0">
+                  <sheet>
                     <group>
                         <group string="General">
                             <field colspan="4" name="name"/>
@@ -1528,6 +1545,7 @@
                         <label colspan="2"
                             string="Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 OR GROUP_A_RULE_2) OR (GROUP_B_RULE_1 OR GROUP_B_RULE_2) )"/>
                     </group>
+                   </sheet> 
                 </form>
             </field>
         </record>
@@ -1593,6 +1611,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Server Action" version="7.0">
+                  <sheet> 
                     <group col="6" colspan="4">
                         <field name="name"/>
                         <field name="model_id"/>
@@ -1669,6 +1688,7 @@
                         </page>
                     </notebook>
                     <field name="type" readonly="1"/>
+                  </sheet>  
                 </form>
             </field>
         </record>
@@ -1862,6 +1882,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Outgoing Mail Servers" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="sequence"/>
@@ -1877,6 +1898,7 @@
                         <field name="smtp_pass" password="True"/>
                         <button name="test_smtp_connection" type="object" string="Test Connection" icon="gtk-network"/>
                     </group>
+                  </sheet>  
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/ir/ir_config_parameter_view.xml b/openerp/addons/base/ir/ir_config_parameter_view.xml
index 24825eefc0f..a3e2f7173d2 100644
--- a/openerp/addons/base/ir/ir_config_parameter_view.xml
+++ b/openerp/addons/base/ir/ir_config_parameter_view.xml
@@ -29,10 +29,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="System Parameters" version="7.0">
+                  <sheet>
                     <group>
                         <field name="key"/>
                         <field name="value"/>
                     </group>
+                  </sheet>  
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/ir/workflow/workflow_view.xml b/openerp/addons/base/ir/workflow/workflow_view.xml
index e4fa561e202..0ac7df78ce7 100644
--- a/openerp/addons/base/ir/workflow/workflow_view.xml
+++ b/openerp/addons/base/ir/workflow/workflow_view.xml
@@ -15,12 +15,14 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
           <form string="Workflow" version="7.0">
+             <sheet>
               <group col="4">
                   <field name="name"/>
                   <field name="osv"/>
                   <field name="on_create"/>
               </group>
               <field name="activities"/>
+            </sheet>
           </form>
       </field>
     </record>
@@ -93,6 +95,7 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Activity" version="7.0">
+           <sheet>
             <group>
                 <group>
                     <field name="name"/>
@@ -138,6 +141,7 @@
                 </field>
             </page>
           </notebook>
+         </sheet> 
         </form>
       </field>
     </record>
@@ -202,6 +206,7 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Transition" version="7.0">
+          <sheet>
             <group col="6">
                 <field name="act_from"/>
                 <field name="act_to"/>
@@ -211,6 +216,7 @@
                 <field name="trigger_expr_id"/>
                 <field name="group_id"/>
             </group>
+          </sheet>
         </form>
       </field>
     </record>
@@ -263,12 +269,14 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Workflow Instances" version="7.0">
+         <sheet>
           <group col="4">
               <field name="wkf_id"/>
               <field name="res_id"/>
               <field name="res_type"/>
               <field name="state"/>
           </group>
+         </sheet> 
         </form>
       </field>
     </record>
@@ -323,6 +331,7 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Workflow Workitems" version="7.0">
+         <sheet>
           <group col="4">
               <field name="wkf_id"/>
               <field name="act_id"/>
@@ -330,6 +339,7 @@
               <field name="inst_id"/>
               <field name="state"/>
           </group>
+         </sheet> 
         </form>
       </field>
     </record>
diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
index 4b15ff8f8c0..5130fa878f2 100644
--- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
@@ -22,7 +22,8 @@
             <field name="model">publisher_warranty.contract</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Publisher Warranty Contract">
+                <form string="Publisher Warranty Contract" version="7.0">
+                  <sheet>
                     <group col="3" colspan="4">
                         <group col="2">
                             <field name="name"/>
@@ -45,6 +46,7 @@
                             attrs="{'invisible':[('state','in',['unvalidated'])]}"/>
                         </group>
                     </group>
+                  </sheet>  
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/res/ir_property_view.xml b/openerp/addons/base/res/ir_property_view.xml
index 3d8fb14b48e..e0b533aeee2 100644
--- a/openerp/addons/base/res/ir_property_view.xml
+++ b/openerp/addons/base/res/ir_property_view.xml
@@ -25,6 +25,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="company_id" groups="base.group_multi_company"/>
@@ -39,6 +40,7 @@
                     <field name="value_text"  attrs="{'invisible' : [('type', 'not in', ('char', 'text'))]}"/>
                     <field name="value_reference"  attrs="{'invisible' : [('type', '!=', 'many2one')]}"/>
                     <field name="value_binary"  attrs="{'invisible' : [('type', '!=', 'binary')]}"/>
+                  </sheet>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index c098c5a92db..bd98b9fbfc5 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -8,6 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bank" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="bic"/>
@@ -33,6 +34,7 @@
                             <field name="active"/>
                         </group>
                     </group>
+                  </sheet>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_lang_view.xml b/openerp/addons/base/res/res_lang_view.xml
index a29275d77e4..24911593e17 100644
--- a/openerp/addons/base/res/res_lang_view.xml
+++ b/openerp/addons/base/res/res_lang_view.xml
@@ -24,6 +24,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Languages" version="7.0">
+                   <sheet>
                     <group col="6" colspan="4">
                         <field name="name"/>
                         <field name="code" />
@@ -97,7 +98,7 @@
                         <label align="0.0" string="12. %%w              ==> 5 ( Friday is the 6th day)"/>
                         <newline/>
                     </group>
-
+                  </sheet>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 277cda2f576..19a2ff6d950 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -8,6 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Groups" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="category_id"/>
                         <field name="name"/>
@@ -57,6 +58,7 @@
                             <field name="comment"/>
                         </page>
                     </notebook>
+                  </sheet>  
                 </form>
             </field>
         </record>
@@ -193,6 +195,7 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Users" version="7.0">
+                   <sheet>
                     <div class="oe_right oe_form_avatar">
                         <field name="avatar" widget='image' on_change="onchange_avatar(avatar)"/>
                     </div>
@@ -215,6 +218,7 @@
                         <field name="user_email" widget="email" readonly="0"/>
                         <field name="signature" readonly="0"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/res/res_widget_view.xml b/openerp/addons/base/res/res_widget_view.xml
index da82738090c..1be2f03f1c1 100644
--- a/openerp/addons/base/res/res_widget_view.xml
+++ b/openerp/addons/base/res/res_widget_view.xml
@@ -17,10 +17,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Widgets" version="7.0">
+                  <sheet>
                     <group>
                         <field name="title"/>
                         <field name="content"/>
                     </group>
+                  </sheet>
                 </form>
             </field>
         </record>
@@ -62,11 +64,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="User Widgets" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="widget_id"/>
                         <field name="user_id"/>
                         <field name="sequence"/>
                     </group>
+                  </sheet>  
                 </form>
             </field>
         </record>