diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 4237a18c286..3e95399093f 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -9,6 +9,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Action Bindings" version="7.0">
+                  <sheet>
                     <group>
                         <group string="Action Binding">
                             <field name="name"/>
@@ -22,6 +23,7 @@
                             <field name="value_unpickle" colspan="4" string="Action Reference"/>
                         </group>
                     </group>
+                  </sheet>
                 </form>
             </field>
         </record>
@@ -32,6 +34,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="User-defined Defaults" version="7.0">
+                   <sheet>
                     <label for="name" class="oe_form_readonly_hidden"/>
                     <h1><field name="name"/></h1>
                     <group>
@@ -48,6 +51,7 @@
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
                     </group>
+                   </sheet> 
                 </form>
             </field>
         </record>
@@ -137,6 +141,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sequences" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
@@ -174,6 +179,7 @@
                         </group>
                     </page>
                     </notebook>
+                   </sheet>
                 </form>
             </field>
         </record>
@@ -229,10 +235,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sequence Type" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
                     </group>
+                   </sheet> 
                 </form>
             </field>
         </record>
@@ -281,11 +289,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Action" version="7.0">
+                  <sheet>
                     <group>
                         <field name="name"/>
                         <field name="type"/>
                         <field name="usage"/>
                     </group>
+                   </sheet>
                 </form>
             </field>
         </record>
@@ -333,6 +343,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Report" version="7.0">
+                  <sheet>
                     <group col="6">
                         <field name="name"/>
                         <field name="model"/>
@@ -367,6 +378,7 @@
                             <field name="groups_id"/>
                         </page>
                     </notebook>
+                   </sheet>
                 </form>
             </field>
         </record>
@@ -437,6 +449,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open a Window" version="7.0">
+                  <sheet>
                     <group col="6">
                         <field name="name"/>
                         <field name="res_model"/>
@@ -487,6 +500,7 @@
                             <field name="groups_id"/>
                         </page>
                     </notebook>
+                  </sheet>
                 </form>
             </field>
         </record>
@@ -616,6 +630,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 +645,7 @@
                         </group>
                     </group>
                     <field name="arch"/>
+                  </sheet>  
                 </form>
             </field>
         </record>
@@ -707,11 +723,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Customized Views" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="user_id"/>
                         <field name="ref_id"/>
                         <field name="arch" colspan="4" nolabel="1"/>
                     </group>
+                   </sheet> 
                 </form>
             </field>
         </record>
@@ -742,6 +760,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 +789,7 @@
                         <field name="description"/>
                     </page>
                     </notebook>
+                  </sheet>
                 </form>
             </field>
         </record>
@@ -843,6 +863,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 +937,7 @@
                             <field name="view_ids"/>
                         </page>
                     </notebook>
+                  </sheet>
                 </form>
             </field>
         </record>
@@ -972,6 +994,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 +1027,7 @@
                             <field name="groups"/>
                         </page>
                     </notebook>
+                  </sheet>  
                 </form>
             </field>
         </record>
@@ -1062,6 +1086,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="External Identifiers" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="module"/>
@@ -1072,6 +1097,7 @@
                         <field name="date_update" />
                         <field name="date_init" />
                     </group>
+                   </sheet> 
                 </form>
             </field>
         </record>
@@ -1168,6 +1194,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 +1211,7 @@
                            <field name="value" nolabel="1" height="400"/>
                         </group>
                     </group>
+                   </sheet>
                 </form>
             </field>
         </record>
@@ -1260,6 +1288,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 +1317,7 @@
                             </field>
                         </page>
                     </notebook>
+                   </sheet> 
                 </form>
             </field>
         </record>
@@ -1340,6 +1370,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 +1397,7 @@
                         <field name="args"/>
                     </page>
                     </notebook>
+                   </sheet> 
                 </form>
             </field>
         </record>
@@ -1439,6 +1471,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 +1483,7 @@
                         <field name="perm_create"/>
                         <field name="perm_unlink"/>
                     </group>
+                   </sheet> 
                 </form>
             </field>
         </record>
@@ -1496,6 +1530,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 +1563,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 +1629,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 +1706,7 @@
                         </page>
                     </notebook>
                     <field name="type" readonly="1"/>
