From 3c8643ce4ca4205e10422df12f5d615537bab01b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 9 Jun 2012 16:39:04 +0200
Subject: [PATCH] [IMP] better form views, new guidelines

bzr revid: fp@tinyerp.com-20120609143904-ydwqfyb54atbcpvw
---
 .../crm_fundraising/crm_fundraising_view.xml  | 74 +++++++-------
 .../report/crm_fundraising_report_view.xml    | 24 ++---
 addons/crm_helpdesk/crm_helpdesk_view.xml     | 99 +++++++++----------
 .../crm_partner_assign/res_partner_view.xml   | 14 +--
 .../wizard/open_questionnaire_view.xml        |  6 +-
 .../decimal_precision_view.xml                |  4 +-
 addons/delivery/delivery_view.xml             | 10 +-
 addons/document/board_document_view.xml       |  4 +-
 .../document_ftp/wizard/ftp_browse_view.xml   | 14 +--
 addons/document_webdav/webdav_view.xml        |  6 +-
 addons/email_template/email_template_view.xml |  2 +-
 addons/event/board_association_view.xml       |  2 +-
 addons/event/wizard/event_confirm_view.xml    | 15 ++-
 .../wizard/event_project_retro_view.xml       | 19 ++--
 addons/fetchmail/fetchmail_view.xml           | 40 ++++----
 .../wizard/google_login_view.xml              |  2 +-
 addons/hr/hr_board.xml                        |  4 +-
 addons/hr/hr_department_view.xml              |  2 +-
 addons/hr/hr_view.xml                         |  8 +-
 addons/hr/res_config_view.xml                 |  2 +-
 addons/hr_attendance/hr_attendance_view.xml   |  4 +-
 .../wizard/hr_attendance_bymonth_view.xml     | 16 +--
 .../wizard/hr_attendance_error_view.xml       | 19 ++--
 addons/hr_evaluation/hr_evaluation_view.xml   | 10 +-
 .../wizard/hr_evaluation_mail_view.xml        | 24 +++--
 addons/hr_expense/hr_expense_view.xml         |  4 +-
 addons/hr_holidays/hr_holidays_view.xml       |  8 +-
 .../hr_holidays_summary_department_view.xml   | 44 ++++-----
 .../hr_holidays_summary_employees_view.xml    | 34 +++----
 addons/hr_recruitment/hr_recruitment_view.xml |  8 +-
 .../hr_timesheet_invoice_view.xml             |  4 +-
 .../hr_timesheet_invoice_create_view.xml      | 33 +++----
 .../hr_timesheet_sheet_view.xml               | 12 +--
 .../wizard/hr_timesheet_current_view.xml      |  8 +-
 addons/idea/idea_view.xml                     |  4 +-
 .../wizard/google_import_message_view.xml     |  2 +-
 .../l10n_be/wizard/l10n_be_vat_intra_view.xml |  4 +-
 addons/l10n_br/l10n_br_view.xml               | 16 +--
 addons/l10n_ch/wizard/bvr_import_view.xml     |  2 +-
 addons/l10n_ch/wizard/create_dta_view.xml     |  2 +-
 .../l10n_fr/wizard/fr_report_bilan_view.xml   |  2 +-
 .../fr_report_compute_resultant_view.xml      |  2 +-
 addons/l10n_lu/wizard/print_vat_view.xml      |  2 +-
 addons/lunch/lunch_view.xml                   | 12 +--
 .../lunch/wizard/lunch_cashbox_clean_view.xml |  2 +-
 .../lunch/wizard/lunch_order_cancel_view.xml  |  2 +-
 .../lunch/wizard/lunch_order_confirm_view.xml |  2 +-
 addons/mail/mail_message_view.xml             |  4 +-
 addons/marketing/res_config_view.xml          |  2 +-
 .../marketing_campaign_view.xml               | 12 +--
 .../wizard/membership_invoice_view.xml        | 14 +--
 addons/mrp/mrp_view.xml                       |  4 +-
 52 files changed, 330 insertions(+), 339 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 02f85b1ad7f..eb7bcade10b 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -61,7 +61,7 @@
             <field name="model">crm.fundraising</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form version="7.0">
                 <header>
                     <button name="case_close" string="Done" states="open,pending" type="object" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" />
@@ -72,57 +72,55 @@
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet string="Funds Form" layout="auto">
-                    <group colspan="4" col="6" class="oe_form_header">
-                        <field name="name" select="1" string="Name"/>
+                    <group col="4">
+                        <field name="name" string="Name"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="user_id" string="Responsible"/>
                         <field name="date"/>
-                        <field name="categ_id" select="1" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
-                        <field name="type_id" string="Payment Mode" select="1" widget="selection"/>
+                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+                        <field name="type_id" string="Payment Mode" widget="selection"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Funds">
-                            <group colspan="2" col="2">
-                                <separator colspan="4" string="Communication"/>
-                                <field name="partner_id" select="1"
-                                    on_change="onchange_partner_id(partner_id, email_from)"
-                                    colspan="2" />
-                                <field name="email_from" colspan="2"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator colspan="4" string="Estimates"/>
-                                <field name="planned_cost"/>
-                                <field name="planned_revenue"/>
-                                <field name="probability"/>
+                            <group>
+                                <group string="Communication">
+                                    <field name="partner_id"
+                                        on_change="onchange_partner_id(partner_id, email_from)"
+                                        />
+                                    <field name="email_from"/>
+                                </group>
+                                <group string="Estimates">
+                                    <field name="planned_cost"/>
+                                    <field name="planned_revenue"/>
+                                    <field name="probability"/>
+                                </group>
                             </group>
                             <separator colspan="4" string="Notes"/>
-                                <field name="description" nolabel="1" colspan="4"/>
+                            <field name="description"/>
                         </page>
                         <page string="Extra Info">
