diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index fe8ed307aa6..7dc6dce5b15 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -373,8 +373,7 @@
                                 <field name="origin" placeholder="SO0032"/>
                                 <field name="move_id" groups="account.group_account_user"/>
                             </group>
-                            <separator string="Additional Information"/>
-                            <field name="comment"/>
+                            <field name="comment" placeholder="Add an additional information in the invoice..."/>
                         </page>
                         <page string="Payments">
                             <field name="payment_ids">
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index accdf95d929..95b53b51339 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -997,6 +997,11 @@ class account_move_line(osv.osv):
         for journal in journals:
             all_journal.append(journal.id)
             for field in journal.view_id.columns_id:
+                # sometimes, it's possible that a defined column is not loaded (the module containing 
+                # this field is not loaded) when we make an update.
+                if field.name not in self._columns:
+                    continue
+
                 if not field.field in fields:
                     fields[field.field] = [journal.id]
                     fld.append((field.field, field.sequence))
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 274a8993dc4..f32630dd8ad 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1829,27 +1829,28 @@
                         <button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,running,done"/>
                     </header>
-
-                    <group>
+                    <sheet>
                         <group>
-                            <field name="name"/>
-                            <field name="model_id"/>
-                            <field name="ref"/>
+                            <group>
+                                <field name="name"/>
+                                <field name="model_id"/>
+                                <field name="ref"/>
+                            </group>
+                            <newline/>
+    
+                            <group string="Starts on">
+                                <field name="date_start"/>
+                                <field name="period_total"/>
+                            </group>
+    
+                            <group string="Valid Up to">
+                                <field name="period_nbr"/>
+                                <field name="period_type"/>
+                            </group>
                         </group>
-                        <newline/>
-
-                        <group string="Starts on">
-                            <field name="date_start"/>
-                            <field name="period_total"/>
-                        </group>
-
-                        <group string="Valid Up to">
-                            <field name="period_nbr"/>
-                            <field name="period_type"/>
-                        </group>
-                    </group>
-                    <separator string="Subscription Lines"/>
-                    <field name="lines_id" widget="one2many_list"/>
+                        <separator string="Subscription Lines"/>
+                        <field name="lines_id" widget="one2many_list"/>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -2357,8 +2358,8 @@
                   <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <group string="res_config_contents" position="replace">
-                	<label string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" width="150"/>
-                	<separator string="Generate Your Chart of Accounts from a Chart Template"/>
+                	<label string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" width="150" />
+                	<separator string="Generate Your Chart of Accounts from a Chart Template" />
                     <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                     <field name="code_digits" groups="account.group_account_user"/>
                     <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 5ed15139448..cde16f0670f 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -114,7 +114,7 @@
                                     <group name="bank" string="Information About the Bank">
                                         <field name="bank" on_change="onchange_bank_id(bank)"/>
                                         <field name="bank_name"/>
-                                        <field name="bank_bic"/>
+                                        <field name="bank_bic" placeholder="[Identifier code]"/>
                                     </group>
                                 </group>
                             </form>
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 265f71d690f..cd1467afd9e 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -31,7 +31,7 @@
        </field>
     </record>
 
-    <record id="account.journal_col11" model="account.journal.column">
+    <record id="journal_col11" model="account.journal.column">
         <field eval="&quot;&quot;&quot;Analytic Distribution&quot;&quot;&quot;" name="name"/>
         <field eval="11" name="sequence"/>
         <field name="view_id" ref="account.account_journal_view"/>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 363373b3204..d02f4e8b015 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -231,19 +231,21 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Budget Lines" version="7.0">
-                    <group col="4">
-                        <field name="crossovered_budget_id"/>
-                        <field name="analytic_account_id"/>
-                        <field name="general_budget_id"/>
-                        <field name="date_from"/>
-                        <field name="date_to"/>
-                        <field name="paid_date"/>
-                        <field name="planned_amount"/>
-                        <field name="practical_amount"/>
-                        <field name="theoritical_amount"/>
-                        <field name="percentage"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="crossovered_budget_id"/>
+                            <field name="analytic_account_id"/>
+                            <field name="general_budget_id"/>
+                            <field name="date_from"/>
+                            <field name="date_to"/>
+                            <field name="paid_date"/>
+                            <field name="planned_amount"/>
+                            <field name="practical_amount"/>
+                            <field name="theoritical_amount"/>
+                            <field name="percentage"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 7be5c4b8024..f70dae8ffcd 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -241,24 +241,26 @@
     </record>
     
     <record model="ir.ui.view" id="view_account_coda_form">
-      <field name="name">account.coda.form</field>
-      <field name="model">account.coda</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-          <form string="CODA File" version="7.0">
-              <group col="4">
-                  <field name="coda_creation_date"/>
-                  <field name="name"/>
-                  <field name="coda_data" filename="name"/>
-                  <field name="date"/>
-                  <field name="user_id"/>
-                  <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-              </group>
-              <separator string="Additional Information"/>
-              <field name="note"/>
-              <field name="statement_ids"/>
-          </form>
-      </field>
+        <field name="name">account.coda.form</field>
+        <field name="model">account.coda</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="CODA File" version="7.0">
+                <sheet>
+                    <group col="4">
+                        <field name="coda_creation_date"/>
+                        <field name="name"/>
+                        <field name="coda_data" filename="name"/>
+                        <field name="date"/>
+                        <field name="user_id"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    </group>
+                    <separator string="Additional Information"/>
+                    <field name="note"/>
+                    <field name="statement_ids"/>
+                </sheet>
+            </form>
+        </field>
     </record>
     
     <record id="view_account_coda_filter" model="ir.ui.view">
@@ -322,57 +324,59 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
           <form string="CODA Bank Statement" version="7.0">
-              <group col="4">
-                  <field name="name"/>
-                  <field name="date"/>
-                  <field name="coda_bank_account_id"/>
-                  <field name="currency"/>
-                  <field name="period_id"/>
-                  <field name="type"/>
-                  <newline/>
-                  <field name="balance_start"/>
-                  <field name="balance_end_real"/>
-              </group>
-              <notebook>
-                <page string="Transactions">
-                  <field name="line_ids">
-                    <tree string="CODA Statement Lines">
-                      <field name="sequence" string="Seq"/>
+              <sheet>
+                  <group col="4">
+                      <field name="name"/>
                       <field name="date"/>
-                      <field name="val_date"/>
-                      <field name="ref"/>
-                      <field name="name" width="250"/>
+                      <field name="coda_bank_account_id"/>
+                      <field name="currency"/>
+                      <field name="period_id"/>
                       <field name="type"/>
-                      <field name="partner_id"/>
-                      <field name="account_id"/>
-                      <field name="amount"/>
-                      <field name="globalisation_amount" string="Glob. Amount"/>
-                      <field name="globalisation_id" string="Glob. Id"/>
-                    </tree>
-                    <form string="CODA Statement Lines" version="7.0">
-                      <group col="4">
+                      <newline/>
+                      <field name="balance_start"/>
+                      <field name="balance_end_real"/>
+                  </group>
+                  <notebook>
+                    <page string="Transactions">
+                      <field name="line_ids">
+                        <tree string="CODA Statement Lines">
                           <field name="sequence" string="Seq"/>
                           <field name="date"/>
                           <field name="val_date"/>
-                          <field name="name"/>
+                          <field name="ref"/>
+                          <field name="name" width="250"/>
                           <field name="type"/>
                           <field name="partner_id"/>
-                          <field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                          <field name="account_id"/>
                           <field name="amount"/>
-                          <field name="ref"/>
-                          <field name="globalisation_amount"/>
-                          <field name="globalisation_level"/>
-                          <field name="globalisation_id"/>
-                      </group>
-                      <separator string="Notes"/>
-                      <field name="note"/>
-                    </form>
-                  </field>
-                </page>
-              </notebook>
-              <group colspan="4">
-                <field name="balance_end"/>
-              </group>
+                          <field name="globalisation_amount" string="Glob. Amount"/>
+                          <field name="globalisation_id" string="Glob. Id"/>
+                        </tree>
+                        <form string="CODA Statement Lines" version="7.0">
+                          <group col="4">
+                              <field name="sequence" string="Seq"/>
+                              <field name="date"/>
+                              <field name="val_date"/>
+                              <field name="name"/>
+                              <field name="type"/>
+                              <field name="partner_id"/>
+                              <field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                              <field name="amount"/>
+                              <field name="ref"/>
+                              <field name="globalisation_amount"/>
+                              <field name="globalisation_level"/>
+                              <field name="globalisation_id"/>
+                          </group>
+                          <separator string="Notes"/>
+                          <field name="note"/>
+                        </form>
+                      </field>
+                    </page>
+                  </notebook>
+                  <group colspan="4">
+                    <field name="balance_end"/>
+                  </group>
+              </sheet>
           </form>
       </field>
     </record>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 150830431ca..deef7c5825d 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -304,19 +304,34 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet>
-                    <group col="6">
-                        <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
-                        <field name="currency_id" invisible="1"/>
+                    <div class="oe_form_title">
+                        <div class="oe_form_readonly_hidden">
+                            <label for="parter_id" /> 
+                        </div>
+                        <h1>
+                            <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+                        </h1>
+                    </div>
+                    <div>
+                        Pay
                         <field name="amount"
                             invisible="context.get('line_type', False)"
                             string="Paid Amount"
+                            class="oe_form_inline"
                             on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
+                        by
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
                             widget="selection"
+                            class="oe_form_inline"
                             on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
+
+                    </div>
+
+                    <group col="6">
+                        <field name="currency_id" invisible="1"/>
                         <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
                         <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
                         <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index b0a81461334..14d0b36cb3d 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -227,18 +227,35 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet string="Supplier Voucher">
+                    <div class="oe_form_title">
+                        <label for="number" class="oe_form_readonly_hidden"/>
+                        <h1><field name="number" readonly="0" /></h1>
+                    </div>
+
                     <field name="pay_now" invisible="1"/>
+                    <group>
+                        <group>
+                            <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
+                            <field name="date" string="Bill Date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
+                            <field name="date_due"/>
+                            <field name="name" colspan="2"/>
+
+                        </group>
+                        <group>
+                            <field name="paid" invisible="1"/>
+                            <field name="currency_id"/>
+                            <field name="journal_id"
+                                domain="[('type','in',['purchase','purchase_refund'])]"
+                                widget="selection"
+                                on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                            <field name="reference"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+
+                    </group>
                     <group col="6">