+                  </sheet>  
                 </form>
             </field>
         </record>
@@ -1745,6 +1783,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Config Wizard Steps" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="action_id"/>
                         <field name="type"/>
@@ -1764,6 +1803,7 @@
                             string="Set as Todo" type="object"
                             icon="gtk-convert"/>
                     </group>
+                  </sheet>
                 </form>
             </field>
         </record>
@@ -1862,6 +1902,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 +1918,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/ir_filters.xml b/openerp/addons/base/ir/ir_filters.xml
index 1985368d6fa..3722b533e19 100644
--- a/openerp/addons/base/ir/ir_filters.xml
+++ b/openerp/addons/base/ir/ir_filters.xml
@@ -17,6 +17,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Filters" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="user_id"/>
@@ -26,6 +27,7 @@
                         <field name="domain"/>
                         <field name="context"/>
                     </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..e71cf928e8d 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>
@@ -110,7 +112,7 @@
                         <group name="bank" string="Information About the Bank">
                             <field name="bank" on_change="onchange_bank_id(bank)"/>
                             <field name="bank_name" attrs="{'required': [('company_id','&lt;&gt;',False)]}"/>
-                            <field name="bank_bic"/>
+                            <field name="bank_bic" placeholder="[Identifier code]" />
                         </group>
                     </group>
 
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index 479c0bfc055..e5e2480d4af 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -91,7 +91,6 @@
                             <field name="bank_ids"/>
                         </page>
                     </notebook>
-
                     </sheet>
                 </form>
             </field>
@@ -149,6 +148,7 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <form string="Multi Company" version="7.0">
+                  <sheet>
                     <group col="6" colspan="4">
                         <field name="name" colspan="6"/>
                         <separator string="Matching" colspan="6"/>
@@ -161,6 +161,7 @@
                         <separator string="Returning" colspan="6"/>
                         <field name="company_dest_id"/>
                     </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_partner.py b/openerp/addons/base/res/res_partner.py
index 5eb4f1232ef..1dbad434ed6 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -136,7 +136,7 @@ class res_partner(osv.osv):
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
         'ref': fields.char('Reference', size=64, select=1),
         'lang': fields.selection(_lang_get, 'Language', help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."),
-        'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'),
+        'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this partner if any.'),
         'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
         'website': fields.char('Website',size=64, help="Website of Partner or Company"),
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 99735659f7b..e4f6b164e2f 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -117,10 +117,16 @@
                             <label for="parent_id" class="oe_form_readonly_hidden"/>
                         </div>
                         <h2 attrs="{'invisible': [('is_company','=', True)]}">
-                            <field name="parent_id" string="Company"
+                            <field name="parent_id"
                                 domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
                                 class="oe_form_inline"
                                 on_change="onchange_address(use_parent_address, parent_id)"/>, 
+                            
+                        </h2>
+                        <div attrs="{'invisible' : [('is_company', '=', True)]}">
+                            <label for="function" class="oe_form_readonly_hidden" />
+                        </div>
+                        <h2 attrs="{'invisible' : [('is_company', '=', True)]}">
                             <field name="function" class="oe_form_inline" placeholder="Job Position"/>
                         </h2>
                         <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
@@ -218,16 +224,16 @@
                         <page string="Sales &amp; Purchases" attrs="{'invisible': [('customer', '=', False), ('supplier', '=', False)]}">
                             <group>
                                 <group>
-                                    <field name="lang"/>
-                                    <field name="user_id"/>
-                                    <field name="date"/>
+                                    <field name="user_id" />
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <field name="ref"/>
+                                    <field name="lang"/>
+                                    <field name="date"/>
                                 </group>
                                 <group>
                                     <field name="customer"/>
                                     <field name="supplier"/>
                                     <field name="active"/>
-                                    <field name="ref"/>
                                 </group>
                             </group>
                         </page>
diff --git a/openerp/addons/base/res/res_request_view.xml b/openerp/addons/base/res/res_request_view.xml
index 2fa5caccea9..0fecd3cd72d 100644
--- a/openerp/addons/base/res/res_request_view.xml
+++ b/openerp/addons/base/res/res_request_view.xml
@@ -7,11 +7,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Request Link" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="object"/>
                         <field name="priority"/>
                     </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>