-                            <group col="2" colspan="2">
-                                <separator colspan="4" string="Misc"/>
-                                <field name="active"/>
-                                <field name="id" select="1"/>
-                                <field name="priority" string="Priority"/>
-                            </group>
-                            <group col="2" colspan="2" groups="base.group_no_one">
-                                <separator colspan="4" string="Dates"/>
-                                <field name="create_date"/>
-                                <field name="date_closed"/>
-                                <field name="duration"/>
-                            </group>
-                            <newline/>
-                            <group colspan="4" col="2">
-                                <separator colspan="4" string="References"/>
-                                <field colspan="4" name="ref"/>
-                                <field colspan="4" name="ref2"/>
+                            <group>
+                                <group string="Misc">
+                                    <field name="active"/>
+                                    <field name="id"/>
+                                    <field name="priority" string="Priority"/>
+                                </group>
+                                <group groups="base.group_no_one" string="Dates">
+                                    <field name="create_date"/>
+                                    <field name="date_closed"/>
+                                    <field name="duration"/>
+                                </group>
+                                <group string="References">
+                                    <field name="ref"/>
+                                    <field name="ref2"/>
+                                </group>
                             </group>
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_form_sheet_width">
+                <footer>
                     <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 6cdf7410348..afdcf56d50e 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -37,17 +37,19 @@
             <field name="model">crm.fundraising.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Cases">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="section_id" select="1"/>
-                    <field name="nbr" select="1"/>
-                    <field name="delay_close"/>
-                    <field name="amount_revenue"/>
-                    <field name="amount_revenue_prob"/>
-                    <field name="probability"/>
-                    <field name="state" select="1"/>
+                <form string="Cases" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="month"/>
+                        <field name="user_id"/>
+                        <field name="section_id"/>
+                        <field name="nbr"/>
+                        <field name="delay_close"/>
+                        <field name="amount_revenue"/>
+                        <field name="amount_revenue_prob"/>
+                        <field name="probability"/>
+                        <field name="state"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index d6b21ab9191..0997cbfc87b 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -28,7 +28,7 @@
             <field name="model">crm.helpdesk</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form layout="manual" version="7.0">
                 <header>
                     <button name="case_open" string="Open" type="object"
                             states="draft,pending"/>
@@ -42,73 +42,64 @@
                             states="open,draft,pending"/>
                     <button name="case_cancel" string="Cancel" type="object"
                             states="draft,open,pending"/>
-                    <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet string="Helpdesk Support" layout="auto">
-                    <group colspan="4" col="7" class="oe_form_header">
-                        <field name="name" select="1" string="Query"/>
+                    <group col="4" class="oe_form_header">
+                        <field name="name" string="Query"/>
                         <field name="section_id" widget="selection"/>
-                        <field name="user_id" select="1"/>
-                        <button name="remind_user"
-                            states="open,pending"
-                            string="Send Reminder" type="object"
-                            icon="gtk-go-forward" />
-                        <field name="date" select="1"/>
+                        <field name="user_id"/>
+                        <field name="date"/>
                         <field name="date_deadline"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="General">
-                            <group col="3" colspan="2">
-                                <separator colspan="4" string="Communication"/>
-                                <field name="partner_id" colspan="2"
-                                    on_change="onchange_partner_id(partner_id, email_from)"
-                                    select="1" />
-                                <newline/>
-                                <field name="email_from" colspan="2"/>
-                                <button name="remind_partner"
-                                    states="open,pending"
-                                    string="Send Reminder" type="object"
-                                    icon="gtk-go-forward" />
+                            <group>
+                                <group string="Communication">
+                                    <field name="partner_id"
+                                        on_change="onchange_partner_id(partner_id, email_from)"
+                                        />
+                                    <field name="email_from"/>
+                                    <button name="remind_partner"
+                                        states="open,pending"
+                                        string="Send Reminder" type="object"
+                                        icon="gtk-go-forward" />
+                                </group>
+                                <group string="Categorization">
+                                    <field name="priority"/>
+                                    <field name="categ_id" context="{'object_id':'crm.helpdesk'}"/>
+                                    <field name="channel_id"/>
+                                </group>
                             </group>
 
-                            <group col="2" colspan="2">
-                                <separator colspan="4" string="Categorization"/>
-                                <field name="priority"/>
-                                <field name="categ_id" context="{'object_id':'crm.helpdesk'}"/>
-                                <field name="channel_id"/>
-                            </group>
-
-                            <separator colspan="4" string="Notes"/>
-                            <field name="description" colspan="4" nolabel="1" />
+                            <separator string="Notes"/>
+                            <field name="description"/>
                         </page>
                         <page string="Extra Info">
-                            <group colspan="2" col="2" groups="base.group_no_one">
-                                <separator colspan="4" string="Dates"/>
-                                <field name="create_date"/>
-                                <field name="write_date"/>
-                                <field name="date_closed"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator colspan="4" string="Misc"/>
-                                <field name="id" select="1"/>
-                                <field name="active"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator colspan="4" string="Estimates"/>
-                                <field name="planned_cost"/>
-                            </group>
-                            <newline/>
-                            <group colspan="4" col="2">
-                                <separator colspan="4" string="References"/>
-                                <field colspan="4" name="ref"/>
-                                <field colspan="4" name="ref2"/>
+                            <group>
+                                <group groups="base.group_no_one" string="Dates">
+                                    <field name="create_date"/>
+                                    <field name="write_date"/>
+                                    <field name="date_closed"/>
+                                </group>
+                                <group string="Misc">
+                                    <field name="id"/>
+                                    <field name="active"/>
+                                </group>
+                                <group string="Estimates">
+                                    <field name="planned_cost"/>
+                                </group>
+                                <group string="References">
+                                    <field name="ref"/>
+                                    <field name="ref2"/>
+                                </group>
                             </group>
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_form_bottom">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
+                <footer>
+                    <field name="message_ids" widget="ThreadView"/>
+                </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index 4bd768179a3..4138cbf7f09 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -9,9 +9,11 @@
             <field name="model">res.partner.activation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Activation">
-                    <field name="name" />
-                    <field name="sequence" />
+                <form string="Activation" version="7.0">
+                    <group col="4">
+                        <field name="name" />
+                        <field name="sequence" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -54,9 +56,9 @@
         <field name="model">res.partner.grade</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Partner Grade">
-                <group col="6" colspan="4">
-                    <field name="name" select="1"/>
+            <form string="Partner Grade" version="7.0">
+                <group col="4">
+                    <field name="name"/>
                     <field name="sequence"/>
                     <field name="active"/>
                 </group>
diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
index 901e66b1a1d..6c70f30c036 100644
--- a/addons/crm_profiling/wizard/open_questionnaire_view.xml
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -7,7 +7,7 @@
             <field name="model">open.questionnaire</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Questionnaires">
+                <form string="Questionnaires" version="7.0">
                     <header>
                         <button name="build_form" string="Open Questionnaire" icon="terp-camera_test" type="object"/>
                         <button special="cancel" icon="gtk-cancel" string="Cancel"/>
@@ -33,7 +33,7 @@
             <field name="model">open.questionnaire</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                     <separator colspan="4" string="Questionnaire"/>
                     <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
                     <separator string="" colspan="4" />
@@ -63,7 +63,7 @@
             <field name="model">open.questionnaire.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Questionnaire">
+                <form string="Questionnaire" version="7.0">
                     <field name="question_id"/>
                     <field name="answer_id" domain="[('question_id', '=', question_id)]"/>
                 </form>
diff --git a/addons/decimal_precision/decimal_precision_view.xml b/addons/decimal_precision/decimal_precision_view.xml
index 661bf643239..5dec74cd8f4 100644
--- a/addons/decimal_precision/decimal_precision_view.xml
+++ b/addons/decimal_precision/decimal_precision_view.xml
@@ -6,7 +6,7 @@
             <field name="name">Decimal Precision</field>
             <field name="model">decimal.precision</field>
             <field name="arch" type="xml">
-                <form string="Decimal Precision">
+                <form string="Decimal Precision" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="digits"/>
@@ -20,7 +20,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Decimal Precision">
-                    <field name="name" select="1"/>
+                    <field name="name"/>
                     <field name="digits"/>
                 </tree>
             </field>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 421b821002c..8c953ba101b 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -20,7 +20,7 @@
             <field name="model">delivery.carrier</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Carrier">
+                <form string="Carrier" version="7.0">
                     <group col="4" name="general">
                         <field name="name"/>
                         <field name="partner_id"/>
@@ -41,7 +41,7 @@
                               <field name="sequence"/>
                               <field name="name"/>
                          </tree>
-                        <form string="Delivery grids">
+                        <form string="Delivery grids" version="7.0">
                              <group col="4">
                                  <field name="name"/>
                                  <field name="active"/>
@@ -99,7 +99,7 @@
             <field name="model">delivery.grid</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Delivery grids">
+                <form string="Delivery grids" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="active"/>
@@ -139,8 +139,8 @@
             <field name="model">delivery.grid.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Grid Lines">
-                    <field colspan="4" name="name" select="1"/>
+                <form string="Grid Lines" version="7.0">
+                    <field colspan="4" name="name"/>
                     <div>
                         <label string="condition" for="type"/>
                         <field name="type" class="oe_form_inline"/>
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index acfcf4cb63a..287a6c296e8 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -6,7 +6,7 @@
              <field name="model">board.board</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Document board" layout="manual">
+                <form string="Document board" layout="manual" version="7.0">
                      <board style="2-1" >
                         <column>
                             <action string="New Files"
@@ -54,7 +54,7 @@
              <field name="model">board.board</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Document board" layout="manual">
+                <form string="Document board" layout="manual" version="7.0">
                      <board style="2-1">
                         <column>
                             <action string="Wall of Shame"
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index 90182b70e0d..5a3c2105adc 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -6,14 +6,14 @@
             <field name="model">document.ftp.browse</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Browse Document">
-                    <separator string="Browse Document" colspan="4"/>
-                    <field name="url" widget="url" colspan="4" width="250"/>
-                    <separator colspan="4"/>
-                    <group col="4" colspan="4">
-                        <label string="" colspan="2"/>
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                <form string="Browse Document" version="7.0">
+                    <header>
                         <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok"/>
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                    <header>
+                    <separator string="Browse Document"/>
+                    <group>
+                        <field name="url" widget="url"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index d1d633b1052..881db073ae9 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">
+            <form string="Properties" version="7.0">
                 <group col="4">
                     <field name="namespace"/>
                     <field name="name"/>
@@ -86,7 +86,7 @@
                     <field name="namespace"/>
                     <field name="name"/>
                 </tree>
-                <form string="Properties">
+                <form string="Properties" version="7.0">
                     <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">
+            <form string="Properties" version="7.0">
                 <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 feb4d54a1ed..1403721af53 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -7,7 +7,7 @@
             <field name="model">email.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Templates">
+                <form string="Templates" version="7.0">
                     <group col="4">
                         <field name="name" required="1"/>
                         <field name="model_id" required="1" on_change="onchange_model_id(model_id)"/>
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 72b46a74116..4f6e3a37b08 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -39,7 +39,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Association Dashboard" layout="manual">
+                <form string="Association Dashboard" layout="manual" version="7.0">
                     <board style="2-1">
                         <column>
                             <action string="Next Events"
diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml
index 2fe8682540a..7218fdcf803 100644
--- a/addons/event/wizard/event_confirm_view.xml
+++ b/addons/event/wizard/event_confirm_view.xml
@@ -7,13 +7,12 @@
             <field name="model">event.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Event Confirmation">
-              		<label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button  icon="gtk-close" special="cancel" string="Close"/>
-                        <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object"/>
-                    </group>
+              <form string="Event Confirmation" version="7.0">
+                  <header>
+                      <button icon="gtk-ok" name="confirm" string="Confirm Anyway" type="object"/>
+                      <button  icon="gtk-close" special="cancel" string="Close"/>
+                  <header>
+                  <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
             </form>
             </field>
         </record>
@@ -30,4 +29,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/event_project/wizard/event_project_retro_view.xml b/addons/event_project/wizard/event_project_retro_view.xml
index 198c8ee405d..f4c8e40e9b2 100644
--- a/addons/event_project/wizard/event_project_retro_view.xml
+++ b/addons/event_project/wizard/event_project_retro_view.xml
@@ -7,15 +7,16 @@
             <field name="model">event.project</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-               <form string="Retro-Planning">