-                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
-                        <field name="date" string="Bill Date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
-                        <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
-                        <field name="number"/>
-                        <field name="name" colspan="2"/>
-                        <field name="reference"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id" domain="[('type','=','other')]"  invisible="True"/>
                         <field name="type" invisible="True"/>
-                        <field name="currency_id"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Bill Information">
@@ -250,20 +267,29 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <group col="3">
-                                <group col="1" string="Internal Notes">
-                                    <field name="narration"/>
-                                </group>
-                                <group col="2">
-                                    <separator string="Payment Terms" colspan="2"/>
-                                    <field name="date_due"/>
-                                    <field name="paid" invisible="1"/>
-                                </group>
-                                <group col="4">
-                                    <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label string="" colspan="1"/><field name="amount" string="Total"/>
+                            <group>
+                                <group>
+                                    <field name="narration" placeholder="Internal Notes" nolabel="1" />
                                 </group>
+                                <group class="oe_form_subtotal_footer">
+                                    <!--
+                                    <div>
+                                        <label for="tax_id" />
+                                        <button type="object" 
+                                            icon="terp-stock_format-scientific" 
+                                            name="compute_tax"
+                                            attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    </div>
+                                    -->
+                                    <field name="tax_id" 
+                                        on_change="onchange_price(line_dr_ids, tax_id, partner_id)"
+                                        widget="selection"
+                                        domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"
+                                        />
+                                    <field name="tax_amount" />
+                                    <field name="amount" string="Total" class="oe_form_subtotal_footer_separator"/>
+                                </group>                                    
+
                             </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
diff --git a/addons/anonymization/anonymization_view.xml b/addons/anonymization/anonymization_view.xml
index 162c38b3da1..77bb6f2e82a 100644
--- a/addons/anonymization/anonymization_view.xml
+++ b/addons/anonymization/anonymization_view.xml
@@ -10,6 +10,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Anonymized Field" version="7.0">
+            	<sheet>
                 <group col="4">
                     <field name="model_id" on_change="onchange_model_id(model_id)" />
                     <field name="model_name" on_change="onchange_model_name(model_name)" />
@@ -20,6 +21,7 @@
                     <field name="field_name" on_change="onchange_field_name(field_name, model_name)" />
                     <field name="state" />
                 </group>
+                </sheet>
             </form>
         </field>
     </record>
@@ -102,6 +104,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Anonymization History" version="7.0">
+            	<sheet>
                 <group col="4">
                     <field name="date"/>
                     <field name="state"/>
@@ -119,6 +122,7 @@
                         </tree>
                     </field>
                 </group>
+                </sheet>
             </form>
         </field>
     </record>
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 295ff2793d5..f21836aeee5 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -12,13 +12,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="AuditTrail Rule" version="7.0">
-                    <header>
-                        <button string="_Subscribe" name="subscribe" icon="gtk-ok"
-                            type="object" states="draft" />
-                        <button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel"
-                            type="object" states="subscribed" />
-                        <field name="state" widget="statusbar"/>
-                    </header>
+                   <header>
+                       <button string="_Subscribe" name="subscribe" icon="gtk-ok"
+                           type="object" states="draft" />
+                       <button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel"
+                           type="object" states="subscribed" />
+                       <field name="state" widget="statusbar"/>
+                   </header>
+                 <sheet>
                     <group col="4">
                         <field name="name" required="1"/>
                         <field name="object_id"/>
@@ -32,6 +33,7 @@
                         <field name="user_id" colspan="4" nolabel="1" />
                         <field name="action_id" colspan="4" readonly="1" groups="base.group_no_one"/>
                     </group>
+                   </sheet>  
                 </form>
             </field>
         </record>
@@ -96,6 +98,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="AuditTrail Logs" version="7.0">
+                 <sheet>
                     <group col="4">
                         <field name="timestamp" required="1" readonly="1"/>
                         <field name="user_id" readonly="1"/>
@@ -141,6 +144,7 @@
                             <field name="new_value_text" />
                         </tree>
                     </field>
+                  </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index c51735f8ded..11d53a0899c 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -13,80 +13,82 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Action Rule" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="model_id" on_change="onchange_model_id(model_id)"/>
-                        <field name="filter_id" />
-                        <field name="sequence"/>
-                        <field name="active"/>
-                    </group>
-                    <notebook>
-                        <page string="Conditions">
-                            <group>
-                                <group name="model" string="Conditions on Model Fields">
-                                    <field name="regex_name"/>
-                                    <field name="trg_user_id"/>
-                                </group>
-                                <group name="partner" string="Conditions on Model Partner">
-                                    <field name="trg_partner_id"/>
-                                    <field name="trg_partner_categ_id"/>
-                                </group>
-                                <group string="Conditions on States">
-                                    <field name="trg_state_from"/>
-                                    <field name="trg_state_to"/>
-                                </group>
-                                <group string="Conditions on Timing">
-                                    <field name="trg_date_type"/>
-                                    <group attrs="{'invisible': [('trg_date_type', '=', 'none')]}">
-                                        <field name="trg_date_range" string="Delay After Trigger Date"/>
-                                        <field name="trg_date_range_type"/>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                            <field name="model_id" on_change="onchange_model_id(model_id)"/>
+                            <field name="filter_id" />
+                            <field name="sequence"/>
+                            <field name="active"/>
+                        </group>
+                        <notebook>
+                            <page string="Conditions">
+                                <group>
+                                    <group name="model" string="Conditions on Model Fields">
+                                        <field name="regex_name"/>
+                                        <field name="trg_user_id"/>
+                                    </group>
+                                    <group name="partner" string="Conditions on Model Partner">
+                                        <field name="trg_partner_id"/>
+                                        <field name="trg_partner_categ_id"/>
+                                    </group>
+                                    <group string="Conditions on States">
+                                        <field name="trg_state_from"/>
+                                        <field name="trg_state_to"/>
+                                    </group>
+                                    <group string="Conditions on Timing">
+                                        <field name="trg_date_type"/>
+                                        <group attrs="{'invisible': [('trg_date_type', '=', 'none')]}">
+                                            <field name="trg_date_range" string="Delay After Trigger Date"/>
+                                            <field name="trg_date_range_type"/>
+                                        </group>
                                     </group>
                                 </group>
-                            </group>
-                            <separator string="Note"/>
-                            <label string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
-                        </page>
-                        <page string="Actions">
-                            <group string="Fields to Change" col="4">
-                                <field name="act_user_id"/>
-                                <field name="act_state"/>
-                            </group>
-                            <group col="2" string="Server Action to be Triggered">
-                                <field name="server_action_id"/>
-                            </group>
-                        </page>
-                        <page string="Email Actions">
-                            <group col="4">
-                                <separator colspan="4" string="Email Reminders"/>
-                                <field name="act_remind_partner"/>
-                                <field name="act_remind_attach"/>
-                                <field name="act_remind_user"/>
-                                <group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
-                                    <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
+                                <separator string="Note"/>
+                                <label string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
+                            </page>
+                            <page string="Actions">
+                                <group string="Fields to Change" col="4">
+                                    <field name="act_user_id"/>
+                                    <field name="act_state"/>
                                 </group>
-                                <separator colspan="4" string="Email Information"/>
-                                <field name="act_email_from" />
-                                <field name="act_email_to" />
-                                <field name="act_mail_to_user"/>
-                                <field colspan="4" name="act_mail_to_email"/>
-                                <field name="act_mail_to_watchers"/>
-                                <field colspan="4" name="act_email_cc"/>
-                                <separator colspan="4" string="Email Body"/>
-                                <field colspan="4" name="act_mail_body" height="250"
-                                    nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
-                                <separator colspan="4" string="Special Keywords to be Used in the Body"/>
-                                <label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
-                                <label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
-                                <label align="0.0" string="%%(object_description)s = Object description" colspan="2"/>
-                                <label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/>
-                                <label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
-                                <label align="0.0" string="%%(partner_email)s = Partner Email" colspan="2"/>
-                                <label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/>
-                                <label align="0.0" string="%%(object_user_email)s = Responsible Email" colspan="2"/>
-                                <label align="0.0" string="%%(object_user_phone)s = Responsible phone" colspan="2"/>
-                            </group>
-                        </page>
-                    </notebook>
+                                <group col="2" string="Server Action to be Triggered">
+                                    <field name="server_action_id"/>
+                                </group>
+                            </page>
+                            <page string="Email Actions">
+                                <group col="4">
+                                    <separator colspan="4" string="Email Reminders"/>
+                                    <field name="act_remind_partner"/>
+                                    <field name="act_remind_attach"/>
+                                    <field name="act_remind_user"/>
+                                    <group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
+                                        <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
+                                    </group>
+                                    <separator colspan="4" string="Email Information"/>
+                                    <field name="act_email_from" />
+                                    <field name="act_email_to" />
+                                    <field name="act_mail_to_user"/>
+                                    <field colspan="4" name="act_mail_to_email"/>
+                                    <field name="act_mail_to_watchers"/>
+                                    <field colspan="4" name="act_email_cc"/>
+                                    <separator colspan="4" string="Email Body"/>
+                                    <field colspan="4" name="act_mail_body" height="250"
+                                        nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
+                                    <separator colspan="4" string="Special Keywords to be Used in the Body"/>
+                                    <label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
+                                    <label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
+                                    <label align="0.0" string="%%(object_description)s = Object description" colspan="2"/>
+                                    <label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/>
+                                    <label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
+                                    <label align="0.0" string="%%(partner_email)s = Partner Email" colspan="2"/>
+                                    <label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/>
+                                    <label align="0.0" string="%%(object_user_email)s = Responsible Email" colspan="2"/>
+                                    <label align="0.0" string="%%(object_user_phone)s = Responsible phone" colspan="2"/>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
            </record>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 5046b122bf5..1dceb87d621 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -42,22 +42,20 @@
                     <button string="Apply" type="object" name="execute"/>
                     <button string="Cancel" special="cancel"/>
                 </header>
-                <sheet>
-                    <group>
-                        <group name="config_sale" colspan="4"/>
+                <group>
+                    <group name="config_sale" colspan="4"/>
 
