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

bzr revid: fp@tinyerp.com-20120609141314-m26hf1pfyk0hd8oz
---
 .../wizard/account_followup_print_view.xml    |  91 ++++++-----
 .../account_invoice_layout_view.xml           |  12 +-
 .../account_invoice_special_message.xml       |  13 +-
 .../account_payment/account_payment_view.xml  |  18 +--
 .../account_payment_create_order_view.xml     |  36 ++---
 .../wizard/account_payment_pay_view.xml       |  39 +++--
 ...ccount_payment_populate_statement_view.xml |  13 +-
 .../account_sequence_installer_view.xml       | 102 ++++++-------
 .../account_voucher/account_voucher_view.xml  |   8 +-
 .../voucher_payment_receipt_view.xml          |  24 +--
 .../voucher_sales_purchase_view.xml           |  14 +-
 .../account_voucher_unreconcile_view.xml      |  13 +-
 addons/anonymization/anonymization_view.xml   |  14 +-
 addons/audittrail/audittrail_view.xml         |  12 +-
 .../wizard/audittrail_view_log_view.xml       |  26 ++--
 .../base_action_rule_view.xml                 |   2 +-
 addons/base_calendar/base_calendar_view.xml   |  32 ++--
 .../base_calendar_invite_attendee_view.xml    |  48 +++---
 .../base_report_designer_installer.xml        | 124 +++++++--------
 .../wizard/base_report_design_view.xml        |  18 +--
 addons/base_setup/base_setup_views.xml        |   4 +-
 addons/base_setup/res_config_view.xml         |   2 +-
 .../board/wizard/board_menu_create_view.xml   |  26 ++--
 addons/caldav/caldav_view.xml                 |   8 +-
 addons/crm/board_crm_view.xml                 |   4 +-
 addons/crm/crm_lead_view.xml                  |  10 +-
 addons/crm/crm_meeting_view.xml               |   4 +-
 addons/crm/crm_phonecall_view.xml             |  37 +++--
 addons/crm/crm_view.xml                       | 144 +++++++++---------
 .../wizard/crm_phonecall_to_partner_view.xml  |  86 +++++------
 .../crm_phonecall_to_phonecall_view.xml       |  15 +-
 31 files changed, 492 insertions(+), 507 deletions(-)

diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index a58c77a719c..c3082bd42aa 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -7,18 +7,17 @@
             <field name="model">account.followup.print</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Send followups">
-                <separator string="Send Follow-Ups" colspan="4"/>
-                <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information." colspan="4" nolabel="1"/>
-                <group col="4" colspan="6">
+            <form string="Send followups" version="7.0">
+                <header>
+                    <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                <header>
+                <separator string="Send Follow-Ups"/>
+                <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
+                <group col="4">
                     <field name="followup_id"/>
                     <field name="date"/>
                 </group>
-                <separator colspan="4"/>
-                <group col="2" colspan="4">
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                    <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
-                </group>
             </form>
             </field>
         </record>
@@ -75,38 +74,37 @@
             <field name="model">account.followup.print.all</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Send followups">
-                <group col="4" colspan="6">
-                        <notebook>
-                            <page string="Partner Selection">
-                                <separator string="Select Partners to Remind" colspan="4"/>
-                                <field name="partner_ids" colspan="4" nolabel="1" context="{'search_default_balance_positive': 1}" domain="[('company_id','=',context.get('company_id',False))]"/>
-                            </page>
-                            <page string="Email Settings">
-                                <field name="email_conf" colspan="4"/>
-                                <field name="partner_lang" colspan="4"/>
-                                <field name="test_print" colspan="4"/>
-                                <field name="email_subject" colspan="4"/>
-                                <separator string="Email Body" colspan="4" />
-                                <field name="email_body" colspan="4" nolabel="1"/>
-                                <separator string="Legend" colspan="4"/>
-                                <label string="%%(partner_name)s: Partner name" colspan="2"/>
-                                <label string="%%(user_signature)s: User name" colspan="2"/>
-                                <label string="%%(followup_amount)s: Total Amount Due" colspan="2"/>
-                                <label string="%%(date)s: Current Date" colspan="2"/>
-                                <label string="%%(company_name)s: User's Company name" colspan="2"/>
-                                <label string="%%(company_currency)s: User's Company Currency" colspan="2"/>
-                                <label string="%%(heading)s: Move line header" colspan="2"/>
-                                <label string="%%(line)s: Ledger Posting lines" colspan="2"/>
-                            </page>
-                        </notebook>
-                </group>
-                <separator colspan="4"/>
-                <group>
-                    <button special="cancel" string="Cancel" icon='gtk-cancel'/>
-                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print"/>
+            <form string="Send followups" version="7.0">
+                <header>
                     <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute"/>
-                </group>
+                    <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print"/>
+                    <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+                <header>
+                <notebook>
+                    <page string="Partner Selection">
+                        <field name="partner_ids" context="{'search_default_balance_positive': 1}" domain="[('company_id','=',context.get('company_id',False))]"/>
+                    </page>
+                    <page string="Email Settings">
+                        <group col="4">
+                            <field name="email_conf" colspan="4"/>
+                            <field name="partner_lang" colspan="4"/>
+                            <field name="test_print" colspan="4"/>
+                            <field name="email_subject" colspan="4"/>
+                            <separator string="Email Body" colspan="4" />
+                            <field name="email_body" colspan="4" nolabel="1"/>
+                        </group>
+                        <group string="Legend">
+                            <label string="%%(partner_name)s: Partner name"/>
+                            <label string="%%(user_signature)s: User name"/>
+                            <label string="%%(followup_amount)s: Total Amount Due"/>
+                            <label string="%%(date)s: Current Date"/>
+                            <label string="%%(company_name)s: User's Company name"/>
+                            <label string="%%(company_currency)s: User's Company Currency"/>
+                            <label string="%%(heading)s: Move line header"/>
+                            <label string="%%(line)s: Ledger Posting lines"/>
+                        </group>
+                    </page>
+                </notebook>
             </form>
             </field>
         </record>
@@ -116,15 +114,12 @@
             <field name="model">account.followup.print.all</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Summary">
-                <group col="4" colspan="6">
-                    <separator string="Summary" colspan="4"/>
-                    <field name="summary" height="300" width="800" nolabel="1"/>
-                </group>
-                <separator colspan="4"/>
-                <group>
+            <form string="Summary" version="7.0">
+                <header>
                     <button special="cancel" string="Ok" icon='gtk-cancel'/>