-                    <field name="project_id" colspan="4"/>
-                    <field name="date_start"/>
-                    <field name="date"/>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button  icon="gtk-close" special="cancel" string="Close"/>
-                        <button icon="gtk-ok" name="create_duplicate" string="Ok" type="object"/>
-                    </group>
+               <form string="Retro-Planning" version="7.0">
+                   <header>
+                       <button icon="gtk-ok" name="create_duplicate" string="Ok" type="object"/>
+                       <button  icon="gtk-close" special="cancel" string="Close"/>
+                   <header>
+                   <group col="4">
+                       <field name="project_id" colspan="4"/>
+                       <field name="date_start"/>
+                       <field name="date"/>
+                   </group>
               </form>
             </field>
         </record>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 2f92891ab86..d19fb4c4ca1 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -24,36 +24,38 @@
             <field name="model">fetchmail.server</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Incoming Mail Server">
+                <form string="Incoming Mail Server" version="7.0">
                     <header attrs="{'invisible' : [('type', '=', 'local')]}">
                         <button string="Test &amp; Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
                         <button string="Fetch Now" type="object" name="fetch_mail" states="done" icon="gtk-network"/>
                         <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
                         <field name="state" widget="statusbar"/>
                     </header>
-                    <group>
+                    <group col="4">
                         <field name="name"/>
                         <field name="type" on_change="onchange_server_type(type, is_ssl, object_id)"/>
                         <field name="date"/>
                     </group>
                     <notebook>
                         <page string="Server &amp; Login">
-                            <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Server Information">
-                                <field name="server" colspan="2" attrs="{'required' : [('type', '!=', 'local')]}" />
-                                <field name="port" required="1" attrs="{'required' : [('type', '!=', 'local')]}" />
-                                <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
-                            </group>
-                            <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Login Information">
-                                <field name="user" attrs="{'required' : [('type', '!=', 'local')]}"/>
-                                <field name="password" password="True" attrs="{'required' : [('type', '!=', 'local')]}"/>
-                            </group>
-                            <group string="Actions to Perform on Incoming Mails">
-                                <field name="object_id" on_change="onchange_server_type(type, is_ssl, object_id)"/>
-                                <field name="action_id"/>
-                            </group>
-                            <group attrs="{'invisible' : [('type', '!=', 'local')]}" string="Configuration">
-                                <field name="configuration" colspan="4"/>
-                                <field name="script" colspan="4" widget="url"/>
+                            <group>
+                                <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Server Information">
+                                    <field name="server" colspan="2" attrs="{'required' : [('type', '!=', 'local')]}" />
+                                    <field name="port" required="1" attrs="{'required' : [('type', '!=', 'local')]}" />
+                                    <field name="is_ssl" on_change="onchange_server_type(type, is_ssl)"/>
+                                </group>
+                                <group attrs="{'invisible' : [('type', '=', 'local')]}" string="Login Information">
+                                    <field name="user" attrs="{'required' : [('type', '!=', 'local')]}"/>
+                                    <field name="password" password="True" attrs="{'required' : [('type', '!=', 'local')]}"/>
+                                </group>
+                                <group string="Actions to Perform on Incoming Mails">
+                                    <field name="object_id" on_change="onchange_server_type(type, is_ssl, object_id)"/>
+                                    <field name="action_id"/>
+                                </group>
+                                <group attrs="{'invisible' : [('type', '!=', 'local')]}" string="Configuration">
+                                    <field name="configuration" colspan="4"/>
+                                    <field name="script" colspan="4" widget="url"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Advanced" groups="base.group_no_one">
@@ -110,7 +112,7 @@
           <field name="inherit_id" ref="mail.view_email_message_tree"/>
           <field name="arch" type="xml">
               <field name="user_id" position="after">
-                  <field name="fetchmail_server_id" select="1"/>
+                  <field name="fetchmail_server_id"/>
               </field>
           </field>
       </record>
diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml
index d6c1ad70b40..0e19a14d221 100644
--- a/addons/google_base_account/wizard/google_login_view.xml
+++ b/addons/google_base_account/wizard/google_login_view.xml
@@ -6,7 +6,7 @@
             <field name="model">google.login</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Google login" >
+                <form string="Google login"  version="7.0">
                     <header>
                         <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                         <button name="login" string="_Login" type="object" icon="terp-check"/>
diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
index e665c5067eb..22687d27c69 100644
--- a/addons/hr/hr_board.xml
+++ b/addons/hr/hr_board.xml
@@ -7,7 +7,7 @@
         <field name="model">board.board</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="My Board" layout="manual">
+            <form string="My Board" layout="manual" version="7.0">
                 <board style="2-1">
                     <column/>
                     <column/>
@@ -34,7 +34,7 @@
         <field name="model">board.board</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="HR Manager Board" layout="manual">
+            <form string="HR Manager Board" layout="manual" version="7.0">
                 <board style="2-1">
                     <column/>
                     <column/>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 4e2746e2c27..d6fd393edf8 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -12,7 +12,7 @@
             <field name="model">hr.department</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="department">
+                <form string="department" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="parent_id"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index dea72fc3db2..bed32142a39 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -22,7 +22,7 @@
             <field name="model">hr.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employee">
+                <form string="Employee" version="7.0">
                     <sheet>
                     <div class="oe_right oe_form_button_box">
                         <!-- Put here related buttons -->
@@ -112,7 +112,7 @@
                     <field name="department_id" widget="selection">
                     </field>
                     <field name="job_id" widget="selection"/>
-                    <field name="category_ids" select="1"/>
+                    <field name="category_ids"/>
                     <field name="parent_id"/>
                     <newline />
                     <group expand="0" string="Group By...">
@@ -274,7 +274,7 @@
             <field name="model">hr.employee.category</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employee Category">
+                <form string="Employee Category" version="7.0">
                     <group>
                         <field name="name" />
                         <field name="parent_id" />
@@ -349,7 +349,7 @@
             <field name="model">hr.job</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Job">
+                <form string="Job" version="7.0">
                     <header>
                         <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
                         <button name="job_open" string="In Position" states="old,recruit" type="object"/>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 4cb42f55585..e3cfd96d26f 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -14,7 +14,7 @@
             <field name="model">hr.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Human Resources">