-                        <!-- this part is necessary to allow the plugins to extend the view -->
-                        <field name="module_crm" invisible="1"/>
-                        <group name="config_fetchmail" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
-                            <separator string="Emails"/>
-                        </group>
-                        <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                        <newline/>
-                        <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
-
-                        <group name="config_crm" colspan="2"/>
+                    <!-- this part is necessary to allow the plugins to extend the view -->
+                    <field name="module_crm" invisible="1"/>
+                    <group name="config_fetchmail" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
+                        <separator string="Emails"/>
                     </group>
-                </sheet>
+                    <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                    <newline/>
+                    <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
+
+                    <group name="config_crm" colspan="2"/>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index fb1587b543c..3006dafa643 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -192,7 +192,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <field name="type" position="after">
+                <field name="company_id" position="before">
                     <field name="weight"/>
                     <field name="weight_net"/>
                 </field>
diff --git a/addons/delivery/partner_view.xml b/addons/delivery/partner_view.xml
index d4dc924b6a0..235cff3a872 100644
--- a/addons/delivery/partner_view.xml
+++ b/addons/delivery/partner_view.xml
@@ -5,14 +5,11 @@
             <field name="name">res.partner.carrier.property.form.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="inherit_id" ref="stock.view_partner_property_form" />
             <field name="arch" type="xml">
-                <page string="Sales &amp; Purchases" position="inside">
-                    <group colspan="2" col="2">
-                        <separator string="Deliveries Properties" colspan="4"/>
-                        <field name="property_delivery_carrier"/>
-                    </group>
-                </page>
+                <field name="property_stock_supplier" position="after">
+                    <field name="property_delivery_carrier"/>
+                </field>
             </field>
         </record>
 
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index e8ce8be4f2d..82919ab02cb 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -69,7 +69,7 @@
         <field name="model">document.directory</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Directories" col="4">
+            <form string="Directories" col="4" version="7.0">
                 <group col="4">
                     <field name="name"/>
                     <field name="parent_id"/>
@@ -238,47 +238,49 @@
         <field name="priority" eval="1"/>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Documents">
-                <group col="4">
-                    <field name="name"/>
-                    <field name="parent_id"/>
-                    <field name="user_id"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                </group>
-                <notebook colspan="4">
-                <page string="Attachment">
-                    <group>
-                        <group string="Data">
-                            <field name="type"/>
-                            <newline />
-                            <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
-                            <field name="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
-                            <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
-                        </group>
-                        <group>
-                            <field name="res_id" invisible="True"/>
-                            <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
-                            <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
-                            <separator string="Related to" colspan="2"/>
-                            <field name="partner_id"/>
-                        </group>
-                        <group groups="base.group_no_one" string="Created">
-                            <field name="create_uid" readonly="1"/>
-                            <field name="create_date" readonly="1"/>
-                        </group>
-                        <group groups="base.group_no_one" string="Modified">
-                            <field name="write_uid" readonly="1"/>
-                            <field name="write_date" readonly="1"/>
-                        </group>
+            <form string="Documents" version="7.0">
+                <sheet>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="parent_id"/>
+                        <field name="user_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
-                </page>
-                <page string="Indexed Content - experimental" groups="base.group_no_one">
-                    <field name="index_content"/>
-                </page>
-                <page string="Notes">
-                    <field name="description"/>
-                </page>
-                </notebook>
+                    <notebook colspan="4">
+                    <page string="Attachment">
+                        <group>
+                            <group string="Data">
+                                <field name="type"/>
+                                <newline />
+                                <field name="datas" filename="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
+                                <field name="datas_fname" attrs="{'invisible':[('type','=','url')]}"/>
+                                <field name="url" widget="url" attrs="{'invisible':[('type','=','binary')]}"/>
+                            </group>
+                            <group>
+                                <field name="res_id" invisible="True"/>
+                                <field name="res_model" readonly="True" invisible="True" attrs="{'invisible': [('res_id','=',0)]}"/>
+                                <field name="res_name" readonly="1" attrs="{'invisible': [('res_id','=',0)]}"/>
+                                <separator string="Related to" colspan="2"/>
+                                <field name="partner_id"/>
+                            </group>
+                            <group groups="base.group_no_one" string="Created">
+                                <field name="create_uid" readonly="1"/>
+                                <field name="create_date" readonly="1"/>
+                            </group>
+                            <group groups="base.group_no_one" string="Modified">
+                                <field name="write_uid" readonly="1"/>
+                                <field name="write_date" readonly="1"/>
+                            </group>
+                        </group>
+                    </page>
+                    <page string="Indexed Content - experimental" groups="base.group_no_one">
+                        <field name="index_content"/>
+                    </page>
+                    <page string="Notes">
+                        <field name="description"/>
+                    </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index b0101c01574..8962da0a1f3 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -7,7 +7,7 @@
         <field name="model">document.webdav.dir.property</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Properties" version="7.0">
+            <form string="Properties">
                 <group col="4">
                     <field name="namespace"/>
                     <field name="name"/>
@@ -107,7 +107,7 @@
         <field name="model">document.webdav.file.property</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Properties" version="7.0">
+            <form string="Properties">
                 <group col="4">
                     <field name="namespace"/>
                     <field name="name"/>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 1403721af53..7bb86132af9 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -8,6 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Templates" version="7.0">
+                  <sheet>
                     <group col="4">
                         <field name="name" required="1"/>
                         <field name="model_id" required="1" on_change="onchange_model_id(model_id)"/>
@@ -98,6 +99,7 @@
                             </group>
                         </page>
                     </notebook>
+                   </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index d19fb4c4ca1..7c89babf3da 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -31,12 +31,13 @@
                         <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
                         <field name="state" widget="statusbar"/>
                     </header>
-                    <group col="4">
+                    <sheet>
+                     <group col="4">
                         <field name="name"/>
                         <field name="type" on_change="onchange_server_type(type, is_ssl, object_id)"/>
                         <field name="date"/>
-                    </group>
-                    <notebook>
+                     </group>
+                     <notebook>
                         <page string="Server &amp; Login">
                             <group>
                                 <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Server Information">
@@ -67,6 +68,7 @@
                             </group>
                         </page>
                     </notebook>
+                  </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index e3cfd96d26f..d78e3a4e5d1 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -19,27 +19,25 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
-                        <group col="4">
-                            <separator string="Additional Features" colspan="4"/>
-                            <field name="module_hr_expense"/>
-                            <field name="module_hr_recruitment"/>
-                            <field name="module_hr_evaluation"/>
-                            <field name="module_hr_contract"/>
-                            <field name="module_hr_holidays"/>
-                            <newline/>
-                            <field name="module_hr_payroll"/>
-                            <button colspan="2" name="%(open_payroll_modules)d" type="action"
-                                string="Install Country-Specific Payroll" icon="gtk-go-forward"/>
+                    <group col="4">
+                        <separator string="Additional Features" colspan="4"/>
+                        <field name="module_hr_expense"/>
+                        <field name="module_hr_recruitment"/>
+                        <field name="module_hr_evaluation"/>
+                        <field name="module_hr_contract"/>
+                        <field name="module_hr_holidays"/>
+                        <newline/>
+                        <field name="module_hr_payroll"/>
+                        <button colspan="2" name="%(open_payroll_modules)d" type="action"
+                            string="Install Country-Specific Payroll" icon="gtk-go-forward"/>
 
-                            <separator string="Timesheets" colspan="4"/>
-                            <field name="module_hr_attendance"/>
-                            <field name="module_hr_timesheet"/>
-                            <field name="module_hr_timesheet_sheet"/>
+                        <separator string="Timesheets" colspan="4"/>
+                        <field name="module_hr_attendance"/>
+                        <field name="module_hr_timesheet"/>
+                        <field name="module_hr_timesheet_sheet"/>
 
-                            <group name="config_recruitment" colspan="4"/>
-                         </group>
-                    </sheet>
+                        <group name="config_recruitment" colspan="4"/>
+                     </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 1934c975ae2..92e2a8bcbed 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -8,12 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee attendances" version="7.0">
+                	<sheet>
                     <group>
                         <field name="employee_id"/>
                         <field name="name"/>
                         <field name="action"/>
                         <field name="action_desc"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 67bd4d930e0..142cb6b7667 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -66,7 +66,8 @@
             <field name="model">hr.contract</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Contract">
+                <form string="Contract" version="7.0">
+                	<sheet>
                     <group col="4">
                         <field name="name" />
                         <field name="employee_id" />
@@ -101,6 +102,7 @@
                             </group>
                         </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 416056cfe7f..3f41cc28fbf 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -72,13 +72,11 @@
                     <button name="idea_cancel" string="Refuse" states="open" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
                 </header>
-                <sheet>
                     <label for="name" class="oe_form_readonly_hidden"/>
                     <h1><field name="name"/></h1>
                     <label for="category_ids"/>
                     <h2><field name="category_ids"/></h2>
                     <field name="description"/>
-                </sheet>
                 <footer>
                     <field name="message_ids" widget="ThreadView"/>
                 </footer>
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 2e5e6785438..23d3d9d0f6c 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -11,19 +11,18 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <separator string="Wiki" colspan="4"/>
-                        <field name="module_wiki_faq"/>
-                        <newline/>
-                        <field name="module_wiki_quality_manual"/>
+                    <newline/>
+                    <separator string="Wiki" colspan="4"/>
+                    <field name="module_wiki_faq"/>
+                    <newline/>
+                    <field name="module_wiki_quality_manual"/>
 
-                        <separator string="Documents" colspan="4"/>
-                        <field name="module_document"/>
-                        <newline/>
-                        <field name="module_document_ftp"/>
-                        <newline/>
-                        <field name="module_document_webdav"/>
-                    </sheet>
+                    <separator string="Documents" colspan="4"/>
+                    <field name="module_document"/>
+                    <newline/>
+                    <field name="module_document_ftp"/>
+                    <newline/>
+                    <field name="module_document_webdav"/>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml
index b4f96afc700..7640dee6f56 100644
--- a/addons/l10n_uk/l10n_uk_wizard.xml
+++ b/addons/l10n_uk/l10n_uk_wizard.xml
@@ -9,14 +9,16 @@
             <field name="inherit_id" ref="account.view_wizard_multi_chart"/>
             <field name="arch" type="xml">
               <data>
-                    <xpath expr="//form/group/group/separator" position="attributes">
+<!--
+                    <xpath expr="//group[@string='res_config_contents']/separator" position="attributes">
                         <attribute name="string">
                         Generate Your UK Accounting Chart from a Chart Template
                         </attribute>
                     </xpath>