-                </group>
+                <header>
+                <separator string="Summary"/>
+                <field name="summary"/>
             </form>
             </field>
         </record>
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index de9f37b4374..8e18ec51d5b 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -95,11 +95,13 @@
         <field name="model">notify.message</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Messages">
-                <separator string="Write a notification or a wishful message."/>
-                <field name="name"/>
-                <separator string="Special Message"/>
-                <field name="msg"/>
+            <form string="Messages" version="7.0">
+                <group string="Write a notification or a wishful message.">
+                    <field name="name"/>
+                </group>
+                <group string="Special Message">
+                    <field name="msg"/>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
index 5bf1e480d1e..75b44ec7fe5 100644
--- a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
+++ b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
@@ -7,14 +7,13 @@
             <field name="model">account.invoice.special.msg</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Select Message">
-                    <group colspan="4" col="6">
-                        <field name="message"/>
-                    </group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <form string="Select Message" version="7.0">
+                    <header>
                         <button name="check_report" string="Print" type="object" icon="gtk-print"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <header>
+                    <group>
+                        <field name="message"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index a6fe0de9b14..45f42a3ab1a 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -76,7 +76,7 @@
             <field name="model">payment.mode</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment Mode">
+                <form string="Payment Mode" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="journal"/>
@@ -102,7 +102,7 @@
             <field name="model">payment.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="open" states="draft" string="Confirm Payments" />
                     <button name="set_done" states="open" string="Make Payments" type="object"/>
@@ -122,11 +122,11 @@
                           type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
                     </group>
                     <field name="line_ids" context="{'order_id': active_id or False}" >
-                        <form string="Payment Line">
+                        <form string="Payment Line" version="7.0">
                             <notebook>
                                 <page string="Payment">
                                     <group col="4">
-                                        <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" select="1" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
+                                        <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
                                         <separator colspan="4" string="Transaction Information"/>
                                         <field name="date"/>
                                         <label for="amount_currency"/>
@@ -134,7 +134,7 @@
                                             <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_form_inline"/>
                                             <field name="currency" nolabel="1" class="oe_form_inline"/>
                                         </div>
-                                        <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)" select="1"/>
+                                        <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)"/>
                                         <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
                                         <separator colspan="2" string="Owner Account"/>
                                         <separator colspan="2" string="Destination Account"/>
@@ -164,7 +164,7 @@
                         </form>
                         <tree string="Payment Line">
                             <field name="ml_inv_ref" />
-                            <field name="partner_id" select="1"/>
+                            <field name="partner_id"/>
                             <field name="communication"/>
                             <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                             <field name="ml_maturity_date"/>
@@ -249,7 +249,7 @@
             <field name="model">payment.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Payment Line">
+                <form string="Payment Line" version="7.0">
                     <notebook>
                         <page string="Payment">
                             <group col="4">
@@ -262,7 +262,7 @@
                                     <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_form_inline"/>
                                     <field name="currency" class="oe_form_inline"/>
                                 </div>
-                                <field name="partner_id" on_change="onchange_partner(partner_id, False)" select="1"/>
+                                <field name="partner_id" on_change="onchange_partner(partner_id, False)"/>
                                 <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
                                 <separator colspan="2" string="Owner Account"/>
                                 <separator colspan="2" string="Desitination Account"/>
@@ -300,7 +300,7 @@
                     <field name="order_id"/>
                     <field name="ml_inv_ref" />
                     <field name="ml_maturity_date"/>
-                    <field name="partner_id" select="1"/>
+                    <field name="partner_id"/>
                     <field name="communication"/>
                     <field name="amount" sum="Amount Total"/>
                     <field name="amount_currency" sum="Currency Amount Total"/>
diff --git a/addons/account_payment/wizard/account_payment_create_order_view.xml b/addons/account_payment/wizard/account_payment_create_order_view.xml
index 538d32efe80..8cb0b15a971 100644
--- a/addons/account_payment/wizard/account_payment_create_order_view.xml
+++ b/addons/account_payment/wizard/account_payment_create_order_view.xml
@@ -2,39 +2,35 @@
 <openerp>
     <data>
 
-		<record id="view_create_payment_order" model="ir.ui.view">
+        <record id="view_create_payment_order" model="ir.ui.view">
             <field name="name">payment.order.create.form</field>
             <field name="model">payment.order.create</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Search Payment lines">
-                <group col="4" colspan="6">
-                    <field name="duedate" />
-                </group>
-                <separator colspan="4"/>
-                <group col="2" colspan="4">
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+            <form string="Search Payment lines" version="7.0">
+                <header>
                     <button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute"/>
+                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                <header>
+                <group>
+                    <field name="duedate" />
                 </group>
             </form>
             </field>
         </record>
 
-		<record id="view_create_payment_order_lines" model="ir.ui.view">
+        <record id="view_create_payment_order_lines" model="ir.ui.view">
             <field name="name">payment.order.create.form</field>
             <field name="model">payment.order.create</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Search Payment lines">
-                    <group col="4" colspan="6">
-                        <separator colspan="4" string="Entries"/>
-                        <field name="entries" nolabel="1"/>
-                    </group>
-                    <separator colspan="4"/>
-                    <group col="2" colspan="4">
-                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                <form string="Search Payment lines" version="7.0">
+                    <header>
                         <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute"/>
-                    </group>
+                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <header>
+                    <separator string="Entries"/>
+                    <field name="entries"/>
                 </form>
             </field>
         </record>
@@ -49,5 +45,5 @@
             <field name="target">new</field>
         </record>
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index a8835e0da8f..8445b95c492 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -7,27 +7,26 @@
              <field name="model">account.payment.make.payment</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-				<form string="Make Payment">
-					<separator string="Are you sure you want to make payment?"/>
-					<newline/>
-					<group  colspan="2" col="4">
-						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1"/>
-	 				</group>
-				</form>
-			</field>
-		</record>
+                <form string="Make Payment" version="7.0">
+                    <header>
+                        <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1"/>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <header>
+                    <separator string="Are you sure you want to make payment?"/>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_account_payment_make_payment" model="ir.actions.act_window">
-			<field name="name">Make Payment</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.payment.make.payment</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="view_id" ref="account_payment_make_payment_view"/>
-			<field name="target">new</field>
-		</record>
+        <record id="action_account_payment_make_payment" model="ir.actions.act_window">
+            <field name="name">Make Payment</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.payment.make.payment</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_payment_make_payment_view"/>
+            <field name="target">new</field>
+        </record>
 
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
index 55a2158fa7d..afcaf82be3a 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -7,13 +7,12 @@
              <field name="model">account.payment.populate.statement</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Populate Statement:">