+                <form string="Configure Human Resources" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index b4cde27484d..c2c964565ad 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -7,7 +7,7 @@
             <field name="model">hr.attendance</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employee attendances">
+                <form string="Employee attendances" version="7.0">
                     <group>
                         <field name="employee_id"/>
                         <field name="name"/>
@@ -90,7 +90,7 @@
             <field name="model">hr.action.reason</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Define attendance reason">
+                <form string="Define attendance reason" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="action_type"/>
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 660cdbc81cd..a5015fe4fe5 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -7,13 +7,15 @@
             <field name="model">hr.attendance.month</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Print Attendance Report Monthly">
-                <field name="month"/>
-                <field name="year"/>
-                <newline/>
-                <separator colspan="4"/>
-                <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                <button name="print_report" string="Print" type="object"  icon="gtk-print"/>
+            <form string="Print Attendance Report Monthly" version="7.0">
+                <header>
+                    <button name="print_report" string="Print" type="object"  icon="gtk-print"/>
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                </header>
+                <group col="4">
+                    <field name="month"/>
+                    <field name="year"/>
+                </group>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 8f943d7d1da..a9557fa2962 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -7,16 +7,17 @@
             <field name="model">hr.attendance.error</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Print Attendance Report Error">
-                <separator string="Analysis Information" colspan="4"/>
-                <field name="init_date"/>
-                <field name="end_date"/>
-                <field name="max_delay"/>
+            <form string="Print Attendance Report Error" version="7.0">
+                <header>
+                    <button name="print_report" string="Print" type="object" icon="gtk-print" colspan="2"/>
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel' colspan="2"/>
+                </header>
+                <group string="Analysis Information" col="4">
+                    <field name="init_date"/>
+                    <field name="end_date"/>
+                    <field name="max_delay"/>
+                </group>
                 <label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
-                <newline/>
-                <separator colspan="4"/>
-                <button special="cancel"  string="Cancel" icon='gtk-cancel' colspan="2"/>
-                <button name="print_report" string="Print" type="object" icon="gtk-print" colspan="2"/>
             </form>
             </field>
         </record>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index a215e04a3bf..710c33f12b9 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -25,7 +25,7 @@
             <field name="model">hr_evaluation.plan</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Appraisal Plan">
+                <form string="Appraisal Plan" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -71,7 +71,7 @@
             <field name="model">hr_evaluation.plan.phase</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Appraisal Plan Phases">
+                <form string="Appraisal Plan Phases" version="7.0">
                  <notebook>
                    <page string="General">
                     <group>
@@ -146,7 +146,7 @@
             <field name="model">hr_evaluation.evaluation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Appraisal">
+                <form string="Appraisal" version="7.0">
                 <header>
                     <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object"/>
                     <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object"/>
@@ -170,7 +170,7 @@
                     <notebook>
                         <page string="Appraisal" attrs="{'invisible':[('state','=','draft')]}">
                             <field name="survey_request_ids">
-                                <form string="Interview Appraisal">
+                                <form string="Interview Appraisal" version="7.0">
                                     <group col="4">
                                         <field name="survey_id"/>
                                         <div colspan="2">
@@ -273,7 +273,7 @@
             <field name="model">hr.evaluation.interview</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Interview Appraisal">
+                <form string="Interview Appraisal" version="7.0">
                     <header>
                         <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" />
                         <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index 1bae791dca1..c10389f2126 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -2,24 +2,22 @@
 <openerp>
     <data>
 
-	<record id="view_hr_evaluation_send_mail" model="ir.ui.view">
+    <record id="view_hr_evaluation_send_mail" model="ir.ui.view">
         <field name="name">hr.evaluation.send.mail</field>
         <field name="model">hr.evaluation.reminder</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-			<form string="Evaluation Reminders">
-				<group width="340">
-				<separator string="Send Evaluation Reminder" colspan="4"/>
-				<field name="evaluation_id"/>
-				<separator colspan="4"/>
-					<group colspan="4">
-						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
-					</group>
-				</group>
-         	</form>
+            <form string="Evaluation Reminders" version="7.0">
+                <header>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
+                <header>
+                <group string="Send Evaluation Reminder"/>
+                    <field name="evaluation_id"/>
+                </group>
+             </form>
         </field>
-	</record>
+    </record>
 
     <record id="action_hr_evaluation_send_mail" model="ir.actions.act_window">
         <field name="name">Evaluation Send Mail</field>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index b8e699e278f..e57f20734eb 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -63,7 +63,7 @@
             <field name="type">form</field>
             <field name="model">hr.expense.expense</field>
             <field name="arch" type="xml">
-                <form string="Expenses Sheet">
+                <form string="Expenses Sheet" version="7.0">
                 <header>
                     <button name="confirm" states="draft" string="Submit to Manager" type="workflow"/>
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
@@ -85,7 +85,7 @@
                     <notebook>
                         <page string="Description">
                             <field name="line_ids" context="{'currency_id': currency_id}">
-                                <form string="Expense Lines">
+                                <form string="Expense Lines" version="7.0">
                                     <group col="6" colspan="4">
                                         <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
                                         <field name="name" colspan="4"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index f0f809922a7..5576025b7dd 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -63,7 +63,7 @@
             <field name="type">form</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
-                <form layout="manual">
+                <form layout="manual" version="7.0">
                 <header>
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
@@ -112,7 +112,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Allocation Request">
+                <form string="Allocation Request" version="7.0">
                 <header>
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
@@ -178,7 +178,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Leaves Management">
+                <form string="Leaves Management" version="7.0">
                     <header>
                         <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                         <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
@@ -369,7 +369,7 @@
             <field name="model">hr.holidays.status</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Leave Type">
+                <form string="Leave Type" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="color_name"/>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index ba8b180ff9a..12cb3ceeb0d 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -2,24 +2,22 @@
 <openerp>
     <data>
 
-		<record id="view_hr_holidays_summary_dept" model="ir.ui.view">
+        <record id="view_hr_holidays_summary_dept" model="ir.ui.view">
             <field name="name">hr.holidays.summary.dept.form</field>
             <field name="model">hr.holidays.summary.dept</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Holidays by Department">