-                    <xpath expr="//form/group/group/label" position="attributes">
+                    <xpath expr="//group[@string='res_config_contents']/label" position="attributes">
                         <attribute name="string">SELECT 4 DIGIT ACCOUNTS.  This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/ Financial Accounts/Generate Chart of Accounts from a Chart Template.</attribute>
                     </xpath>
+-->                    
               </data>
             </field>
         </record>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 47de833a66b..ffd07973546 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -350,11 +350,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Box Amount by User" version="7.0">
+                 <sheet>
                     <group col="4">
                         <field name="user_id"/>
                         <field name="box"/>
                         <field name="amount"/>
                     </group>
+                 </sheet>   
                 </form>
             </field>
         </record>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 67b2efc84a0..b2b34da8472 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -50,27 +50,29 @@
             <field name="type">form</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
-                <form string="Group">
-                    <group colspan="4" col="8">
-                        <group colspan="6" col="4">
-                            <separator string="General Information" colspan="4"/>
-                            <field name="name" colspan="2"/>
-                            <field name="responsible_id" colspan="2"/>
-                            <newline/>
-                            <field name="description" colspan="4"/>
+                <form string="Group" version="7.0">
+                    <sheet>
+                        <group colspan="4" col="8">
+                            <group colspan="6" col="4">
+                                <separator string="General Information" colspan="4"/>
+                                <field name="name" colspan="2"/>
+                                <field name="responsible_id" colspan="2"/>
+                                <newline/>
+                                <field name="description" colspan="4"/>
+                            </group>
+                            <group colspan="1" col="2">
+                                <separator string="Group Image" colspan="2"/>
+                                <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
+                            </group>
+                            <group colspan="1" col="2">
+                                <separator string="Privacy Settings" colspan="2"/>
+                                <field name="public" nolabel="1"/>
+                                <label string="This group is visible by non members" colspan="2"/>
+                            </group>
                         </group>
-                        <group colspan="1" col="2">
-                            <separator string="Group Image" colspan="2"/>
-                            <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
-                        </group>
-                        <group colspan="1" col="2">
-                            <separator string="Privacy Settings" colspan="2"/>
-                            <field name="public" nolabel="1"/>
-                            <label string="This group is visible by non members" colspan="2"/>
-                        </group>
-                    </group>
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
-                            options='{"thread_level": 1}'/>
+                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"
+                                options='{"thread_level": 1}'/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 1f7ec2297de..179486a4d93 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -26,20 +26,22 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Message" version="7.0">
-                    <group>
+                    <sheet>
                         <group>
-                            <field name="subject"/>
-                            <field name="date"/>
-                            <field name="type"/>
-                            <field name="body_text"/>
+                            <group>
+                                <field name="subject"/>
+                                <field name="date"/>
+                                <field name="type"/>
+                                <field name="body_text"/>
+                            </group>
+                            <group>
+                                <field name="user_id" string="User"/>
+                                <field name="model"/>
+                                <field name="res_id"/>
+                                <field name="parent_id"/>
+                            </group>
                         </group>
-                        <group>
-                            <field name="user_id" string="User"/>
-                            <field name="model"/>
-                            <field name="res_id"/>
-                            <field name="parent_id"/>
-                        </group>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -79,57 +81,59 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Email message" version="7.0">
-                    <label for="subject" class="oe_form_readonly_hidden"/>
-                    <h1><field name="subject"/></h1>
-                    <label for="user_id"/>
-                    <h2><field name="user_id" class="oe_form_inline" string="User"/> on <field name="date" class="oe_form_inline"/></h2>
-                    <group col="4">
-                        <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
-                        <field name="type"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Details">
-                            <group string="Recipients">
-                                <field name="email_from"/>
-                                <field name="email_to"/>
-                                <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
-                                <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
-                                <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
-                            </group>
-                            <group col="4" string="Message Details">
-                                <field name="model"/>
-                                <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
-                                <field name="res_id"/>
-                                <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
-                                <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
-                            </group>
-                            <notebook>
-                                <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
-                                    <field name="body_html" widget="text_html"/>
-                                </page>
-                                <page string="Body (Plain)">
-                                    <field name="body_text" widget="text"/>
-                                </page>
-                            </notebook>
-                            <group col="5">
-                                <field name="state" colspan="2"/>
-                                <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
-                                <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
-                                    context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
-                            </group>
-                        </page>
-                        <page string="Attachments">
-                            <field name="attachment_ids"/>
-                        </page>
-                        <page string="Advanced" groups="base.group_no_one">
-                            <group col="2" colspan="4">
-                                <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
-                                <field name="auto_delete"/>
-                                <field name="headers" colspan="4" attrs="{'invisible':[('headers', '=', False)]}"/>
-                                <field name="original" colspan="4" attrs="{'invisible':[('original', '=', False)]}"/>
-                            </group>
-                        </page>
-                    </notebook>
+                    <sheet>
+                        <label for="subject" class="oe_form_readonly_hidden"/>
+                        <h1><field name="subject"/></h1>
+                        <label for="user_id"/>
+                        <h2><field name="user_id" class="oe_form_inline" string="User"/> on <field name="date" class="oe_form_inline"/></h2>
+                        <group col="4">
+                            <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
+                            <field name="type"/>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Details">
+                                <group string="Recipients">
+                                    <field name="email_from"/>
+                                    <field name="email_to"/>
+                                    <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
+                                    <field name="email_bcc" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
+                                    <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
+                                </group>
+                                <group col="4" string="Message Details">
+                                    <field name="model"/>
+                                    <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
+                                    <field name="res_id"/>
+                                    <field name="message_id" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
+                                    <field name="references" colspan="4" widget="char" size="512" attrs="{'invisible':[('references', '=', False)]}"/>
+                                </group>
+                                <notebook>
+                                    <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
+                                        <field name="body_html" widget="text_html"/>
+                                    </page>
+                                    <page string="Body (Plain)">
+                                        <field name="body_text" widget="text"/>
+                                    </page>
+                                </notebook>
+                                <group col="5">
+                                    <field name="state" colspan="2"/>
+                                    <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
+                                    <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
+                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
+                                </group>
+                            </page>
+                            <page string="Attachments">
+                                <field name="attachment_ids"/>
+                            </page>
+                            <page string="Advanced" groups="base.group_no_one">
+                                <group col="2" colspan="4">
+                                    <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
+                                    <field name="auto_delete"/>
+                                    <field name="headers" colspan="4" attrs="{'invisible':[('headers', '=', False)]}"/>
+                                    <field name="original" colspan="4" attrs="{'invisible':[('original', '=', False)]}"/>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index c51818f13f5..acbfc4ad9ba 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -11,13 +11,11 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
-                        <group col="4" string="Campaigns">
-                            <field name="module_marketing_campaign"/>
-                            <field name="module_marketing_campaign_crm_demo"/>
-                            <field name="module_crm_profiling"/>
-                        </group>
-                    </sheet>
+                    <group col="4" string="Campaigns">
+                        <field name="module_marketing_campaign"/>
+                        <field name="module_marketing_campaign_crm_demo"/>
+                        <field name="module_crm_profiling"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 58672e9a6cc..83607c1ecd5 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -94,10 +94,15 @@
             <field name="arch" type="xml">
                 <page string="Information" position="after">
                     <page string="Membership">
-                        <field name="membership" readonly="0"/>
-                        <newline/>
-                        <field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
-                        <field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
+                        <group>
+                            <group>
+                                <field name="membership" readonly="0"/>
+                            </group>
+                            <group>
+                                <field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
+                                <field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
+                            </group>
+                        </group>
                     </page>
                 </page>
             </field>
@@ -235,23 +240,23 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Membership">
-                        <group colspan="2" col="2">
-                            <group colspan="4" col="3">
-                            <field name="free_member"/>
-                            <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" icon="gtk-apply"/>
-                            <field colspan="4" name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
-                            <field colspan="4" name="membership_state"/>
+                        <group>
+                            <group>
+                                <field name="free_member"/>
+                                <field colspan="4" name="membership_state"/>
+                                <button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" icon="gtk-apply"/>
+                            </group>
+                            <group>
+                                <field name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
+                                <field name="membership_start"/>
+                                <field name="membership_stop"/>
+                                <field name="membership_cancel"/>
                             </group>
-                        </group>
-                        <group colspan="2" col="2">
-                            <field name="membership_start"/>
-                            <field name="membership_stop"/>
-                            <field name="membership_cancel"/>
                         </group>
                         <field name="member_lines" nolabel="1" colspan="4" readonly="1">
                             <tree string="Memberships">
                                 <field name="date"/>
-                                <field name="membership_id"/>
+                                <field name="membership_id" string="Membership"/>
                                 <field name="member_price"/>
                                 <field name="account_invoice_id"/>
                                 <field name="state"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index b2ace70fc08..d82b475e351 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -321,61 +321,66 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bill of Material" version="7.0">