-                    <group colspan="4" col="6">
-                        <field name="lines" colspan="4" height="300" width="800" nolabel="1" />
-                        <separator colspan="6"/>
-                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <form string="Populate Statement:" version="7.0">
+                    <header>
                         <button name="populate_statement" string="ADD" type="object" icon="gtk-ok"/>
-                    </group>
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    </header>
+                    <field name="lines"/>
                 </form>
              </field>
         </record>
@@ -41,4 +40,4 @@
        </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_sequence/account_sequence_installer_view.xml b/addons/account_sequence/account_sequence_installer_view.xml
index 70c12684a75..1ecf464923a 100644
--- a/addons/account_sequence/account_sequence_installer_view.xml
+++ b/addons/account_sequence/account_sequence_installer_view.xml
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<record id="view_account_sequence_installer" model="ir.ui.view">
-			<field name="name">account.sequence.installer.view</field>
-			<field name="model">account.sequence.installer</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.res_config_installer"/>
-			<field name="arch" type="xml">
-				<data>
-					<form position="attributes">
-						<attribute name="string">Account Sequence Application Configuration</attribute>
-					</form>
-					<separator string="title" position="before">
-						<label string="You can enhance the Account Sequence Application by installing ."/>
-					</separator>
-					<xpath expr="//separator[@string='title']" position="after">
-						<group colspan="8" position="inside">
-							<field name="name" colspan="4"/>
-							<field name="prefix"/>
-							<field name="suffix"/>
-							<field name="number_next"/>
-							<field name="number_increment"/>
-							<field name="padding"/>
-							<field name="company_id" groups="base.group_multi_company"/>
-						</group>
-					</xpath>
-					<separator string="title" position="attributes">
-						<attribute name="string">Configure Your Account Sequence Application</attribute>
-					</separator>
-					<xpath expr="//button[@string='Install Modules']" position="attributes">
-						<attribute name="string">Configure</attribute>
-					</xpath>
-				</data>
-			</field>
-		</record>
+    <data>
+        <record id="view_account_sequence_installer" model="ir.ui.view">
+            <field name="name">account.sequence.installer.view</field>
+            <field name="model">account.sequence.installer</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="arch" type="xml">
+                <data>
+                    <form position="attributes">
+                        <attribute name="string">Account Sequence Application Configuration</attribute>
+                    </form>
+                    <separator string="title" position="before">
+                        <label string="You can enhance the Account Sequence Application by installing ."/>
+                    </separator>
+                    <xpath expr="//separator[@string='title']" position="after">
+                        <group colspan="8" position="inside">
+                            <field name="name" colspan="4"/>
+                            <field name="prefix"/>
+                            <field name="suffix"/>
+                            <field name="number_next"/>
+                            <field name="number_increment"/>
+                            <field name="padding"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
+                    </xpath>
+                    <separator string="title" position="attributes">
+                        <attribute name="string">Configure Your Account Sequence Application</attribute>
+                    </separator>
+                    <xpath expr="//button[@string='Install Modules']" position="attributes">
+                        <attribute name="string">Configure</attribute>
+                    </xpath>
+                </data>
+            </field>
+        </record>
 
-		<record id="action_account_seq_installer" model="ir.actions.act_window">
-			<field name="name">Account Sequence Application Configuration</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.sequence.installer</field>
-			<field name="view_id" ref="view_account_sequence_installer"/>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
-	
-		<record id="account_seq_installer_todo" model="ir.actions.todo">
-			<field name="action_id" ref="action_account_seq_installer"/>
-			<field name="category_id" ref="account.category_accounting_configuration"/>
-			<field name="sequence">3</field>
-			<field name="type">automatic</field>
-		</record>
-	</data>
+        <record id="action_account_seq_installer" model="ir.actions.act_window">
+            <field name="name">Account Sequence Application Configuration</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.sequence.installer</field>
+            <field name="view_id" ref="view_account_sequence_installer"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    
+        <record id="account_seq_installer_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_account_seq_installer"/>
+            <field name="category_id" ref="account.category_accounting_configuration"/>
+            <field name="sequence">3</field>
+            <field name="type">automatic</field>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index be9d717fb3c..586d06449c8 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -25,7 +25,7 @@
             <field name="model">account.voucher.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Voucher Lines">
+                <form string="Voucher Lines" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="account_id"/>
@@ -41,7 +41,7 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                   <header>
                       <button name="proforma_voucher" string="Post" states="draft"/>
                       <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
@@ -53,11 +53,11 @@
                     <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
-                        <field name="journal_id" widget="selection" select="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                        <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="type" required="1"/>
                         <field name="name" colspan="2"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="reference" select="1"/>
+                        <field name="reference"/>
                         <field name="account_id" widget="selection" invisible="True"/>
                     </group>
                     <notebook colspan="4">
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 79e103e6a85..03fa5ad1f4d 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -72,17 +72,17 @@
             <field name="type">form</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
-                <form string="Bill Payment">
+                <form string="Bill Payment" version="7.0">
                     <group col="6">
                         <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Supplier" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1, 'invoice_currency': currency_id}" />
                         <field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
-                            widget="selection" select="1"
+                            widget="selection"
                             on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-                        <field name="reference" select="1" string="Payment Ref"/>
+                        <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                        <field name="reference" string="Payment Ref"/>
                         <field name="name" colspan="2"/>
                         <field name="account_id"
                             widget="selection"
@@ -143,7 +143,7 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
@@ -158,11 +158,11 @@
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
-                            widget="selection" select="1"
+                            widget="selection"
                             on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-                        <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
+                        <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"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id"
@@ -295,7 +295,7 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
@@ -314,11 +314,11 @@
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             invisible="context.get('line_type', False)"
-                            widget="selection" select="1"
+                            widget="selection"
                             on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                             string="Payment Method"/>
-                        <field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-                        <field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
+                        <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"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="account_id"
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index bad68fd1634..dba40940166 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -80,7 +80,7 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft"/>
                     <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
@@ -96,7 +96,7 @@
                         <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
                         <field name="number"/>
                         <field name="name" colspan="2"/>
-                        <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="type" invisible="True"/>
                         <field name="currency_id"/>
                     </group>
@@ -205,7 +205,7 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form version="7.0">
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft"/>
                     <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
@@ -218,12 +218,12 @@
                     <field name="pay_now" invisible="1"/>
                     <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" select="1" 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" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
+                        <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" select="1"/>
-                        <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
+                        <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"/>
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
index 9ceee73eda5..84ec38bf3af 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
@@ -7,12 +7,13 @@
             <field name="model">account.voucher.unreconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-             <form string="Unreconciliation">