-			    <group col="4" colspan="6">
-				    <field name="date_from" />
-				    <newline/>
-				    <field name="holiday_type" colspan="4"/>
-				    <newline/>
-				    <field name="depts" colspan="4"/>
-					<separator colspan="4"/>
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-					<button colspan="1" icon="gtk-print" name="print_report" string="Print" type="object"/>
-				</group>
-			</form>
+            <form string="Holidays by Department" version="7.0">
+                <header>
+                    <button icon="gtk-print" name="print_report" string="Print" type="object"/>
+                    <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                </header>
+                <group>
+                    <field name="date_from" />
+                    <field name="holiday_type"/>
+                    <field name="depts"/>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -32,14 +30,14 @@
             <field name="target">new</field>
         </record>
 
-		<menuitem id="menu_hr_leaves_reports" parent="base.menu_hr_reports" sequence="10" name="Leaves"/>
-		
-		<menuitem
-	        name="Leaves by Department"
-	        parent="menu_hr_leaves_reports"
-	        action="action_hr_holidays_summary_dept"
-	        id="menu_account_central_journal"
-	        icon="STOCK_PRINT"/>
+        <menuitem id="menu_hr_leaves_reports" parent="base.menu_hr_reports" sequence="10" name="Leaves"/>
+        
+        <menuitem
+            name="Leaves by Department"
+            parent="menu_hr_leaves_reports"
+            action="action_hr_holidays_summary_dept"
+            id="menu_account_central_journal"
+            icon="STOCK_PRINT"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index 530d2a60351..d8a46ff4af4 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -2,25 +2,25 @@
 <openerp>
     <data>
 
-		<record id="view_hr_holidays_summary_employee" model="ir.ui.view">
+        <record id="view_hr_holidays_summary_employee" model="ir.ui.view">
             <field name="name">hr.holidays.summary.employee.form</field>
             <field name="model">hr.holidays.summary.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Employee's Holidays">
-			    <group col="4" colspan="6">
-				    <field name="date_from"/>
-				    <newline/>
-				    <field name="holiday_type"/>
-				    <newline/>
-				    <field name="emp" invisible="True"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-				</group>
-			</form>
+            <form string="Employee's Holidays">
+                <group col="4" colspan="6">
+                    <field name="date_from"/>
+                    <newline/>
+                    <field name="holiday_type"/>
+                    <newline/>
+                    <field name="emp" invisible="True"/>
+                </group>
+                <separator colspan="4"/>
+                <group col="2" colspan="4">
+                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -33,7 +33,7 @@
             <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="hr_holidays_summary_employee_value">
+        <record model="ir.values" id="hr_holidays_summary_employee_value">
             <field name="model_id" ref="hr.model_hr_employee" />
             <field name="name">Employee's Holidays</field>
             <field name="key2">client_print_multi</field>
@@ -42,5 +42,5 @@
             <field name="model">hr.employee</field>
         </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 4d3a90aa554..75a74c88139 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -70,7 +70,7 @@
         <field name="model">hr.applicant</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Jobs - Recruitment Form">
+            <form string="Jobs - Recruitment Form" version="7.0">
             <header>
                 <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" type="action"
                         states="open,pending"/>
@@ -378,7 +378,7 @@
         <field name="model">hr.recruitment.stage</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Stage">
+            <form string="Stage" version="7.0">
                 <group col="4" string="Stage Definition">
                     <field name="name"/>
                     <field name="department_id"/>
@@ -429,7 +429,7 @@
         <field name="model">hr.recruitment.degree</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Degree">
+            <form string="Degree" version="7.0">
                 <group>
                     <field name="name"/>
                     <field name="sequence"/>
@@ -471,7 +471,7 @@
         <field name="model">hr.recruitment.source</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Sources of Applicants">
+            <form string="Sources of Applicants" version="7.0">
                 <group>
                     <field name="name"/>
                 </group>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index c6920406576..c18ac4de667 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -57,7 +57,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id" position="replace">
-                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)" select="1"/>
+                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
                 </field>
             </field>
         </record>
@@ -160,7 +160,7 @@
             <field name="model">hr_timesheet_invoice.factor</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Type of invoicing">
+                <form string="Type of invoicing" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="customer_name"/>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index 8aa2b07f927..80a0a3d3e09 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -7,27 +7,24 @@
             <field name="model">hr.timesheet.invoice.create</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Create Invoice">
-                <notebook colspan="4">
+            <form string="Create Invoice" version="7.0">
+                <header>
+                    <button name="do_create" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                <header>
+                <notebook>
                     <page string="Billing Data">
-                       <group col="4" colspan="4">
-                           <separator string="Do you want to show details of work in invoice?" colspan="4"/>
-                                <field name="date"/>
-                                <field name="time"/>
-                                <field name="name"/>
-                                <field name="price"/>
-                           </group>
-                        <group col="2" colspan="4">
-                            <separator string="Force to use a specific product" colspan="4"/>
-                            <field name="product"/>
-                        </group>
+                       <group string="Do you want to show details of work in invoice?">
+                           <field name="date"/>
+                           <field name="time"/>
+                           <field name="name"/>
+                           <field name="price"/>
+                       </group>
+                       <group  string="Force to use a specific product">
+                           <field name="product"/>
+                       </group>
                     </page>
                 </notebook>
-                <separator colspan="4"/>
-                <group col="2" colspan="4">
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                    <button name="do_create" string="Create Invoices" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
-                </group>
             </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index a4f11225a7e..cb658f46704 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -19,7 +19,7 @@
             <field name="model">hr_timesheet_sheet.sheet.account</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Timesheet by Accounts">
+                <form string="Timesheet by Accounts" version="7.0">
                     <group col="4">
                         <field name="sheet_id"/>
                         <field name="name" groups="analytic.group_analytic_accounting"/>
@@ -62,7 +62,7 @@
             <field name="model">hr_timesheet_sheet.sheet</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Timesheet">
+                <form string="Timesheet" version="7.0">
                 <header>
                     <button name="button_confirm" states="draft" string="Submited to Manager" type="object"/>
                     <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