-                    <label for="product_id" class="oe_form_readonly_hidden"/>
-                    <h1>
-                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_form_inline"/>: 
-                        <field name="product_qty" class="oe_form_inline"/>
-                        <field name="product_uom" class="oe_form_inline"/>
-                    </h1>
-                    <label for="routing_id" class="oe_form_readonly_hidden"/>
-                    <h2>
-                        <field name="routing_id"  groups="mrp.group_mrp_routings"/>
-                    </h2>
-                    <group>
-                        <group>
-                            <field name="name"/>
-                            <field name="code" string="Reference"/>
-                        </group>
-                        <group>
-                            <field name="type"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="product_uos_qty" groups="product.group_uos" />
-                            <field name="product_uos"  groups="product.group_uos"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="Components">
-                            <field name="bom_lines" widget="one2many_list">
-                                <tree string="Components" editable="bottom">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
-                                    <field name="product_qty"/>
-                                    <field name="product_uom"/>
-                                    <field name="name" invisible="1"/>
-                                    <field name="date_start"/>
-                                    <field name="date_stop"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
-                            <field name="revision_ids"/>
-                        </page>
-                        <page string="Properties" groups="product.group_mrp_properties">
-                            <group col="4">
-                                <field name="position"/>
-                                <field name="active"/>
-                                <field name="sequence"/>
-                                <field name="bom_id"/>
-
-                                <field name="date_start"/>
-                                <field name="date_stop"/>
-                                <field name="product_rounding"/>
-                                <field name="product_efficiency"/>
-                            </group>
-                            <separator string="Properties"/>
-                            <field name="property_ids"/>
-                        </page>
-                    </notebook>
-                    <newline/>
+                	<sheet>
+	                    <label for="product_id" class="oe_form_readonly_hidden"/>
+	                    <h1>
+	                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_form_inline"/>: 
+	                        <field name="product_qty" class="oe_form_inline"/>
+	                        <field name="product_uom" class="oe_form_inline"/>
+	                    </h1>
+	                    <label for="routing_id" class="oe_form_readonly_hidden"/>
+	                    <h2>
+	                        <field name="routing_id"  groups="mrp.group_mrp_routings"/>
+	                    </h2>
+	                    <group>
+	                        <group>
+	                            <field name="name"/>
+	                            <field name="code" string="Reference"/>
+	                        </group>
+	                        <group>
+	                            <field name="type"/>
+	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+	                            <field name="product_uos_qty" groups="product.group_uos" />
+	                            <field name="product_uos"  groups="product.group_uos"/>
+	                        </group>
+	                    </group>
+	                    <notebook>
+	                        <page string="Components">
+	                            <field name="bom_lines" widget="one2many_list">
+	                                <tree string="Components" editable="bottom">
+	                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
+	                                    <field name="product_qty"/>
+	                                    <field name="product_uom"/>
+	                                    <field name="name" invisible="1"/>
+	                                    <field name="date_start"/>
+	                                    <field name="date_stop"/>
+	                                </tree>
+	                            </field>
+	                        </page>
+	                        <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
+	                            <field name="revision_ids"/>
+	                        </page>
+	                        <page string="Properties" groups="product.group_mrp_properties">
+	                            <group>
+                                        <group>
+                                            <field name="position"/>
+                                            <field name="bom_id"/>
+                                            <field name="sequence"/>
+                                            <field name="active"/>
+                                        </group>
+                                        <group>
+                                            <field name="date_start"/>
+                                            <field name="date_stop"/>
+                                            <field name="product_rounding"/>
+                                            <field name="product_efficiency"/>
+                                        </group>
+	                            </group>
+	                            <separator string="Properties"/>
+	                            <field name="property_ids" widget="many2many_tags" />
+	                        </page>
+	                    </notebook>
+	                    <newline/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index be54110d641..a00bf797318 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -11,22 +11,21 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet layout="auto">
-                        <group col="4" string="Manufacturing Order">
-                            <field name="module_mrp_operations"/>
-                            <field name="module_stock_planning"/>
-                            <field name="module_mrp_subproduct"/>
-                            <field name="module_mrp_repair"/>
-                        </group>
-                        <group string="Logistics" col="4">
-                            <field name="module_mrp_jit"/>
-                            <field name="module_stock_no_autopicking"/>
-                        </group>
-                        <group string="Bill Of Material" col="4">
-                            <field name="group_mrp_routings"/>
-                            <field name="group_mrp_properties"/>
-                        </group>
-                    </sheet>
+                    <newline/>
+                    <group col="4" string="Manufacturing Order">
+                        <field name="module_mrp_operations"/>
+                        <field name="module_stock_planning"/>
+                        <field name="module_mrp_subproduct"/>
+                        <field name="module_mrp_repair"/>
+                    </group>
+                    <group string="Logistics" col="4">
+                        <field name="module_mrp_jit"/>
+                        <field name="module_stock_no_autopicking"/>
+                    </group>
+                    <group string="Bill Of Material" col="4">
+                        <field name="group_mrp_routings"/>
+                        <field name="group_mrp_properties"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index ab68e12ae41..33ae06d53d5 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -651,11 +651,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="PoS Categories" version="7.0">
+                	<sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="parent_id"/>
                         <field name="sequence"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 268820f92d3..7a456fc2d89 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -14,76 +14,78 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process" version="7.0">
-                <group col="4">
-                    <field name="name"/>
-                    <field name="model_id"/>
-                    <field name="active"/>
-                </group>
-                <notebook colspan="4">
-                    <page string="Nodes">
-                        <field name="node_ids" colspan="4" nolabel="1">
-                            <tree string="Process Nodes">
-                                <field name="name"/>
-                                <field name="model_id"/>
-                                <field name="kind"/>
-                                <field name="flow_start"/>
-                            </tree>
-                            <form string="Process Node" version="7.0">
-                                <group colspan="4" col="4">
+                <sheet>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="model_id"/>
+                        <field name="active"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Nodes">
+                            <field name="node_ids" colspan="4" nolabel="1">
+                                <tree string="Process Nodes">
                                     <field name="name"/>
-                                    <field name="flow_start"/>
+                                    <field name="model_id"/>
                                     <field name="kind"/>
-                                    <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-
-                                </group>
-                                <notebook colspan="4">
-                                    <page string="Properties">
-                                        <group colspan="4" col="6">
-                                            <field name="model_id"/>
-                                            <field name="menu_id"/>
-                                            <field name="help_url" widget="url"/>
-                                        </group>
-                                        <separator string="Conditions" colspan="4"/>
-                                        <field name="model_states"/>
-                                        <field name="condition_ids" nolabel="1" colspan="4">
-                                            <tree string="Other Conditions" editable="top">
-                                                <field name="name"/>
+                                    <field name="flow_start"/>
+                                </tree>
+                                <form string="Process Node" version="7.0">
+                                    <group colspan="4" col="4">
+                                        <field name="name"/>
+                                        <field name="flow_start"/>
+                                        <field name="kind"/>
+                                        <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
+    
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Properties">
+                                            <group colspan="4" col="6">
                                                 <field name="model_id"/>
-                                                <field name="model_states"/>
-                                            </tree>
-                                        </field>
-                                    </page>
-                                    <page string="Transitions">
-                                        <group colspan="4" col="4">
-                                            <group colspan="2" col="2">
-                                                <field name="transition_in" nolabel="1" height="400">
-                                                    <tree string="Incoming Transitions">
-                                                        <field name="name"/>
-                                                        <field name="source_node_id"/>
-                                                    </tree>
-                                                </field>
-                                           </group>
-                                           <group colspan="2" col="2">
-                                                <field name="transition_out" nolabel="1" height="400">
-                                                    <tree string="Outgoing Transitions">
-                                                        <field name="name"/>
-                                                        <field name="target_node_id"/>
-                                                    </tree>
-                                                </field>
-                                           </group>
-                                        </group>
-                                    </page>
-                                    <page string="Notes">
-                                       <field name="note" nolabel="1" colspan="4"/>
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Notes">
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </page>
-                </notebook>
+                                                <field name="menu_id"/>
+                                                <field name="help_url" widget="url"/>
+                                            </group>
+                                            <separator string="Conditions" colspan="4"/>
+                                            <field name="model_states"/>
+                                            <field name="condition_ids" nolabel="1" colspan="4">
+                                                <tree string="Other Conditions" editable="top">
+                                                    <field name="name"/>
+                                                    <field name="model_id"/>
+                                                    <field name="model_states"/>
+                                                </tree>
+                                            </field>
+                                        </page>
+                                        <page string="Transitions">
+                                            <group colspan="4" col="4">
+                                                <group colspan="2" col="2">
+                                                    <field name="transition_in" nolabel="1" height="400">
+                                                        <tree string="Incoming Transitions">
+                                                            <field name="name"/>
+                                                            <field name="source_node_id"/>
+                                                        </tree>
+                                                    </field>
+                                               </group>
+                                               <group colspan="2" col="2">
+                                                    <field name="transition_out" nolabel="1" height="400">
+                                                        <tree string="Outgoing Transitions">
+                                                            <field name="name"/>
+                                                            <field name="target_node_id"/>
+                                                        </tree>
+                                                    </field>
+                                               </group>
+                                            </group>
+                                        </page>
+                                        <page string="Notes">
+                                           <field name="note" nolabel="1" colspan="4"/>
+                                        </page>
+                                    </notebook>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Notes">
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
@@ -153,47 +155,49 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Node" version="7.0">
-                <group colspan="4" col="6">
-                    <field name="name"/>
-                    <field name="process_id"/>
-                    <field name="flow_start"/>
-                    <field name="kind"/>
-                    <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-                </group>
-                <notebook>
-                    <page string="Properties">
-                        <group col="4">
-                            <field name="model_id"/>
-                            <field name="menu_id"/>
-                            <field name="help_url" widget="url"/>
-                            <field name="model_states"/>
-                        </group>
-                        <field name="condition_ids">
-                            <tree string="Other Conditions" editable="bottom">
-                                <field name="name"/>
+                <sheet layout="auto">
+                    <group colspan="4" col="6">
+                        <field name="name"/>
+                        <field name="process_id"/>
+                        <field name="flow_start"/>
+                        <field name="kind"/>
+                        <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
+                    </group>
+                    <notebook>
+                        <page string="Properties">
+                            <group col="4">
                                 <field name="model_id"/>
+                                <field name="menu_id"/>
+                                <field name="help_url" widget="url"/>
                                 <field name="model_states"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Transitions">
-                        <field name="transition_in" nolabel="1" height="400">
-                            <tree string="Incoming Transitions">
-                                <field name="name"/>
-                                <field name="source_node_id"/>
-                            </tree>
-                        </field>
-                        <field name="transition_out" nolabel="1" height="400">
-                            <tree string="Outgoing Transitions">
-                                <field name="name"/>
-                                <field name="target_node_id"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Notes">
-                       <field name="note"/>
-                    </page>
-                </notebook>
+                            </group>
+                            <field name="condition_ids">
+                                <tree string="Other Conditions" editable="bottom">
+                                    <field name="name"/>
+                                    <field name="model_id"/>
+                                    <field name="model_states"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Transitions">
+                            <field name="transition_in" nolabel="1" height="400">
+                                <tree string="Incoming Transitions">
+                                    <field name="name"/>
+                                    <field name="source_node_id"/>
+                                </tree>
+                            </field>
+                            <field name="transition_out" nolabel="1" height="400">
+                                <tree string="Outgoing Transitions">
+                                    <field name="name"/>
+                                    <field name="target_node_id"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Notes">
+                           <field name="note"/>
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
@@ -252,38 +256,40 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Transition" version="7.0">
-                <group col="4">
-                    <field name="name"/>
-                    <field name="source_node_id"/>
-                    <field name="target_node_id"/>
-                </group>
-                <notebook>
-                    <page string="Actions">
-                        <field name="action_ids">
-                            <tree string="Actions">
-                                <field name="name"/>
-                                <field name="state"/>
-                                <field name="action"/>
-                            </tree>
-                            <form string="Actions" version="7.0">
-                                <group col="4">
-                                    <field name="name" colspan="4"/>
+                <sheet layout="auto">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="source_node_id"/>
+                        <field name="target_node_id"/>
+                    </group>
+                    <notebook>
+                        <page string="Actions">
+                            <field name="action_ids">
+                                <tree string="Actions">
+                                    <field name="name"/>
                                     <field name="state"/>
                                     <field name="action"/>