-                <separator colspan="4" string="Unreconciliation Transactions" />
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
-                <separator colspan="4"/>
-                <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok"/>
+             <form string="Unreconciliation" version="7.0">
+                <header>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok"/>
+                </header>
+                <separator string="Unreconciliation Transactions" />
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
              </form>
             </field>
         </record>
diff --git a/addons/anonymization/anonymization_view.xml b/addons/anonymization/anonymization_view.xml
index 7f5a2226bdd..162c38b3da1 100644
--- a/addons/anonymization/anonymization_view.xml
+++ b/addons/anonymization/anonymization_view.xml
@@ -9,15 +9,15 @@
         <field name="model">ir.model.fields.anonymization</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Anonymized Field">
+            <form string="Anonymized Field" version="7.0">
                 <group col="4">
-                    <field name="model_id" select="1" on_change="onchange_model_id(model_id)" />
-                    <field name="model_name" select="1" on_change="onchange_model_name(model_name)" />
+                    <field name="model_id" on_change="onchange_model_id(model_id)" />
+                    <field name="model_name" on_change="onchange_model_name(model_name)" />
                     <field name="field_id"
-                           select="1"
+                          
                            on_change="onchange_field_id(field_id, model_name)"
                            domain="[('model_id','=',model_id), ('ttype', 'not in', ['function', 'binary', 'many2many', 'many2one', 'one2many', 'reference'])]" />
-                    <field name="field_name" select="1" on_change="onchange_field_name(field_name, model_name)" />
+                    <field name="field_name" on_change="onchange_field_name(field_name, model_name)" />
                     <field name="state" />
                 </group>
             </form>
@@ -55,7 +55,7 @@
         <field name="model">ir.model.fields.anonymize.wizard</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Database Anonymization">
+            <form string="Database Anonymization" version="7.0">
                 <header>
                     <button name="anonymize_database"
                             string="Anonymize Database"
@@ -101,7 +101,7 @@
         <field name="model">ir.model.fields.anonymization.history</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Anonymization History">
+            <form string="Anonymization History" version="7.0">
                 <group col="4">
                     <field name="date"/>
                     <field name="state"/>
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index f2615ddee81..295ff2793d5 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -11,7 +11,7 @@
             <field name="model">audittrail.rule</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="AuditTrail Rule">
+                <form string="AuditTrail Rule" version="7.0">
                     <header>
                         <button string="_Subscribe" name="subscribe" icon="gtk-ok"
                             type="object" states="draft" />
@@ -20,8 +20,8 @@
                         <field name="state" widget="statusbar"/>
                     </header>
                     <group col="4">
-                        <field name="name" select="1" required="1"/>
-                        <field name="object_id" select="1"/>
+                        <field name="name" required="1"/>
+                        <field name="object_id"/>
                         <field name="log_read"/>
                         <field name="log_write"/>
                         <field name="log_unlink"/>
@@ -29,7 +29,7 @@
                         <field name="log_action"/>
                         <field name="log_workflow"/>
                         <separator string="Users (if User is not added then it will applicable for all users)"  colspan="4" />
-                        <field name="user_id" select="1" colspan="4" nolabel="1" />
+                        <field name="user_id" colspan="4" nolabel="1" />
                         <field name="action_id" colspan="4" readonly="1" groups="base.group_no_one"/>
                     </group>
                 </form>
@@ -95,7 +95,7 @@
             <field name="model">audittrail.log</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="AuditTrail Logs">
+                <form string="AuditTrail Logs" version="7.0">
                     <group col="4">
                         <field name="timestamp" required="1" readonly="1"/>
                         <field name="user_id" readonly="1"/>
@@ -106,7 +106,7 @@
                     </group>
                     <field name="line_ids" mode="tree,form"
                         widget="one2many_list" readonly="1">
-                        <form string="Log Lines">
+                        <form string="Log Lines" version="7.0">
                             <group col="4">
                             <field name="field_id" colspan="4"
                                 readonly="1" />
diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml
index e32bc65de40..9a3fd0f344c 100644
--- a/addons/audittrail/wizard/audittrail_view_log_view.xml
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -4,30 +4,26 @@
     
     <!-- Audittrail View Log  wizard-->
     
-  		<record id="view_audittrail_view_log" model="ir.ui.view">
+        <record id="view_audittrail_view_log" model="ir.ui.view">
             <field name="name">audittrail.view.log.form</field>
             <field name="model">audittrail.view.log</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Audit Logs">
-                	<group colspan="4" >
-                		 <field name="from" colspan="4"/>
-              			 <newline/>
-              			 <field name="to" colspan="4"/>   
-                    </group>
-                       	<separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel"
-                    		string="Cancel" />
-                    	<button icon="gtk-open" string="Open Logs"
-                    		name="log_open_window" type="object" />
+                <form string="Audit Logs" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" />
+                    <header>
+                    <group col="4">
+                         <field name="from"/>
+                         <field name="to"/>
                     </group>
                </form>
             </field>
-  		</record>
+          </record>
   
   <!-- action for audittrail view log wizard -->
-  		
+          
         <record id="action_audittrail_view_log" model="ir.actions.act_window">
             <field name="name">View log</field>
             <field name="res_model">audittrail.view.log</field>
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 4e1fe508c1a..c51735f8ded 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -12,7 +12,7 @@
             <field name="model">base.action.rule</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Action Rule">
+                <form string="Action Rule" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="model_id" on_change="onchange_model_id(model_id)"/>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 035aff278f9..fa073938a37 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -8,7 +8,7 @@
             <field name="model">calendar.attendee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invitation details">
+                <form string="Invitation details" version="7.0">
                     <header>
                         <button name="do_tentative"
                             states="needs-action,declined,accepted"
@@ -156,15 +156,15 @@
             <field name="model">res.alarm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reminder details">
+                <form string="Reminder details" version="7.0">
                     <group col="4">
                         <field name="name" />
                         <field name="active" />
                         <separator string="Reminder Details" colspan="4" />
-                        <field name="trigger_duration" select="1" />
-                        <field name="trigger_interval" select="1" />
-                        <field name="trigger_occurs" select="1" />
-                        <field name="trigger_related" select="1" />
+                        <field name="trigger_duration" />
+                        <field name="trigger_interval" />
+                        <field name="trigger_occurs" />
+                        <field name="trigger_related" />
                     </group>
                 </form>
             </field>
@@ -178,11 +178,11 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Reminder details">
-                <field name="name" select="1"/>
-                <field name="trigger_interval" select="1"/>
-                <field name="trigger_duration" select="1"/>
-                <field name="trigger_occurs" select="1"/>
-                <field name="trigger_related" select="1"/>
+                <field name="name"/>
+                <field name="trigger_interval"/>
+                <field name="trigger_duration"/>
+                <field name="trigger_occurs"/>
+                <field name="trigger_related"/>
                 </tree>
             </field>
         </record>