@@ -81,7 +81,7 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="department_id"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                         <field name="user_id" invisible="1"/>
                     </group>
                     <notebook>
@@ -122,7 +122,7 @@
                                     <field invisible="1" name="general_account_id"/>
                                     <field invisible="1" name="user_id" required="1"/>
                                 </tree>
-                                <form string="Timesheet Lines">
+                                <form string="Timesheet Lines" version="7.0">
                                     <field name="date"/>
                                     <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
                                     <field name="name"/>
@@ -239,7 +239,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="arch" type="xml">
                 <field name="date" position="after">
-                    <field name="sheet_id" select="1"/>
+                    <field name="sheet_id"/>
                 </field>
             </field>
         </record>
@@ -255,7 +255,7 @@
             <field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
             <field name="arch" type="xml">
                 <field name="action" position="after">
-                    <field name="sheet_id" select="1" />
+                    <field name="sheet_id" />
                 </field>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index 8c32cf924e7..90ffc938116 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -6,12 +6,12 @@
         <field name="model">hr.timesheet.current.open</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="My Timesheet">
-               <separator string="It will open your current timesheet" colspan="4" />
-               <group colspan="4" col="6">
+            <form string="My Timesheet" version="7.0">
+               <header>
                     <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
                     <button  icon="terp-camera_test" name="open_timesheet" string="Open" type="object"/>
-               </group>
+               </header>
+               <separator string="It will open your current timesheet"/>
            </form>
         </field>
     </record>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 3d2df613276..416056cfe7f 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -19,7 +19,7 @@
             <field name="model">idea.category</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Category of Ideas">
+                <form string="Category of Ideas" version="7.0">
                     <group>
                         <field name="name"/>
                     </group>
@@ -65,7 +65,7 @@
         <field name="model">idea.idea</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Idea">
+            <form string="Idea" version="7.0">
                 <header>
                     <button name="idea_open" string="Open" states="draft"/>
                     <button name="idea_close" string="Accept" states="open"/>
diff --git a/addons/import_google/wizard/google_import_message_view.xml b/addons/import_google/wizard/google_import_message_view.xml
index 9124fe2b1c1..215de9ba59c 100644
--- a/addons/import_google/wizard/google_import_message_view.xml
+++ b/addons/import_google/wizard/google_import_message_view.xml
@@ -7,7 +7,7 @@
             <field name="model">google.import.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import Google Data">
+                <form string="Import Google Data" version="7.0">
                     <header>
                         <button  icon="gtk-ok" special="cancel" string="_Ok"/>
                     </header>
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index 1b5ac984223..c851fa0e559 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -7,7 +7,7 @@
             <field name="model">partner.vat.intra</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Partner VAT intra">
+                <form string="Partner VAT intra" version="7.0">
                     <header>
                         <button name="create_xml" string="Create _XML" type="object" icon="gtk-execute"/>
                         <button name="preview" string="_Preview" type="object" icon="gtk-print"/>
@@ -39,7 +39,7 @@
             <field name="model">partner.vat.intra</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Save XML">
+                <form string="Save XML" version="7.0">
                     <header>
                         <button special="cancel" string="Close" icon="gtk-cancel" colspan="4"/>
                     </header>
diff --git a/addons/l10n_br/l10n_br_view.xml b/addons/l10n_br/l10n_br_view.xml
index 0a2955b81a3..65fcd0c401b 100644
--- a/addons/l10n_br/l10n_br_view.xml
+++ b/addons/l10n_br/l10n_br_view.xml
@@ -7,7 +7,7 @@
             <field name="model">l10n_br_account.cst.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Tax Situation Code Template">
+                <form string="Tax Situation Code Template" version="7.0">
                     <group col="4">
                         <field name="code"/>
                         <field name="name"/>
@@ -23,9 +23,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Tax Situation Code Template">
-                    <field name="code" select="1"/>
-                    <field name="name" select="1"/>
-                    <field name="tax_code_template_id" select="2"/>
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="tax_code_template_id"/>
                 </tree>
             </field>
         </record>
@@ -44,7 +44,7 @@
             <field name="model">l10n_br_account.cst</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Tax Situation Code">
+                <form string="Tax Situation Code" version="7.0">
                     <group col="4">
                         <field name="code"/>
                         <field name="name"/>
@@ -60,9 +60,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Tax Situation Code">
-                    <field name="code" select="1"/>
-                    <field name="name" select="1"/>
-                    <field name="tax_code_id" select="2"/>
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="tax_code_id"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index ec7ba5f29f7..81c92f25484 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -7,7 +7,7 @@
             <field name="model">bvr.import.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="BVR Import">
+                <form string="BVR Import" version="7.0">
                     <header>
                         button name="import_bvr" string="Import" type="object" icon="gtk-ok"  colspan="2"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
diff --git a/addons/l10n_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml
index 9f9812f2499..005b491cc8f 100644
--- a/addons/l10n_ch/wizard/create_dta_view.xml
+++ b/addons/l10n_ch/wizard/create_dta_view.xml
@@ -7,7 +7,7 @@
             <field name="model">create.dta.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="DTA file creation - Results">
+                <form string="DTA file creation - Results" version="7.0">
                     <header>
                         <button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"  colspan="2"/>
diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index c78e3195088..80b10cc4523 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -8,7 +8,7 @@
             <field name="model">account.bilan.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Bilan Report">
+                <form string="Bilan Report" version="7.0">
                    <header>
                         <button name="print_bilan_report" string="Print" type="object" icon="gtk-ok"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index fa52eb6a663..58ad0d8333e 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.cdr.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string='Compte de resultat'>
+                <form string='Compte de resultat' version="7.0">
                     <header>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                         <button name="print_cdr_report" string="Print" type="object" icon="gtk-ok"/>
diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index c45929da727..47e9a4ca3f7 100644
--- a/addons/l10n_lu/wizard/print_vat_view.xml
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -6,7 +6,7 @@
             <field name="model">vat.declaration.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Print Tax Statements">
+                <form string="Print Tax Statements" version="7.0">
                    <header>
                         <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" icon="gtk-ok"/>
                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 42eb90311ea..47de833a66b 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -23,7 +23,7 @@
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" attrs="{'invisible':[('state','=','confirmed')]}"/>
                     <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action"/>