-                                </group>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Workflow Transitions">
-                        <field name="transition_ids"/>
-                    </page>
-                    <page string="Associated Groups">
-                        <field name="group_ids"/>
-                    </page>
-                    <page string="Notes">
-                        <field name="note"/>
-                    </page>
-                </notebook>
+                                </tree>
+                                <form string="Actions" version="7.0">
+                                    <group col="4">
+                                        <field name="name" colspan="4"/>
+                                        <field name="state"/>
+                                        <field name="action"/>
+                                    </group>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Workflow Transitions">
+                            <field name="transition_ids"/>
+                        </page>
+                        <page string="Associated Groups">
+                            <field name="group_ids"/>
+                        </page>
+                        <page string="Notes">
+                            <field name="note"/>
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index cdd7be0de1f..a2f987e3aa1 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -12,7 +12,6 @@
                 <form string="Scheduler Parameters" version="7.0">
                     <header>
                         <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" />
-                        <button icon='gtk-cancel' special="cancel" string="Cancel" />
                     </header>
                     <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing.">
                         <field name="automatic"/>
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 4d917230acc..4aa53511460 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -8,10 +8,10 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
-                    <newline/>
-                    <group col="2" colspan="2" groups="product.group_sale_pricelist">
-                        <separator string="Sales Properties" colspan="2"/>
-                        <field name="property_product_pricelist"/>
+                    <group>
+                        <group name="pricelists" groups="product.group_sale_pricelist">
+                            <field name="property_product_pricelist"/>
+                        </group>
                     </group>
                 </page>
             </field>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 9d1e19a7c81..18c7875fcdc 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -12,25 +12,23 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
-                        <group col="4">
-                            <separator string="Project" colspan="4"/>
-                            <field name="module_project_mrp"/>
-                            <field name="module_project_timesheet"/>
-                            <field name="module_pad"/>
-                            <field name="group_tasks_work_on_tasks"/>
-                            <field name="group_time_work_estimation_tasks"/>
-                            <field name="group_manage_delegation_task"/>
+                    <group col="4">
+                        <separator string="Project" colspan="4"/>
+                        <field name="module_project_mrp"/>
+                        <field name="module_project_timesheet"/>
+                        <field name="module_pad"/>
+                        <field name="group_tasks_work_on_tasks"/>
+                        <field name="group_time_work_estimation_tasks"/>
+                        <field name="group_manage_delegation_task"/>
 
-                            <separator string="Planning" colspan="4"/>
-                            <field name="module_project_long_term"/>
+                        <separator string="Planning" colspan="4"/>
+                        <field name="module_project_long_term"/>
 
-                            <separator string="Helpdesk and Support" colspan="4"/>
-                            <field name="module_project_issue"/>
-                            <field name="module_project_issue_sheet"/>
-                            <group name="support" colspan="4"/>
-                        </group>
-                    </sheet>
+                        <separator string="Helpdesk and Support" colspan="4"/>
+                        <field name="module_project_issue"/>
+                        <field name="module_project_issue_sheet"/>
+                        <group name="support" colspan="4"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 1717fb950f7..119d6c1c90e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -213,7 +213,7 @@
                                 </group>
                             </group>
                            <separator string="Force Assigned Users"/>