@@ -209,7 +209,7 @@
             <field name="model">calendar.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events">
+                <form string="Events" version="7.0">
                 <header>
                     <button name="do_confirm"
                         string="Confirm"
@@ -231,11 +231,11 @@
                 </header>
                 <sheet>
                     <group col="6">
-                        <field name="name" select="1" string="Summary"
+                        <field name="name" string="Summary"
                             colspan="4" required="1" />
                         <field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)" />
                         <newline/>
-                        <field name="date" string="Start Date" required="1" select="1"
+                        <field name="date" string="Start Date" required="1"
                             on_change="onchange_dates(date,duration,False,allday)" />
                         <field name="duration" widget="float_time"
                             on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
@@ -272,7 +272,7 @@
                                 <field name="sent_by_uid" string="From"/>
                                 <field name="user_id" string="To"/>
                                 <field name="email" />
-                                <field name="role" width="200" select="1" />
+                                <field name="role" width="200" />
                                 <field name="state" />
                                 <button name="do_tentative"
                                     states="needs-action,declined,accepted"
@@ -291,7 +291,7 @@
                                     states="needs-action,tentative,declined,accepted"
                                     context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                             </tree>
-                            <form string="Invitation details">
+                            <form string="Invitation details" version="7.0">
                                 <notebook colspan="4">
                                     <page string="Details">
                                         <group col="4">
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index ea0d444ce54..985bab8bf6b 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<!--    Attendee invite wizard-->
+    <data>
+        <!--    Attendee invite wizard-->
 
-		<record id="view_calendar_invite_attendee_wizard"
-			model="ir.ui.view">
-			<field name="name">Invite Attendees</field>
-			<field name="model">base_calendar.invite.attendee</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Invite People">
+        <record id="view_calendar_invite_attendee_wizard"
+            model="ir.ui.view">
+            <field name="name">Invite Attendees</field>
+            <field name="model">base_calendar.invite.attendee</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Invite People">
                     <separator string="Invite People" colspan="4"/>
-					<field name="type"/>
-					<field name="send_mail"/>
+                    <field name="type"/>
+                    <field name="send_mail"/>
                     <notebook colspan="4">
                         <page string="Data">
                             <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'external')]}">
@@ -35,21 +35,21 @@
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button name="do_invite" string="Invite" type="object" icon="gtk-ok"/>
                     </group>
-				</form>
-			</field>
-		</record>
+                </form>
+            </field>
+        </record>
 
 
-		<!--    Attendee invite action-->
+        <!--    Attendee invite action-->
 
-		<record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
-			<field name="name">Invite Attendees</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">base_calendar.invite.attendee</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
+        <record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
+            <field name="name">Invite Attendees</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base_calendar.invite.attendee</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 5c972521cc6..cde9b55f991 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
-		<record id="view_report_designer_installer" model="ir.ui.view">
-			<field name="name">Form View: OpenERP Report Designer Installation</field>
-			<field name="model">base_report_designer.installer</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.res_config_installer"/>
-			<field name="arch" type="xml">
-				<data>
-					<form position="attributes">
-						<attribute name="string">OpenERP Report Designer Configuration</attribute>
-					</form>
-					<separator string="title" position="before">
-						<label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
-					</separator>
-					<xpath expr="//button[@string='Install Modules']" position="replace">
-						<button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
-						<button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
-					</xpath>
-					<xpath expr="//button[@string='Cancel']" position="replace">
-						<button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
-					</xpath>
-					<xpath expr="//separator[@string='title']" position="after">
-						<group colspan="8" height="450" width="750">
-							<field name="name" invisible="1"/>
-							<field name="plugin_file" filename="name"/>
-							<separator string="Installation and Configuration Steps" colspan="4"/>
-							<field name="description" nolabel="1" colspan="8"/>
-						</group>
-					</xpath>
-					<separator string="title" position="attributes">
-						<attribute name="string">OpenERP Report Designer</attribute>
-					</separator>
-				</data>
-			</field>
-		</record>
-		<record id="action_report_designer_installer" model="ir.actions.act_window">
-			<field name="name">OpenERP Report Designer Installation</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">base_report_designer.installer</field>
-			<field name="view_id" ref="view_report_designer_installer"/>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
-		<record id="report_designer_installer_todo" model="ir.actions.todo">
-			<field name="action_id" ref="action_report_designer_installer"/>
-			<field name="category_id" ref="base.category_tools_customization_config"/>
-			<field name="sequence">3</field>
-			<field name="type">automatic</field>
-		</record>
-		<record id="action_report_designer_wizard" model="ir.actions.act_window">
-			<field name="name">OpenERP Report Designer</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">base_report_designer.installer</field>
-			<field name="view_id" ref="view_report_designer_installer"/>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-			<field name="context">{'menu':True}</field>
-		</record>
-		<menuitem parent="base.menu_reporting_config" name="Report Designer" action="action_report_designer_wizard" id="menu_action_report_designer_wizard" sequence="1"/>
-	</data>
+    <data>
+        <record id="view_report_designer_installer" model="ir.ui.view">
+            <field name="name">Form View: OpenERP Report Designer Installation</field>
+            <field name="model">base_report_designer.installer</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_installer"/>
+            <field name="arch" type="xml">
+                <data>
+                    <form position="attributes">
+                        <attribute name="string">OpenERP Report Designer Configuration</attribute>
+                    </form>
+                    <separator string="title" position="before">
+                        <label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
+                    </separator>
+                    <xpath expr="//button[@string='Install Modules']" position="replace">
+                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
+                        <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+                    </xpath>
+                    <xpath expr="//button[@string='Cancel']" position="replace">
+                        <button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
+                    </xpath>
+                    <xpath expr="//separator[@string='title']" position="after">
+                        <group colspan="8" height="450" width="750">
+                            <field name="name" invisible="1"/>
+                            <field name="plugin_file" filename="name"/>
+                            <separator string="Installation and Configuration Steps" colspan="4"/>
+                            <field name="description" nolabel="1" colspan="8"/>
+                        </group>
+                    </xpath>
+                    <separator string="title" position="attributes">
+                        <attribute name="string">OpenERP Report Designer</attribute>
+                    </separator>
+                </data>
+            </field>
+        </record>
+        <record id="action_report_designer_installer" model="ir.actions.act_window">
+            <field name="name">OpenERP Report Designer Installation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base_report_designer.installer</field>
+            <field name="view_id" ref="view_report_designer_installer"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <record id="report_designer_installer_todo" model="ir.actions.todo">
+            <field name="action_id" ref="action_report_designer_installer"/>
+            <field name="category_id" ref="base.category_tools_customization_config"/>
+            <field name="sequence">3</field>
+            <field name="type">automatic</field>
+        </record>
+        <record id="action_report_designer_wizard" model="ir.actions.act_window">
+            <field name="name">OpenERP Report Designer</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base_report_designer.installer</field>
+            <field name="view_id" ref="view_report_designer_installer"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'menu':True}</field>
+        </record>
+        <menuitem parent="base.menu_reporting_config" name="Report Designer" action="action_report_designer_wizard" id="menu_action_report_designer_wizard" sequence="1"/>
+    </data>
 </openerp>
diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
index 3460fb1af79..7467e55a9f4 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -9,11 +9,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Get a report">
-	            <separator string="Select your report" colspan="4"/>
-	            <field name="report_id"/>
-	             <separator string="" colspan="4"/>
-	               <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	               <button name="get_report" string="Continue" type="object" icon="gtk-ok"/>
+                <separator string="Select your report" colspan="4"/>
+                <field name="report_id"/>
+                 <separator string="" colspan="4"/>
+                   <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                   <button name="get_report" string="Continue" type="object" icon="gtk-ok"/>
             </form>
             </field>
        </record>
@@ -54,10 +54,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Save RML FIle">
-	            <separator string="The RML Report" colspan="4"/>
-	            <field name="file_rml"/>
-	            <newline/>
-	             <separator string="" colspan="4"/>
+                <separator string="The RML Report" colspan="4"/>
+                <field name="file_rml"/>
+                <newline/>
+                 <separator string="" colspan="4"/>
                <button special="cancel" string="Cancel" icon="gtk-cancel"/>
             </form>
             </field>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index b228f1fbd98..5046b122bf5 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -9,7 +9,7 @@
           <field name="inherit_id" ref="base.res_config_view_base"/>
          <field name="arch" type="xml">
             <data>
-              <form position="attributes">
+              <form position="attributes" version="7.0">
                 <attribute name="string">Specify Your Terminology</attribute>
               </form>
              <group string="res_config_contents" position="replace">
@@ -37,7 +37,7 @@
         <field name="model">sale.config.settings</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Configure Sales">
+            <form string="Configure Sales" version="7.0">
                 <header>
                     <button string="Apply" type="object" name="execute"/>
                     <button string="Cancel" special="cancel"/>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 7752f3ed5ac..0b85e13a08f 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -6,7 +6,7 @@
             <field name="model">base.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="General Settings">
+                <form string="General Settings" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml
index a4398d1a07d..8961edc8a64 100644
--- a/addons/board/wizard/board_menu_create_view.xml
+++ b/addons/board/wizard/board_menu_create_view.xml
@@ -4,28 +4,24 @@
     
     <!--Board menu create wizard  -->
     
-  		<record id="view_board_menu_create" model="ir.ui.view">
+        <record id="view_board_menu_create" model="ir.ui.view">
             <field name="name">board.menu.create.form</field>
             <field name="model">board.menu.create</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Create Menu For Dashboard">
-                	<group colspan="4" >
-                		 <separator string="Menu Information" colspan="4"/>
-              			 <field name="menu_name"/>
-              			 <field name="menu_parent_id"/>
-                    </group>
-                       	<separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel"
-                    		string="Cancel" />
-                    	<button icon="gtk-save" string="Create Menu"
-                    		name="board_menu_create" type="object" />
+                <form string="Create Menu For Dashboard" version="7.0">
+                    <header>
+                        <button icon="gtk-save" string="Create Menu" name="board_menu_create" type="object" />
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                    <header>
+                    <group colspan="4" string="Menu Information"/>
+                        <field name="menu_name"/>
+                        <field name="menu_parent_id"/>
                     </group>
                </form>
             </field>
-  		</record>
-  		
+        </record>
+        
   <!-- Action for Board Menu create wizard. -->
   
         <record id="action_board_menu_create" model="ir.actions.act_window">
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 79915d9308a..53adcd97e16 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -7,7 +7,7 @@
             <field name="priority">40</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Calendar Collections">
+                <form string="Calendar Collections" version="7.0">
                     <group col="4">
                         <field name="name" colspan="4"/>
                         <field name="user_id"/>
@@ -80,7 +80,7 @@
             <field name="model">basic.calendar</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Calendar">
+                <form string="Calendar" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="type"/>
@@ -93,7 +93,7 @@
                     <notebook>
                         <page string="Calendar Lines">
                             <field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
-                                <form string="Calendar Lines">
+                                <form string="Calendar Lines" version="7.0">
                                     <group col="4">
                                         <field name="name" required="1"/>
                                         <field name="object_id" required="1"/>
@@ -106,7 +106,7 @@
                                             <field name="field_id" required="1" domain="[('model_id', '=', parent.object_id)]" />
                                             <field name="expr" />
                                         </tree>
-                                        <form string="Attributes Mapping">
+                                        <form string="Attributes Mapping" version="7.0">
                                             <group col="4">
                                                 <field name="name" required="1" domain="[('type', '=', parent.name)]"/>
                                                 <field name="field_id" domain="[('model_id', '=', parent.object_id)]"
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index fd6b95d81f9..a9c0d6a48bb 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -65,7 +65,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Dashboard" layout="manual">
+                <form string="Sales Dashboard" layout="manual" version="7.0">
                     <board style="2-1">
                         <column>
                             <action string="My Opportunities" name="%(act_my_oppor)d" creatable="true"/>
@@ -156,7 +156,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Statistics Dashboard" layout="manual">
+                <form string="Statistics Dashboard" layout="manual" version="7.0">
                     <board style="1-1">
                         <column>
                             <action string="Opportunities by Categories" name="%(act_oppor_categ)d"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index dfceb723a1c..287414c81e4 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -60,7 +60,7 @@
         <field name="model">crm.lead</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Leads Form">
+            <form string="Leads Form" version="7.0">
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
                             states="draft,open,pending" help="Convert to Opportunity"/>
@@ -129,8 +129,8 @@
                                 <field name="company_id"
                                     groups="base.group_multi_company"
                                     widget="selection" colspan="2" />
-                                <field name="type_id" select="1" widget="selection"/>
-                                <field name="channel_id" select="1" widget="selection"/>
+                                <field name="type_id" widget="selection"/>
+                                <field name="channel_id" widget="selection"/>
                                 <field name="referred"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