@@ -105,7 +105,7 @@
             <field name="name">Cashboxes</field>
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
-                <form string="Cashboxes">
+                <form string="Cashboxes" version="7.0">
                     <field name="name"/>
                     <field name="manager"/>
                 </form>
@@ -145,7 +145,7 @@
             <field name="name">CashMove</field>
             <field name="model">lunch.cashmove</field>
             <field name="arch" type="xml">
-                <form string="CashMove">
+                <form string="CashMove" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="user_cashmove"/>
@@ -219,7 +219,7 @@
             <field name="name"> Category of product </field>
             <field name="model">lunch.category</field>
             <field name="arch" type="xml">
-                <form string="Category">
+                <form string="Category" version="7.0">
                     <separator string="Category Related to Products" colspan="4"/>
                     <field name="name"/>
                 </form>
@@ -253,7 +253,7 @@
             <field name="type">form</field>
             <field name="model">lunch.product</field>
             <field name="arch" type="xml">
-                <form string="Products">
+                <form string="Products" version="7.0">
                      <group col="6">
                           <field name="name"/>
                           <field name="category_id"/>
@@ -349,7 +349,7 @@
             <field name="model">report.lunch.amount</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Box Amount by User">
+                <form string="Box Amount by User" version="7.0">
                     <group col="4">
                         <field name="user_id"/>
                         <field name="box"/>
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index 97219507eed..c7bf795aafc 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -9,7 +9,7 @@
             <field name="model">lunch.cashbox.clean</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reset cashbox">
+                <form string="Reset cashbox" version="7.0">
                     <header>
                         <button  icon="gtk-ok" name="set_to_zero" string="Set to Zero" type="object"/>
                         <button  icon="gtk-cancel" special="cancel" string="No"/>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index 69d3c4cc46d..1bc98f089cb 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -9,7 +9,7 @@
             <field name="model">lunch.order.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Cancel Order">
+                <form string="Cancel Order" version="7.0">
                     <header>
                         <button  icon="gtk-ok" name="cancel" string="Yes" type="object"/>
                         <button  icon="gtk-cancel" special="cancel" string="No"/>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index c15023ee124..9cf41d4d333 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -9,7 +9,7 @@
             <field name="model">lunch.order.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Confirm">
+                <form string="Confirm" version="7.0">
                     <header>
                         <button  icon="gtk-ok" name="confirm" string="Confirm Order" type="object"/>
                         <button  icon="gtk-cancel" special="cancel" string="Cancel"/>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 7dc12d52e8f..bac65dc2682 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -25,7 +25,7 @@
             <field name="type">form</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <form string="Message">
+                <form string="Message" version="7.0">
                     <group>
                         <group>
                             <field name="subject"/>
@@ -78,7 +78,7 @@
             <field name="model">mail.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Email message">
+                <form string="Email message" version="7.0">
                     <label for="subject" class="oe_form_readonly_hidden"/>
                     <h1><field name="subject"/></h1>
                     <label for="user_id"/>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index 6c9ec73d1de..c51818f13f5 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -6,7 +6,7 @@
             <field name="model">marketing.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Marketing">
+                <form string="Configure Marketing" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 8cb3dabe3ef..0a88c718f8a 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -15,7 +15,7 @@
         <field name="model">marketing.campaign</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form>
+            <form version="7.0">
             <header>
                 <button name="state_running_set" string="Run" states="draft"/>
                 <button name="state_done_set" string="Done" states="running"/>
@@ -133,7 +133,7 @@
         <field name="model">marketing.campaign.segment</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form layout="manual" version="7.0">
             <header>
                 <button name="state_running_set" string="Run" states="draft"/>
                 <button name="state_done_set" string="Close" states="running"/>
@@ -240,7 +240,7 @@
         <field name="model">marketing.campaign.activity</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Activities">
+            <form string="Activities" version="7.0">
                 <group>
                     <group string="Activity">
                         <field name="name"/>
@@ -275,7 +275,7 @@
                         <field name="interval_nbr"/>
                         <field name="interval_type"/>
                     </tree>
-                    <form string="Incoming Transitions">
+                    <form string="Incoming Transitions" version="7.0">
                         <group col="4">
                             <field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
                             <field name='trigger'/>
@@ -291,7 +291,7 @@
                         <field name="interval_nbr"/>
                         <field name="interval_type"/>
                     </tree>
-                    <form string="Outgoing Transitions">
+                    <form string="Outgoing Transitions" version="7.0">
                         <group col="4">
                             <field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
                             <field name='trigger'/>
@@ -352,7 +352,7 @@
         <field name="model">marketing.campaign.workitem</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Marketing Campaign Activities">
+            <form string="Marketing Campaign Activities" version="7.0">
             <header>
                 <button string="Process" states="todo" name="process" type="object"/>
                 <button string="Reset" states="exception,cancelled" name="button_draft" type="object"/>
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index dedecf1e9dc..520bab0a067 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -7,14 +7,14 @@
             <field name="model">membership.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Membership Invoice">
-                	<group colspan="4" >
-                     	<field name="product_id" colspan="4" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
-                        <field name="member_price" colspan="4" />
-                    </group>
-                    <group colspan="4" col="6">
+                <form string="Membership Invoice" version="7.0">
+                    <header>
+                        <button  icon="gtk-apply" string="Join" name="membership_invoice" type="object"/>
                         <button  icon="gtk-close" special="cancel" string="Close"/>
-           	            <button  icon="gtk-apply" string="Join" name="membership_invoice" type="object"/>
+                    <header>
+                    <group>
+                        <field name="product_id" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
+                        <field name="member_price"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 6d27eec1e66..236b6660405 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -141,7 +141,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Work Center">
-                    <group col="6" colspan="4">
+                    <group col="4">
                         <field name="name" select="1"/>
                         <field name="code" select="1"/>
                         <field name="active"/>
@@ -149,7 +149,7 @@
                         <field name="calendar_id" widget="selection"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="General Information">
                             <group col="2" colspan="2">
                             <separator colspan="2" string="Capacity Information"/>