-                           <field name="user_force_ids"/>
+                           <field name="user_force_ids" widget="many2many_tags" />
                            <separator string="Previous Phases"/>
                            <field name="previous_phase_ids"/>
                            <separator string="Next Phases"/>
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index 4a66cecf9cd..85ab158e0b2 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -28,7 +28,7 @@ class project_compute_phases(osv.osv_memory):
         'target_project': fields.selection([
             ('all', 'Compute All My Projects'),
             ('one', 'Compute a Single Project'),
-            ], 'Schedule', required=True),
+            ], 'Action', required=True),
         'project_id': fields.many2one('project.project', 'Project')
     }
     _defaults = {
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index bf2c51e41e6..37c7256cb7c 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -10,9 +10,8 @@
                   <form string="Schedule Phases" version="7.0">
                       <header>
                           <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
-                          <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
                       </header>
-                      <group string="Schedule Phases">
+                      <group>
                           <field name="target_project"/>
                           <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
                       </group>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index ac30a3aa6d9..3ceac7e9a9e 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -10,7 +10,6 @@
                  <form string="Schedule Tasks" version="7.0">
                      <header>
                          <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
-                         <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
                      </header>
                      <group>
                          <field name="project_id"/>
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 09e99bfcbdd..96981db1502 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -8,12 +8,9 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="priority">36</field>
             <field name="arch" type="xml">
-                <page string="Sales &amp; Purchases" position="inside">
-                    <group colspan="2" col="2" groups="product.group_purchase_pricelist">
-                        <separator string="Purchase Properties" colspan="2"/>
-                        <field name="property_product_pricelist_purchase" />
-                    </group>
-                </page>
+                <field name="property_product_pricelist" position="after">
+                    <field name="property_product_pricelist_purchase" />
+                </field>
             </field>
         </record>
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index fffcbc7101b..147aaa1e159 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -395,40 +395,42 @@
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <form string="Purchase Order Line" version="7.0">
-                    <label for="order_id" class="oe_form_readonly_hidden"/>
-                    <h1>
-                        <field name="order_id" class="oe_form_inline"/>, 
-                        <field name="date_order" class="oe_form_inline"/>
-                    </h1>
-                    <label for="partner_id" class="oe_form_readonly_hidden"/>
-                    <h2><field name="partner_id"/></h2>
-
-                    <group>
-                        <group>
-                            <field name="name"/>
-                            <field name="product_id" readonly="1"/>
-                            <label for="product_qty"/>
-                            <div>
-                                <field name="product_qty" readonly="1" class="oe_form_inline"/>
-                                <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_form_inline"/>
-                            </div>
-                            <field name="price_unit"/>
-                        </group>
-                        <group>
-                            <field name="date_planned" widget="date"  readonly="1"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                            <field name="taxes_id" widget="many2many_tags"
-                                domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
-                            <field name="invoiced"/>
-                        </group>
-                    </group>
-                    <separator string="Manual Invoices"/>
-                    <field name="invoice_lines"/>
-                    <separator string="Notes"/>
-                    <field name="notes"/>
-                    <separator string="Stock Moves"/>
-                    <field name="move_ids"/>
+                	<sheet>
+	                    <label for="order_id" class="oe_form_readonly_hidden"/>
+	                    <h1>
+	                        <field name="order_id" class="oe_form_inline"/>, 
+	                        <field name="date_order" class="oe_form_inline"/>
+	                    </h1>
+	                    <label for="partner_id" class="oe_form_readonly_hidden"/>
+	                    <h2><field name="partner_id"/></h2>
+	
+	                    <group>
+	                        <group>
+	                            <field name="name"/>
+	                            <field name="product_id" readonly="1"/>
+	                            <label for="product_qty"/>
+	                            <div>
+	                                <field name="product_qty" readonly="1" class="oe_form_inline"/>
+	                                <field name="product_uom" readonly="1" groups="product.group_uom" class="oe_form_inline"/>
+	                            </div>
+	                            <field name="price_unit"/>
+	                        </group>
+	                        <group>
+	                            <field name="date_planned" widget="date"  readonly="1"/>
+	                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+	                            <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+	                            <field name="taxes_id" widget="many2many_tags"
+	                                domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
+	                            <field name="invoiced"/>
+	                        </group>
+	                    </group>
+	                    <separator string="Manual Invoices"/>
+	                    <field name="invoice_lines"/>
+	                    <separator string="Notes"/>
+	                    <field name="notes"/>
+	                    <separator string="Stock Moves"/>
+	                    <field name="move_ids"/>
+	            	</sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index c45503faa36..c7765e756c6 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -11,7 +11,6 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
                     <group col="4">
                         <separator string="Invoicing" colspan="4"/>
                         <field name="default_invoice_method"/>
@@ -28,7 +27,6 @@
                         <separator string="Products" colspan="4"/>
                         <field name="module_product_manufacturer"/>
                     </group>
-                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/report_webkit/ir_report_view.xml b/addons/report_webkit/ir_report_view.xml
index 1d60f6a873d..fed94c92d70 100644
--- a/addons/report_webkit/ir_report_view.xml
+++ b/addons/report_webkit/ir_report_view.xml
@@ -6,7 +6,7 @@
             <field name="inherit_id" ref="base.act_report_xml_view"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Security']" position="before" >
+                <xpath expr="//page[@string='Security']" position="before" >
                     <page string="Webkit" attrs="{'invisible':[('report_type','!=','webkit')]}">
                         <field name="webkit_header"/>
                         <field name="webkit_debug"/>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index bf8ab3c11e9..4da1a465c42 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -77,12 +77,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Working Time" version="7.0">
+                	<sheet>
                     <group col="4">
                         <field name="name"/>
                         <field name="manager"/>
                         <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <field name="attendance_ids"/>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -220,6 +222,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Detail" version="7.0">
+                	<sheet>
                     <group>
                        <group>
                            <field name="resource_id" on_change="onchange_resource(resource_id)"/>
@@ -234,6 +237,7 @@
                            <field name="date_to"/>
                        </group>
                    </group>
+                   </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9688fb69802..74967040753 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -136,12 +136,12 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" />
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
-                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                         </group><group>
                             <field name="date_order"/>
                             <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
                             <field name="client_order_ref"/>
+                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                         </group>
                     </group>
                     <notebook>
@@ -196,8 +196,7 @@
                                         </group>
                                         <separator string="Properties" colspan="2"/>
                                         <field name="property_ids" colspan="4" nolabel="1" />
-                                        <separator string="Notes" groups="base.group_sale_notes_subtotal"/>
-                                        <field name="notes" groups="base.group_sale_notes_subtotal"/>
+                                        <field name="notes" groups="base.group_sale_notes_subtotal" placeholder="Add a note on order line..."/>
                                         <div groups="base.group_no_one">
                                             <separator colspan="4" string="Invoice Lines"/>
                                             <field colspan="4" name="invoice_lines" nolabel="1"/>
@@ -207,6 +206,7 @@
                                     </group>
                                 </form>
                                 <tree string="Sales Order Lines">
+                                    <field name="sequence" />
                                     <field name="name"/>
                                     <field name="product_uom_qty" string="Quantity"/>
                                     <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
@@ -223,7 +223,7 @@
                                 <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
                             </group>
                             <separator string="Notes"/>
-                            <field name="note" placeholder="Our quotation is valid for 30 days..."/>
+                            <field name="note" placeholder="Add a global note on the sale order..."/>
                         </page>
                         <page string="Other Information">
                             <group>
@@ -236,30 +236,37 @@
                                 <group>
                                     <field name="user_id"/>
                                     <field groups="base.group_no_one" name="origin"/>
-                                    <field name="invoiced"/>
-                                    <field name="shipped"/>
                                 </group>
                                 <group name="sale_pay">
                                     <field name="payment_term" widget="selection"/>
                                     <field name="fiscal_position" widget="selection"/>
                                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                 </group>
+                                <group>
+                                    <field name="invoiced"/>
+                                    <field name="shipped"/>
+                                </group>
                             </group>
                         </page>
                         <page string="History">
                             <separator string="Invoices"/>
-                            <field name="invoice_ids" context="{'form_view_ref':'account.invoice_form'}"/>
+                            <field name="invoice_ids" context="{'form_view_ref':'account.invoice_form'}">
+                                <tree string="Invoices" colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'">
+                                    <field name="date_invoice" />
+                                    <field name="number" />
+                                    <field name="partner_id" />
+                                    <field name="user_id" />
+                                    <field name="date_due" />
+                                    <field name="amount_total" />
+                                    <field name="state" />
+                                </tree>
+                            </field>
                             <separator string="Delivery Orders"/>
                             <field name="picking_ids" context="{'default_type': 'out'}">
                                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
                                     <field name="name"/>
-                                    <field name="partner_id"/>
-                                    <field name="origin"/>
-                                    <field name="date"/>
+                                    <field name="partner_id" string="Customer" />
                                     <field name="min_date"/>
-                                    <field name="backorder_id"/>
-                                    <field name="invoice_state"/>
-                                    <field name="stock_journal_id" widget="selection"/>
                                     <field name="state"/>
                                     <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" context="{'default_type': 'out'}"/>
                                 </tree>
@@ -412,6 +419,7 @@
                         <button name="button_done" string="Done" type="object" states="confirmed,exception" icon="gtk-go-forward"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                     </header>
+                    <sheet>
                     <label for="order_id" class="oe_form_readonly_hidden"/>
                     <h1><field name="order_id"/></h1>
                     <label for="order_partner_id" class="oe_form_readonly_hidden"/>
@@ -435,6 +443,7 @@
                     </group>
                     <separator string="Notes" groups="base.group_sale_notes_subtotal"/>
                     <field name="notes" groups="base.group_sale_notes_subtotal"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 519863b85f7..7ec91f73dca 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -9,9 +9,7 @@
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
             <xpath expr="//group[@class='oe_form_subtotal_footer']" position="inside">
-                <group>
-                    <field name="margin"/>
-                </group>
+                <field name="margin"/>
             </xpath>
         </field>
     </record>
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 608c41a4909..8b997e2357e 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -46,7 +46,6 @@ synchronization with other companies, etc.
     'demo_xml': ['share_demo.xml'],
     'data': [
         'security/share_security.xml',
-        'share_view.xml',
         'res_users_view.xml',
         'wizard/share_wizard_view.xml'
     ],
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index 3b74fbb4dbc..52e154c1667 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -49,9 +49,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_groups_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page//field[@name='users']" position="attributes">
+                <field name="users" position="attributes">
                     <attribute name="context">{'search_default_no_share':1}</attribute>
-                </xpath>
+                </field>
+                <field name="name" position="after">
+                    <field name="share"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/addons/share/share_view.xml b/addons/share/share_view.xml
deleted file mode 100644
index 315f750a7f6..00000000000
--- a/addons/share/share_view.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_groups_form" model="ir.ui.view">
-            <field name="name">res.groups.form</field>
-            <field name="model">res.groups</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_groups_form"/>
-            <field name="arch" type="xml">
-                 <field name="name" position="after">
-                    <field name="share"/>
-                </field>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 5a90c20aa81..1c229121e1c 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -9,15 +9,14 @@
         <field name="name">res.partner.stock.property.form.inherit</field>
         <field name="model">res.partner</field>
         <field name="type">form</field>
-        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="inherit_id" ref="product.view_partner_property_form"/>
         <field name="arch" type="xml">
-            <page string="Sales &amp; Purchases" position="inside">
-                <group colspan="2" col="2" groups="stock.group_locations">
-                    <separator string="Inventory Properties" colspan="2"/>
+            <group name="pricelists" position="after">
+                <group groups="stock.group_locations">
                     <field name="property_stock_customer" domain="[('usage','=','customer')]"/>
                     <field name="property_stock_supplier" domain="[('usage','=','supplier')]"/>
                 </group>
-            </page>
+            </group>
         </field>
     </record>
 
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 135c2c79fa4..63d22f4fab8 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -202,7 +202,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="store" position="after">
-                    <group col="2" colspan="2" name="store" groups="stock.group_locations">
+                    <group name="store" groups="stock.group_locations">
                         <separator string="Counter-Part Locations Properties" colspan="2"/>
                         <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
                         <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index de3e91ee183..77bf887c13d 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -12,32 +12,30 @@
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
-                    <sheet>
-                        <group col="4">
-                            <separator string="Traceability" colspan="4"/>
-                            <field name="group_stock_production_lot"/>
-                            <field name="module_product_expiry"
-                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
-                            <newline/>
-                            <field name="group_stock_tracking_lot"/>
+                    <group col="4">
+                        <separator string="Traceability" colspan="4"/>
+                        <field name="group_stock_production_lot"/>
+                        <field name="module_product_expiry"
+                            attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                        <newline/>
+                        <field name="group_stock_tracking_lot"/>
 
-                            <separator string="Logistics" colspan="4"/>
-                            <field name="group_stock_multiple_locations"/>
-                            <field name="module_stock_location"/>
-                            <field name="module_stock_invoice_directly"/>
-                            <field name="decimal_precision"/>
+                        <separator string="Logistics" colspan="4"/>
+                        <field name="group_stock_multiple_locations"/>
+                        <field name="module_stock_location"/>
+                        <field name="module_stock_invoice_directly"/>
+                        <field name="decimal_precision"/>
 
-                            <separator string="Products" colspan="4"/>
-                            <field name="group_stock_packaging"/>
-                            <field name="group_stock_inventory_valuation"/>
-                            <field name="group_uom"/>
-                            <field name="group_uos"/>
-                            <field name="group_product_variant"/>
+                        <separator string="Products" colspan="4"/>
+                        <field name="group_stock_packaging"/>
+                        <field name="group_stock_inventory_valuation"/>
+                        <field name="group_uom"/>
+                        <field name="group_uos"/>
+                        <field name="group_product_variant"/>
 
-                            <separator string="Partners" colspan="4"/>
-                            <field name="module_claim_from_delivery"/>
-                        </group>
-                    </sheet>
+                        <separator string="Partners" colspan="4"/>
+                        <field name="module_claim_from_delivery"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8f18b89ed1f..316a9d987fa 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -848,16 +848,20 @@
                             </field>
                         </page>
                         <page string="Additional info">
-                            <group col="4">
-                                <field name="auto_picking"/>
-                                <field name="date_done"/>
-                                <field name="move_type"/>
-                                <field name="type"/>
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <group>
+                                <group>
+                                    <field name="move_type"/>
+                                    <field name="type"/>
+                                    <field name="auto_picking"/>
+                                </group>
+                                <group>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <field name="date_done"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Notes">
-                            <field name="note" placeholder="Quality test ok..."/>
+                            <field name="note" placeholder="Add an internal note..."/>
                         </page>
                     </notebook>
                 </sheet>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index cc9158aa23c..3419b96d2a1 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -302,150 +302,152 @@
             <field name="model">survey.page</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Survey Page">
-                    <field name="title" colspan="4" select="1"/>
-                    <field name="survey_id" select="1"/>
-                    <field name="sequence"/>
-                    <separator string="Description" colspan="4"/>
-                    <field name="note" colspan="4" nolabel="1"/>
-                    <field name="question_ids" colspan="4" nolabel="1">
-                    <form string="Survey Question">
-                        <field name="question" colspan="4" select="1"/>
+                <form string="Survey Page" version="7.0">
+                    <sheet>
+                        <field name="title" colspan="4" select="1"/>
+                        <field name="survey_id" select="1"/>
                         <field name="sequence"/>
-                        <field name="tot_resp"/>
-                        <field name="type" on_change="on_change_type(type)"/>
-                        <field name="in_visible_rating_weight" invisible="1"/>
-                        <field name="in_visible_menu_choice" invisible="1"/>
-                        <field name="in_visible_answer_type" invisible="1"/>
-                        <notebook colspan="4">
-                            <page string="Options">
-                                <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-                                  <separator string="Answer" colspan="4"/>
-                                   <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-                                       <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
-                                   </group>
-                                   <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-                                       <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-                                        <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-                                           <field name="no_of_rows"/>
-                                        </group>
-                                   </group>
-                                </group>
-                                <newline/>
-                                <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-                                    <separator string="Comment Field" colspan="4"/>
-                                    <group colspan="4">
-                                        <field name="is_comment_require"/>
-                                    </group>
-                                    <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-                                        <group col="4" colspan="4">
-                                            <field name="comment_field_type" colspan="1"/>
-                                            <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                <field colspan="2" name="comment_label" />
+                        <separator string="Description" colspan="4"/>
+                        <field name="note" colspan="4" nolabel="1"/>
+                        <field name="question_ids" colspan="4" nolabel="1">
+                        <form string="Survey Question">
+                            <field name="question" colspan="4" select="1"/>
+                            <field name="sequence"/>
+                            <field name="tot_resp"/>
+                            <field name="type" on_change="on_change_type(type)"/>
+                            <field name="in_visible_rating_weight" invisible="1"/>
+                            <field name="in_visible_menu_choice" invisible="1"/>
+                            <field name="in_visible_answer_type" invisible="1"/>
+                            <notebook colspan="4">
+                                <page string="Options">
+                                    <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+                                      <separator string="Answer" colspan="4"/>
+                                       <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+                                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
+                                       </group>
+                                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                           <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                            <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+                                               <field name="no_of_rows"/>
                                             </group>
-                                        </group>
-                                        <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                            <field name="comment_valid_type" colspan="2"/>
-                                            <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-                                                <field name="comment_minimum_no" string="Between"/>
-                                                <field name="comment_maximum_no" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-                                                <field name="comment_minimum_float" string="Between"/>
-                                                <field name="comment_maximum_float" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-                                                <field name="comment_minimum_date" string="Between"/>
-                                                <field name="comment_maximum_date" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
-                                                <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
-                                            </group>
-                                        </group>
+                                       </group>
                                     </group>
-                                </group>
-                                <newline/>
-                                <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-                                    <field name="comment_column"/>
-                                    <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-                                        <field name="column_name" colspan="2"/>
-                                    </group>
-                                </group>
-                                <newline/>
-                                <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-                                    <separator string="Validation" colspan="4"/>
-                                    <group colspan="4">
-                                        <field name="is_validation_require"/>
-                                    </group>
-                                    <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-                                        <field name="validation_type" colspan="2"/>
-                                        <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-                                            <field name="validation_minimum_no" string="Between"/>
-                                            <field name="validation_maximum_no" string="and"/>
-                                        </group>
-                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-                                            <field name="validation_minimum_float" string="Between"/>
-                                            <field name="validation_maximum_float" string="and"/>
-                                        </group>
-                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-                                            <field name="validation_minimum_date" string="Between"/>
-                                            <field name="validation_maximum_date" string="and"/>
-                                        </group>
-                                    </group>
-                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-                                        <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                        <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-                                    </group>
-                                </group>
-                                <newline/>
-                                <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-                                    <separator string="Required Answer" colspan="4"/>
                                     <newline/>
-                                    <field name="is_require_answer"/>
-                                    <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-                                        <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-                                            <field name="required_type"/>
-                                            <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-                                                <field name="req_ans" />
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-                                                <field name="minimum_req_ans"/>
-                                                <field name="maximum_req_ans"/>
-                                            </group>
+                                    <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+                                        <separator string="Comment Field" colspan="4"/>
+                                        <group colspan="4">
+                                            <field name="is_comment_require"/>
                                         </group>
-                                        <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-                                            <label string="When the question is not answered, display this error message:"/>
-                                            <field name="req_error_msg" colspan="4" nolabel="1"/>
-                                        </group>
-                                        <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                            <group colspan="2" >
-                                                <field name="numeric_required_sum"/>
+                                        <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                            <group col="4" colspan="4">
+                                                <field name="comment_field_type" colspan="1"/>
+                                                <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                    <field colspan="2" name="comment_label" />
+                                                </group>
+                                            </group>
+                                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                <field name="comment_valid_type" colspan="2"/>
+                                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                    <field name="comment_minimum_no" string="Between"/>
+                                                    <field name="comment_maximum_no" string="and"/>
+                                                </group>
+                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                    <field name="comment_minimum_float" string="Between"/>
+                                                    <field name="comment_maximum_float" string="and"/>
+                                                </group>
+                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                    <field name="comment_minimum_date" string="Between"/>
+                                                    <field name="comment_maximum_date" string="and"/>
+                                                </group>
+                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                    <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                </group>
                                             </group>
-                                            <newline/>
-                                            <label string="When the choices do not add up correctly, display this error message"/>
-                                            <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
-                                        </group>
-                                        <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-                                            <field name="rating_allow_one_column_require"/>
                                         </group>
                                     </group>
-                                </group>
-                                <newline/>
-                                <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-                                    <separator string="Descriptive Text" colspan="4"/>
-                                    <field name="descriptive_text" colspan="4" nolabel="1"/>
-                                </group>
-                            </page>
-                        </notebook>
-
-                    </form>
-                    <tree string="Survey Question">
-                        <field name="sequence" string="Seq"/>
-                        <field name="question" colspan="4" select="1"/>
-                        <field name="answer_choice_ids"/>
-                    </tree>
-                    </field>
+                                    <newline/>
+                                    <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+                                        <field name="comment_column"/>
+                                        <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                            <field name="column_name" colspan="2"/>
+                                        </group>
+                                    </group>
+                                    <newline/>
+                                    <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                        <separator string="Validation" colspan="4"/>
+                                        <group colspan="4">
+                                            <field name="is_validation_require"/>
+                                        </group>
+                                        <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                            <field name="validation_type" colspan="2"/>
+                                            <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                                <field name="validation_minimum_no" string="Between"/>
+                                                <field name="validation_maximum_no" string="and"/>
+                                            </group>
+                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                                <field name="validation_minimum_float" string="Between"/>
+                                                <field name="validation_maximum_float" string="and"/>
+                                            </group>
+                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                                <field name="validation_minimum_date" string="Between"/>
+                                                <field name="validation_maximum_date" string="and"/>
+                                            </group>
+                                        </group>
+                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                            <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+                                        </group>
+                                    </group>
+                                    <newline/>
+                                    <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                        <separator string="Required Answer" colspan="4"/>
+                                        <newline/>
+                                        <field name="is_require_answer"/>
+                                        <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                <field name="required_type"/>
+                                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                    <field name="req_ans" />
+                                                </group>
+                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                    <field name="minimum_req_ans"/>
+                                                    <field name="maximum_req_ans"/>
+                                                </group>
+                                            </group>
+                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                                <label string="When the question is not answered, display this error message:"/>
+                                                <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                            </group>
+                                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                                <group colspan="2" >
+                                                    <field name="numeric_required_sum"/>
+                                                </group>
+                                                <newline/>
+                                                <label string="When the choices do not add up correctly, display this error message"/>
+                                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                            </group>
+                                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                                <field name="rating_allow_one_column_require"/>
+                                            </group>
+                                        </group>
+                                    </group>
+                                    <newline/>
+                                    <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                        <separator string="Descriptive Text" colspan="4"/>
+                                        <field name="descriptive_text" colspan="4" nolabel="1"/>
+                                    </group>
+                                </page>
+                            </notebook>
+    
+                        </form>
+                        <tree string="Survey Question">
+                            <field name="sequence" string="Seq"/>
+                            <field name="question" colspan="4" select="1"/>
+                            <field name="answer_choice_ids"/>
+                        </tree>
+                        </field>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index c10890d3928..1dc8b4cdb1f 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -30,7 +30,7 @@
             <field name="model">wiki.groups</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Wiki Groups">
+                <form string="Wiki Groups" version="7.0">
                     <group col="4" colspan="3" >
                         <field name="name" select="1"/>
                         <field name="create_date" readonly="2"/>
@@ -41,17 +41,18 @@
                             attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
                     </group>
                     <notebook colspan="4">
-                    <page string="Notes">
-                        <separator string="Group Description" colspan="4"/>
-                        <field name="notes" colspan="4" nolabel="1"/>
-                    </page><page string="Configuration">
-                        <separator string="Page Template" colspan="4"/>
-                        <field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
-                    </page>
+                        <page string="Notes">
+                            <separator string="Group Description" colspan="4"/>
+                            <field name="notes" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="Configuration">
+                            <separator string="Page Template" colspan="4"/>
+                            <field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
+                        </page>
                     </notebook>
                      <field name="menu_id"/>
                      <button
-                         name="%(wiki.action_wiki_create_menu)d"
+                        name="%(wiki.action_wiki_create_menu)d"
                          string="Create Menu"
                           type="action"
                           icon="gtk-justify-fill"
@@ -126,30 +127,32 @@
             <field name="model">wiki.wiki</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Wiki">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="6"/>
-                        <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>
-                        <field name="parent_id" domain="[('group_id','=',group_id)]"/>
-                        <field name="section"/>                        
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Content">
-                        <separator colspan="4" string="Page Content"/>
-                        <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
-                        </page>
-                    </notebook>
-                    <group col="2" colspan="2" groups="base.group_no_one">
-                        <separator colspan="4" string="Modification Information"/>
-                        <field name="write_date" readonly="1"/>
-                        <field name="minor_edit"/>
-                        <field name="review" select="1"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Meta Information"/>
-                        <field name="tags" select="1"/>
-                        <field name="toc" groups="base.group_no_one"/>
-                    </group>
+                <form string="Wiki" version="7.0">
+                    <sheet>
+                        <group col="6" colspan="4">
+                            <field name="name" select="1" colspan="6"/>
+                            <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>
+                            <field name="parent_id" domain="[('group_id','=',group_id)]"/>
+                            <field name="section"/>                        
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Content">
+                            <separator colspan="4" string="Page Content"/>
+                            <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
+                            </page>
+                        </notebook>
+                        <group col="2" colspan="2" groups="base.group_no_one">
+                            <separator colspan="4" string="Modification Information"/>
+                            <field name="write_date" readonly="1"/>
+                            <field name="minor_edit"/>
+                            <field name="review" select="1"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator colspan="4" string="Meta Information"/>
+                            <field name="tags" select="1"/>
+                            <field name="toc" groups="base.group_no_one"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -227,12 +230,14 @@
             <field name="model">wiki.wiki.history</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Wiki History">
-                    <field name="wiki_id" select="1" colspan="4"/>
-                    <field name="summary" select="1" colspan="4"/>
-                    <field name="text_area" select="1" colspan="4" nolabel="1" widget="text_wiki"/>
-                    <field name="create_date" select="1" readonly="1"/>
-                    <field name="minor_edit" select="1" groups="base.group_no_one"/>
+                <form string="Wiki History" version="7.0">
+                    <sheet>
+                        <field name="wiki_id" select="1" colspan="4"/>
+                        <field name="summary" select="1" colspan="4"/>
+                        <field name="text_area" select="1" colspan="4" nolabel="1" widget="text_wiki"/>
+                        <field name="create_date" select="1" readonly="1"/>
+                        <field name="minor_edit" select="1" groups="base.group_no_one"/>
+                    </sheet>
                 </form>
             </field>
         </record>