@@ -361,7 +361,7 @@
         <field name="type">form</field>
         <field name="priority">20</field>
         <field name="arch" type="xml">
-            <form string="Opportunities" validate="0">
+            <form string="Opportunities" validate="0" version="7.0">
                 <header>
                     <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" />
                     <button name="case_open" string="Open" states="draft,pending" type="object" />
@@ -417,7 +417,7 @@
                             <field name="section_id" colspan="1" widget="selection"/>
                         </group>
                         <group>
-                            <field name="categ_id" select="1"
+                            <field name="categ_id"
                                 string="Category" widget="selection"
                                 domain="[('object_id.model', '=', 'crm.lead')]" />
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 857edc8a900..e98ce2ce8f6 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -25,7 +25,7 @@
         <field name="model">crm.meeting</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Meetings">
+            <form string="Meetings" version="7.0">
                 <header>
                     <button name="case_open" string="Confirm" type="object"
                             states="draft"/>
@@ -115,7 +115,7 @@
                                     states="needs-action,tentative,declined,accepted"
                                     context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                             </tree>
-                            <form string="Invitation details">
+                            <form string="Invitation details" version="7.0">
                                 <notebook colspan="4">
                                     <page string="Details">
                                         <field name="email" />
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 2e1c35e683a..a0442eb966a 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -62,7 +62,7 @@
         <field name="model">crm.phonecall</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form version="7.0">
             <header>
                 <button name="case_open" string="Confirm" type="object"
                         states="draft,pending" icon="gtk-go-forward"/>
@@ -72,28 +72,26 @@
                         states="cancel" icon="gtk-convert"/>
                 <button name="case_cancel" string="Cancel" type="object"
                         states="draft,open,pending" icon="gtk-cancel"/>
+                <button string="Convert to Opportunity"
+                    name="%(phonecall2opportunity_act)d"
+                    icon="gtk-index" type="action"
+                    attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+                <button string="Schedule Other Call"
+                    icon="terp-call-start"
+                    name="%(phonecall_to_phonecall_act)d"
+                    type="action"  />
+                <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
             </header>
-            <sheet string="Phone Call" layout="auto">
-                 <group colspan="6" col="7">
+            <sheet string="Phone Call">
+                 <group col="4">
                     <field name="name" required="1"/>
                     <field name="partner_phone"/>
                     <field name="duration" widget="float_time"/>
-                    <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
 
                     <field name="date"/>
                     <field name="user_id"/>
                     <field name="section_id" colspan="1" widget="selection" />
-                    <button string="Schedule Other Call"
-                     icon="terp-call-start"
-                    name="%(phonecall_to_phonecall_act)d"
-                    type="action"  />
-                    <label colspan="6"  string=""/>
-                    <button string="Convert to Opportunity"
-                        name="%(phonecall2opportunity_act)d"
-                        icon="gtk-index" type="action"
-                        attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-
                 </group>
 
                 <group col="3" colspan="2">
@@ -107,7 +105,6 @@
                         attrs="{'invisible':[('partner_id','!=',False)]}"
                         groups="base.group_partner_manager"/>
                     <newline/>
-                    <newline/>
                     <field name="partner_mobile" />
                 </group>
                 <group col="2" colspan="2">
@@ -117,12 +114,12 @@
                     <field name="priority"/>
                     <field name="opportunity_id"/>
                 </group>
-                <separator string="Description" colspan="4" />
-                <field name="description" nolabel="1" colspan="4" />
+                <separator string="Description"/>
+                <field name="description"/>
             </sheet>
-            <div class="oe_form_sheet_width">
-                <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/crm_view.xml b/addons/crm/crm_view.xml
index dacfa5c2946..36523cde9e4 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -30,8 +30,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Channels">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
+                    <field name="name"/>
+                    <field name="active"/>
                 </tree>
             </field>
         </record>
@@ -40,9 +40,11 @@
             <field name="model">crm.case.channel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Channel">
-                    <field name="name" select="1"/>
-                    <field name="active" select="1"/>
+                <form string="Channel" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="active"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -63,38 +65,35 @@
             <field name="model">crm.case.section</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Team">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="2"/>
-                        <field name="parent_id" select="2"/>
-                        <field name="code" select="1"/>
-                        <newline/>
-                        <field name="user_id" select="2"/>
-                        <field name="resource_calendar_id" select="2"/>
-                        <field name="active" select="2"/>
+                <form string="Sales Team" version="7.0">
+                    <group>
+                        <group>
+                            <field name="name" colspan="2"/>
+                            <field name="parent_id"/>
+                            <field name="code"/>
+                        </group>
+                        <group>
+                            <field name="user_id"/>
+                            <field name="resource_calendar_id"/>
+                            <field name="active"/>
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Sales Team">
-                            <group col="2" colspan="1">
-                                <separator string="Mail Gateway" colspan="2"/>
-                                <field name="reply_to" select="2"/>
-                            </group>
-                            <group col="2" colspan="1">
-                                <separator string="Configuration" colspan="2"/>
-                                <field name="allow_unlink" select="2"/>
+                            <group col="4">
+                                <field name="reply_to"/>
+                                <field name="allow_unlink"/>
                                 <field name="change_responsible"/>
+                                <field name="member_ids"/>
                             </group>
-                            <group col="1" colspan="4">
-                                <separator string="Team Members" colspan="4"/>
-                                <field name="member_ids" nolabel="1" colspan="4"   height="250"/>
                             </group>
                         </page>
                         <page string="Stages">
-                            <separator string="Select Stages for this Sales Team" colspan="4"/>
-                            <field name="stage_ids" colspan="4" nolabel="1"/>
+                            <separator string="Select Stages for this Sales Team"/>
+                            <field name="stage_ids"/>
                         </page>
                         <page string="Notes">
-                            <field name="note" select="1" colspan="4" nolabel="1"/>
+                            <field name="note"/>
                         </page>
                     </notebook>
                 </form>
@@ -110,9 +109,9 @@
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree string="Sales Team">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="user_id" select="1"/>
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="user_id"/>
                 </tree>
             </field>
         </record>
@@ -157,9 +156,9 @@
             <field name="type">form</field>
             <field name="priority" eval="1"/>
             <field name="arch" type="xml">
-                <form string="Stage">
-                    <group colspan="4" col="6">
-                        <field name="name" select="1"/>
+                <form string="Stage" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
                         <field name="probability"/>
                         <field name="on_change"/>
                         <field name="case_default"/>
@@ -168,9 +167,9 @@
                         <field name="fold"/>
                         <field name="type"/>
                     </group>
-                    <separator string="Requirements" colspan="4"/>
-                    <field name="requirements" nolabel="1" colspan="4"/>
-                    <field name="section_ids" invisible="1" colspan="4"/>
+                    <separator string="Requirements"/>
+                    <field name="requirements" nolabel="1"/>
+                    <field name="section_ids" invisible="1"/>
                 </form>
             </field>
         </record>
@@ -192,10 +191,12 @@
             <field name="model">crm.case.categ</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Case Category">
-                    <field name="name" select="1"/>
-                    <field name="section_id" select="1"/>
-                    <field name="object_id"  invisible="1" />
+                <form string="Case Category" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="section_id"/>
+                        <field name="object_id"  invisible="1" />
+                    </group>
                 </form>
             </field>
         </record>
@@ -235,9 +236,11 @@
             <field name="model">crm.case.resource.type</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Campaign">
-                    <field name="name" select="1"/>
-                    <field name="section_id"/>
+                <form string="Campaign" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="section_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -288,15 +291,16 @@
             <field name="model">crm.segmentation.line</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Partner Segmentation Lines">
-                    <field colspan="4" name="name" select="1"/>
-                    <group col="2" colspan="4">
-                        <field name="expr_name"/>
-                        <field name="expr_operator"/>
-                        <field name="expr_value"/>
+                <form string="Partner Segmentation Lines" version="7.0">
+                    <group col="4">
+                        <field colspan="4" name="name"/>
+                        <group col="2" colspan="4">
+                            <field name="expr_name"/>
+                            <field name="expr_operator"/>
+                            <field name="expr_value"/>
+                        </group>
+                        <field name="operator"/>
                     </group>
-                    <newline/>
-                    <field name="operator"/>
                 </form>
             </field>
         </record>
@@ -308,24 +312,8 @@
             <field name="model">crm.segmentation</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Partner Segmentation">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="categ_id"/>
-                        <field name="exclusif"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Sales Purchase">
-                            <field name="sales_purchase_active"/>
-                            <separator colspan="4" string="Segmentation Test"/>
-                            <field colspan="4" name="segmentation_line" widget="one2many_list" nolabel="1"/>
-                        </page>
-                        <page string="Description">
-                               <field colspan="4" name="description" nolabel="1"/>
-                           </page>
-                    </notebook>
-                    <field name="state"/>
-                    <group col="3" colspan="2">
+                <form string="Partner Segmentation" version="7.0">
+                    <header>
                         <button name="process_start"
                             states="not running"
                             string="Compute Segmentation" type="object"
@@ -336,7 +324,25 @@
                         <button name="process_continue" states="running"
                             string="Continue Process" type="object"
                             icon="gtk-go-forward" />
+                        <field name="state" widget="statusbar"/>
+                    </header>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="categ_id"/>
+                        <field name="exclusif"/>
                     </group>
+                    <notebook>
+                       <page string="Sales Purchase">
+                           <group>
+                               <field name="sales_purchase_active"/>
+                           </group>
+                           <separator string="Segmentation Test"/>
+                           <field name="segmentation_line" widget="one2many_list"/>
+                       </page>
+                       <page string="Description">
+                           <field name="description"/>
+                       </page>
+                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index b9f7dad6c07..1c973ee6c94 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -1,49 +1,47 @@
 <openerp>
-  	<data>
+      <data>
 
-  	<!-- Phonecall to partner confirmation form -->
-  	
-  		<record id="view_crm_phonecall2partner_create" model="ir.ui.view">
-	      <field name="name">crm.phonecall2partner.view.create</field>
-	      <field name="model">crm.phonecall2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner">
-	      		<label string="Are you sure you want to create a partner based on this Phonecall ?" colspan="4"/>
-        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
-        		<separator string="" colspan="4" />
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
-	
-	<!-- Phonecall to partner  form view -->
-	
-	   <record id="view_crm_phonecall2partner" model="ir.ui.view">
-	      <field name="name">crm.phonecall2partner.view</field>
-	      <field name="model">crm.phonecall2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner">
-	      		<field name="action"/>
-	      		<group attrs="{'invisible':[('action','!=','exist')]}">
-		            <field name="partner_id" attrs="{'required':[('action','=','exist')]}" />
-		        </group>
-		        <separator string="" colspan="4" />
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
+      <!-- Phonecall to partner confirmation form -->
+      
+          <record id="view_crm_phonecall2partner_create" model="ir.ui.view">
+          <field name="name">crm.phonecall2partner.view.create</field>
+          <field name="model">crm.phonecall2partner</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+            <form string="Create a Partner" version="7.0">
+                <header>
+                    <button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <header>
+                <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
+                <label string="You may have to verify that this partner does not exist already."/>
+            </form>
+        </field>
+       </record>
+    
+    <!-- Phonecall to partner  form view -->
+    
+       <record id="view_crm_phonecall2partner" model="ir.ui.view">
+          <field name="name">crm.phonecall2partner.view</field>
+          <field name="model">crm.phonecall2partner</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+            <form string="Create a Partner" version="7.0">
+                <header>
+                    <button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                <header>
+                <group>
+                    <field name="action"/>
+                    <field name="partner_id" attrs="{'required':[('action','=','exist')],'invisible':[('action','!=','exist')]}" />
+                </group>
+            </form>
+          </field>
+       </record>
 
-	 <!-- Phonecall to Partner wizard -->
+     <!-- Phonecall to Partner wizard -->
 
-		<record id="action_crm_phonecall2partner" model="ir.actions.act_window">
+        <record id="action_crm_phonecall2partner" model="ir.actions.act_window">
             <field name="name">Create a Partner</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">crm.phonecall2partner</field>
@@ -51,7 +49,7 @@
             <field name="view_id" ref="view_crm_phonecall2partner_create"/>
             <field name="target">new</field>
         </record>
-		
+        
 
- 	</data>
+     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 345d8ba0ba5..73cdf7679c2 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -9,7 +9,13 @@
             <field name="model">crm.phonecall2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Schedule/Log a Call">
+                <form string="Schedule/Log a Call" version="7.0">
+                    <header>
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_schedule" type="object" string="Log Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
+                        <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+                    <header>
+                    <group col="4">
                         <separator string="Schedule/Log a Call" colspan="4"/>
                         <field name="action"/>
                         <separator string="Call Details" colspan="4"/>
@@ -19,12 +25,7 @@
                         <field name="user_id" />
                         <field name="section_id"/>
                         <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                        <separator string=" " colspan="4"/>
-                        <group colspan="4" col="3" >
-                            <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                            <button name="action_schedule" type="object" string="Log Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                            <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
-                        </group>
+                    </group>
                 </form>
             </field>
         </record>