diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml
index 4b3436c8a51..8ceb8a91885 100644
--- a/addons/account/account_bank_view.xml
+++ b/addons/account/account_bank_view.xml
@@ -9,7 +9,6 @@
     <record id="view_partner_bank_form_inherit" model="ir.ui.view">
         <field name="name">Partner Bank Accounts - Journal</field>
         <field name="model">res.partner.bank</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="base.view_partner_bank_form"/>
         <field name="arch" type="xml">
             <group name="bank" position="after">
@@ -26,7 +25,6 @@
     <record id="view_partner_bank_tree_add_currency" model="ir.ui.view">
         <field name="name">Partner Bank Accounts - Add currency on tree</field>
         <field name="model">res.partner.bank</field>
-        <field name="type">tree</field>
         <field name="inherit_id" ref="base.view_partner_bank_tree"/>
         <field name="arch" type="xml">
             <field name="acc_number" position="after">
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index d2661674bae..c92d4eda602 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -3,7 +3,6 @@
         <record id="view_account_configuration_installer" model="ir.ui.view">
             <field name="name">account.installer.form</field>
             <field name="model">account.installer</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
                 <form position="attributes" version="7.0">
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index d04030c909e..5aca260bc12 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -6,7 +6,6 @@
         <record id="view_invoice_line_calendar" model="ir.ui.view">
             <field name="name">account.invoice.calendar</field>
             <field name="model">account.invoice</field>
-            <field name="type">calendar</field>
             <field name="arch" type="xml">
                 <calendar string="Invoices" color="journal_id" date_start="date_invoice">
                     <field name="partner_id"/>
@@ -18,7 +17,6 @@
         <record model="ir.ui.view" id="view_invoice_graph">
             <field name="name">account.invoice.graph</field>
             <field name="model">account.invoice</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Invoices" type="bar">
                     <field name="partner_id"/>
@@ -30,7 +28,6 @@
         <record id="view_invoice_line_tree" model="ir.ui.view">
             <field name="name">account.invoice.line.tree</field>
             <field name="model">account.invoice.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Invoice Line">
                     <field name="name"/>
@@ -47,7 +44,6 @@
         <record id="view_invoice_line_form" model="ir.ui.view">
             <field name="name">account.invoice.line.form</field>
             <field name="model">account.invoice.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice Line" version="7.0">
                     <group>
@@ -78,7 +74,6 @@
         <record id="view_invoice_tax_tree" model="ir.ui.view">
             <field name="name">account.invoice.tax.tree</field>
             <field name="model">account.invoice.tax</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Manual Invoice Taxes">
                     <field name="sequence"/>
@@ -94,7 +89,6 @@
         <record id="view_invoice_tax_form" model="ir.ui.view">
             <field name="name">account.invoice.tax.form</field>
             <field name="model">account.invoice.tax</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Manual Invoice Taxes" version="7.0">
                     <group col="4">
@@ -120,7 +114,6 @@
         <record id="invoice_tree" model="ir.ui.view">
             <field name="name">account.invoice.tree</field>
             <field name="model">account.invoice</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'" string="Invoice">
                     <field name="partner_id" groups="base.group_user"/>
@@ -146,10 +139,9 @@
         <record id="invoice_supplier_form" model="ir.ui.view">
             <field name="name">account.invoice.supplier.form</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Supplier Invoice" version="7.0">
                 <header>
                     <span groups="base.group_user">
                         <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
@@ -289,9 +281,8 @@
         <record id="invoice_form" model="ir.ui.view">
             <field name="name">account.invoice.form</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Invoice" version="7.0">
                 <header>
                     <span groups="base.group_user">
                         <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight"/>
@@ -443,7 +434,6 @@
         <record id="view_account_invoice_filter" model="ir.ui.view">
             <field name="name">account.invoice.select</field>
             <field name="model">account.invoice</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invoice">
                     <field name="number" string="Invoice" filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 24d21cff3e8..5bf45aab487 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -9,9 +9,8 @@
         <record id="view_account_fiscalyear_form" model="ir.ui.view">
             <field name="name">account.fiscalyear.form</field>
             <field name="model">account.fiscalyear</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Fiscal year" version="7.0">
                 <header>
                     <button name="create_period" states="draft" string="Create Monthly Periods" type="object" class="oe_highlight"/>
                     <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_highlight"/>
@@ -47,7 +46,6 @@
         <record id="view_account_fiscalyear_tree" model="ir.ui.view">
             <field name="name">account.fiscalyear.tree</field>
             <field name="model">account.fiscalyear</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';gray:state == 'done' " string="Fiscalyear">
                     <field name="code"/>
@@ -60,7 +58,6 @@
         <record id="view_account_fiscalyear_search" model="ir.ui.view">
             <field name="name">account.fiscalyear.search</field>
             <field name="model">account.fiscalyear</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Fiscalyear">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Fiscal Year"/>
@@ -102,9 +99,8 @@
         <record id="view_account_period_form" model="ir.ui.view">
             <field name="name">account.period.form</field>
             <field name="model">account.period</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Account Period" version="7.0">
 	                <header>
 	                    <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
 	                    <field name="state" widget="statusbar" nolabel="1"/>
@@ -133,7 +129,6 @@
         <record id="view_account_period_tree" model="ir.ui.view">
             <field name="name">account.period.tree</field>
             <field name="model">account.period</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
               <tree colors="blue:state == 'draft';gray:state == 'done' " string="Period">
                     <field name="name"/>
@@ -150,7 +145,6 @@
         <record id="view_account_period_search" model="ir.ui.view">
             <field name="name">account.period.search</field>
             <field name="model">account.period</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Period">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Period"/>
@@ -183,7 +177,6 @@
         <record id="view_account_form" model="ir.ui.view">
             <field name="name">account.account.form</field>
             <field name="model">account.account</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account" version="7.0">
                     <label for="code" class="oe_edit_only" string="Account Code and Name"/>
@@ -225,7 +218,6 @@
         <record id="view_account_search" model="ir.ui.view">
             <field name="name">account.account.search</field>
             <field name="model">account.account</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/>
@@ -244,7 +236,6 @@
         <record id="view_account_list" model="ir.ui.view">
             <field name="name">account.account.list</field>
             <field name="model">account.account</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_id</field>
             <field name="arch" type="xml">
                 <tree colors="blue:type == 'view';black:type in ('other','receivable','payable','consolidation');gray:type == 'closed'" string="Chart of accounts" toolbar="1" >
@@ -264,7 +255,6 @@
         <record id="view_treasory_graph" model="ir.ui.view">
            <field name="name">account.treasury.graph</field>
            <field name="model">account.account</field>
-           <field name="type">graph</field>
            <field name="arch" type="xml">
                <graph string="Treasury Analysis" type="bar">
                   <field name="name"/>
@@ -298,7 +288,6 @@
         <record id="view_account_tree" model="ir.ui.view">
             <field name="name">account.account.tree</field>
             <field name="model">account.account</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_id</field>
             <field name="arch" type="xml">
                 <tree colors="blue:type == 'view';black:type in ('other','receivable','payable','consolidation');gray:type == 'closed'" string="Chart of accounts" toolbar="1" >
@@ -325,7 +314,6 @@
          <record id="view_account_gain_loss_tree" model="ir.ui.view">
            <field name="name">Unrealized Gain or Loss</field>
             <field name="model">account.account</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Unrealized Gains and losses">
                     <field name="code"/>
@@ -379,7 +367,6 @@
         <record id="view_journal_column_form" model="ir.ui.view">
             <field name="name">account.journal.column.form</field>
             <field name="model">account.journal.column</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal Column" version="7.0">
                     <field name="name"/>
@@ -391,7 +378,6 @@
         <record id="view_journal_column_tree" model="ir.ui.view">
             <field name="name">account.journal.column.tree</field>
             <field name="model">account.journal.column</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Journal Column">
                     <field name="sequence"/>
@@ -403,7 +389,6 @@
         <record id="view_account_journal_view_search" model="ir.ui.view">
             <field name="name">account.journal.view.search</field>
             <field name="model">account.journal.view</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Journal View">
                     <field name="name" string="Journal View"/>
@@ -413,7 +398,6 @@
         <record id="view_account_journal_view_tree" model="ir.ui.view">
             <field name="name">account.journal.view.tree</field>
             <field name="model">account.journal.view</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Journal View">
                     <field name="name"/>
@@ -423,7 +407,6 @@
         <record id="view_account_journal_view_form" model="ir.ui.view">
             <field name="name">account.journal.view.form</field>
             <field name="model">account.journal.view</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal View" version="7.0">
                     <field name="name"/>
@@ -460,7 +443,6 @@
         <record id="view_account_journal_tree" model="ir.ui.view">
             <field name="name">account.journal.tree</field>
             <field name="model">account.journal</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Account Journal">
                     <field name="code"/>
@@ -474,7 +456,6 @@
         <record id="view_account_journal_search" model="ir.ui.view">
             <field name="name">account.journal.search</field>
             <field name="model">account.journal</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Account Journal">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Journal"/>
@@ -494,7 +475,6 @@
         <record id="view_account_journal_form" model="ir.ui.view">
             <field name="name">account.journal.form</field>
             <field name="model">account.journal</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Journal" version="7.0">
                     <div class="oe_title">
@@ -581,7 +561,6 @@
         <record id="view_account_bank_statement_filter" model="ir.ui.view">
             <field name="name">account.cash.statement.select</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
                     <field name="name" string="Bank Statement"/>
@@ -602,7 +581,6 @@
         <record id="view_bank_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:balance_end_real!=balance_end and state=='draft';blue:state=='draft' and (balance_end_real==balance_end);black:state=='confirm'" string="Statement">
                     <field name="name"/>
@@ -619,7 +597,6 @@
         <record id="view_bank_statement_search" model="ir.ui.view">
             <field name="name">account.bank.statement.search</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
                     <field name="name" string="Bank Statement"/>
@@ -639,7 +616,6 @@
         <record id="view_bank_statement_form" model="ir.ui.view">
             <field name="name">account.bank.statement.form</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bank Statement" version="7.0">
                 <header>
@@ -767,7 +743,6 @@
         <record id="view_account_type_search" model="ir.ui.view">
             <field name="name">account.account.type.search</field>
             <field name="model">account.account.type</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Account Type">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Type"/>
@@ -778,7 +753,6 @@
         <record id="view_account_type_tree" model="ir.ui.view">
             <field name="name">account.account.type.tree</field>
             <field name="model">account.account.type</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Account Type">
                     <field name="name"/>
@@ -790,7 +764,6 @@
         <record id="view_account_type_form" model="ir.ui.view">
             <field name="name">account.account.type.form</field>
             <field name="model">account.account.type</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Type" version="7.0">
                     <group>
@@ -833,7 +806,6 @@
         <record id="view_account_move_tree" model="ir.ui.view">
             <field name="name">account.move.tree</field>
             <field name="model">account.move</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state == 'posted'" string="Journal Entries">
                     <field name="name"/>
@@ -855,7 +827,6 @@
         <record id="view_move_reconcile_form" model="ir.ui.view">
             <field name="name">account.move.reconcile.form</field>
             <field name="model">account.move.reconcile</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal Entry Reconcile" version="7.0">
                     <group col="4">
@@ -877,7 +848,6 @@
         <record id="view_tax_code_search" model="ir.ui.view">
             <field name="name">account.tax.code.search</field>
             <field name="model">account.tax.code</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Account Tax Code">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Code"/>
@@ -889,7 +859,6 @@
         <record id="view_tax_code_tree" model="ir.ui.view">
             <field name="name">account.tax.code.tree</field>
             <field name="model">account.tax.code</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="priority">100</field>
             <field name="arch" type="xml">
@@ -905,7 +874,6 @@
         <record id="view_tax_code_form" model="ir.ui.view">
             <field name="name">account.tax.code.form</field>
             <field name="model">account.tax.code</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Tax Code" version="7.0">
                     <group>
@@ -957,7 +925,6 @@
         <record id="view_tax_tree" model="ir.ui.view">
             <field name="name">account.tax.tree</field>
             <field name="model">account.tax</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree string="Account Tax">
@@ -971,7 +938,6 @@
         <record id="view_account_tax_search" model="ir.ui.view">
             <field name="name">account.tax.search</field>
             <field name="model">account.tax</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Taxes">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax"/>
@@ -982,7 +948,6 @@
         <record id="view_tax_form" model="ir.ui.view">
             <field name="name">account.tax.form</field>
             <field name="model">account.tax</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Tax" version="7.0">
                     <group>
@@ -1085,7 +1050,6 @@
         <record id="view_move_line_tree" model="ir.ui.view">
             <field name="name">account.move.line.tree</field>
             <field name="model">account.move.line</field>
-            <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" editable="top" on_write="on_create_write">
@@ -1114,7 +1078,6 @@
         <record id="view_move_line_form" model="ir.ui.view">
             <field name="name">account.move.line.form</field>
             <field name="model">account.move.line</field>
-            <field name="type">form</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Journal Item" version="7.0">
@@ -1185,7 +1148,6 @@
         <record id="view_move_line_form2" model="ir.ui.view">
             <field name="name">account.move.line.form2</field>
             <field name="model">account.move.line</field>
-            <field name="type">form</field>
             <field eval="9" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Journal Item" version="7.0">
@@ -1234,7 +1196,6 @@
         <record id="account_move_line_graph" model="ir.ui.view">
             <field name="name">account.move.line.graph</field>
             <field name="model">account.move.line</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Account Statistics" type="bar">
                     <field name="account_id"/>
@@ -1247,7 +1208,6 @@
         <record id="view_account_move_line_filter" model="ir.ui.view">
             <field name="name">Journal Items</field>
             <field name="model">account.move.line</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Journal Items">
                     <field name="date"/>
@@ -1337,7 +1297,6 @@
         <record id="account_move_graph" model="ir.ui.view">
             <field name="name">account.move.graph</field>
             <field name="model">account.move</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Account Statistics" type="bar">
                     <field name="period_id"/>
@@ -1348,7 +1307,6 @@
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">account.move.tree</field>
             <field name="model">account.move</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state == 'posted'" string="Journal Entries">
                     <field name="name"/>
@@ -1366,9 +1324,8 @@
         <record id="view_move_form" model="ir.ui.view">
             <field name="name">account.move.form</field>
             <field name="model">account.move</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Account Entry" version="7.0">
                 <header>
                     <button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight"/>
                     <button name="button_cancel" states="posted" string="Cancel" type="object"/>
@@ -1494,7 +1451,6 @@
         <record id="view_account_move_filter" model="ir.ui.view">
             <field name="name">account.move.select</field>
             <field name="model">account.move</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Move">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
@@ -1629,7 +1585,6 @@
         <record id="view_journal_period_tree" model="ir.ui.view">
             <field name="name">account.journal.period.tree</field>
             <field name="model">account.journal.period</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';gray:state == 'done';black:state == 'printed'" string="Journals">
                     <field icon="icon" name="fiscalyear_id"/>
@@ -1653,7 +1608,6 @@
         <record id="view_model_line_tree" model="ir.ui.view">
             <field name="name">account.model.line.tree</field>
             <field name="model">account.model.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Journal Entry Model Line" editable="bottom">
                     <field name="sequence"/>
@@ -1672,7 +1626,6 @@
         <record id="view_model_line_form" model="ir.ui.view">
             <field name="name">account.model.line.form</field>
             <field name="model">account.model.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal Entry Model Line" version="7.0">
                     <group col="4">
@@ -1693,7 +1646,6 @@
         <record id="view_model_form" model="ir.ui.view">
             <field name="name">account.model.form</field>
             <field name="model">account.model</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal Entry Model" version="7.0">
                     <group col="4">
@@ -1713,7 +1665,6 @@
         <record id="view_model_tree" model="ir.ui.view">
             <field name="name">account.model.tree</field>
             <field name="model">account.model</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Journal Entry Model">
                     <field name="name"/>
@@ -1726,7 +1677,6 @@
         <record id="view_model_search" model="ir.ui.view">
             <field name="name">account.model.search</field>
             <field name="model">account.model</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Journal Entry Model">
                     <field name="name" string="Journal Entry Model"/>
@@ -1759,7 +1709,6 @@
         <record id="view_payment_term_line_tree" model="ir.ui.view">
             <field name="name">account.payment.term.line.tree</field>
             <field name="model">account.payment.term.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Payment Term">
                     <field name="sequence"/>
@@ -1776,7 +1725,6 @@
         <record id="view_payment_term_line_form" model="ir.ui.view">
             <field name="name">account.payment.term.line.form</field>
             <field name="model">account.payment.term.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payment Term" version="7.0">
                     <field name="name"/>
@@ -1815,7 +1763,6 @@
         <record id="view_payment_term_search" model="ir.ui.view">
             <field name="name">account.payment.term.search</field>
             <field name="model">account.payment.term</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Payment Term">
                     <field name="name" string="Payment Term"/>
@@ -1827,7 +1774,6 @@
         <record id="view_payment_term_form" model="ir.ui.view">
             <field name="name">account.payment.term.form</field>
             <field name="model">account.payment.term</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payment Term" version="7.0">
                     <group>
@@ -1859,7 +1805,6 @@
         <record id="view_subscription_line_form" model="ir.ui.view">
             <field name="name">account.subscription.line.form</field>
             <field name="model">account.subscription.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription lines" version="7.0">
                     <group>
@@ -1873,7 +1818,6 @@
         <record id="view_subscription_line_tree" model="ir.ui.view">
             <field name="name">account.subscription.line.tree</field>
             <field name="model">account.subscription.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Subscription lines">
                     <field name="date"/>
@@ -1885,7 +1829,6 @@
         <record id="view_subscription_tree" model="ir.ui.view">
             <field name="name">account.subscription.tree</field>
             <field name="model">account.subscription</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';gray:state == 'done';black:state == 'running'" string="Entry Subscription">
                     <field name="name"/>
@@ -1900,7 +1843,6 @@
          <record id="view_subscription_search" model="ir.ui.view">
             <field name="name">account.subscription.search</field>
             <field name="model">account.subscription</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Entry Subscription">
                     <field name="name" string="Account Subscription"/>
@@ -1919,7 +1861,6 @@
         <record id="view_subscription_form" model="ir.ui.view">
             <field name="name">account.subscription.form</field>
             <field name="model">account.subscription</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Recurring" version="7.0">
                     <header>
@@ -1990,7 +1931,6 @@
         <record id="view_subscription_line_form_complete" model="ir.ui.view">
             <field name="name">account.subscription.line.form</field>
             <field name="model">account.subscription.line</field>
-            <field name="type">form</field>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Subscription lines" version="7.0">
@@ -2015,7 +1955,6 @@
         <record id="view_move_line_tax_tree" model="ir.ui.view">
             <field name="name">account.move.line.tax.tree</field>
             <field name="model">account.move.line</field>
-            <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items">
@@ -2083,7 +2022,6 @@
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Create Account</field>
             <field name="model">account.addtmpl.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Account" version="7.0">
                     <header>
@@ -2124,7 +2062,6 @@
         <record id="view_account_template_form" model="ir.ui.view">
             <field name="name">account.account.template.form</field>
             <field name="model">account.account.template</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Template" version="7.0">
                     <notebook>
@@ -2156,7 +2093,6 @@
         <record id="view_account_template_tree" model="ir.ui.view">
             <field name="name">account.account.template.tree</field>
             <field name="model">account.account.template</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Account Template">
                     <field name="code"/>
@@ -2170,7 +2106,6 @@
         <record id="view_account_template_search" model="ir.ui.view">
             <field name="name">account.account.template.search</field>
             <field name="model">account.account.template</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Account Templates">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/>
@@ -2202,7 +2137,6 @@
         <record id="view_account_chart_template_form" model="ir.ui.view">
             <field name="name">account.chart.template.form</field>
             <field name="model">account.chart.template</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Chart of Accounts Template" version="7.0">
                     <group col="4">
@@ -2234,7 +2168,6 @@
         <record id="view_account_chart_template_seacrh" model="ir.ui.view">
             <field name="name">account.chart.template.search</field>
             <field name="model">account.chart.template</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Chart of Account Templates">
                     <field name="name" string="Account Template"/>
@@ -2254,7 +2187,6 @@
         <record id="view_account_chart_template_tree" model="ir.ui.view">
             <field name="name">account.chart.template.tree</field>
             <field name="model">account.chart.template</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Chart of Accounts Template">
                     <field name="name"/>
@@ -2282,7 +2214,6 @@
         <record id="view_account_tax_template_form" model="ir.ui.view">
             <field name="name">account.tax.template.form</field>
             <field name="model">account.tax.template</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Tax Template" version="7.0">
                     <group col="4">
@@ -2339,7 +2270,6 @@
         <record id="view_account_tax_template_tree" model="ir.ui.view">
             <field name="name">account.tax.template.tree</field>
             <field name="model">account.tax.template</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Account Tax Template">
                     <field name="name" />
@@ -2350,7 +2280,6 @@
         <record id="view_account_tax_template_search" model="ir.ui.view">
             <field name="name">account.tax.template.search</field>
             <field name="model">account.tax.template</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Tax Templates">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax Template"/>
@@ -2375,7 +2304,6 @@
         <record id="view_tax_code_template_tree" model="ir.ui.view">
             <field name="name">account.tax.code.template.tree</field>
             <field name="model">account.tax.code.template</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree string="Account Tax Code Template" toolbar="1">
@@ -2389,7 +2317,6 @@
         <record id="view_tax_code_template_search" model="ir.ui.view">
             <field name="name">account.tax.code.template.search</field>
             <field name="model">account.tax.code.template</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search tax template">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Template"/>
@@ -2404,7 +2331,6 @@
         <record id="view_tax_code_template_form" model="ir.ui.view">
             <field name="name">account.tax.code.template.form</field>
             <field name="model">account.tax.code.template</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Tax Code Template" version="7.0">
                     <group col="4">
@@ -2434,7 +2360,6 @@
         <record id="view_wizard_multi_chart" model="ir.ui.view">
             <field name="name">Set Your Accounting Options</field>
             <field name="model">wizard.multi.charts.accounts</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
                 <form position="attributes" version="7.0">
@@ -2522,7 +2447,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
         <record id="account_account_graph" model="ir.ui.view">
             <field name="name">account.account.graph</field>
             <field name="model">account.account</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Account Statistics" type="bar">
                     <field name="name"/>
@@ -2536,7 +2460,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
         <record id="view_account_position_template_search" model="ir.ui.view">
             <field name="name">account.fiscal.position.template.search</field>
             <field name="model">account.fiscal.position.template</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Fiscal Position">
                     <field name="name" string="Fiscal Position Template"/>
@@ -2547,7 +2470,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
         <record id="view_account_position_template_form" model="ir.ui.view">
             <field name="name">account.fiscal.position.template.form</field>
             <field name="model">account.fiscal.position.template</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fiscal Position Template" version="7.0">
                     <group col="4">
@@ -2580,7 +2502,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
         <record id="view_account_position_template_tree" model="ir.ui.view">
             <field name="name">account.fiscal.position.template.tree</field>
             <field name="model">account.fiscal.position.template</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Fiscal Position">
                     <field name="name"/>
@@ -2605,7 +2526,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
         <record id="view_cash_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end);black:state == 'open'" string="Statement">
                     <field name="name"/>
@@ -2623,9 +2543,8 @@ action = pool.get('res.config').next(cr, uid, [], context)
         <record id="view_bank_statement_form2" model="ir.ui.view">
             <field name="name">account.bank.statement.form</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Statement" version="7.0">
                 <header>
                     <button name="button_confirm_cash" states="open" string="Close CashBox" type="object" class="oe_highlight"/>
                     <button name="button_open" states="draft" string="Open CashBox" type="object" class="oe_highlight"/>
@@ -2723,7 +2642,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
         <record id="account_cash_statement_graph" model="ir.ui.view">
             <field name="name">account.bank.statement.graph</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Account Statistics" type="bar">
                     <field name="date"/>
@@ -2790,7 +2708,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
         <record id="view_account_financial_report_form" model="ir.ui.view">
             <field name="name">account.financial.report.form</field>
             <field name="model">account.financial.report</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Report" version="7.0">
                     <group col="4">
@@ -2818,7 +2735,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
         <record id="view_account_financial_report_tree" model="ir.ui.view">
             <field name="name">account.financial.report.tree</field>
             <field name="model">account.financial.report</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Account Report">
                     <field name="name"/>
@@ -2832,7 +2748,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
         <record id="view_account_financial_report_search" model="ir.ui.view">
             <field name="name">account.financial.report.search</field>
             <field name="model">account.financial.report</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Account Report">
                     <field name="name" string="Account Report"/>
@@ -2861,7 +2776,6 @@ action = pool.get('res.config').next(cr, uid, [], context)
         <record id="view_account_report_tree_hierarchy" model="ir.ui.view">
             <field name="name">account.report.hierarchy</field>
             <field name="model">account.financial.report</field>
-            <field name="type">tree</field>
             <field name="field_parent">children_ids</field>
             <field name="arch" type="xml">
                 <tree string="Account Reports Hierarchy">
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 913e43e5982..630c551c5ca 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -25,7 +25,6 @@
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
             <field name="model">board.board</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Board" version="7.0">
                     <board style="2-1">
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 05e1c77edea..447622b57c5 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -5,7 +5,6 @@
             <field name="name">res.company.form.inherit</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Overdue Payments" position="inside">
@@ -20,7 +19,6 @@
             <field name="name">res.company.form.inherit</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='account_grp']" position="inside">
                     <field name="property_reserve_and_surplus_account"/>
diff --git a/addons/account/ir_sequence_view.xml b/addons/account/ir_sequence_view.xml
index c09fb7abb37..bae969ed199 100644
--- a/addons/account/ir_sequence_view.xml
+++ b/addons/account/ir_sequence_view.xml
@@ -4,7 +4,6 @@
         <record id="sequence_inherit_form" model="ir.ui.view">
             <field name="name">ir.sequence.form</field>
             <field name="model">ir.sequence</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.sequence_view"/>
             <field name="arch" type="xml">
                 <page position="after">
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index d44c7c460c7..d83571b314e 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -5,7 +5,6 @@
         <record id="view_account_position_form" model="ir.ui.view">
             <field name="name">account.fiscal.position.form</field>
             <field name="model">account.fiscal.position</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fiscal Position">
                     <group col="4">
@@ -42,7 +41,6 @@
         <record id="view_account_position_tree" model="ir.ui.view">
             <field name="name">account.fiscal.position.tree</field>
             <field name="model">account.fiscal.position</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Fiscal Position">
                     <field name="name"/>
@@ -70,7 +68,6 @@
         <record id="view_partner_property_form" model="ir.ui.view">
             <field name="name">res.partner.property.form.inherit</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="priority">2</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 8591b28b173..659a4f6ac36 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -4,7 +4,6 @@
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
@@ -27,7 +26,6 @@
         <record id="product_template_form_view" model="ir.ui.view">
             <field name="name">product.template.product.form.inherit</field>
             <field name="model">product.template</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
@@ -48,7 +46,6 @@
         <record id="view_category_property_form" model="ir.ui.view">
             <field name="name">product.category.property.form.inherit</field>
             <field name="model">product.category</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
                 <data>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index b95e1c16bfd..e3b902a000f 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -5,7 +5,6 @@
         <record id="view_account_analytic_account_list" model="ir.ui.view">
             <field name="name">account.analytic.account.list</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">tree</field>
             <field eval="8" name="priority"/>
             <field name="arch" type="xml">
                 <tree toolbar="1" colors="red:state=='pending';grey:state in ('cancelled','close');blue:type=='view'" string="Analytic Accounts">
@@ -27,7 +26,6 @@
         <record id="view_account_analytic_account_search" model="ir.ui.view">
             <field name="name">account.analytic.account.search</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Account">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
@@ -49,7 +47,6 @@
         <record id="view_account_analytic_account_tree" model="ir.ui.view">
             <field name="name">account.analytic.account.tree</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
@@ -124,7 +121,6 @@
         <record id="view_account_analytic_line_form" model="ir.ui.view">
             <field name="name">account.analytic.line.form</field>
             <field name="model">account.analytic.line</field>
-            <field name="type">form</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <form string="Analytic Entry" version="7.0">
@@ -166,7 +162,6 @@
         <record id="view_account_analytic_line_tree" model="ir.ui.view">
             <field name="name">account.analytic.line.tree</field>
             <field name="model">account.analytic.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="top" string="Analytic Entries">
                     <field name="date"/>
@@ -187,7 +182,6 @@
         <record id="view_account_analytic_line_filter" model="ir.ui.view">
             <field name="name">account.analytic.line.select</field>
             <field name="model">account.analytic.line</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Analytic Lines">
                     <field name="name" string="Analytic Line"/>
@@ -239,7 +233,6 @@
         <record id="account_analytic_line_extended_form" model="ir.ui.view">
             <field name="name">account.analytic.line.extended_form</field>
             <field name="model">account.analytic.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project line" version="7.0">
                     <group>
@@ -288,7 +281,6 @@
         <record id="view_account_analytic_journal_tree" model="ir.ui.view">
             <field name="name">account.analytic.journal.tree</field>
             <field name="model">account.analytic.journal</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Analytic Journal">
                     <field name="code"/>
@@ -301,7 +293,6 @@
         <record id="view_analytic_journal_search" model="ir.ui.view">
             <field name="name">account.analytic.journal.search</field>
             <field name="model">account.analytic.journal</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Journals">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Journal"/>
@@ -316,7 +307,6 @@
         <record id="view_account_analytic_journal_form" model="ir.ui.view">
             <field name="name">account.analytic.journal.form</field>
             <field name="model">account.analytic.journal</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Analytic Journal" version="7.0">
                     <group col="4">
@@ -381,7 +371,6 @@
             <field name="name">account.journal.form.1</field>
             <field name="model">account.journal</field>
             <field name="inherit_id" ref="account.view_account_journal_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="type" position="after">
                     <field name="analytic_journal_id"/>
@@ -392,7 +381,6 @@
      <record id="analytic_accounts_graph" model="ir.ui.view">
             <field name="name">analytic.accounts.graph</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Analytic Account Statistics" type="bar">
                     <field name="complete_name"/>
diff --git a/addons/account/project/wizard/account_analytic_balance_report_view.xml b/addons/account/project/wizard/account_analytic_balance_report_view.xml
index be5cdf3b027..7090ea7897a 100644
--- a/addons/account/project/wizard/account_analytic_balance_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_balance_report_view.xml
@@ -5,7 +5,6 @@
         <record id="account_analytic_balance_view" model="ir.ui.view">
             <field name="name">Account Analytic Balance</field>
             <field name="model">account.analytic.balance</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Select Period" version="7.0">
                 <header>
diff --git a/addons/account/project/wizard/account_analytic_chart_view.xml b/addons/account/project/wizard/account_analytic_chart_view.xml
index c8f2d811319..70769049002 100644
--- a/addons/account/project/wizard/account_analytic_chart_view.xml
+++ b/addons/account/project/wizard/account_analytic_chart_view.xml
@@ -5,7 +5,6 @@
         <record id="account_analytic_chart_view" model="ir.ui.view">
             <field name="name">Chart of Analytic Accounts</field>
             <field name="model">account.analytic.chart</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Analytic Account Charts" version="7.0">
                     <header>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
index b2d8c9c87b0..8a6657f7583 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
@@ -5,7 +5,6 @@
         <record id="account_analytic_cost_ledger_journal_view" model="ir.ui.view">
             <field name="name">Account Analytic Cost Ledger Journal</field>
             <field name="model">account.analytic.cost.ledger.journal.report</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select period" version="7.0">
                     <header>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
index d3cde4e1138..7e2b7b7679e 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_view.xml
@@ -5,7 +5,6 @@
         <record id="account_analytic_cost_view" model="ir.ui.view">
             <field name="name">Account Analytic Check</field>
             <field name="model">account.analytic.cost.ledger</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Select Period" version="7.0">
                 <header>
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
index 3949ac22a83..7d414ee6525 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
@@ -5,7 +5,6 @@
         <record id="account_analytic_invert_balance_view" model="ir.ui.view">
             <field name="name">Account Analytic Inverted Balance</field>
             <field name="model">account.analytic.inverted.balance</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select Period" version="7.0">
                     <header>
diff --git a/addons/account/project/wizard/account_analytic_journal_report_view.xml b/addons/account/project/wizard/account_analytic_journal_report_view.xml
index d3401717ade..e4c4cd314db 100644
--- a/addons/account/project/wizard/account_analytic_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml
@@ -5,7 +5,6 @@
         <record id="account_analytic_journal_view" model="ir.ui.view">
             <field name="name">Account Analytic Journal</field>
             <field name="model">account.analytic.journal.report</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select Period" version="7.0">
                     <header>
diff --git a/addons/account/project/wizard/project_account_analytic_line_view.xml b/addons/account/project/wizard/project_account_analytic_line_view.xml
index ced6602b36d..55124cc283f 100644
--- a/addons/account/project/wizard/project_account_analytic_line_view.xml
+++ b/addons/account/project/wizard/project_account_analytic_line_view.xml
@@ -5,7 +5,6 @@
         <record id="view_project_account_analytic_line_form" model="ir.ui.view">
             <field name="name">project.account.analytic.line.form</field>
             <field name="model">project.account.analytic.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="View Account Analytic Lines" version="7.0">
                     <header>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 35031180523..8963ba97376 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -4,7 +4,6 @@
     <record id="view_analytic_entries_report_tree" model="ir.ui.view">
         <field name="name">analytic.entries.report.tree</field>
         <field name="model">analytic.entries.report</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Analytic Entries Analysis">
                 <field name="date" invisible="1"/>
@@ -31,7 +30,6 @@
     <record id="view_analytic_entries_report_search" model="ir.ui.view">
         <field name="name">analytic.entries.report.search</field>
         <field name="model">analytic.entries.report</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Analytic Entries Analysis">
                 <field name="day" string="Day"/>
@@ -59,7 +57,6 @@
     <record id="view_account_analytic_entries_search" model="ir.ui.view">
          <field name="name">account.analytic.entries.graph</field>
          <field name="model">analytic.entries.report</field>
-         <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Analytic Entries Analysis" type="bar">
                 <field name="user_id"/>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 8c445052094..667c61ab78f 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -4,7 +4,6 @@
     <record id="view_account_entries_report_tree" model="ir.ui.view">
         <field name="name">account.entries.report.tree</field>
         <field name="model">account.entries.report</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="blue:move_state == 'draft';black:move_state == 'posted'" string="Entries Analysis">
                 <field name="date" invisible="1"/>
@@ -38,7 +37,6 @@
     <record id="view_account_entries_report_graph" model="ir.ui.view">
          <field name="name">account.entries.report.graph</field>
          <field name="model">account.entries.report</field>
-         <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Entries Analysis" type="bar">
                 <field name="partner_id"/>
@@ -51,7 +49,6 @@
     <record id="view_company_analysis_tree" model="ir.ui.view">
          <field name="name">account.company.analysis.tree</field>
          <field name="model">account.entries.report</field>
-         <field name="type">tree</field>
          <field name="arch" type="xml">
              <tree string="Company Analysis" >
                 <field name="user_type"/>
@@ -64,7 +61,6 @@
     <record id="view_account_entries_report_search" model="ir.ui.view">
         <field name="name">account.entries.report.search</field>
         <field name="model">account.entries.report</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Entries Analysis">
                 <field name="date"/>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index e3e0b210f20..c22d5d55f45 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -4,7 +4,6 @@
     <record id="view_account_invoice_report_tree" model="ir.ui.view">
         <field name="name">account.invoice.report.tree</field>
         <field name="model">account.invoice.report</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')"  string="Invoices Analysis">
                 <field name="date" invisible="1"/>
@@ -40,7 +39,6 @@
     <record id="view_account_invoice_report_graph" model="ir.ui.view">
          <field name="name">account.invoice.report.graph</field>
          <field name="model">account.invoice.report</field>
-         <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Invoices Analysis" type="bar">
                  <field name="product_id"/>
@@ -52,7 +50,6 @@
     <record id="view_account_invoice_report_search" model="ir.ui.view">
         <field name="name">account.invoice.report.search</field>
         <field name="model">account.invoice.report</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Invoices Analysis">
                 <field name="date"/>
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index c9c667ae70e..a947cce4f57 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -7,7 +7,6 @@
         <record id="view_crm_case_user_graph" model="ir.ui.view">
             <field name="name">report.account.receivable.graph</field>
             <field name="model">report.account.receivable</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Accounts by Type" type="bar">
                     <field name="name"/>
@@ -18,7 +17,6 @@
         <record id="view_crm_case_user_tree" model="ir.ui.view">
             <field name="name">report.account.receivable.tree</field>
             <field name="model">report.account.receivable</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Accounts by Type">
                     <field name="name"/>
@@ -32,7 +30,6 @@
         <record id="view_crm_case_user_form" model="ir.ui.view">
             <field name="name">report.account.receivable.form</field>
             <field name="model">report.account.receivable</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Accounts by Type" version="7.0">
                     <group>
@@ -55,7 +52,6 @@
         <record id="view_aged_recv_graph" model="ir.ui.view">
             <field name="name">report.aged.receivable.graph</field>
             <field name="model">report.aged.receivable</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Aged Receivable" type="bar">
                     <field name="name"/>
@@ -67,7 +63,6 @@
         <record id="view_aged_recv_tree" model="ir.ui.view">
             <field name="name">report.aged.receivable.tree</field>
             <field name="model">report.aged.receivable</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Aged Receivable">
                     <field name="name"/>
@@ -88,7 +83,6 @@
         <record id="board_view_created_invoice" model="ir.ui.view">
             <field name="name">report.invoice.created.tree</field>
             <field name="model">report.invoice.created</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state in('paid','cancel') " string="Invoices">
                        <field name="create_date"/>
@@ -119,7 +113,6 @@
         <record id="view_report_account_sales_tree" model="ir.ui.view">
             <field name="name">report.account.sales.tree</field>
             <field name="model">report.account.sales</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sales by Account">
                     <field name="name"/>
@@ -136,7 +129,6 @@
         <record id="view_report_account_sales_graph" model="ir.ui.view">
              <field name="name">report.account.sales.graph</field>
              <field name="model">report.account.sales</field>
-             <field name="type">graph</field>
              <field name="arch" type="xml">
                  <graph string="Sales by Account" type="pie">
                      <field name="account_id"/>
@@ -148,7 +140,6 @@
         <record id="view_report_account_sales_search" model="ir.ui.view">
             <field name="name">report.account.sales.search</field>
             <field name="model">report.account.sales</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
                     <field name="name" string="Year"/>
@@ -168,7 +159,6 @@
         <record id="view_report_account_type_sales_tree" model="ir.ui.view">
             <field name="name">report.account_type.sales.tree</field>
             <field name="model">report.account_type.sales</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sales by Account Type">
                     <field name="name"/>
@@ -186,7 +176,6 @@
         <record id="view_report_account_type_sales_form" model="ir.ui.view">
             <field name="name">report.account_type.sales.form</field>
             <field name="model">report.account_type.sales</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <tree string="Sales by Account Type">
                     <field name="name"/>
@@ -199,7 +188,6 @@
         <record id="view_report_account_type_sales_graph" model="ir.ui.view">
              <field name="name">report.account_type.sales.graph</field>
              <field name="model">report.account_type.sales</field>
-             <field name="type">graph</field>
              <field name="arch" type="xml">
                  <graph string="Sales by Account" type="pie">
                      <field name="user_type"/>
@@ -211,7 +199,6 @@
         <record id="view_report_account_type_sales_search" model="ir.ui.view">
             <field name="name">report.account_type.sales.search</field>
             <field name="model">report.account_type.sales</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Sales by Account">
                     <field name="name" string="Year"/>
diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml
index f0096b561bb..ee21b9e5ec6 100644
--- a/addons/account/report/account_treasury_report_view.xml
+++ b/addons/account/report/account_treasury_report_view.xml
@@ -4,7 +4,6 @@
     <record id="view_account_treasury_report_tree" model="ir.ui.view">
         <field name="name">account.treasury.report.tree</field>
         <field name="model">account.treasury.report</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Treasury Analysis">
                 <field name="date" invisible="1"/>
@@ -22,7 +21,6 @@
     <record id="view_account_treasury_report_graph" model="ir.ui.view">
          <field name="name">account.treasury.report.graph</field>
          <field name="model">account.treasury.report</field>
-         <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Treasury Analysis" type="bar">
                 <field name="period_id"/>
@@ -33,7 +31,6 @@
     <record id="view_account_treasury_report_search" model="ir.ui.view">
         <field name="name">account.treasury.report.search</field>
         <field name="model">account.treasury.report</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Treasury Analysis">
                 <field name="fiscalyear_id"/>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index ebcd99a6915..79a65f70414 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -13,7 +13,6 @@
         <record id="view_account_config_settings" model="ir.ui.view">
             <field name="name">account settings</field>
             <field name="model">account.config.settings</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Accounting" version="7.0" class="oe_form_configuration">
                     <header>
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index be1776497b3..7840f5a9719 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -5,7 +5,6 @@
         <record id="account_automatic_reconcile_view" model="ir.ui.view">
              <field name="name">Account Automatic Reconcile</field>
              <field name="model">account.automatic.reconcile</field>
-             <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
                     <separator string="Reconciliation"/>
@@ -51,7 +50,6 @@
         <record id="account_automatic_reconcile_view1" model="ir.ui.view">
              <field name="name">Automatic reconcile unreconcile</field>
              <field name="model">account.automatic.reconcile</field>
-             <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Reconciliation Result" version="7.0">
                     <group>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 7e33e61eec8..1da342b4236 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -4,7 +4,6 @@
         <record id="view_account_change_currency" model="ir.ui.view">
             <field name="name">Change Currency</field>
             <field name="model">account.change.currency</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice Currency" version="7.0">
                     <group string="This wizard will change the currency of the invoice">
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index ee4bdc199c5..7533cb117eb 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -4,7 +4,6 @@
         <record id="view_account_chart" model="ir.ui.view">
             <field name="name">account.chart.form</field>
             <field name="model">account.chart</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account charts" version="7.0">
                     <group>
diff --git a/addons/account/wizard/account_financial_report_view.xml b/addons/account/wizard/account_financial_report_view.xml
index 39c4fac83fd..8388284be4a 100644
--- a/addons/account/wizard/account_financial_report_view.xml
+++ b/addons/account/wizard/account_financial_report_view.xml
@@ -5,7 +5,6 @@
         <record id="accounting_report_view" model="ir.ui.view">
             <field name="name">Accounting Report</field>
             <field name="model">accounting.report</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.account_common_report_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='target_move']" position="after">
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index a4b558ab163..a4863f17ec5 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -4,7 +4,6 @@
         <record id="view_account_fiscalyear_close_state" model="ir.ui.view">
             <field name="name">account.fiscalyear.close.state.form</field>
             <field name="model">account.fiscalyear.close.state</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close states of Fiscal year and periods" version="7.0">
 	                <group>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 8c4df8548f6..4708c7bb4f4 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -4,7 +4,6 @@
         <record id="view_account_fiscalyear_close" model="ir.ui.view">
             <field name="name">account.fiscalyear.close.form</field>
             <field name="model">account.fiscalyear.close</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
                     <separator string="Generate Fiscal Year Opening Entries"/>
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 08db574e9ac..78a9b085bf1 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -5,7 +5,6 @@
         <record id="view_account_invoice_refund" model="ir.ui.view">
             <field name="name">account.invoice.refund.form</field>
             <field name="model">account.invoice.refund</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Credit Note" version="7.0">
                     <separator string="Credit Note Options"/>
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 0ea2eefebc5..11703a4f259 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -4,7 +4,6 @@
         <record id="account_invoice_confirm_view" model="ir.ui.view">
             <field name="name">account.invoice.confirm.form</field>
             <field name="model">account.invoice.confirm</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Confirm Draft Invoices" version="7.0">
                     <separator string="Confirm Draft Invoices"/>
@@ -26,7 +25,6 @@
         <record id="account_invoice_cancel_view" model="ir.ui.view">
             <field name="name">account.invoice.cancel.form</field>
             <field name="model">account.invoice.cancel</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cancel Selected Invoices" version="7.0">
                     <separator string="Cancel Selected Invoices"/>
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index af0b50168de..ec1bee35901 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -5,7 +5,6 @@
         <record id="open_journal_button_view" model="ir.ui.view">
             <field name="name">Open Journal Button</field>
             <field name="model">account.journal.select</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal Select" version="7.0">
                     <label string="Are you sure you want to open Journal Entries?"/>
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index bd0a25bcf70..39d31753c76 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -4,7 +4,6 @@
         <record id="view_account_move_bank_reconcile" model="ir.ui.view">
             <field name="name">account.move.bank.reconcile.form</field>
             <field name="model">account.move.bank.reconcile</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bank reconciliation" version="7.0">
                     <group>
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 72ee1a525d9..17250e74c9d 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -5,7 +5,6 @@
         <record id="view_account_move_journal_form" model="ir.ui.view">
             <field name="name">account.move.journal.form</field>
             <field name="model">account.move.journal</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Standard Entries">
                     <field name="target_move"/>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 1e36cc8bafe..e7c6268c14e 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -4,7 +4,6 @@
         <record id="view_account_move_line_reconcile_select" model="ir.ui.view">
             <field name="name">account.move.line.reconcile.select.form</field>
             <field name="model">account.move.line.reconcile.select</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
                     <group>
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index ade86e29c50..50233858d9d 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -5,7 +5,6 @@
         <record id="account_move_line_select_button_view" model="ir.ui.view">
             <field name="name">Open Move Line Button</field>
             <field name="model">account.move.line.select</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Select" version="7.0">
                     <label string="Are you sure you want to open Account move line entries?"/>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index 63ba44ba8a7..757ebbffa8f 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -4,7 +4,6 @@
         <record id="view_account_move_line_unreconcile_select" model="ir.ui.view">
             <field name="name">account.move.line.unreconcile.select.form</field>
             <field name="model">account.move.line.unreconcile.select</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Unreconciliation" version="7.0">
                     <group>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index 7f950e4cf53..c2c271af41b 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -4,7 +4,6 @@
         <record id="view_account_open_closed_fiscalyear" model="ir.ui.view">
             <field name="name">account.open.closed.fiscalyear.form</field>
             <field name="model">account.open.closed.fiscalyear</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Choose Fiscal Year " version="7.0">
                     <group>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index c6aa828e3ce..98f485d07df 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -5,7 +5,6 @@
         <record id="view_account_period_close" model="ir.ui.view">
             <field name="name">account.period.close.form</field>
             <field name="model">account.period.close</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close Period" version="7.0">
                     <group string="Are you sure?">
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index ffa298bf22d..3dcfceb2159 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -4,7 +4,6 @@
         <record id="account_partner_reconcile_view" model="ir.ui.view">
             <field name="name">Partner Reconcilation Process</field>
             <field name="model">account.partner.reconcile.process</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Partner Reconciliation" version="7.0">
                     <group col="4">
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index d6344f2cbc1..184ce1aaab0 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -5,7 +5,6 @@
         <record id="view_account_move_line_reconcile_full" model="ir.ui.view">
             <field name="name">account.move.line.reconcile.full.form</field>
             <field name="model">account.move.line.reconcile</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
                     <group col="4" string="Reconciliation Transactions">
@@ -48,7 +47,6 @@
         <record id="account_move_line_reconcile_writeoff" model="ir.ui.view">
             <field name="name">account.move.line.reconcile.writeoff.form</field>
             <field name="model">account.move.line.reconcile.writeoff</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Information addendum" version="7.0">
                     <header>
diff --git a/addons/account/wizard/account_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index c42e0bc38ad..b2c8ccd3011 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -6,7 +6,6 @@
         <record id="account_report_balance_view" model="ir.ui.view">
           <field name="name">Trial Balance</field>
           <field name="model">account.balance.report</field>
-          <field name="type">form</field>
           <field name="inherit_id" ref="account_common_report_view" />
           <field name="arch" type="xml">
             <data>
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index 0e82603ced1..77ebf02570f 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -5,7 +5,6 @@
         <record id="account_aged_balance_view" model="ir.ui.view">
             <field name="name">Aged Partner Balance</field>
             <field name="model">account.aged.trial.balance</field>
-            <field name="type">form</field>
             <!--<field name="inherit_id" ref="account_common_report_view" />-->
             <field name="arch" type="xml">
                 <form string="Report Options" version="7.0">
diff --git a/addons/account/wizard/account_report_central_journal_view.xml b/addons/account/wizard/account_report_central_journal_view.xml
index b139f0f2c43..2819d93471d 100644
--- a/addons/account/wizard/account_report_central_journal_view.xml
+++ b/addons/account/wizard/account_report_central_journal_view.xml
@@ -6,7 +6,6 @@
             <field name="name">Account central Journal</field>
             <field name="model">account.central.journal</field>
             <field name="inherit_id" ref="account_common_report_view" />
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="target_move" position="after">
                     <field name="amount_currency"/>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index 18953270e09..688f9e6de47 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -5,7 +5,6 @@
         <record id="account_common_report_view" model="ir.ui.view">
             <field name="name">Common Report</field>
             <field name="model">account.common.report</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Report Options" version="7.0">
                 <label string=""/>  <!-- binding for inherited views -->
diff --git a/addons/account/wizard/account_report_general_journal_view.xml b/addons/account/wizard/account_report_general_journal_view.xml
index 93c82cd5810..fc57789d0b7 100644
--- a/addons/account/wizard/account_report_general_journal_view.xml
+++ b/addons/account/wizard/account_report_general_journal_view.xml
@@ -5,7 +5,6 @@
         <record id="account_report_general_journal_view" model="ir.ui.view">
             <field name="name">Account General Journal</field>
             <field name="model">account.general.journal</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index 5078eeac88b..b636101ee79 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -5,7 +5,6 @@
         <record id="account_report_general_ledger_view" model="ir.ui.view">
             <field name="name">General Ledger</field>
             <field name="model">account.report.general.ledger</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
@@ -26,7 +25,6 @@
         <record id="account_report_general_ledger_view_inherit" model="ir.ui.view">
             <field name="name">General Ledger</field>
             <field name="model">account.report.general.ledger</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account_report_general_ledger_view" />
             <field name="arch" type="xml">
                <field name="fiscalyear_id" position="replace">
diff --git a/addons/account/wizard/account_report_partner_balance_view.xml b/addons/account/wizard/account_report_partner_balance_view.xml
index 3d3e020050c..6df8dd474c6 100644
--- a/addons/account/wizard/account_report_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_partner_balance_view.xml
@@ -5,7 +5,6 @@
         <record id="account_partner_balance_view" model="ir.ui.view">
             <field name="name">Partner Balance</field>
             <field name="model">account.partner.balance</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index 1bc223a956d..f3dd9a80f09 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -5,7 +5,6 @@
          <record id="account_partner_ledger_view" model="ir.ui.view">
             <field name="name">Partner Ledger</field>
             <field name="model">account.partner.ledger</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
diff --git a/addons/account/wizard/account_report_print_journal_view.xml b/addons/account/wizard/account_report_print_journal_view.xml
index 9a2ef25a1fe..ae8049d579e 100644
--- a/addons/account/wizard/account_report_print_journal_view.xml
+++ b/addons/account/wizard/account_report_print_journal_view.xml
@@ -5,7 +5,6 @@
         <record id="account_report_print_journal" model="ir.ui.view">
             <field name="name">Account Print Journal</field>
             <field name="model">account.print.journal</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
             <data>
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index 5e53fb66d0f..5139ccc7137 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -5,7 +5,6 @@
         <record id="view_account_state_open" model="ir.ui.view">
             <field name="name">Account State Open</field>
             <field name="model">account.state.open</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open Invoice" version="7.0">
                     <label string="Are you sure you want to open this invoice ?"/>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index e32439537d7..c988d73c2aa 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -5,7 +5,6 @@
         <record id="view_account_subscription_generate" model="ir.ui.view">
             <field name="name">account.subscription.generate.form</field>
             <field name="model">account.subscription.generate</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
                     <group>
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index 08091ce1bda..66f0b957b43 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -5,7 +5,6 @@
         <record id="view_account_tax_chart" model="ir.ui.view">
             <field name="name">account.tax.chart.form</field>
             <field name="model">account.tax.chart</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account tax charts" version="7.0">
                     <group>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index dc3cf7b748a..785469aad51 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -5,7 +5,6 @@
         <record id="account_unreconcile_view" model="ir.ui.view">
             <field name="name">Unreconcile Entries</field>
             <field name="model">account.unreconcile</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Unreconciliation" version="7.0">
                 <separator string="Unreconciliate Transactions"/>
@@ -40,7 +39,6 @@
         <record id="account_unreconcile_reconcile_view" model="ir.ui.view">
             <field name="name">Unreconcile Entries</field>
             <field name="model">account.unreconcile.reconcile</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Unreconciliation" version="7.0">
                 <header>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 6170ca4fe12..7e3e70af202 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -5,7 +5,6 @@
         <record id="view_account_use_model" model="ir.ui.view">
             <field name="name">account.use.model.form</field>
             <field name="model">account.use.model</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
 	            <form string="Create Entries From Models" version="7.0">
 	                <group>
@@ -35,7 +34,6 @@
         <record id="view_account_use_model_create_entry" model="ir.ui.view">
             <field name="name">account.use.model.create.entry.form</field>
             <field name="model">account.use.model</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model" version="7.0">
                     <label string = "Are you sure you want to create entries?"/>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 991921710a7..6a9b1e159f0 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -6,7 +6,6 @@
         <record id="validate_account_move_view" model="ir.ui.view">
             <field name="name">Post Journal Entries</field>
             <field name="model">validate.account.move</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Post Journal Entries" version="7.0">
                     <group>
@@ -43,7 +42,6 @@
         <record id="validate_account_move_line_view" model="ir.ui.view">
             <field name="name">Post Journal Entries</field>
             <field name="model">validate.account.move.lines</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Post Journal Entries" version="7.0">
                     <separator string="Post Journal Entries"/>
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 0a53a6207c5..83667914a6a 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -5,7 +5,6 @@
         <record id="view_account_vat_declaration" model="ir.ui.view">
             <field name="name">Account Tax Declaration</field>
             <field name="model">account.vat.declaration</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Taxes Report" version="7.0">
                 <label colspan="4" string="This menu prints a tax declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
diff --git a/addons/account/wizard/pos_box.xml b/addons/account/wizard/pos_box.xml
index 46f4eeb3699..469a46ebcc5 100644
--- a/addons/account/wizard/pos_box.xml
+++ b/addons/account/wizard/pos_box.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="cash_box_in_form">
             <field name="name">cash_box_in</field>
             <field name="model">cash.box.in</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Put Money In" version="7.0">
                     <separator string="Fill in this form if you put money in the cash register:" colspan="4" />
@@ -33,7 +32,6 @@
         <record model="ir.ui.view" id="cash_box_out_form">
             <field name="name">cash_box_out</field>
             <field name="model">cash.box.out</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Take Money Out" version="7.0">
                     <separator string="Describe why you take money from the cash register:"/>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 537397fd369..9e5be21cf70 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -16,7 +16,6 @@
         <record id="view_account_analytic_account_overdue_search" model="ir.ui.view">
             <field name="name">account.analytic.account.search</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Account">
                     <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 32839063f02..cd043749309 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -16,7 +16,6 @@
         <record id="account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="40" name="priority"/>
             <field name="arch" type="xml">
@@ -101,7 +100,6 @@
             <field name="name">account.analytic.account.tree</field>
             <field name="model">account.analytic.account</field>
             <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <field name="date" position="before">
                     <field name="last_invoice_date"/>
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 3e2ba0fe5f3..ff09fb4b0db 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -4,7 +4,6 @@
         <record id="view_account_analytic_default_tree" model="ir.ui.view">
             <field name="name">account.analytic.default.tree</field>
             <field name="model">account.analytic.default</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Analytic Defaults">
                     <field name="sequence"/>
@@ -22,7 +21,6 @@
         <record id="view_account_analytic_default_form" model="ir.ui.view">
             <field name="name">account.analytic.default.form</field>
             <field name="model">account.analytic.default</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Analytic Defaults" version="7.0">
                     <group col="4">
@@ -43,7 +41,6 @@
         <record id="view_account_analytic_default_form_search" model="ir.ui.view">
             <field name="name">account.analytic.default.search</field>
             <field name="model">account.analytic.default</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
                     <field name="date_stop"/>
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 045a0eb0cbb..76d6aeed7b8 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -7,7 +7,6 @@
     <record model="ir.ui.view" id="view_account_journal_form_inherit">
         <field name="name">account.journal.form.inherit</field>
         <field name="model">account.journal</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="account.view_account_journal_form"/>
         <field name="arch" type="xml">
             <field name="centralisation" position="before">
@@ -19,7 +18,6 @@
     <record id="view_move_form_inherit" model="ir.ui.view">
        <field name="name">account.move.form.inherit</field>
        <field name="model">account.move</field>
-       <field name="type">form</field>
        <field name="inherit_id" ref="account.view_move_form"/>
        <field name="arch" type="xml">
            <xpath expr="/form/sheet/notebook/page/field[@name='line_id']/tree/field[@name='analytic_account_id']" position="replace">
@@ -43,7 +41,6 @@
     <record model="ir.ui.view" id="view_move_line_form_inherit">
         <field name="name">account.move.line.form.inherit</field>
         <field name="model">account.move.line</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="account.view_move_line_form"/>
         <field name="arch" type="xml">
             <field name="analytic_account_id" position="replace">
@@ -55,7 +52,6 @@
     <record model="ir.ui.view" id="view_move_line_form_1_inherit">
         <field name="name">account.move.line.form.inherit1</field>
         <field name="model">account.move.line</field>
-        <field name="type">form</field>
         <field name="priority">2</field>
         <field name="inherit_id" ref="account.view_move_line_form2"/>
         <field name="arch" type="xml">
@@ -68,7 +64,6 @@
     <record model="ir.ui.view" id="view_move_line_tree_inherit">
         <field name="name">account.move.line.tree.inherit</field>
         <field name="model">account.move.line</field>
-        <field name="type">tree</field>
         <field name="priority">2</field>
         <field name="inherit_id" ref="account.view_move_line_tree"/>
         <field name="arch" type="xml">
@@ -84,7 +79,6 @@
         <field name="name">account.invoice.line.form.inherit</field>
         <field name="model">account.invoice.line</field>
         <field name="inherit_id" ref="account.view_invoice_line_form"/>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <field name="account_analytic_id" position="replace">
                 <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
@@ -95,7 +89,6 @@
     <record model="ir.ui.view" id="invoice_supplier_form_inherit">
         <field name="name">account.invoice.supplier.form.inherit</field>
         <field name="model">account.invoice</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="account.invoice_supplier_form"/>
         <field name="priority">2</field>
         <field name="arch" type="xml">
@@ -109,7 +102,6 @@
     <record model="ir.ui.view" id="account_analytic_plan_instance_form">
         <field name="name">account.analytic.plan.instance.form</field>
         <field name="model">account.analytic.plan.instance</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Analytic Distribution" version="7.0">
                 <group col="4">
@@ -135,7 +127,6 @@
     <record model="ir.ui.view" id="account_analytic_plan_instance_tree">
         <field name="name">account.analytic.plan.instance.tree</field>
         <field name="model">account.analytic.plan.instance</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Analytic Distribution">
                 <field name="name"/>
@@ -165,7 +156,6 @@
     <record model="ir.ui.view" id="account_analytic_plan_instance_line_form">
         <field name="name">account.analytic.plan.instance.line.form</field>
         <field name="model">account.analytic.plan.instance.line</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Analytic Distribution Line" version="7.0">
                 <group col="4">
@@ -180,7 +170,6 @@
     <record model="ir.ui.view" id="account_analytic_plan_instance_line_tree">
         <field name="name">account.analytic.plan.instance.line.tree</field>
         <field name="model">account.analytic.plan.instance.line</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Analytic Distribution Lines">
                 <field name="plan_id"/>
@@ -193,7 +182,6 @@
     <record model="ir.ui.view" id="account_analytic_plan_search">
         <field name="name">account.analytic.plan.search</field>
         <field name="model">account.analytic.plan</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Analytic Plans">
                 <field name="name" string="Analytic Plan"/>
@@ -204,7 +192,6 @@
     <record model="ir.ui.view" id="account_analytic_plan_form">
         <field name="name">account.analytic.plan.form</field>
         <field name="model">account.analytic.plan</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Analytic Plan" version="7.0">
                 <group col="4">
@@ -219,7 +206,6 @@
     <record model="ir.ui.view" id="account_analytic_plan_tree">
         <field name="name">account.analytic.plan.tree</field>
         <field name="model">account.analytic.plan</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Analytic Plans">
                 <field name="name"/>
@@ -250,7 +236,6 @@
     <record model="ir.ui.view" id="account_analytic_plan_line_form">
         <field name="name">account.analytic.plan.line.form</field>
         <field name="model">account.analytic.plan.line</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Analytic Plan Line" version="7.0">
                 <group col="4">
@@ -268,7 +253,6 @@
     <record model="ir.ui.view" id="account_analytic_plan_line_tree">
         <field name="name">account.analytic.plan.line.tree</field>
         <field name="model">account.analytic.plan.line</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Analytic Plan Lines">
                 <field name="name"/>
@@ -284,7 +268,6 @@
 
         <record model="ir.ui.view" id="view_default_inherit_form">
             <field name="name">account.analytic.default.form.plans</field>
-            <field name="type">form</field>
             <field name="model">account.analytic.default</field>
             <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_form"/>
             <field name="arch" type="xml">
@@ -295,7 +278,6 @@
         </record>
          <record model="ir.ui.view" id="view_default_inherit_tree">
             <field name="name">account.analytic.default.tree.plans</field>
-            <field name="type">tree</field>
             <field name="model">account.analytic.default</field>
             <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_tree"/>
             <field name="arch" type="xml">
@@ -308,7 +290,6 @@
         <record id="view_bank_statement_inherit_form" model="ir.ui.view">
             <field name="name">account.bank.statement.form.inherit</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/tree/field[@name='analytic_account_id']" position="replace">
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index c25705572d1..07e2ca19cd9 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -5,7 +5,6 @@
         <record id="view_account_crossovered_analytic" model="ir.ui.view">
             <field name="name">account.crossovered.analytic.form</field>
             <field name="model">account.crossovered.analytic</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Crossovered Analytic" version="7.0">
                 <group col="4">
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
index 5b8a11f2587..fdc7fa6868a 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
@@ -4,7 +4,6 @@
         <record id="view_analytic_plan_create_model_msg" model="ir.ui.view">
             <field name="name">analytic.plan.create.model.msg.form</field>
             <field name="model">analytic.plan.create.model</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Distribution Model Saved" version="7.0">
                 <label string="Save This Distribution as a Model"/>
@@ -20,7 +19,6 @@
         <record id="view_analytic_plan_create_model" model="ir.ui.view">
             <field name="name">analytic.plan.create.model.form</field>
             <field name="model">analytic.plan.create.model</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Distribution Model Saved" version="7.0">
                 <label string="This distribution model has been saved.You will be able to reuse it later."/>
diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml
index b88f8f2db42..4acc69b7595 100644
--- a/addons/account_anglo_saxon/product_view.xml
+++ b/addons/account_anglo_saxon/product_view.xml
@@ -4,7 +4,6 @@
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit.stock</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='property_account_expense']" position="after">
@@ -18,7 +17,6 @@
         <record id="product_template_form_view" model="ir.ui.view">
             <field name="name">product.template.product.form.inherit</field>
             <field name="model">product.template</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.product_template_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='property_account_expense']" position="after">
@@ -31,7 +29,6 @@
         <record id="view_category_property_form" model="ir.ui.view">
             <field name="name">product.category.property.form.inherit.stock</field>
             <field name="model">product.category</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
                 <data>
diff --git a/addons/account_asset/account_asset_invoice_view.xml b/addons/account_asset/account_asset_invoice_view.xml
index 40ee51e10b8..eb6403b6f48 100644
--- a/addons/account_asset/account_asset_invoice_view.xml
+++ b/addons/account_asset/account_asset_invoice_view.xml
@@ -7,7 +7,6 @@
             <field name="name">account.invoice.line.form</field>
             <field name="model">account.invoice.line</field>
             <field name="inherit_id" ref="account.view_invoice_line_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="account_id" position="after">
                     <field name="asset_category_id"/>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index cdc772ad65d..c230f63e204 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -8,7 +8,6 @@
     <record model="ir.ui.view" id="view_account_asset_category_form">
         <field name="name">account.asset.category.form</field>
         <field name="model">account.asset.category</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Asset category" version="7.0">
                 <group>
@@ -47,7 +46,6 @@
     <record model="ir.ui.view" id="view_account_asset_category_tree">
         <field name="name">account.asset.category.tree</field>
         <field name="model">account.asset.category</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Asset category">
                 <field name="name"/>
@@ -61,7 +59,6 @@
     <record model="ir.ui.view" id="view_account_asset_category_search">
         <field name="name">account.asset.category.search</field>
         <field name="model">account.asset.category</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Asset Category">
                 <field name="name" string="Asset Category"/>
@@ -77,7 +74,6 @@
     <record model="ir.ui.view" id="view_account_asset_asset_form">
         <field name="name">account.asset.asset.form</field>
         <field name="model">account.asset.asset</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Asset" version="7.0">
                 <header>
@@ -187,7 +183,6 @@
     <record model="ir.ui.view" id="view_account_asset_asset_tree">
         <field name="name">account.asset.asset.tree</field>
         <field name="model">account.asset.asset</field>
-        <field name="type">tree</field>
         <field name="field_parent">child_ids</field>
         <field name="arch" type="xml">
             <tree string="Assets" colors="blue:(state == 'draft');grey:(state == 'close')">
@@ -207,7 +202,6 @@
     <record model="ir.ui.view" id="view_account_asset_asset_hierarchy_tree">
         <field name="name">account.asset.asset.hierarchy</field>
         <field name="model">account.asset.asset</field>
-        <field name="type">tree</field>
         <field name="field_parent">child_ids</field>
         <field name="arch" type="xml">
             <tree string="Assets">
@@ -227,7 +221,6 @@
     <record id="view_account_asset_search" model="ir.ui.view">
         <field name="name">account.asset.asset.search</field>
         <field name="model">account.asset.asset</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Account Asset">
                 <field name="name" string="Asset"/>
@@ -247,7 +240,6 @@
     <record model="ir.ui.view" id="view_account_asset_history_form">
         <field name="name">account.asset.history.form</field>
         <field name="model">account.asset.history</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Asset History" version="7.0">
                 <group>
@@ -272,7 +264,6 @@
     <record model="ir.ui.view" id="view_account_asset_history_tree">
         <field name="name">account.asset.history.tree</field>
         <field name="model">account.asset.history</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Asset history">
                 <field name="date"/>
@@ -297,7 +288,6 @@
     <record id="view_account_move_line_form_inherit" model="ir.ui.view">
         <field name="name">Journal Items (form)</field>
         <field name="model">account.move.line</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="account.view_move_line_form"/>
         <field name="arch" type="xml">
             <field name="statement_id" position="after">
@@ -309,7 +299,6 @@
     <record id="view_account_move_line_filter_inherit" model="ir.ui.view">
         <field name="name">Journal Items (Search)</field>
         <field name="model">account.move.line</field>
-        <field name="type">search</field>
         <field name="inherit_id" ref="account.view_account_move_line_filter"/>
         <field name="arch" type="xml">
             <field name="account_id" position="after">
diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index 91f700fb92a..bc598011086 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -5,7 +5,6 @@
     <record model="ir.ui.view" id="view_asset_asset_report_tree">
         <field name="name">asset.asset.report.tree</field>
         <field name="model">asset.asset.report</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Assets">
                 <field name="name" invisible="1"/>
@@ -28,7 +27,6 @@
     <record model="ir.ui.view" id="action_account_asset_report_graph">
         <field name="name">asset.asset.report.graph</field>
         <field name="model">asset.asset.report</field>
-        <field name="type">graph</field>
         <field name="arch" type="xml">
             <graph string="Assets Analysis" type="bar">
                 <field name="asset_id"/>
@@ -40,7 +38,6 @@
     <record id="view_asset_asset_report_search" model="ir.ui.view">
         <field name="name">asset.asset.report.search</field>
         <field name="model">asset.asset.report</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Assets Analysis">
                 <field name="purchase_date"/>
diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
index 15b11f4dcff..1c7f3458441 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="asset_modify_form">
             <field name="name">wizard.asset.modify.form</field>
             <field name="model">asset.modify</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Modify Asset" version="7.0">
                     <group string="Asset Durations to Modify" col="4">
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index e9b64a33a25..edabc6cc6de 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -4,7 +4,6 @@
         <record id="view_asset_depreciation_confirmation_wizard" model="ir.ui.view">
             <field name="name">asset.depreciation.confirmation.wizard</field>
             <field name="model">asset.depreciation.confirmation.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compute Asset" version="7.0">
                     <group>
diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index c77fb896840..30b2778817c 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -7,7 +7,6 @@
     <record id="view_statement_line_global_form" model="ir.ui.view">
       <field name="name">statement.line.global.form</field>
       <field name="model">account.bank.statement.line.global</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Batch Payment Info" version="7.0">
             <group col="4">
@@ -41,7 +40,6 @@
       <field name="name">view.bank.statement.form.add.fields</field>
       <field name="model">account.bank.statement</field>
       <field name="inherit_id" ref="account.view_bank_statement_form"/>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <data>
           <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='date']" position="after">
@@ -67,7 +65,6 @@
     <record id="view_bank_statement_line_list" model="ir.ui.view">
       <field name="name">bank.statement.line.list</field>
       <field name="model">account.bank.statement.line</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree editable="bottom" string="Statement Lines">
           <field name="sequence" readonly="1" invisible="1"/>
@@ -92,7 +89,6 @@
     <record id="view_bank_statement_line_form" model="ir.ui.view">
       <field name="name">bank.statement.line.form</field>
       <field name="model">account.bank.statement.line</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Statement Line" version="7.0">
           <group col="4">
@@ -120,7 +116,6 @@
     <record id="view_bank_statement_line_filter" model="ir.ui.view">
         <field name="name">bank.statement.line.filter</field>
         <field name="model">account.bank.statement.line</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Bank Transactions">
                 <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
diff --git a/addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml b/addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml
index 6d2e8e6683c..e5533658f4b 100644
--- a/addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml
+++ b/addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml
@@ -7,7 +7,6 @@
     <record id="view_cancel_statement_line" model="ir.ui.view">
       <field name="name">cancel.statement.line.form</field>
       <field name="model">cancel.statement.line</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Cancel selected statement lines" version="7.0">
             <header>
diff --git a/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml b/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
index 91a3a99c197..f8baab70b9f 100644
--- a/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
+++ b/addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
@@ -7,7 +7,6 @@
     <record id="view_confirm_statement_line" model="ir.ui.view">
       <field name="name">confirm.statement.line.form</field>
       <field name="model">confirm.statement.line</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Confirm selected statement lines" version="7.0">
             <header>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index f3f4e5fc47d..21f9cc69b8a 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -15,7 +15,6 @@
         <record id="view_budget_post_search" model="ir.ui.view">
             <field name="name">account.budget.post.search</field>
             <field name="model">account.budget.post</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Budgetary Position">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budgetary Position"/>
@@ -27,7 +26,6 @@
         <record id="view_budget_post_tree" model="ir.ui.view">
             <field name="name">account.budget.post.tree</field>
             <field name="model">account.budget.post</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Budgetary Position">
                     <field name="code"/>
@@ -52,7 +50,6 @@
         <record model="ir.ui.view" id="view_budget_post_form">
             <field name="name">account.budget.post.form.inherit</field>
             <field name="model">account.budget.post</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Budgetary Position" version="7.0">
                     <group col="4">
@@ -105,9 +102,8 @@
         <record model="ir.ui.view" id="crossovered_budget_view_form">
             <field name="name">crossovered.budget.view.form</field>
             <field name="model">crossovered.budget</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Budget" version="7.0">
                     <header>
                         <button string="Confirm" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
                         <button string="Approve" name="validate" states="confirm" type="workflow" class="oe_highlight"/>
@@ -181,7 +177,6 @@
         <record model="ir.ui.view" id="crossovered_budget_view_tree">
             <field name="name">crossovered.budget.view.tree</field>
             <field name="model">crossovered.budget</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree colors="blue:state == 'draft';gray:state in ('done','cancel');black:state in ('confirm','validate')" string="Budget">
                     <field name="name" colspan="1"/>
@@ -198,7 +193,6 @@
         <record id="view_crossovered_budget_search" model="ir.ui.view">
            <field name="name">crossovered.budget.search</field>
            <field name="model">crossovered.budget</field>
-           <field name="type">search</field>
            <field name="arch" type="xml">
                <search string="Budget">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Budget"/>
@@ -240,7 +234,6 @@
         <record model="ir.ui.view" id="view_crossovered_budget_line_tree">
             <field name="name">crossovered.budget.line.tree</field>
             <field name="model">crossovered.budget.lines</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Budget Lines">
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
@@ -259,7 +252,6 @@
         <record model="ir.ui.view" id="view_crossovered_budget_line_form">
             <field name="name">crossovered.budget.line.form</field>
             <field name="model">crossovered.budget.lines</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Budget Lines" version="7.0">
                     <sheet>
@@ -303,7 +295,6 @@
 
         <record model="ir.ui.view" id="view_account_analytic_account_form_inherit_budget">
             <field name="name">account.analytic.account.form.inherot.budget</field>
-            <field name="type">form</field>
             <field name="model">account.analytic.account</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml
index c08f15a7410..6c5af8463c9 100644
--- a/addons/account_budget/wizard/account_budget_analytic_view.xml
+++ b/addons/account_budget/wizard/account_budget_analytic_view.xml
@@ -5,7 +5,6 @@
         <record id="account_budget_analytic_view" model="ir.ui.view">
              <field name="name">account.budget.analytic.form</field>
              <field name="model">account.budget.analytic</field>
-             <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
                      <group string="This wizard is used to print budget" col="4">
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
index 5f2ec7ee46c..0659971c9a0 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
@@ -5,7 +5,6 @@
         <record id="account_budget_crossvered_report_view" model="ir.ui.view">
              <field name="name">account.budget.crossvered.report.form</field>
              <field name="model">account.budget.crossvered.report</field>
-             <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
                     <group string="This wizard is used to print budget" col="4">
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
index 3e02604b746..b87bc2e18ac 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
@@ -5,7 +5,6 @@
         <record id="account_budget_crossvered_summary_report_view" model="ir.ui.view">
              <field name="name">account.budget.crossvered.summary.report.form</field>
              <field name="model">account.budget.crossvered.summary.report</field>
-             <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
                     <group string="This wizard is used to print summary of budgets">
diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml
index 984cbeefeef..d9905420608 100644
--- a/addons/account_budget/wizard/account_budget_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_report_view.xml
@@ -5,7 +5,6 @@
       <record id="account_budget_report_view" model="ir.ui.view">
         <field name="name">account.budget.report.form</field>
         <field name="model">account.budget.report</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
           <form string="Select Dates Period" version="7.0">
               <group string="Print Budgets" col="4">
diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
index 9bf37134920..4ed8093a0aa 100644
--- a/addons/account_cancel/account_cancel_view.xml
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -4,7 +4,6 @@
         <record id="view_account_journal_form_inherit" model="ir.ui.view">
             <field name="name">account.journal.form</field>
             <field name="model">account.journal</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_journal_form"/>
             <field name="arch" type="xml">
                 <field name="entry_posted" position="after">
@@ -16,7 +15,6 @@
         <record id="invoice_form_cancel_inherit" model="ir.ui.view">
             <field name="name">invoice.form.cancel.inherit</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='invoice_cancel']" position="replace">
@@ -28,7 +26,6 @@
         <record id="invoice_supplier_cancel_form_inherit" model="ir.ui.view">
             <field name="name">invoice.supplier.cancel.form.inherit</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='invoice_cancel']" position="replace">
diff --git a/addons/account_check_writing/account_view.xml b/addons/account_check_writing/account_view.xml
index 5f9dd1dccbb..53dd1cb1c93 100644
--- a/addons/account_check_writing/account_view.xml
+++ b/addons/account_check_writing/account_view.xml
@@ -9,7 +9,6 @@
         <record id="view_account_journal_form" model="ir.ui.view">
             <field name="name">account.journal.form</field>
             <field name="model">account.journal</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_journal_form" />
             <field name="arch" type="xml">
                 <field name="type" on_change="onchange_type(type, currency)" />
@@ -27,7 +26,6 @@
         <record id="check_format_company" model="ir.ui.view">
             <field name="name">res.company.check.format</field>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="priority">17</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml
index 96592b0da5a..520c78009d5 100644
--- a/addons/account_check_writing/account_voucher_view.xml
+++ b/addons/account_check_writing/account_voucher_view.xml
@@ -7,7 +7,6 @@
         <record model="ir.ui.view" id="view_vendor_payment_check_form">
             <field name="name">account.voucher.payment.check.form</field>
             <field name="model">account.voucher</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account_voucher.view_vendor_payment_form" />
             <field name="arch" type="xml">
                 <field name="journal_id" position="after">
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 07f397c663f..0b42ad6352f 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -9,7 +9,6 @@
     <record id="view_coda_bank_account_search" model="ir.ui.view">
         <field name="name">coda.bank.account.search</field>
         <field name="model">coda.bank.account</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="CODA Bank Account Configuration">
                 <field name="name" filter_domain="['|', ('name','ilike',self), ('description1','ilike',self)]" string="CODA Bank Account"/>
@@ -29,7 +28,6 @@
     <record id="view_coda_bank_account_list" model="ir.ui.view">
       <field name="name">coda.bank.account.list</field>
       <field name="model">coda.bank.account</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="CODA Bank Account Configuration">
           <field name="name"/>
@@ -44,7 +42,6 @@
     <record id="view_coda_bank_account_form" model="ir.ui.view">
       <field name="name">coda.bank.account.form</field>
       <field name="model">coda.bank.account</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="CODA Bank Account Configuration" version="7.0">
             <group col="4">
@@ -82,7 +79,6 @@
     <record id="view_account_coda_trans_type_tree" model="ir.ui.view">
       <field name="name">account.coda.trans.type.tree</field>
       <field name="model">account.coda.trans.type</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="CODA Transaction Types">
           <field name="type"/>
@@ -94,7 +90,6 @@
     <record id="view_account_coda_trans_type_form" model="ir.ui.view">
       <field name="name">account.coda.trans.type.form</field>
       <field name="model">account.coda.trans.type</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
           <form string="CODA Transaction Type" version="7.0">
               <group col="4">
@@ -118,7 +113,6 @@
     <record id="view_account_coda_trans_code_tree" model="ir.ui.view">
       <field name="name">account.coda.trans.code.tree</field>
       <field name="model">account.coda.trans.code</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="CODA Transaction Codes">
           <field name="code"/>
@@ -131,7 +125,6 @@
     <record id="view_account_coda_trans_code_form" model="ir.ui.view">
       <field name="name">account.coda.trans.code.form</field>
       <field name="model">account.coda.trans.code</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
           <form string="CODA Transaction Code" version="7.0">
               <group col="4">
@@ -157,7 +150,6 @@
     <record id="view_account_coda_trans_category_tree" model="ir.ui.view">
       <field name="name">account.coda.trans.category.tree</field>
       <field name="model">account.coda.trans.category</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="CODA Transaction Categories">
           <field name="category"/>
@@ -168,7 +160,6 @@
     <record id="view_account_coda_trans_category_form" model="ir.ui.view">
       <field name="name">account.coda.trans.category.form</field>
       <field name="model">account.coda.trans.category</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
           <form string="CODA Transaction Category" version="7.0">
               <field name="category"/>
@@ -189,7 +180,6 @@
     <record id="view_account_coda_comm_type_tree" model="ir.ui.view">
       <field name="name">account.coda.comm.type.tree</field>
       <field name="model">account.coda.comm.type</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="CODA Structured Communication Types">
           <field name="code"/>
@@ -200,7 +190,6 @@
     <record id="view_account_coda_comm_type_form" model="ir.ui.view">
       <field name="name">account.coda.comm.type.form</field>
       <field name="model">account.coda.comm.type</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
           <form string="CODA Structured Communication Type" version="7.0">
               <field name="code"/>
@@ -225,7 +214,6 @@
     <record model="ir.ui.view" id="view_account_coda_tree">
       <field name="name">account.coda.tree</field>
       <field name="model">account.coda</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="CODA Files">
           <field name="coda_creation_date"/>
@@ -240,7 +228,6 @@
     <record model="ir.ui.view" id="view_account_coda_form">
         <field name="name">account.coda.form</field>
         <field name="model">account.coda</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="CODA File" version="7.0">
                 <sheet>
@@ -263,7 +250,6 @@
     <record id="view_account_coda_filter" model="ir.ui.view">
       <field name="name">account.coda.search</field>
       <field name="model">account.coda</field>
-      <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Search CODA Files">
             <field name="coda_creation_date"/>
@@ -295,7 +281,6 @@
     <record id="view_coda_bank_statement_list" model="ir.ui.view">
       <field name="name">coda.bank.statement.list</field>
       <field name="model">coda.bank.statement</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end)" string="CODA Bank Statements">
           <field name="name"/>
@@ -313,7 +298,6 @@
     <record id="view_coda_bank_statement_form" model="ir.ui.view">
       <field name="name">coda.bank.statement.form</field>
       <field name="model">coda.bank.statement</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
           <form string="CODA Bank Statement" version="7.0">
               <sheet>
@@ -376,7 +360,6 @@
     <record id="view_coda_bank_statement_search" model="ir.ui.view">
         <field name="name">coda.bank.statement.search</field>
         <field name="model">coda.bank.statement</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search CODA Bank Statements">
                 <field name="name" string="CODA Bank Statement"/>
@@ -412,7 +395,6 @@
     <record id="view_coda_bank_statement_line_list" model="ir.ui.view">
       <field name="name">coda.bank.statement.line.list</field>
       <field name="model">coda.bank.statement.line</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree editable="bottom" string="CODA Statement Lines">
           <field name="sequence" readonly="1" invisible="1"/>
@@ -435,7 +417,6 @@
     <record id="view_coda_bank_statement_line_form" model="ir.ui.view">
       <field name="name">coda.bank.statement.line.form</field>
       <field name="model">coda.bank.statement.line</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="CODA Statement Line" version="7.0">
             <group col="4">
@@ -461,7 +442,6 @@
     <record id="view_coda_bank_statement_line_filter" model="ir.ui.view">
         <field name="name">coda.bank.statement.line.filter</field>
         <field name="model">coda.bank.statement.line</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Bank Transactions">
                 <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Bank Transaction"/>
diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/account_coda/account_coda_wizard.xml
index 655f1afb95e..76178820d9c 100644
--- a/addons/account_coda/account_coda_wizard.xml
+++ b/addons/account_coda/account_coda_wizard.xml
@@ -5,7 +5,6 @@
     <record id="account_coda_import_view" model="ir.ui.view">
       <field name="name">Import CODA File</field>
       <field name="model">account.coda.import</field>
-      <field name="type">form</field>
       <field name="priority">1</field>
       <field name="arch" type="xml">
         <form string="Import CODA File" version="7.0">
@@ -25,7 +24,6 @@
     <record id="account_coda_import_result_view" model="ir.ui.view">
       <field name="name">Import CODA File</field>
       <field name="model">account.coda.import</field>
-      <field name="type">form</field>
       <field name="priority">2</field>
       <field name="arch" type="xml">
         <form string="Import CODA File" version="7.0">
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 3d1d4333bbb..b26458a73af 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -4,7 +4,6 @@
         <record id="view_account_followup_followup_line_tree" model="ir.ui.view">
             <field name="name">account_followup.followup.line.tree</field>
             <field name="model">account_followup.followup.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Follow-up Steps">
                     <field name="name"/>
@@ -17,7 +16,6 @@
         <record id="view_account_followup_followup_line_form" model="ir.ui.view">
             <field name="name">account_followup.followup.line.form</field>
             <field name="model">account_followup.followup.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Follow-up Steps" version="7.0">
                     <group col="4">
@@ -41,7 +39,6 @@
         <record id="view_account_followup_followup_form" model="ir.ui.view">
             <field name="name">account_followup.followup.form</field>
             <field name="model">account_followup.followup</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Follow-up" version="7.0">
                     <group col="4">
@@ -56,7 +53,6 @@
         <record id="view_account_followup_followup_tree" model="ir.ui.view">
             <field name="name">account_followup.followup.tree</field>
             <field name="model">account_followup.followup</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Follow-up">
                     <field name="name"/>
@@ -68,7 +64,6 @@
         <record id="view_account_followup_filter" model="ir.ui.view">
             <field name="name">account.followup.select</field>
             <field name="model">account_followup.followup</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Follow-up">
                     <field name="name" string="Follow-up"/>
@@ -101,7 +96,6 @@
         <record id="account_move_line_partner_tree" model="ir.ui.view">
             <field name="name">account.move.line.partner.tree</field>
             <field name="model">account.move.line</field>
-            <field name="type">tree</field>
             <field eval="32" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="red:state == 'draft';black:state == 'validate'" editable="bottom" string="Partner entries">
@@ -157,7 +151,6 @@
             <field name="name">res.company.followup.form.inherit</field>
             <field name="inherit_id" ref="account.view_company_inherit_form"/>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="overdue_msg" nolabel="1" colspan="4" position="after">
                     <separator string="Follow-up Message" colspan="4"/>
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index 6ec18407787..966931d78a9 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -5,7 +5,6 @@
         <record id="view_account_followup_stat_tree" model="ir.ui.view">
             <field name="name">account_followup.stat.tree</field>
             <field name="model">account_followup.stat</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Follow-up lines">
                     <field name="partner_id"/>
@@ -26,7 +25,6 @@
       <record id="view_account_followup_stat_graph" model="ir.ui.view">
            <field name="name">account_followup.stat.graph</field>
            <field name="model">account_followup.stat</field>
-           <field name="type">graph</field>
            <field name="arch" type="xml">
                <graph string="Follow-up lines" type="bar">
                   <field name="partner_id"/>
@@ -37,7 +35,6 @@
         <record id="view_account_followup_stat_search" model="ir.ui.view">
             <field name="name">account_followup.stat.search</field>
             <field name="model">account_followup.stat</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Follow-ups Sent">
                     <field name="date_move"/>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 2949177205f..fe77dbc053e 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -5,7 +5,6 @@
         <record id="view_account_followup_print" model="ir.ui.view">
             <field name="name">account.followup.print.form</field>
             <field name="model">account.followup.print</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Send follow-ups" version="7.0">
                 <group col="4">
@@ -23,7 +22,6 @@
 
         <record id="action_account_followup_print" model="ir.actions.act_window">
             <field name="name">Send Follow-Ups</field>
-            <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.followup.print</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -38,7 +36,6 @@
         <record id="account_followup_stat_by_partner_search" model="ir.ui.view">
             <field name="name">account_followup.stat.by.partner.search</field>
             <field name="model">account_followup.stat.by.partner</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Partner to Remind">
                     <field name="date_followup"/>
@@ -54,7 +51,6 @@
            <record id="account_followup_stat_by_partner_tree" model="ir.ui.view">
             <field name="name">account_followup.stat.by.partner.tree</field>
             <field name="model">account_followup.stat.by.partner</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Partner to Remind">
                    <field name="partner_id"/>
@@ -70,7 +66,6 @@
            <record id="view_account_followup_print_all" model="ir.ui.view">
             <field name="name">account.followup.print.all.form</field>
             <field name="model">account.followup.print.all</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Send Follow-Ups" version="7.0">
                 <header>
@@ -110,7 +105,6 @@
            <record id="view_account_followup_print_all_msg" model="ir.ui.view">
             <field name="name">account.followup.print.all.msg.form</field>
             <field name="model">account.followup.print.all</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Summary" version="7.0">
                 <separator string="Summary"/>
diff --git a/addons/account_payment/account_invoice_view.xml b/addons/account_payment/account_invoice_view.xml
index aeea324e128..ebb6bcbf965 100644
--- a/addons/account_payment/account_invoice_view.xml
+++ b/addons/account_payment/account_invoice_view.xml
@@ -4,7 +4,6 @@
         <record id="invoice_supplier_form" model="ir.ui.view">
             <field name="name">account.invoice.supplier.form.inherit</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <field name="partner_bank_id" position="before">
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 5395bcafb17..e3e9b2ae558 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -6,7 +6,6 @@
         <record id="view_move_line_form" model="ir.ui.view">
             <field name="name">account.move.line.form.inherit</field>
             <field name="model">account.move.line</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_move_line_form"/>
             <field name="arch" type="xml">
                 <field name="reconcile_partial_id" position="after">
@@ -18,7 +17,6 @@
         <record model="ir.ui.view" id="view_move_line_tree_wiz">
             <field name="name">account.move.line.tree</field>
             <field name="model">account.move.line</field>
-            <field name="type">tree</field>
             <field name="priority" eval="1"/>
             <field name="arch" type="xml">
                 <tree string="Account Entry Line">
@@ -44,7 +42,6 @@
         <record id="view_payment_mode_search" model="ir.ui.view">
             <field name="name">payment.mode.search</field>
             <field name="model">payment.mode</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Payment Mode">
                     <field name="name" string="Payment Mode"/>
@@ -60,7 +57,6 @@
         <record id="view_payment_mode_tree" model="ir.ui.view">
             <field name="name">payment.mode.tree</field>
             <field name="model">payment.mode</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Payment Mode">
                     <field name="name"/>
@@ -73,7 +69,6 @@
         <record id="view_payment_mode_form" model="ir.ui.view">
             <field name="name">payment.mode.form</field>
             <field name="model">payment.mode</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payment Mode" version="7.0">
                     <group col="4">
@@ -99,9 +94,8 @@
         <record id="view_payment_order_form" model="ir.ui.view">
             <field name="name">payment.order.form</field>
             <field name="model">payment.order</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Payment Order" version="7.0">
                 <header>
                     <button name="open" states="draft" string="Confirm Payments" class="oe_highlight"/>
                     <button name="set_done" states="open" string="Make Payments" type="object" class="oe_highlight"/>
@@ -191,7 +185,6 @@
         <record id="view_payment_order_tree" model="ir.ui.view">
             <field name="name">payment.order.tree</field>
             <field name="model">payment.order</field>
-            <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';gray:state in ('cancel','done');black:state == 'open'" string="Payment order">
@@ -210,7 +203,6 @@
         <record id="view_payment_order_search" model="ir.ui.view">
             <field name="name">payment.order.tree.search</field>
             <field name="model">payment.order</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payment Orders">
                     <field name="reference" string="Payment Order"/>
@@ -256,7 +248,6 @@
         <record id="view_payment_line_form" model="ir.ui.view">
             <field name="name">Payment Line</field>
             <field name="model">payment.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payment Line" version="7.0">
                     <notebook>
@@ -302,7 +293,6 @@
         <record id="view_payment_line_tree" model="ir.ui.view">
             <field name="name">Payment Lines</field>
             <field name="model">payment.line</field>
-            <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Payment Line">
@@ -331,7 +321,6 @@
         <record id="view_bank_statement_form" model="ir.ui.view">
             <field name="name">account.bank.statement.form.inherit</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
 	            <xpath expr="//div[@name='import_buttons']" position="inside">
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 ab90144f0e2..df0080a4b23 100644
--- a/addons/account_payment/wizard/account_payment_create_order_view.xml
+++ b/addons/account_payment/wizard/account_payment_create_order_view.xml
@@ -5,7 +5,6 @@
         <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" version="7.0">
                 <group>
@@ -23,7 +22,6 @@
         <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" version="7.0">
                     <group string="Entries">
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index 1053d47eebd..16baaba9e8d 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -5,7 +5,6 @@
         <record id="account_payment_make_payment_view" model="ir.ui.view">
              <field name="name">account.payment.make.payment.form</field>
              <field name="model">account.payment.make.payment</field>
-             <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Make Payment" version="7.0">
                     <separator string="Are you sure you want to make payment?"/>
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 c2789f95d38..acc85d661c2 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -5,7 +5,6 @@
         <record id="account_payment_populate_statement_view" model="ir.ui.view">
              <field name="name">Payment Populate statement</field>
              <field name="model">account.payment.populate.statement</field>
-             <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Populate Statement:" version="7.0">
                     <group>
diff --git a/addons/account_sequence/account_sequence.xml b/addons/account_sequence/account_sequence.xml
index 3ed16cfa58e..255008d6dab 100644
--- a/addons/account_sequence/account_sequence.xml
+++ b/addons/account_sequence/account_sequence.xml
@@ -5,7 +5,6 @@
         <record id="view_account_move_form_inherit" model="ir.ui.view">
            <field name="name">account.move.form.inherit</field>
            <field name="model">account.move</field>
-           <field name="type">form</field>
            <field name="inherit_id" ref="account.view_move_form"/>
            <field name="arch" type="xml">
                 <field name="period_id" position="after">
@@ -17,7 +16,6 @@
         <record id="view_account_journal_form_inherit" model="ir.ui.view">
            <field name="name">account.journal.form.inherit</field>
            <field name="model">account.journal</field>
-           <field name="type">form</field>
            <field name="inherit_id" ref="account.view_account_journal_form"/>
            <field name="arch" type="xml">
                 <field name="sequence_id" position="after">
@@ -29,7 +27,6 @@
         <record id="view_account_move_tree_inherit" model="ir.ui.view">
             <field name="name">account.move.tree.inherit</field>
             <field name="model">account.move</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="account.view_move_tree"/>
             <field name="arch" type="xml">
                 <field name="ref" position="before">
diff --git a/addons/account_sequence/account_sequence_installer_view.xml b/addons/account_sequence/account_sequence_installer_view.xml
index 2d733e83f11..bb9324ea617 100644
--- a/addons/account_sequence/account_sequence_installer_view.xml
+++ b/addons/account_sequence/account_sequence_installer_view.xml
@@ -4,7 +4,6 @@
         <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>
diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index c6128c4e619..323be77f334 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -4,7 +4,6 @@
         <record id="view_invoice_customer" model="ir.ui.view">
             <field name="name">account.invoice.customer.pay</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='invoice_open'][last()]" position="after">
@@ -18,7 +17,6 @@
         <record id="view_invoice_supplier" model="ir.ui.view">
             <field name="name">account.invoice.supplier.pay</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='invoice_open'][last()]" position="after">
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index e5e01252dff..2de4d6176b0 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="view_voucher_tree">
             <field name="name">account.voucher.tree</field>
             <field name="model">account.voucher</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';gray:state == 'cancel';red:audit" string="Voucher Entries">
                     <field name="date"/>
@@ -23,7 +22,6 @@
         <record model="ir.ui.view" id="view_voucher_line_form">
             <field name="name">account.voucher.line.form</field>
             <field name="model">account.voucher.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Voucher Lines" version="7.0">
                     <group col="4">
@@ -39,9 +37,8 @@
         <record model="ir.ui.view" id="view_voucher_form">
             <field name="name">account.voucher.form</field>
             <field name="model">account.voucher</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Accounting Voucher" version="7.0">
                   <header>
                       <button name="proforma_voucher" string="Post" states="draft" class="oe_highlight"/>
                       <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
@@ -122,7 +119,6 @@
         <record id="view_voucher_filter" model="ir.ui.view">
             <field name="name">account.voucher.select</field>
             <field name="model">account.voucher</field>
-            <field name="type">search</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
@@ -148,7 +144,6 @@
         <record id="account_cash_statement_graph" model="ir.ui.view">
             <field name="name">account.voucher.graph</field>
             <field name="model">account.voucher</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Voucher Statistics" type="bar">
                     <field name="date"/>
@@ -201,7 +196,6 @@
         <record id="view_bank_statement_form_invoice" model="ir.ui.view">
             <field name="name">account.bank.statement.invoice.form.inherit</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='import_buttons']" position="inside">
@@ -215,7 +209,6 @@
         <record id="view_bank_statement_tree_voucher" model="ir.ui.view">
             <field name="name">account.bank.statement.voucher.tree.inherit</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
@@ -227,7 +220,6 @@
         <record id="view_bank_statement_form_voucher" model="ir.ui.view">
             <field name="name">account.bank.statement.voucher.form.inherit</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='sequence']" position="before">
@@ -238,7 +230,6 @@
         <record id="view_cash_statement_tree_voucher" model="ir.ui.view">
             <field name="name">account.cash.statement.voucher.tree.inherit</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form2"/>
             <field name="arch" type="xml">
                 <xpath expr="//page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
@@ -250,7 +241,6 @@
         <record id="view_cash_statement_form_voucher" model="ir.ui.view">
             <field name="name">account.cash.statement.voucher.form.inherit</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form2"/>
             <field name="arch" type="xml">
                 <xpath expr="//page/field[@name='line_ids']/form/group/field[@name='amount']" position="after">
@@ -264,7 +254,6 @@
             <field name="name">res.company.form.inherit</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="currency_id" position="after">
                       <field name="income_currency_exchange_account_id"/>
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index ba4d6c2f31c..15b2433ec25 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -5,7 +5,6 @@
    <record id="view_sale_receipt_report_tree" model="ir.ui.view">
         <field name="name">sale.receipt.report.tree</field>
         <field name="model">sale.receipt.report</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')"  string="Sales Receipt Analysis">
                 <field name="date" invisible="1"/>
@@ -33,7 +32,6 @@
     <record id="view_sale_receipt_report_graph" model="ir.ui.view">
          <field name="name">sale.receipt.report.graph</field>
          <field name="model">sale.receipt.report</field>
-         <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Sales Receipt Analysis" type="bar">
                  <field name="account_id"/>
@@ -45,7 +43,6 @@
     <record id="view_sale_receipt_report_search" model="ir.ui.view">
         <field name="name">sale.receipt.report.search</field>
         <field name="model">sale.receipt.report</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Sales Receipt Analysis">
                 <field name="date"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index ef983145901..45144be24d4 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -5,7 +5,6 @@
         <record id="view_voucher_filter_customer_pay" model="ir.ui.view">
             <field name="name">account.voucher.customer.pay.select</field>
             <field name="model">account.voucher</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
@@ -29,7 +28,6 @@
         <record id="view_voucher_filter_vendor_pay" model="ir.ui.view">
             <field name="name">account.voucher.purchase.pay.select</field>
             <field name="model">account.voucher</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
@@ -51,7 +49,6 @@
         <record model="ir.ui.view" id="view_low_priority_payment_form">
             <field name="name">account.voucher.payment.low.priority.form</field>
             <field name="model">account.voucher</field>
-            <field name="type">form</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <form string="Bill Payment" version="7.0">
@@ -121,9 +118,8 @@
         <record model="ir.ui.view" id="view_vendor_payment_form">
             <field name="name">account.voucher.payment.form</field>
             <field name="model">account.voucher</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Voucher Payment" version="7.0">
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
@@ -286,9 +282,8 @@
         <record model="ir.ui.view" id="view_vendor_receipt_form">
             <field name="name">account.voucher.receipt.form</field>
             <field name="model">account.voucher</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Receipt" version="7.0">
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index f8eff4e7b19..965e2600f24 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -4,7 +4,6 @@
         <record id="view_voucher_filter_vendor" model="ir.ui.view">
             <field name="name">account.voucher.purchase.select</field>
             <field name="model">account.voucher</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
@@ -27,7 +26,6 @@
         <record id="view_voucher_filter_sale" model="ir.ui.view">
             <field name="name">account.voucher.sale.select</field>
             <field name="model">account.voucher</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Vouchers">
                     <field name="number" string="Voucher"/>
@@ -60,9 +58,8 @@
         <record model="ir.ui.view" id="view_sale_receipt_form">
             <field name="name">account.voucher.sale.form</field>
             <field name="model">account.voucher</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Sale voucher" version="7.0">
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
                     <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)]}" class="oe_highlight"/>
@@ -204,9 +201,8 @@
         <record model="ir.ui.view" id="view_purchase_receipt_form">
             <field name="name">account.voucher.purchase.form</field>
             <field name="model">account.voucher</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Purchase Voucher" version="7.0">
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
                     <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)]}" class="oe_highlight"/>
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 7af5155a6d3..f97d3ef58cb 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -4,7 +4,6 @@
         <record id="view_account_statement_from_invoice_lines" model="ir.ui.view">
             <field name="name">account.statement.from.invoice.lines.form</field>
             <field name="model">account.statement.from.invoice.lines</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Entries" version="7.0">
                     <separator string="Payable and Receivables"/>
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index d590506a0c6..ccd77638fd9 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -5,9 +5,8 @@
         <record id="view_account_analytic_account_form" model="ir.ui.view">
             <field name="name">analytic.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Analytic Account" version="7.0">
                     <sheet string="Analytic Account">
                         <label for="name" class="oe_edit_only"/>
                         <h1>
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
index 3e892d5940f..f461ed224b8 100644
--- a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
+++ b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
@@ -4,7 +4,6 @@
         <record id="project_form_expense_form" model="ir.ui.view">
             <field name="name">project.project.form.expense.inherit</field>
             <field name="model">project.project</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="analytic_contract_project.project_account_analytic_account_form"/>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
index 0148c05d0b4..2869eaed86d 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -4,7 +4,6 @@
         <record id="account_analytic_account_form_expense_form" model="ir.ui.view">
             <field name="name">account.analytic.account.form.expense.inherit</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
             <field eval="60" name="priority"/>
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="total"]' position='before'>
@@ -35,7 +34,6 @@
         <!--<record id="project_form_expense_form" model="ir.ui.view">
             <field name="name">project.project.form.expense.inherit</field>
             <field name="model">project.project</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="analytic_contract_project.project_account_analytic_account_form"/>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
index 9914ed455af..84f01e19643 100644
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ b/addons/analytic_contract_project/analytic_contract_project_view.xml
@@ -5,7 +5,6 @@
         <record id="project_account_analytic_account_form" model="ir.ui.view">
             <field name="name">project.project.form.inherit</field>
             <field name="model">project.project</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
@@ -102,7 +101,6 @@
         <record id="project_invoice_form" model="ir.ui.view">
             <field name="name">Inherit project form : Invoicing Data</field>
             <field name="model">project.project</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
@@ -117,7 +115,6 @@
         <record id="contract_inherited_form" model="ir.ui.view">
             <field name="name">Inherit contract form : adding UoM</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="priority">50</field>
             <field name="arch" type="xml">
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 9c6e89d1bda..6fa141f480d 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -6,7 +6,6 @@
         <record model="ir.ui.view" id="analytic_user_funct_grid_tree">
             <field name="name">analytic_user_funct_grid.tree</field>
             <field name="model">analytic.user.funct.grid</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="User's Product for this Analytic Account" editable="bottom">
                     <field name="user_id" required="1"/>
@@ -18,7 +17,6 @@
         <record model="ir.ui.view" id="analytic_user_funct_grid_form">
             <field name="name">analytic_user_funct_grid.form</field>
             <field name="model">analytic.user.funct.grid</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="User's Product for this Analytic Account">
                     <field name="user_id" required="1"/>
@@ -31,7 +29,6 @@
         <record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook/page" position="after">
@@ -46,7 +43,6 @@
         <record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
             <field name="name">hr.timesheet.sheet.form.tree</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">form</field>
             <field name="priority" eval="18"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
@@ -60,7 +56,6 @@
         <record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit1">
             <field name="name">hr.timesheet.sheet.form.form</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">form</field>
             <field name="priority" eval="19"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
@@ -74,7 +69,6 @@
         <record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='account_id']" position="replace">
@@ -86,7 +80,6 @@
         <record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='user_id']" position="replace">
@@ -98,7 +91,6 @@
         <record model="ir.ui.view" id="hr_timesheet_line_tree_inherit">
             <field name="name">hr.analytic.timesheet.tree</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="/tree/field[@name='account_id']" position="replace">
@@ -110,7 +102,6 @@
         <record model="ir.ui.view" id="hr_timesheet_line_tree_inherit_2">
             <field name="name">hr.analytic.timesheet.tree</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="/tree/field[@name='user_id']" position="replace">
diff --git a/addons/anonymization/anonymization_view.xml b/addons/anonymization/anonymization_view.xml
index 6f874f60eda..5aba288d4f8 100644
--- a/addons/anonymization/anonymization_view.xml
+++ b/addons/anonymization/anonymization_view.xml
@@ -7,7 +7,6 @@
     <record model="ir.ui.view" id="view_ir_model_fields_anonymization_form">
         <field name="name">ir.model.fields.anonymization.form</field>
         <field name="model">ir.model.fields.anonymization</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Anonymized Field" version="7.0">
                 <sheet>
@@ -29,7 +28,6 @@
     <record model="ir.ui.view" id="view_ir_model_fields_anonymization_tree">
         <field name="name">ir.model.fields.anonymization.tree</field>
         <field name="model">ir.model.fields.anonymization</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Anonymized Fields">
                 <field name="model_id" />
@@ -55,7 +53,6 @@
     <record model="ir.ui.view" id="view_ir_model_fields_anonymize_wizard_form">
         <field name="name">ir.model.fields.anonymize.wizard.form</field>
         <field name="model">ir.model.fields.anonymize.wizard</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Database Anonymization" version="7.0">
                 <header>
@@ -101,7 +98,6 @@
     <record model="ir.ui.view" id="view_ir_model_fields_anonymization_history_form">
         <field name="name">ir.model.fields.anonymization.history.form</field>
         <field name="model">ir.model.fields.anonymization.history</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Anonymization History" version="7.0">
                 <sheet>
@@ -130,7 +126,6 @@
     <record model="ir.ui.view" id="view_ir_model_fields_anonymization_history_tree">
         <field name="name">ir.model.fields.anonymization.history.tree</field>
         <field name="model">ir.model.fields.anonymization.history</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Anonymization History">
                 <field name="date" />
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index a61d5e21f3a..b041329f6bd 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -9,7 +9,6 @@
         <record model="ir.ui.view" id="view_audittrail_rule_form">
             <field name="name">audittrail.rule.form</field>
             <field name="model">audittrail.rule</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="AuditTrail Rule" version="7.0">
                    <header>
@@ -41,7 +40,6 @@
         <record model="ir.ui.view" id="view_audittrail_rule_tree">
             <field name="name">audittrail.rule.tree</field>
             <field name="model">audittrail.rule</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state == 'subscribed'" string="AuditTrail Rules">
                     <field name="name"/>
@@ -60,7 +58,6 @@
         <record id="view_audittrail_rule_search" model="ir.ui.view">
             <field name="name">audittrail.rule.search</field>
             <field name="model">audittrail.rule</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Rule">
                     <field name="name" string="Audittrail Rule"/>
@@ -91,7 +88,6 @@
         <record model="ir.ui.view" id="view_audittrail_log_form">
             <field name="name">audittrail.log.form</field>
             <field name="model">audittrail.log</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="AuditTrail Logs" version="7.0">
                  <sheet>
@@ -148,7 +144,6 @@
         <record model="ir.ui.view" id="view_audittrail_log_tree">
             <field name="name">audittrail.log.tree</field>
             <field name="model">audittrail.log</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="AuditTrail Logs">
                     <field name="timestamp"/>
@@ -163,7 +158,6 @@
        <record id="view_audittrail_log_search" model="ir.ui.view">
             <field name="name">audittrail.log.search</field>
             <field name="model">audittrail.log</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Audittrail Log">
                     <field name="name" string="Audittrail Log"/>
diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml
index fdfffb73c23..414527bdbb0 100644
--- a/addons/audittrail/wizard/audittrail_view_log_view.xml
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -7,7 +7,6 @@
         <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" version="7.0">
                     <group col="4">
diff --git a/addons/auth_ldap/user_ldap_installer.xml b/addons/auth_ldap/user_ldap_installer.xml
index 1f652f69699..8dc1361c9cc 100644
--- a/addons/auth_ldap/user_ldap_installer.xml
+++ b/addons/auth_ldap/user_ldap_installer.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="view_ldap_installer_form">
             <field name="name">ldap.installer.form</field>
             <field name="model">res.company.ldap</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="LDAP Configuration" version="7.0">
                     <group>
diff --git a/addons/auth_ldap/users_ldap_view.xml b/addons/auth_ldap/users_ldap_view.xml
index b87800aa8c8..c4fc7cebbbe 100644
--- a/addons/auth_ldap/users_ldap_view.xml
+++ b/addons/auth_ldap/users_ldap_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="company_form_view">
             <field name="name">res.company.form.inherit.users_ldap</field>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='account_grp']" position="after">
diff --git a/addons/auth_openid/res_users.xml b/addons/auth_openid/res_users.xml
index df0c31856e2..be4fbdf294b 100644
--- a/addons/auth_openid/res_users.xml
+++ b/addons/auth_openid/res_users.xml
@@ -4,7 +4,6 @@
         <record id="view_users_form" model="ir.ui.view">
             <field name="name">res.users.form</field>
             <field name="model">res.users</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
                 <notebook colspan="4" position="inside">
diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml
index d30d383ecdb..3bea8dc2aed 100644
--- a/addons/auth_signup/res_config.xml
+++ b/addons/auth_signup/res_config.xml
@@ -6,7 +6,6 @@
             <field name="name">base.config.settings.signup</field>
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//group[last()]" position="after">
                     <group>
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index ba51b729305..0d268438a41 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -10,7 +10,6 @@
            <record id="view_base_action_rule_form" model="ir.ui.view">
                <field name="name">base.action.rule.form</field>
             <field name="model">base.action.rule</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Action Rule" version="7.0">
                     <sheet>
@@ -98,7 +97,6 @@
            <record id="view_base_action_rule_tree" model="ir.ui.view">
                <field name="name">base.action.rule.tree</field>
             <field name="model">base.action.rule</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Action Rule">
                     <field name="sequence"/>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 0e12d835710..89066ce74bb 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -6,7 +6,6 @@
         <record id="base_calendar_attendee_form_view" model="ir.ui.view">
             <field name="name">calendar.attendee.form</field>
             <field name="model">calendar.attendee</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invitation details" version="7.0">
                     <header>
@@ -62,7 +61,6 @@
         <record id="base_calendar_attendee_tree_view" model="ir.ui.view">
             <field name="name">calendar.attendee.tree</field>
             <field name="model">calendar.attendee</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Invitation details">
                     <field name="sent_by_uid" string="Invitation From"/>
@@ -81,7 +79,6 @@
         <record id="base_calendar_attendee_search_view" model="ir.ui.view">
             <field name="name">calendar.attendee.search</field>
             <field name="model">calendar.attendee</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
                     <field name="email" string="Email"/>
@@ -129,7 +126,6 @@
         <record id="res_alarm_form_view" model="ir.ui.view">
             <field name="name">res.alarm.form</field>
             <field name="model">res.alarm</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reminder details" version="7.0">
                     <group col="4">
@@ -150,7 +146,6 @@
         <record id="res_alarm_tree_view" model="ir.ui.view">
             <field name="name">res.alarm.tree</field>
             <field name="model">res.alarm</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Reminder details">
                 <field name="name"/>
@@ -189,7 +184,6 @@
         <record model="ir.ui.view" id="event_form_view">
             <field name="name">Event Form</field>
             <field name="model">calendar.event</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Events" version="7.0">
                 <header>
@@ -363,7 +357,6 @@
         <record model="ir.ui.view" id="event_tree_view">
             <field name="name">Event Tree</field>
             <field name="model">calendar.event</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Events">
                     <field name="name" string="Subject"/>
@@ -382,7 +375,6 @@
         <record model="ir.ui.view" id="event_calendar_view">
             <field name="name">Events Calendar</field>
             <field name="model">calendar.event</field>
-            <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <calendar string="Events" date_start="date" color="show_as" date_delay="duration">
@@ -398,7 +390,6 @@
         <record id="view_calendar_event_filter" model="ir.ui.view">
             <field name="name">Calendar Events Search</field>
             <field name="model">calendar.event</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Events">
                     <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index a97d2967ffa..c6826786379 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -45,7 +45,6 @@
     <record id="view_crm_meeting_type_tree" model="ir.ui.view">
         <field name="name">Meeting Types Tree</field>
         <field name="model">crm.meeting.type</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Meeting Types" editable="bottom">
                 <field name="name"/>
@@ -68,7 +67,6 @@
     <record model="ir.ui.view" id="view_crm_meeting_form">
         <field name="name">CRM - Meetings Form</field>
         <field name="model">crm.meeting</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Meetings" version="7.0">
                 <header>
@@ -245,7 +243,6 @@
     <record model="ir.ui.view" id="view_crm_meeting_tree">
         <field name="name">CRM - Meetings Tree</field>
         <field name="model">crm.meeting</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Meetings" fonts="bold:needaction_pending==True"
                 colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
@@ -264,7 +261,6 @@
     <record model="ir.ui.view" id="view_crm_meeting_calendar">
         <field name="name">CRM - Meetings Calendar</field>
         <field name="model">crm.meeting</field>
-        <field name="type">calendar</field>
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
             <calendar string="Meetings" date_start="date" color="user_id" date_stop="date_deadline" date_delay="duration">
@@ -279,7 +275,6 @@
     <record id="view_crm_meeting_gantt" model="ir.ui.view">
         <field name="name">CRM - Meetings Gantt</field>
         <field name="model">crm.meeting</field>
-        <field name="type">gantt</field>
         <field name="arch" type="xml">
             <gantt date_delay="duration" date_start="date" string="Meetings"/>
         </field>
@@ -290,7 +285,6 @@
     <record id="view_crm_meeting_search" model="ir.ui.view">
         <field name="name">CRM - Meetings Search</field>
         <field name="model">crm.meeting</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Meetings">
                 <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
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 3bdb9144907..5510259a7a7 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -7,7 +7,6 @@
             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" version="7.0">
                     <separator string="Invite People" colspan="4"/>
diff --git a/addons/base_module_doc_rst/base_module_doc_rst_view.xml b/addons/base_module_doc_rst/base_module_doc_rst_view.xml
index 2fa4e220d0d..b90583ae635 100644
--- a/addons/base_module_doc_rst/base_module_doc_rst_view.xml
+++ b/addons/base_module_doc_rst/base_module_doc_rst_view.xml
@@ -10,7 +10,6 @@
             <field name="name">ir.module.module.form.graph</field>
             <field name="model">ir.module.module</field>
             <field name="inherit_id" ref="base.module_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Relationship Graph">
diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
index 4072db42318..ed30fc64822 100644
--- a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
+++ b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
@@ -5,7 +5,6 @@
         <record id="view_relationship_graph" model="ir.ui.view">
             <field name="name">create.relation.graph.form</field>
             <field name="model">create.relation.graph</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Relationship Graph" version="7.0">
                     <separator string="Relationship Graphs" colspan="6"/>
diff --git a/addons/base_module_doc_rst/wizard/tech_guide_rst_view.xml b/addons/base_module_doc_rst/wizard/tech_guide_rst_view.xml
index 50166dffc96..86c7002568c 100644
--- a/addons/base_module_doc_rst/wizard/tech_guide_rst_view.xml
+++ b/addons/base_module_doc_rst/wizard/tech_guide_rst_view.xml
@@ -5,7 +5,6 @@
     <record id="view_technical_guide" model="ir.ui.view">
         <field name="name">tech.guide.rst.form</field>
         <field name="model">tech.guide.rst</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Create Technical Guide in rst format">
                 <separator string="Technical Guide in rst Format" colspan="4"/>
diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
index 281576b0b6a..afe9833c209 100644
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -5,7 +5,6 @@
         <record id="base_module_record_data_view" model="ir.ui.view">
             <field name="name">base_module_record_data</field>
             <field name="model">base.module.data</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Data Recording" version="7.0">
                     <group>
@@ -53,7 +52,6 @@
         <record id="module_create_xml_view" model="ir.ui.view">
             <field name="name">module.create.xml.form</field>
             <field name="model">base.module.record.data</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Data Recording">
                     <separator string="Result, paste this to your module's xml" colspan="4" />
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index a621ae69547..fdfb6e9fc66 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -5,7 +5,6 @@
         <record id="base_module_record_objects_view" model="ir.ui.view">
             <field name="name">base_module_record_objects</field>
             <field name="model">base.module.record</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Objects Recording" version="7.0">
                     <group>
@@ -57,7 +56,6 @@
         <record id="module_create_form_view" model="ir.ui.view">
             <field name="name">module.create.form</field>
             <field name="model">base.module.record.objects</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module Recording">
                     <group string="Module successfully created!">
@@ -83,7 +81,6 @@
         <record id="info_start_form_view" model="ir.ui.view">
             <field name="name">info.start.form.view</field>
             <field name="model">base.module.record.objects</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
                     <group string="Module Information">
@@ -109,7 +106,6 @@
         <record id="module_recording_message_view" model="ir.ui.view">
             <field name="name">module_recording_message</field>
             <field name="model">base.module.record.objects</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module Recording">
                     <label string="Thanks For using Module Recorder" colspan="4" align="0.0"/>
@@ -120,7 +116,6 @@
         <record id="yml_save_form_view" model="ir.ui.view">
             <field name="name">yml.save.form</field>
             <field name="model">base.module.record.objects</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module Recording">
                     <separator string="YAML file successfully created !" colspan="4"/>
diff --git a/addons/base_module_record/wizard/base_module_save_view.xml b/addons/base_module_record/wizard/base_module_save_view.xml
index 39943697d4f..361e65344f1 100644
--- a/addons/base_module_record/wizard/base_module_save_view.xml
+++ b/addons/base_module_record/wizard/base_module_save_view.xml
@@ -5,7 +5,6 @@
         <record id="base_module_save_view" model="ir.ui.view">
             <field name="name">base_module_save</field>
             <field name="model">base.module.save</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
                     <group string="Recording Information">
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index b0494a1453d..657eae8fd63 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -4,7 +4,6 @@
         <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>
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 12ac67e3ba0..e0fbb248d84 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -4,7 +4,6 @@
         <record id="view_base_report_sxw" model="ir.ui.view">
             <field name="name">Base Report sxw</field>
             <field name="model">base.report.sxw</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Get a report" version="7.0">
                 <group string="Select your report">
@@ -32,7 +31,6 @@
         <record id="view_base_report_file_sxw" model="ir.ui.view">
             <field name="name">Base Report File sxw</field>
             <field name="model">base.report.file.sxw</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Get a report">
             <separator string="The .SXW report" colspan="4"/>
@@ -49,7 +47,6 @@
         <record id="view_base_report_file_rml" model="ir.ui.view">
             <field name="name">Base Report File sxw</field>
             <field name="model">base.report.rml.save</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Save RML FIle">
                     <separator string="The RML Report"/>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 0db6c173d9b..e07f576aa41 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -6,9 +6,6 @@
         <record id="base.menu_res_company_global" model="ir.ui.menu">
             <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
         </record>
-        <record id="base.menu_users" model="ir.ui.menu">
-            <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
-        </record>
         <record id="base.menu_publisher_warranty" model="ir.ui.menu">
             <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
         </record>
@@ -17,7 +14,6 @@
         <record id="base_setup_terminology_form" model="ir.ui.view">
             <field name="name">Specify Your Terminology</field>
             <field name="model">base.setup.terminology</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
                 <data>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 59841b6988e..fe0fc7d1254 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -5,7 +5,6 @@
         <record id="view_general_configuration" model="ir.ui.view">
             <field name="name">General Settings</field>
             <field name="model">base.config.settings</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="General Settings" version="7.0" class="oe_form_configuration">
                     <header>
@@ -63,7 +62,6 @@
         <record id="view_sale_config_settings" model="ir.ui.view">
             <field name="name">sale settings</field>
             <field name="model">sale.config.settings</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Sales" version="7.0" class="oe_form_configuration">
                     <header>
@@ -99,9 +97,10 @@
                         <separator string="Emails Integration" attrs="{'invisible': [('module_crm','=',False)]}"/>
                         <p attrs="{'invisible': [('module_crm','=',False)]}">
                             OpenERP allows to automatically create leads (or others documents)
-                            from incoming emails. You can synchronize emails with OpenERP
-                            by connecting the mail gateway to your mail server or by manually
-                            pressing buttons in our mail clients.
+                            from incoming emails. You can automatically synchronize emails with OpenERP
+                            using regular POP/IMAP accounts, using a direct email integration script for your
+                            email server, or by manually pushing emails to OpenERP using specific
+                            plugins for your preferred email application.
                         </p>
                         <group name="On Mail Client" attrs="{'invisible': [('module_crm','=',False)]}">
                             <label for="id" string="On Mail Client"/>
diff --git a/addons/board/board_mydashboard_view.xml b/addons/board/board_mydashboard_view.xml
index b08cf05b490..02d3276d0d2 100644
--- a/addons/board/board_mydashboard_view.xml
+++ b/addons/board/board_mydashboard_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="board_my_dash_view">
             <field name="name">My Dashboard</field>
             <field name="model">board.board</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="My Dashboard" version="7.0">
                     <board style="2-1">
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 219fc17f1b9..99b3cd705f2 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -4,7 +4,6 @@
     <record id="view_board_create" model="ir.ui.view">
         <field name="name">board.create.form</field>
         <field name="model">board.create</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Create New Dashboard" version="7.0">
                 <group colspan="4">
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index a45a2231738..9f867a96c6d 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -5,7 +5,6 @@
             <field name="name">Calendar Collections : Form</field>
             <field name="model">document.directory</field>
             <field name="priority">40</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Calendar Collections" version="7.0">
                     <group col="4">
@@ -24,7 +23,6 @@
         <record model="ir.ui.view" id="view_calendar_collection_tree">
             <field name="name">Calendar Collections : Tree</field>
             <field name="model">document.directory</field>
-            <field name="type">tree</field>
             <field name="priority">40</field>
             <field name="arch" type="xml">
                 <tree string="Calendar Collections" toolbar="1">
@@ -78,7 +76,6 @@
         <record model="ir.ui.view" id="view_caldav_form">
             <field name="name">Calendar : Form</field>
             <field name="model">basic.calendar</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Calendar" version="7.0">
                     <group col="4">
@@ -138,7 +135,6 @@
         <record model="ir.ui.view" id="view_caldav_tree">
             <field name="name">Calendar : Tree</field>
             <field name="model">basic.calendar</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Calendars" toolbar="1">
                     <field name="name"/>
@@ -155,7 +151,6 @@
         <record model="ir.ui.view" id="view_caldav_search">
             <field name="name">Calendar: Search</field>
             <field name="model">basic.calendar</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Calendars">
                     <field name="name" string="Calendar"/>
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 5b26360e08d..c02eb3dea19 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -5,7 +5,6 @@
     <record id="caldav_browse_form" model="ir.ui.view">
             <field name="name">caldav_Browse</field>
             <field name="model">caldav.browse</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Browse Caldav" version="7.0">
                     <sheet>
@@ -44,7 +43,6 @@
         <record id="host_prefernce_form" model="ir.ui.view">
             <field name="name">host_preference</field>
            <field name="model">user.preference</field>
-           <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Caldav's host name configuration" version="7.0">
                     <header>
@@ -64,7 +62,6 @@
      <record id="user_prefernce_form" model="ir.ui.view">
             <field name="name">user_preference</field>
             <field name="model">user.preference</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="User Preference" version="7.0">
                     <header>
diff --git a/addons/caldav/wizard/calendar_event_export_view.xml b/addons/caldav/wizard/calendar_event_export_view.xml
index 92e4504db02..0675f8bc00b 100644
--- a/addons/caldav/wizard/calendar_event_export_view.xml
+++ b/addons/caldav/wizard/calendar_event_export_view.xml
@@ -4,7 +4,6 @@
         <record id="view_calendar_event_export" model="ir.ui.view">
             <field name="name">calendar.event.export.form</field>
             <field name="model">calendar.event.export</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Export ICS">
                     <group colspan="4" >
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
index 014f5500384..a908765782e 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -4,7 +4,6 @@
         <record id="view_calendar_event_import" model="ir.ui.view">
             <field name="name">calendar.event.import.form</field>
             <field name="model">calendar.event.import</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import ICS" version="7.0">
                     <group colspan="4" >
@@ -23,7 +22,6 @@
         <record id="view_calendar_event_import_display" model="ir.ui.view">
             <field name="name">calendar.event.import.form.display</field>
             <field name="model">calendar.event.import</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Message">
                     <group colspan="4" >
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
index 0601349690d..5bd9f72ef2d 100644
--- a/addons/caldav/wizard/calendar_event_subscribe_view.xml
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -4,7 +4,6 @@
         <record id="view_calendar_event_subscribe" model="ir.ui.view">
             <field name="name">calendar.event.subscribe.form</field>
             <field name="model">calendar.event.subscribe</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscribe to Remote Calendar" version="7.0">
                     <group colspan="4" >
@@ -23,7 +22,6 @@
         <record id="view_calendar_event_subscribe_display" model="ir.ui.view">
             <field name="name">calendar.event.subscribe.form.display</field>
             <field name="model">calendar.event.subscribe</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Message...">
                     <group colspan="4" >
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 2d648295b6d..16ed1e4c5ad 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -21,7 +21,6 @@
         <record model="ir.ui.view" id="view_crm_opportunity_stage_graph">
             <field name="name">Opportunities By Stage - Graph</field>
             <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Opportunities By Stage" type="area">
                     <field name="stage_id"/>
@@ -44,7 +43,6 @@
         <record model="ir.ui.view" id="view_crm_opportunity_user_stage_graph">
             <field name="name">Opportunities By Stage Per User - Graph</field>
             <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Opportunities By Stage" type="line">
                     <field name="stage_id"/>
@@ -68,7 +66,6 @@
         <record model="ir.ui.view" id="board_crm_statistical_form">
             <field name="name">CRM - Statistical Dashboard Form</field>
             <field name="model">board.board</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Statistics Dashboard" version="7.0">
                     <board style="1-1">
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index cfeb163f110..b45b8ea8712 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -132,9 +132,10 @@ class crm_case_section(osv.osv):
         return ids
 
     _defaults = {
-        'active': lambda *a: 1,
-        'allow_unlink': lambda *a: 1,
-        'stage_ids': _get_stage_common
+        'active': 1,
+        'allow_unlink': 1,
+        'stage_ids': _get_stage_common,
+        'alias_domain': False, # always hide alias during creation
     }
 
     _sql_constraints = [
@@ -162,16 +163,16 @@ class crm_case_section(osv.osv):
         return res
     
     def create(self, cr, uid, vals, context=None):
-        alias_pool = self.pool.get('mail.alias')
+        mail_alias = self.pool.get('mail.alias')
         if not vals.get('alias_id'):
-            name = vals.pop('alias_name', None) or vals['name']
-            alias_id = alias_pool.create_unique_alias(cr, uid, 
-                    {'alias_name': name},
+            vals.pop('alias_name', None) # prevent errors during copy()
+            alias_id = mail_alias.create_unique_alias(cr, uid, 
+                    {'alias_name': vals['name']},
                     model_name="crm.lead",
                     context=context)
             vals['alias_id'] = alias_id
         res = super(crm_case_section, self).create(cr, uid, vals, context)
-        alias_pool.write(cr, uid, [vals['alias_id']],{'alias_defaults':{'section_id': res,'type':'lead'}},context)
+        mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'section_id': res, 'type':'lead'}}, context)
         return res
         
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/crm/crm_action_rule_view.xml b/addons/crm/crm_action_rule_view.xml
index eccfe380223..f2a5f57702d 100644
--- a/addons/crm/crm_action_rule_view.xml
+++ b/addons/crm/crm_action_rule_view.xml
@@ -6,7 +6,6 @@
             <field name="name">base.action.rule.form.inherit</field>
             <field name="model">base.action.rule</field>
             <field name="inherit_id" ref="base_action_rule.view_base_action_rule_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <group name="partner" position="after">
                     <group col="2" colspan="2">
@@ -22,7 +21,6 @@
             <field name="name">base.action.rule.form2.inherit</field>
             <field name="model">base.action.rule</field>
             <field name="inherit_id" ref="base_action_rule.view_base_action_rule_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <group name="partner" position="after">
                     <group col="2" colspan="2">
@@ -38,7 +36,6 @@
             <field name="name">base.action.rule.form3.inherit</field>
             <field name="model">base.action.rule</field>
             <field name="inherit_id" ref="base_action_rule.view_base_action_rule_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="act_user_id" position="after">
                     <field name="act_section_id"/>
@@ -51,7 +48,6 @@
             <field name="name">base.action.rule.form4.inherit</field>
             <field name="model">base.action.rule</field>
             <field name="inherit_id" ref="base_action_rule.view_base_action_rule_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="act_mail_to_user" position="after">
                     <field name="act_mail_to_partner"/>
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index e12f7840312..c5671385e56 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -26,17 +26,10 @@
         <record model="crm.case.channel" id="crm_case_channel_email">
             <field name="name">Email</field>
         </record>
-        <record id="mail_alias_sales_department" model="mail.alias">
-            <field name="alias_name">sales</field>
-            <field name="alias_model_id" ref="model_crm_lead"/>
-            <field name="alias_user_id" ref="base.user_root"/>
-            <field name="alias_defaults">{'type':'lead'}</field>
-        </record>
-        
+
         <record model="crm.case.section" id="section_sales_department">
             <field name="name">Sales Department</field>
             <field name="code">Sales</field>
-            <field name="alias_id" ref="mail_alias_sales_department"/>
         </record>
 
         <!-- Payment Mode -->
@@ -70,5 +63,13 @@
 
 To manage quotations and sale orders, install the module "Sales Management".</value>
         </function>
+        
+        <record model="mail.alias" id="default_sales_alias">
+            <field name="alias_name">sales</field>
+            <field name="alias_model_id" ref="model_crm_lead"/>
+            <field name="alias_user_id" ref="base.user_root"/>
+            <field name="alias_defaults">{'type':'lead'}</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index dab366c65f7..551e4e93fb8 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
-        <record id="mail_alias_marketing_department" model="mail.alias">
-            <field name="alias_name">info</field>
-            <field name="alias_model_id" ref="model_crm_lead"/>
-            <field name="alias_user_id" ref="base.user_root"/>
-            <field name="alias_defaults">{'type':'lead'}</field>
-        </record>
-    </data>
-
     <data>
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/> 
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index d9f2d8d0284..04f91933f66 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -72,8 +72,6 @@
         </record>
         
         <record model="crm.case.section" id="section_sales_department">
-            <field name="name">Sales Department</field>
-            <field name="code">Sales</field>
             <field name="stage_ids" eval="[ (4, ref('stage_lead1')), (4, ref('stage_lead2')),
                                             (4, ref('stage_lead3')), (4, ref('stage_lead4')),
                                             (4, ref('stage_lead5')), (4, ref('stage_lead6')),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 31535d5f2ce..dd7743bc26b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -47,7 +47,6 @@
         <record id="crm_lead_stage_search" model="ir.ui.view">
             <field name="name">Stage - Search</field>
             <field name="model">crm.case.stage</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stage Search">
                     <field name="name" string="Stage Name"/>
@@ -128,7 +127,6 @@
         <record model="ir.ui.view" id="crm_case_form_view_leads">
         <field name="name">CRM - Leads Form</field>
         <field name="model">crm.lead</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Leads Form" version="7.0">
                 <header>
@@ -233,7 +231,6 @@
         <record model="ir.ui.view" id="crm_case_graph_view_leads">
             <field name="name">Opportunities</field>
             <field name="model">crm.lead</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Opportunities" type="bar">
                     <field name="stage_id"/>
@@ -247,7 +244,6 @@
         <record model="ir.ui.view" id="crm_case_tree_view_leads">
             <field name="name">Leads</field>
             <field name="model">crm.lead</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Leads" fonts="bold:needaction_pending==True" colors="grey:state in ('cancel', 'done')">
                     <field name="date_deadline" invisible="1"/>
@@ -274,7 +270,6 @@
         <record model="ir.ui.view" id="crm_case_calendar_view_leads">
             <field name="name">CRM - Leads Calendar</field>
             <field name="model">crm.lead</field>
-            <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <calendar string="Leads Generation"
@@ -289,7 +284,6 @@
         <record model="ir.ui.view" id="crm_case_kanban_view_leads">
             <field name="name">CRM - Leads Kanban</field>
             <field name="model">crm.lead</field>
-            <field name="type">kanban</field>
             <field name="arch" type="xml">
                 <kanban default_group_by="stage_id">
                     <field name="state" groups="base.group_no_one"/>
@@ -362,7 +356,6 @@
         <record id="view_crm_case_leads_filter" model="ir.ui.view">
             <field name="name">CRM - Leads Search</field>
             <field name="model">crm.lead</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Leads">
                     <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
@@ -411,7 +404,6 @@
         <record model="ir.ui.view" id="crm_case_form_view_oppor">
             <field name="name">Opportunities</field>
             <field name="model">crm.lead</field>
-            <field name="type">form</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Opportunities" version="7.0">
@@ -549,7 +541,6 @@
         <record model="ir.ui.view" id="crm_case_tree_view_oppor">
             <field name="name">Opportunities Tree</field>
             <field name="model">crm.lead</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Opportunities" fonts="bold:needaction_pending==True" colors="gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
                     <field name="date_deadline" invisible="1"/>
@@ -579,7 +570,6 @@
         <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
             <field name="name">CRM - Opportunities Search</field>
             <field name="model">crm.lead</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Opportunities">
                     <field name="name" string="Opportunity / Customer"
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 0340b4f11a6..d7f59267a30 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -7,7 +7,6 @@
     <record id="attendee_form_view_inherit" model="ir.ui.view">
             <field name="name">calendar.attendee.form.inherit</field>
             <field name="model">calendar.attendee</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
             <field name="arch" type="xml">
                 <field name="ref" position="after">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a0bd8326562..9081ea15637 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -65,7 +65,6 @@
     <record model="ir.ui.view" id="crm_case_phone_tree_view">
         <field name="name">CRM - Phone Calls Tree</field>
         <field name="model">crm.phonecall</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree fonts="bold:needaction_pending==True" colors="gray:state in ('cancel','done');blue:state in ('pending',)" string="Phone Calls">
                 <field name="needaction_pending" invisible="1"/>
@@ -104,9 +103,8 @@
     <record model="ir.ui.view" id="crm_case_phone_form_view">
         <field name="name">CRM - Phone Call Form</field>
         <field name="model">crm.phonecall</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
-            <form version="7.0">
+            <form string="Phone Call" version="7.0">
             <header>
                 <button name="case_close" string="Held" type="object" class="oe_highlight"
                         states="open,pending"/>
@@ -166,7 +164,6 @@
     <record model="ir.ui.view" id="crm_case_inbound_phone_tree_view">
         <field name="name">CRM - Logged Phone Calls Tree</field>
         <field name="model">crm.phonecall</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Phone Calls" fonts="bold:needaction_pending==True" editable="top">
                 <field name="date"/>
@@ -204,7 +201,6 @@
     <record model="ir.ui.view" id="crm_case_phone_calendar_view">
         <field name="name">CRM - Phone Calls Calendar</field>
         <field name="model">crm.phonecall</field>
-        <field name="type">calendar</field>
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
             <calendar string="Phone Calls" date_start="date" color="user_id" date_delay="duration">
@@ -218,7 +214,6 @@
     <record id="view_crm_case_phonecalls_filter" model="ir.ui.view">
         <field name="name">CRM - Phone Calls Search</field>
         <field name="model">crm.phonecall</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
                <field name="name" string="Phonecalls"/>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index eaed4564424..355d862c898 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -7,7 +7,6 @@
     <record model="ir.ui.view" id="view_crm_case_section_categ_tree">
         <field name="name">CRM Report - Teams and Type(Tree)</field>
         <field name="model">report.crm.case.section.categ2</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Cases by Team and Type">
                 <field name="name"/>
@@ -29,7 +28,6 @@
     <record model="ir.ui.view" id="view_crm_case_section_categ_form">
         <field name="name">CRM Report - Teams and Type(Form)</field>
         <field name="model">report.crm.case.section.categ2</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Cases by Team and Category2">
                 <field name="name"/>
@@ -51,7 +49,6 @@
     <record model="ir.ui.view" id="view_crm_case_section_categ_graph">
         <field name="name">CRM Report - Teams and Type(Graph)</field>
         <field name="model">report.crm.case.section.categ2</field>
-        <field name="type">graph</field>
         <field name="arch" type="xml">
             <graph string="Cases by Teams and Type" type="bar" orientation="horizontal">
                 <field name="category2_id"/>
@@ -66,7 +63,6 @@
     <record id="view_crm_case_section_categ_filter" model="ir.ui.view">
             <field name="name">CRM Report - Teams and Type(Select)</field>
             <field name="model">report.crm.case.section.categ2</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Type">
                     <field name="name"/>
@@ -94,7 +90,6 @@
     <record model="ir.ui.view" id="view_crm_case_section_stage_tree">
         <field name="name">CRM Report - Teams and Stage(Tree)</field>
         <field name="model">report.crm.case.section.stage</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Cases by Team and Stage">
                 <field name="name"/>
@@ -115,7 +110,6 @@
     <record model="ir.ui.view" id="view_crm_case_section_stage_form">
         <field name="name">CRM Report - Teams and Stage(Form)</field>
         <field name="model">report.crm.case.section.stage</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Cases by Team and Stage">
                 <field name="name"/>
@@ -136,7 +130,6 @@
     <record model="ir.ui.view" id="view_crm_case_section_stage_graph">
         <field name="name">CRM Report - Teams and Stage(Graph)</field>
         <field name="model">report.crm.case.section.stage</field>
-        <field name="type">graph</field>
         <field name="arch" type="xml">
             <graph string="Cases by Team and Stage" type="bar" orientation="horizontal">
                 <field name="stage_id"/>
@@ -151,7 +144,6 @@
     <record id="view_crm_case_section_stage_filter" model="ir.ui.view">
             <field name="name">CRM Report - Teams and Stage(Select)</field>
             <field name="model">report.crm.case.section.stage</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Team and Stage">
                     <field name="name"/>
@@ -178,7 +170,6 @@
     <record model="ir.ui.view" id="view_crm_case_section_categ_stage_tree">
         <field name="name">CRM Report - Team, Category and Stage(Tree)</field>
         <field name="model">report.crm.case.section.categ.stage</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Cases by Team, Category and Stage">
                 <field name="name"/>
@@ -199,7 +190,6 @@
     <record model="ir.ui.view" id="view_crm_case_section_categ_stage_form">
         <field name="name">CRM Report - Team, Category and Stage(Form)</field>
         <field name="model">report.crm.case.section.categ.stage</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Cases by Section, Category and Stage">
                 <field name="name"/>
@@ -220,7 +210,6 @@
     <record id="view_crm_case_section_categ_stage_filter" model="ir.ui.view">
             <field name="name">CRM Report - Section, Category and Stage(Select)</field>
             <field name="model">report.crm.case.section.categ.stage</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Cases by Section, Category and Stage">
                     <field name="name"/>
@@ -237,7 +226,6 @@
     <record model="ir.ui.view" id="view_crm_case_section_categ_stage_graph">
         <field name="name">CRM Report - Section, Category and Stage(Select)</field>
         <field name="model">report.crm.case.section.categ.stage</field>
-        <field name="type">graph</field>
         <field name="arch" type="xml">
             <graph string="Cases by Section, Category and Stage" type="bar" orientation="horizontal">
                 <field name="categ_id"/>
@@ -262,7 +250,6 @@
     <record model="ir.ui.view" id="view_crm_case_section_categ_categ2_tree">
         <field name="name">CRM Report - Section, Category and Type(Tree)</field>
         <field name="model">report.crm.case.section.categ.categ2</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Cases by Section, Category and Type">
                 <field name="name"/>
@@ -284,7 +271,6 @@
     <record model="ir.ui.view" id="view_crm_case_section_categ_categ2_form">
         <field name="name">CRM Report - Section, Category and Type(Form)</field>
         <field name="model">report.crm.case.section.categ.categ2</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Cases by Section, Category and Type">
                 <field name="name"/>
@@ -306,7 +292,6 @@
     <record id="view_crm_case_section_categ_categ2_filter" model="ir.ui.view">
             <field name="name">CRM Report - Section, Category and Type(Select)</field>
             <field name="model">report.crm.case.section.categ.categ2</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cases by User">
                     <field name="name"/>
@@ -323,7 +308,6 @@
     <record model="ir.ui.view" id="view_crm_case_section_categ_categ2_graph">
         <field name="name">CRM Report - Section, Category and Type(Select)</field>
         <field name="model">report.crm.case.section.categ.categ2</field>
-        <field name="type">graph</field>
         <field name="arch" type="xml">
             <graph string="Cases by Section, Category and Type" type="bar" orientation="horizontal">
                 <field name="category2_id"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index d2a5c78729e..b51f1288b95 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -33,7 +33,6 @@
         <record id="crm_case_channel_view_tree" model="ir.ui.view">
             <field name="name">crm.case.channel.tree</field>
             <field name="model">crm.case.channel</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Channels">
                     <field name="name"/>
@@ -44,7 +43,6 @@
         <record id="crm_case_channel_view_form" model="ir.ui.view">
             <field name="name">crm.case.channel.form</field>
             <field name="model">crm.case.channel</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Channel" version="7.0">
                     <group>
@@ -80,7 +78,6 @@
         <record id="crm_case_section_view_form" model="ir.ui.view">
             <field name="name">crm.case.section.form</field>
             <field name="model">crm.case.section</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales Team" version="7.0">
                     <group>
@@ -99,7 +96,7 @@
                     <notebook colspan="4">
                         <page string="Sales Team">
                            <group>
-                                <field name="alias_id" invisible="1"/>
+                                <field name="alias_id" invisible="1" required="0"/>
                                 <label for="alias_name" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
                                 <div attrs="{'invisible': [('alias_domain', '=', False)]}">
                                     <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
@@ -127,7 +124,6 @@
         <record id="crm_case_section_view_tree" model="ir.ui.view">
             <field name="name">crm.case.section.tree</field>
             <field name="model">crm.case.section</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree string="Sales Team">
@@ -166,7 +162,6 @@
         <record model="ir.ui.view" id="crm_case_stage_tree">
             <field name="name">crm.case.stage.tree</field>
             <field name="model">crm.case.stage</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Stages">
                     <field name="sequence"/>
@@ -183,7 +178,6 @@
         <record model="ir.ui.view" id="crm_case_stage_form">
             <field name="name">crm.case.stage.form</field>
             <field name="model">crm.case.stage</field>
-            <field name="type">form</field>
             <field name="priority" eval="1"/>
             <field name="arch" type="xml">
                 <form string="Stage" version="7.0">
@@ -219,7 +213,6 @@
         <record id="crm_case_categ-view" model="ir.ui.view">
             <field name="name">crm.case.categ.form</field>
             <field name="model">crm.case.categ</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Case Category" version="7.0">
                     <group>
@@ -236,7 +229,6 @@
         <record id="crm_case_categ_tree-view" model="ir.ui.view">
             <field name="name">crm.case.categ.tree</field>
             <field name="model">crm.case.categ</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Case Category">
                     <field name="name"/>
@@ -250,7 +242,6 @@
         <record model="ir.ui.view" id="crm_case_resource_type_tree">
             <field name="name">crm.case.resource.type.tree</field>
             <field name="model">crm.case.resource.type</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Campaign">
                     <field name="name"/>
@@ -264,7 +255,6 @@
         <record model="ir.ui.view" id="crm_case_resource_type_form">
             <field name="name">crm.case.resource.type.form</field>
             <field name="model">crm.case.resource.type</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Campaign" version="7.0">
                     <group>
@@ -302,7 +292,6 @@
         <record id="crm_segmentation_line_tree-view" model="ir.ui.view">
             <field name="name">crm.segmentation.line.tree</field>
             <field name="model">crm.segmentation.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Partner Segmentation Lines">
                     <field name="name"/>
@@ -319,7 +308,6 @@
         <record id="crm_segmentation_line-view" model="ir.ui.view">
             <field name="name">crm.segmentation.line.form</field>
             <field name="model">crm.segmentation.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Partner Segmentation Lines" version="7.0">
                     <group col="4">
@@ -340,7 +328,6 @@
         <record id="crm_segmentation-view" model="ir.ui.view">
             <field name="name">crm.segmentation.form</field>
             <field name="model">crm.segmentation</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Partner Segmentation" version="7.0">
                     <header>
@@ -382,7 +369,6 @@
         <record id="crm_segmentation_tree-view" model="ir.ui.view">
             <field name="name">crm.segmentation.tree</field>
             <field name="model">crm.segmentation</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Partner Segmentations">
                     <field name="name"/>
@@ -429,7 +415,6 @@
         <record model="ir.ui.view" id="view_crm_payment_mode_tree">
             <field name="name">crm.payment.mode.tree</field>
             <field name="model">crm.payment.mode</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Payment Mode">
                     <field name="name"/>
@@ -443,7 +428,6 @@
         <record model="ir.ui.view" id="view_crm_payment_mode_form">
             <field name="name">crm.payment.mode.form</field>
             <field name="model">crm.payment.mode</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payment Mode" version="7.0">
                     <group>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 9d0050be69c..4283dd8fb3c 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -7,7 +7,6 @@
         <record id="view_report_crm_lead_tree" model="ir.ui.view">
             <field name="name">crm.lead.report.tree</field>
             <field name="model">crm.lead.report</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
             <tree string="Leads Analysis">
                 <field name="creation_year" invisible="1"/>
@@ -39,7 +38,6 @@
         <record id="view_report_crm_lead_graph" model="ir.ui.view">
             <field name="name">crm.lead.report.graph</field>
             <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="vertical" string="Leads Analysis" type="bar">
                     <field name="stage_id"/>
@@ -52,7 +50,6 @@
         <record id="view_report_crm_opportunity_graph" model="ir.ui.view">
             <field name="name">crm.opportunity.report.graph</field>
             <field name="model">crm.lead.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="vertical" string="Leads Analysis" type="bar">
                     <field name="stage_id"/>
@@ -67,7 +64,6 @@
         <record id="view_report_crm_lead_filter" model="ir.ui.view">
             <field name="name">crm.lead.report.select</field>
             <field name="model">crm.lead.report</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <filter icon="terp-personal" name="lead" string="Lead" domain="[('type','=', 'lead')]" help="Show only lead"/>
@@ -143,7 +139,6 @@
         <record id="view_report_crm_opportunity_tree" model="ir.ui.view">
             <field name="name">crm.lead.report.tree</field>
             <field name="model">crm.lead.report</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
             <tree colors="blue:state == 'draft';black:state in ('open','pending','done');gray:state == 'cancel' " string="Opportunities Analysis">
                 <field name="creation_year" invisible="1"/>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 2eeff7a0981..ec7ea5e6bdb 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -7,7 +7,6 @@
         <record id="view_report_crm_phonecall_tree" model="ir.ui.view">
             <field name="name">crm.phonecall.report.tree</field>
             <field name="model">crm.phonecall.report</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Phone calls">
                     <field name="name" invisible="1"/>
@@ -33,7 +32,6 @@
         <record id="view_report_crm_phonecall_graph" model="ir.ui.view">
             <field name="name">crm.phonecall.report.graph</field>
             <field name="model">crm.phonecall.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Phone calls" type="bar">
                     <field name="state"/>
@@ -48,7 +46,6 @@
     <record id="view_report_crm_phonecall_filter" model="ir.ui.view">
             <field name="name">crm.phonecall.report.select</field>
             <field name="model">crm.phonecall.report</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
                     <filter icon="terp-gtk-go-back-rtl" string="Todo" domain="[('state','in',('draft','open'))]"
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 0d09096918f..3ab9ac8a32c 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -5,7 +5,6 @@
         <record id="view_sale_config_settings" model="ir.ui.view">
             <field name="name">crm settings</field>
             <field name="model">sale.config.settings</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <group name="On Mail Client" version="7.0" position="after">
@@ -22,7 +21,7 @@
                     </group>
                 </group>
                 <div name="config_other" version="7.0" position="inside">
-                    <separator string="Import and Synchronize Data from an Other Application"/>
+                    <separator string="Importing and Synchronizing with External Systems"/>
                     <group>
                         <label for="id" string="Synchronize with"/>
                         <div>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 4461dd63c4c..a3c60d4421c 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -6,7 +6,6 @@
         <record id="view_partners_form_crm1" model="ir.ui.view">
                 <field name="name">view.res.partner.form.crm.inherited1</field>
                 <field name="model">res.partner</field>
-                <field name="type">form</field>
                 <field name="inherit_id" ref="base.view_partner_form"/>
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
@@ -19,7 +18,6 @@
         <record id="view_partners_tree_crm2" model="ir.ui.view">
                 <field name="name">view.res.partner.tree.crm.inherited2</field>
                 <field name="model">res.partner</field>
-                <field name="type">tree</field>
                 <field name="inherit_id" ref="base.view_partner_tree"/>
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
@@ -32,7 +30,6 @@
         <record id="view_partners_form_crm3" model="ir.ui.view">
                 <field name="name">view.res.partner.search.crm.inherited3</field>
                 <field name="model">res.partner</field>
-                <field name="type">search</field>
                 <field name="inherit_id" ref="base.view_res_partner_filter"/>
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
@@ -106,7 +103,6 @@
         <record model="ir.ui.view" id="crm_lead_partner_kanban_view">
             <field name="name">res.partner.kanban.inherit</field>
             <field name="model">res.partner</field>
-            <field name="type">kanban</field>
             <field name="inherit_id" ref="base.res_partner_kanban_view"/>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
@@ -129,7 +125,6 @@
         <record model="ir.ui.view" id="res_partner_view_buttons">
             <field name="name">res.partner.view.buttons</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 3e7b1dc0bab..8829749efa3 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -5,7 +5,6 @@
         <record id="view_crm_lead2opportunity_partner" model="ir.ui.view">
             <field name="name">crm.lead2opportunity.partner.form</field>
             <field name="model">crm.lead2opportunity.partner</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
                     <field name="action"/>
@@ -36,7 +35,6 @@
         <record id="view_crm_lead2opportunity_partner_mass" model="ir.ui.view">
             <field name="name">crm.lead2opportunity.partner.mass.form</field>
             <field name="model">crm.lead2opportunity.partner.mass</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
                     <field name="action"/>
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index a430c943d5d..21a14dd3726 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -6,7 +6,6 @@
        <record id="view_crm_lead2partner" model="ir.ui.view">
           <field name="name">crm.lead2partner.view</field>
           <field name="model">crm.lead2partner</field>
-          <field name="type">form</field>
           <field name="arch" type="xml">
               <form string="Create a Partner" version="7.0">
                   <group col="4">
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index e10272a1635..3a0b11c4255 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -7,7 +7,6 @@
         <record model="ir.ui.view" id="merge_opportunity_form">
             <field name="name">crm.merge.opportunity.form</field>
             <field name="model">crm.merge.opportunity</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Merge Opportunities" version="7.0">
                     <separator string="Select Opportunities"/>
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index ccabcde88fe..6e44573cc89 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -7,7 +7,6 @@
         <record model="ir.ui.view" id="opportunity2phonecall_view">
             <field name="name">crm.opportunity2phonecall.form</field>
             <field name="model">crm.opportunity2phonecall</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" version="7.0">
                     <group>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 8bc97ba141b..765a22de0a6 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -6,7 +6,6 @@
           <record id="view_crm_partner2opportunity" model="ir.ui.view">
           <field name="name">crm.crm.partner2opportunity</field>
           <field name="model">crm.partner2opportunity</field>
-          <field name="type">form</field>
           <field name="arch" type="xml">
               <form string="Create Opportunity" version="7.0">
                   <group col="4">
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
index 00f6700e5a5..763b16d08b1 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
@@ -8,7 +8,6 @@
         <record model="ir.ui.view" id="phonecall2phonecall2meeting_view">
             <field name="name">crm.phonecall2meeting.form</field>
             <field name="model">crm.phonecall2meeting</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Meeting" version="7.0">
                     <label string="Are you sure to schedule a Meeting for this Phonecall?"/>
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index 5304bd8beb5..8ec4846733c 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -7,7 +7,6 @@
         <record model="ir.ui.view" id="phonecall2opportunity_view">
             <field name="name">crm.phonecall2opportunity.form</field>
             <field name="model">crm.phonecall2opportunity</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Opportunity " version="7.0">
                     <group col="4">
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index 1243d7bc456..7231876b0c1 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -6,7 +6,6 @@
           <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">
                 <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
@@ -26,7 +25,6 @@
        <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">
                 <group>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index dd8006c7990..e2d25218749 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -7,7 +7,6 @@
         <record model="ir.ui.view" id="phonecall_to_phonecall_view">
             <field name="name">crm.phonecall2phonecall.form</field>
             <field name="model">crm.phonecall2phonecall</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" version="7.0">
                     <group col="4">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 930c08408cd..cf5d1a780e8 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -34,7 +34,6 @@
         <record id="crm_claim_stage_tree" model="ir.ui.view">
             <field name="name">crm.claim.stage.tree</field>
             <field name="model">crm.claim.stage</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Claim Stages">
                     <field name="sequence"/>
@@ -47,7 +46,6 @@
         <record id="crm_claim_stage_form" model="ir.ui.view">
             <field name="name">crm.claim.stage.form</field>
             <field name="model">crm.claim.stage</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Claim Stage">
                     <field name="name"/>
@@ -81,7 +79,6 @@
         <record model="ir.ui.view" id="crm_case_claims_tree_view">
             <field name="name">CRM - Claims Tree</field>
             <field name="model">crm.claim</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Claims" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('close', 'cancel');red:date_deadline and (date_deadline &lt; current_date)">
                     <field name="name"/>
@@ -102,9 +99,8 @@
         <record model="ir.ui.view" id="crm_case_claims_form_view">
             <field name="name">CRM - Claims Form</field>
             <field name="model">crm.claim</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Claim" version="7.0">
                 <header>
                     <span groups="base.group_user">
                         <button name="case_open" string="Open" type="object" class="oe_highlight"
@@ -196,7 +192,6 @@
         <record model="ir.ui.view" id="crm_case_claims_calendar_view">
             <field name="name">Claims Actions</field>
             <field name="model">crm.claim</field>
-            <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <calendar string="Claims" date_start="date_action_next" color="user_id">
@@ -211,7 +206,6 @@
         <record id="view_crm_case_claims_filter" model="ir.ui.view">
             <field name="name">CRM - Claims Search</field>
             <field name="model">crm.claim</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
                     <field name="name" string="Claims"/>
@@ -239,7 +233,6 @@
         <record id="view_claim_partner_info_form1" model="ir.ui.view">
             <field name="name">res.partner.claim.info.form</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="priority">20</field>
             <field name="arch" type="xml">
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index adfb97a28f0..5a3a3d92a09 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -7,7 +7,6 @@
         <record id="view_report_crm_claim_tree" model="ir.ui.view">
             <field name="name">crm.claim.report.tree</field>
             <field name="model">crm.claim.report</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Claims">
                     <field name="name" invisible="1"/>
@@ -35,7 +34,6 @@
         <record id="view_report_crm_claim_graph" model="ir.ui.view">
             <field name="name">crm.claim.report.graph</field>
             <field name="model">crm.claim.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Claims" type="bar">
                     <field name="state"/>
@@ -50,7 +48,6 @@
         <record id="view_report_crm_claim_filter" model="ir.ui.view">
             <field name="name">crm.claim.report.select</field>
             <field name="model">crm.claim.report</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index 043fd4f76b9..79474f1fb00 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -5,7 +5,6 @@
         <record id="view_project_config_claim" model="ir.ui.view">
             <field name="name">crm_claim settings</field>
             <field name="model">sale.config.settings</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="priority" eval="20"/>       
             <field name="arch" type="xml">
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 0fb0cbf825f..02c6603280a 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -26,9 +26,8 @@
         <record model="ir.ui.view" id="crm_case_form_view_helpdesk">
             <field name="name">CRM - Helpdesk Support Form</field>
             <field name="model">crm.helpdesk</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Helpdesk Support" version="7.0">
                 <header>
                     <button name="case_open" string="Open" type="object" class="oe_highlight"
                             states="draft,pending"/>
@@ -111,7 +110,6 @@
         <record model="ir.ui.view" id="crm_case_tree_view_helpdesk">
             <field name="name">CRM - Helpdesk Support Tree</field>
             <field name="model">crm.helpdesk</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Helpdesk Support Tree"
                     colors="black:state=='open';blue:state=='pending';gray:state in ('cancel','done')">
@@ -132,7 +130,6 @@
         <record model="ir.ui.view" id="crm_case_helpdesk_calendar_view">
             <field name="name">CRM - Helpdesk Support Calendar</field>
             <field name="model">crm.helpdesk</field>
-            <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <calendar string="Helpdesk Supports" date_start="date" color="user_id" date_delay="duration">
@@ -148,7 +145,6 @@
         <record id="view_crm_case_helpdesk_filter" model="ir.ui.view">
             <field name="name">CRM - Helpdesk Search</field>
             <field name="model">crm.helpdesk</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Helpdesk">
                     <field name="name" string="Query"/>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 9aab23eab70..4750fa3344d 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -7,7 +7,6 @@
         <record id="view_report_crm_helpdesk_tree" model="ir.ui.view">
             <field name="name">crm.helpdesk.report.tree</field>
             <field name="model">crm.helpdesk.report</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Helpdesk">
                     <field name="name" invisible="1"/>
@@ -35,7 +34,6 @@
         <record id="view_report_crm_helpdesk_graph" model="ir.ui.view">
             <field name="name">crm.helpdesk.report.graph</field>
             <field name="model">crm.helpdesk.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Helpdesk" type="bar">
                     <field name="state"/>
@@ -50,7 +48,6 @@
         <record id="view_report_crm_helpdesk_filter" model="ir.ui.view">
             <field name="name">crm.helpdesk.report.select</field>
             <field name="model">crm.helpdesk.report</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
                     <filter string="New" icon="terp-check" domain="[('state','=','draft')]" />
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 258b16cea93..d4ff93d52fd 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -4,7 +4,6 @@
         <record id="view_crm_opportunity_geo_assign_form" model="ir.ui.view">
             <field name="name">crm.lead.geo_assign.inherit</field>
             <field name="model">crm.lead</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
                 <data>
@@ -43,7 +42,6 @@
         <record id="view_crm_opportunity_geo_assign_tree" model="ir.ui.view">
             <field name="name">crm.lead.geo_assign.tree.inherit</field>
             <field name="model">crm.lead</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="crm.crm_case_tree_view_oppor"/>
             <field name="arch" type="xml">
                 <field name="partner_id" position="after">
@@ -54,7 +52,6 @@
         <record model="ir.ui.view" id="crm_opportunity_partner_filter">
             <field name="name">crm.opportunity.partner.filter.assigned</field>
             <field name="model">crm.lead</field>
-             <field name="type">search</field>
             <field name="inherit_id" ref="crm.view_crm_case_opportunities_filter"/>
             <field name="arch" type="xml">
                 <filter string="Team" position="after">
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index f88d7e91f00..662a7c3dce0 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -6,7 +6,6 @@
         <record id="view_report_crm_lead_assign_filter" model="ir.ui.view">
             <field name="name">crm.lead.report.assign.select</field>
             <field name="model">crm.lead.report.assign</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <filter icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]"/>
@@ -53,7 +52,6 @@
         <record id="view_report_crm_lead_assign_graph" model="ir.ui.view">
             <field name="name">crm.lead.assign.graph</field>
             <field name="model">crm.lead.report.assign</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Lead Assign" type="bar">
                     <field name="state"/>
@@ -66,7 +64,6 @@
         <record id="view_report_crm_opportunity_assign_tree" model="ir.ui.view">
             <field name="name">crm.lead.assign.report.tree</field>
             <field name="model">crm.lead.report.assign</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
             <tree string="Opportunities Assignment Analysis">
                 <field name="year" invisible="1"/>
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
index af811f8f869..107328ac4e0 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -6,7 +6,6 @@
         <record id="view_report_crm_partner_assign_filter" model="ir.ui.view">
             <field name="name">crm.partner.report.assign.select</field>
             <field name="model">crm.partner.report.assign</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Partner assigned Analysis">
                     <field name="section_id"/>
@@ -41,7 +40,6 @@
        <record id="view_report_crm_partner_assign_tree" model="ir.ui.view">
             <field name="name">crm.partner.assign.report.tree</field>
             <field name="model">crm.partner.report.assign</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
             <tree string="Opportunities Assignment Analysis">
                 <field name="partner_id" invisible="1"/>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index 4138cbf7f09..f5a1e9aad25 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -7,7 +7,6 @@
         <record model="ir.ui.view" id="res_partner_activation_form">
             <field name="name">openerp_custom.res.partner.activation.form</field>
             <field name="model">res.partner.activation</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Activation" version="7.0">
                     <group col="4">
@@ -20,7 +19,6 @@
         <record model="ir.ui.view" id="res_partner_activation_tree">
             <field name="name">openerp_custom.res.partner.activation.tree</field>
             <field name="model">res.partner.activation</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Activation">
                     <field name="name" />
@@ -43,7 +41,6 @@
     <record id="view_partner_grade_tree" model="ir.ui.view">
         <field name="name">res.partner.grade.tree</field>
         <field name="model">res.partner.grade</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Partner Grade">
                 <field name="sequence" invisible="1"/>
@@ -54,7 +51,6 @@
     <record id="view_partner_grade_form" model="ir.ui.view">
         <field name="name">res.partner.grade.form</field>
         <field name="model">res.partner.grade</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Partner Grade" version="7.0">
                 <group col="4">
@@ -78,7 +74,6 @@
     <record id="view_res_partner_filter_assign_tree" model="ir.ui.view">
         <field name="name">res.partner.geo.inherit.tree</field>
         <field name="model">res.partner</field>
-        <field name="type">tree</field>
         <field name="inherit_id" ref="base.view_partner_tree"/>
         <field name="arch" type="xml">
             <field name="user_id" position="after">
@@ -91,7 +86,6 @@
     <record id="view_res_partner_filter_assign" model="ir.ui.view">
         <field name="name">res.partner.geo.inherit.search</field>
         <field name="model">res.partner</field>
-        <field name="type">search</field>
         <field name="inherit_id" ref="base.view_res_partner_filter"/>
         <field name="arch" type="xml">
             <field name="category_id" position="after">
@@ -103,7 +97,6 @@
     <record id="view_crm_partner_geo_form" model="ir.ui.view">
         <field name="name">res.partner.geo.inherit</field>
         <field name="model">res.partner</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
             <xpath expr="//notebook[last()]" position="inside">
@@ -175,7 +168,6 @@
       <record id="view_res_partner_filter_group_activation" model="ir.ui.view">
             <field name="name">res.partner.geo.inherit.search</field>
             <field name="model">res.partner</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="base.view_res_partner_filter"/>
             <field name="arch" type="xml">
                 <filter string="Salesman" position="after">
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index f15f104f1c1..cecf73954e5 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="crm_lead_forward_to_partner_form">
             <field name="name">crm_lead_forward_to_partner</field>
             <field name="model">crm.lead.forward.to.partner</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Send Mail" version="7.0">
                     <separator string="Forward to Partner" colspan="4"/>
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index b779e54bf17..1e894b456c0 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -28,7 +28,6 @@
     <record model="ir.ui.view" id="view_questionnaire_tree">
         <field name="name">Questionnaires</field>
         <field name="model">crm_profiling.questionnaire</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
           <tree string="Questionnaires">
             <field name="name" colspan="4"/>
@@ -43,7 +42,6 @@
     <record model="ir.ui.view" id="view_questionnaire_form">
         <field name="name">Questionnaires</field>
         <field name="model">crm_profiling.questionnaire</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
           <form string="Questionnaires">
             <field name="name"/>
@@ -62,7 +60,6 @@
     <record model="ir.ui.view" id="view_answer">
         <field name="name">Answers</field>
         <field name="model">crm_profiling.answer</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
           <tree string="Answers">
             <field name="question_id"/>
@@ -76,7 +73,6 @@
     <record model="ir.ui.view" id="view_answer_form">
         <field name="name">Answers</field>
         <field name="model">crm_profiling.answer</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
           <form string="Answers">
             <field name="question_id"/>
@@ -90,7 +86,6 @@
     <record model="ir.ui.view" id="view_question_tree">
         <field name="name">Questions</field>
         <field name="model">crm_profiling.question</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
           <tree string="Questions">
             <field name="name" colspan="4"/>
@@ -104,7 +99,6 @@
     <record model="ir.ui.view" id="view_question_form">
         <field name="name">Questions</field>
         <field name="model">crm_profiling.question</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
           <form string="Questions">
             <newline/>
@@ -127,7 +121,6 @@
     <record model="ir.ui.view" id="view_partner_form">
         <field name="name">res.partner.profile.form</field>
         <field name="model">res.partner</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
             <notebook position="inside">
@@ -147,7 +140,6 @@
     <record model="ir.ui.view" id="crm.crm_segmentation-view">
         <field name="name">crm.segmentation.form</field>
         <field name="model">crm.segmentation</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Partner Segmentation">
                 <notebook>
@@ -194,7 +186,6 @@
     <record model="ir.ui.view" id="view_partner_crm_segmentation_tree">
         <field name="name">crm.segmentation.tree</field>
         <field name="model">crm.segmentation</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Partner Segmentations">
                 <field name="name"/>
diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
index 4a1291f01aa..8da8533f494 100644
--- a/addons/crm_profiling/wizard/open_questionnaire_view.xml
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -5,7 +5,6 @@
         <record id="view_open_questionnaire_form" model="ir.ui.view">
             <field name="name">Open Questionnaires</field>
             <field name="model">open.questionnaire</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Questionnaires" version="7.0">
                     <group>
@@ -32,9 +31,8 @@
         <record id="open_questionnaire_form" model="ir.ui.view">
             <field name="name">open.questionnaire.form</field>
             <field name="model">open.questionnaire</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Open Questionnaire" version="7.0">
                     <separator colspan="4" string="Questionnaire"/>
                     <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
                     <footer>
@@ -49,7 +47,6 @@
         <record id="view_open_questionnaire_line_tree" model="ir.ui.view">
             <field name="name">open.questionnaire.line.list</field>
             <field name="model">open.questionnaire.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Questionnaire">
                     <field name="question_id"/>
@@ -61,7 +58,6 @@
         <record id="view_open_questionnaire_line_form" model="ir.ui.view">
             <field name="name">open.questionnaire.line.form</field>
             <field name="model">open.questionnaire.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Questionnaire" version="7.0">
                     <field name="question_id"/>
diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index c959f1722e6..0b3de338808 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -5,7 +5,6 @@
     <record id="crm_todo_opportunity_add" model="ir.ui.view">
         <field name="name">Opportunities - Tasks</field>
         <field name="model">crm.lead</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor" />
         <field name="arch" type="xml">
             <data>
@@ -34,7 +33,6 @@
     <record model="ir.ui.view" id="project_task_crm_tree">
         <field name="name">project.task.tree.crm</field>
         <field name="model">project.task</field>
-        <field name="type">tree</field>
         <field name="priority">20</field>
         <field name="inherit_id" ref="project.view_task_tree2" />
         <field name="arch" type="xml">
diff --git a/addons/decimal_precision/decimal_precision_view.xml b/addons/decimal_precision/decimal_precision_view.xml
index 5dec74cd8f4..5e03a764189 100644
--- a/addons/decimal_precision/decimal_precision_view.xml
+++ b/addons/decimal_precision/decimal_precision_view.xml
@@ -17,7 +17,6 @@
         <record model="ir.ui.view" id="view_decimal_precision_tree">
             <field name="name">Decimal Precision List</field>
             <field name="model">decimal.precision</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Decimal Precision">
                     <field name="name"/>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 464560a3c51..6a68d1a979f 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -6,7 +6,6 @@
         <record id="view_delivery_carrier_tree" model="ir.ui.view">
             <field name="name">delivery.carrier.tree</field>
             <field name="model">delivery.carrier</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Carrier">
                     <field name="name"/>
@@ -19,7 +18,6 @@
         <record id="view_delivery_carrier_form" model="ir.ui.view">
             <field name="name">delivery.carrier.form</field>
             <field name="model">delivery.carrier</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Carrier" version="7.0">
                     <div class="oe_title">
@@ -118,7 +116,6 @@
         <record id="view_delivery_grid_tree" model="ir.ui.view">
             <field name="name">delivery.grid.tree</field>
             <field name="model">delivery.grid</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Delivery grids">
                     <field name="sequence"/>
@@ -131,7 +128,6 @@
         <record id="view_delivery_grid_form" model="ir.ui.view">
             <field name="name">delivery.grid.form</field>
             <field name="model">delivery.grid</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Delivery grids" version="7.0">
                     <group col="4">
@@ -181,7 +177,6 @@
         <record id="view_delivery_grid_line_form" model="ir.ui.view">
             <field name="name">delivery.grid.line.form</field>
             <field name="model">delivery.grid.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Grid Lines" version="7.0">
                     <group>
@@ -213,7 +208,6 @@
         <record id="view_delivery_grid_line_tree" model="ir.ui.view">
             <field name="name">delivery.grid.line.tree</field>
             <field name="model">delivery.grid.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Grid Lines">
                     <field name="name"/>
@@ -228,7 +222,6 @@
 
         <record id="view_picking_withcarrier_out_form" model="ir.ui.view">
             <field name="name">delivery.stock.picking_withcarrier.out.form.view</field>
-            <field name="type">form</field>
             <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
@@ -242,7 +235,6 @@
 
         <record id="view_picking_withweight_internal_form" model="ir.ui.view">
             <field name="name">stock.picking_withweight.internal.form.view</field>
-            <field name="type">form</field>
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
@@ -267,7 +259,6 @@
 
         <record id="view_picking_withweight_internal_move_form" model="ir.ui.view">
             <field name="name">stock.picking_withweight.internal.move.form.view</field>
-            <field name="type">form</field>
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
@@ -280,7 +271,6 @@
 
         <record id="view_move_withweight_form" model="ir.ui.view">
             <field name="name">stock.move.form.weight</field>
-            <field name="type">form</field>
             <field name="model">stock.move</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
@@ -293,7 +283,6 @@
 
         <record id="view_order_withcarrier_form" model="ir.ui.view">
             <field name="name">delivery.sale.order_withcarrier.form.view</field>
-            <field name="type">form</field>
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
@@ -317,7 +306,6 @@
 
         <record id="view_delivery_order_inherit_stock" model="ir.ui.view">
             <field name="name">stock.picking.out.form</field>
-            <field name="type">form</field>
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
diff --git a/addons/delivery/partner_view.xml b/addons/delivery/partner_view.xml
index 235cff3a872..710dab18b93 100644
--- a/addons/delivery/partner_view.xml
+++ b/addons/delivery/partner_view.xml
@@ -4,7 +4,6 @@
         <record id="view_partner_property_form" model="ir.ui.view">
             <field name="name">res.partner.carrier.property.form.inherit</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_partner_property_form" />
             <field name="arch" type="xml">
                 <field name="property_stock_supplier" position="after">
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 38e4a16ad85..a802d788e05 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="board_document_manager_form">
             <field name="name">board.document.manager.form</field>
              <field name="model">board.board</field>
-             <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Document board" version="7.0">
                      <board style="2-1" >
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 92d07751e24..b631583fb27 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -6,7 +6,6 @@
     <record model="ir.ui.view" id="view_document_storage_form">
         <field name="name">document.storage</field>
         <field name="model">document.storage</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Storage Media">
                 <group col="4">
@@ -26,7 +25,6 @@
     <record model="ir.ui.view" id="view_document_storage_tree">
         <field name="name">document.storage</field>
         <field name="model">document.storage</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Storage Media" toolbar="1">
                 <field name="name"/>
@@ -38,7 +36,6 @@
     <record id="view_document_storage_filter" model="ir.ui.view">
             <field name="name">Search View: Document Storage</field>
             <field name="model">document.storage</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document Storage">
                     <field name="name" string="Document Storage"/>
@@ -67,7 +64,6 @@
     <record model="ir.ui.view" id="view_document_directory_form">
         <field name="name">document.directory</field>
         <field name="model">document.directory</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Directories" col="4" version="7.0">
                 <group col="4">
@@ -150,7 +146,6 @@
     <record model="ir.ui.view" id="view_document_directory_tree">
         <field name="name">document.directory</field>
         <field name="model">document.directory</field>
-        <field name="type">tree</field>
         <field name="field_parent">child_ids</field>
         <field name="arch" type="xml">
             <tree string="Directories" toolbar="1">
@@ -168,7 +163,6 @@
     <record id="view_document_directory_filter" model="ir.ui.view">
             <field name="name">Search View: Document Directory</field>
             <field name="model">document.directory</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document Directory">
                     <field name="name" string="Document Directory"/>
@@ -232,7 +226,6 @@
         <field name="name">ir.attachment</field>
         <field name="model">ir.attachment</field>
         <field name="priority" eval="1"/>
-        <field name="type">form</field>
         <field name="inherit_id" ref="base.view_attachment_form"/>
         <field name="arch" type="xml">
             <field name="url" position="after">
@@ -260,7 +253,6 @@
     <record id="view_attach_filter_inherit0" model="ir.ui.view">
             <field name="name">IR Attachment0</field>
             <field name="model">ir.attachment</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
                 <xpath expr="//filter[@name='my_documents_filter']" position="replace">
@@ -279,7 +271,6 @@
 
             <field name="name">IR Attachment2</field>
             <field name="model">ir.attachment</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
                 <filter string="Owner" position="replace">
@@ -294,10 +285,9 @@
     <record model="ir.ui.view" id="view_document_file_tree">
         <field name="name">ir.attachment</field>
         <field name="model">ir.attachment</field>
-        <field name="type">tree</field>
         <field name="priority" eval="1"/>
         <field name="arch" type="xml">
-            <tree colors="blue:type in ('url',)">
+            <tree colors="blue:type in ('url',)" string="Attachments">
                 <field name="name"/>
                 <field name="parent_id" />
                 <field name="user_id"/>
@@ -361,8 +351,7 @@
     <record model="ir.ui.view" id="view_process_node_form_inherit1">
         <field name="name">process.node.form</field>
         <field name="model">process.node</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="process.view_process_node_form"/>
+        <field name="inherit_id" ref="process.view_process_node_form"/>
         <field name="priority" eval="1"/>
         <field name="arch" type="xml">
             <field name="subflow_id" position="after">
@@ -375,8 +364,7 @@
     <record model="ir.ui.view" id="view_process_form_inherit1">
         <field name="name">process.process.form</field>
         <field name="model">process.process</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="process.view_process_form"/>
+        <field name="inherit_id" ref="process.view_process_form"/>
         <field name="priority" eval="1"/>
         <field name="arch" type="xml">
             <field name="subflow_id" position="after">
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index 6b3708d1a2f..2a8b9f34ddf 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -4,7 +4,6 @@
     <record model="ir.ui.view" id="view_document_user_form">
             <field name="name">report.document.user.form</field>
             <field name="model">report.document.user</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Files">
                     <field name="name"/>
@@ -21,7 +20,6 @@
         <record model="ir.ui.view" id="view_document_user_tree">
             <field name="name">report.document.user.tree</field>
             <field name="model">report.document.user</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Files">
                     <field name="name"/>
@@ -38,7 +36,6 @@
         <record id="view_report_document_user_search" model="ir.ui.view">
             <field name="name">report.document.user.search</field>
             <field name="model">report.document.user</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="All users files">
                     <field name="name" filter_domain="['|', '|',('name','ilike',self), ('user','ilike',self), ('directory','ilike',self)]" string="Users File"/>
@@ -61,7 +58,6 @@
         <record model="ir.ui.view" id="view_size_month">
             <field name="name">report.document.user.graph</field>
             <field name="model">report.document.file</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="File Size by Month" type="line">
                     <field name="month"/>
@@ -73,7 +69,6 @@
         <record model="ir.ui.view" id="view_size_month_tree">
             <field name="name">report.document.user.tree</field>
             <field name="model">report.document.file</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="File Size by Month">
                     <field name="month" />
@@ -94,7 +89,6 @@
         <record model="ir.ui.view" id="view_files_by_month_graph">
             <field name="name">report.file.month.graph</field>
             <field name="model">report.document.user</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Files by Month" type="pie">
                     <field name="month" />
@@ -106,7 +100,6 @@
         <record model="ir.ui.view" id="view_files_by_month_tree">
             <field name="name">report.file.month.tree</field>
             <field name="model">report.document.user</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Files by Month">
                     <field name="name"/>
@@ -119,7 +112,6 @@
         <record model="ir.ui.view" id="view_files_by_user_graph">
             <field name="name">report.file.user.graph</field>
             <field name="model">report.document.user</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Files by User" type="pie">
                     <field name="user" />
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index 47cc2c6da3d..48b41f94500 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -4,7 +4,6 @@
     <record id="view_auto_config_form" model="ir.ui.view">
         <field name="name">Auto Configure Directories</field>
         <field name="model">document.configuration</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="base.res_config_view_base"/>
         <field name="arch" type="xml">
           <data>
diff --git a/addons/document_ftp/res_config_view.xml b/addons/document_ftp/res_config_view.xml
index a44d7af0c79..f0184ed8e63 100644
--- a/addons/document_ftp/res_config_view.xml
+++ b/addons/document_ftp/res_config_view.xml
@@ -4,7 +4,6 @@
         <record id="view_document_ftp_configuration" model="ir.ui.view">
             <field name="name">Knowledge Application</field>
             <field name="model">knowledge.config.settings</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="knowledge.view_knowledge_configuration"/>
             <field name="arch" type="xml">
                 <field name="module_document_ftp" position="after">
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index 52f012a92ff..c1613b29a70 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -4,7 +4,6 @@
     <record id="ftp_browse_form" model="ir.ui.view">
             <field name="name">Document FTP Browse</field>
             <field name="model">document.ftp.browse</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Browse Document" version="7.0">
                     <group>
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index 95528b75594..36fb80c51af 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -11,7 +11,6 @@
     <record id="view_auto_config_form" model="ir.ui.view">
         <field name="name">FTP Server Configuration</field>
         <field name="model">document.ftp.configuration</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="base.res_config_view_base"/>
         <field name="arch" type="xml">
           <data>
diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index c54be43d226..fc3bd86fdaf 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -8,7 +8,6 @@
         <record id="view_wiki_tree_children" model="ir.ui.view">
             <field name="name">document.page.tree</field>
             <field name="model">document.page</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="priority">100</field>
             <field name="arch" type="xml">
@@ -23,7 +22,6 @@
         <record id="view_wiki_tree" model="ir.ui.view">
             <field name="name">document.page.list</field>
             <field name="model">document.page</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Document Page">
                     <field name="name"/>
@@ -37,7 +35,6 @@
         <record id="view_wiki_form" model="ir.ui.view">
             <field name="name">document.page.form</field>
             <field name="model">document.page</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Document Page" version="7.0">
                     <field name="type" invisible="1"/>
@@ -67,7 +64,6 @@
         <record id="view_wiki_filter" model="ir.ui.view">
             <field name="name">document.page.search</field>
             <field name="model">document.page</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Document Page">
                     <field name="name" string="Content" filter_domain="['|', ('name','ilike',self), ('content','ilike',self)]"/>
@@ -110,7 +106,6 @@
         <record model="ir.ui.view" id="view_wiki_history_tree">
             <field name="name">document.page.history.tree</field>
             <field name="model">document.page.history</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Document History">
                     <field name="create_date"/>
@@ -123,7 +118,6 @@
         <record model="ir.ui.view" id="wiki_history_form">
             <field name="name">document.page.history.form</field>
             <field name="model">document.page.history</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Document Page History" version="7.0">
                     <label for="page_id" class="oe_edit_only"/>
diff --git a/addons/document_page/wizard/document_page_create_menu_view.xml b/addons/document_page/wizard/document_page_create_menu_view.xml
index 6d689dfe41d..e4647179ad2 100644
--- a/addons/document_page/wizard/document_page_create_menu_view.xml
+++ b/addons/document_page/wizard/document_page_create_menu_view.xml
@@ -5,7 +5,6 @@
         <record id="view_wiki_create_menu" model="ir.ui.view">
             <field name="name">Create Menu</field>
             <field name="model">document.page.create.menu</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
                     <group string="Menu Information">
diff --git a/addons/document_page/wizard/document_page_show_diff_view.xml b/addons/document_page/wizard/document_page_show_diff_view.xml
index c6066669dca..f268db7ad2e 100644
--- a/addons/document_page/wizard/document_page_show_diff_view.xml
+++ b/addons/document_page/wizard/document_page_show_diff_view.xml
@@ -6,7 +6,6 @@
         <record id="view_wiki_show_diff" model="ir.ui.view">
             <field name="name">Show Difference</field>
             <field name="model">wizard.document.page.history.show_diff</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Difference" version="7.0">
                     <field name="diff"/>
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
index 35c37530f4d..5a0cb75274e 100644
--- a/addons/document_webdav/webdav_view.xml
+++ b/addons/document_webdav/webdav_view.xml
@@ -5,7 +5,6 @@
     <record model="ir.ui.view" id="view_dir_props_form">
         <field name="name">document.webdav.dir.property.form</field>
         <field name="model">document.webdav.dir.property</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Properties">
                 <group col="4">
@@ -22,7 +21,6 @@
     <record model="ir.ui.view" id="view_dir_props_tree">
         <field name="name">document.webdav.dir.property.tree</field>
         <field name="model">document.webdav.dir.property</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Properties" toolbar="1">
                 <field name="dir_id" />
@@ -35,7 +33,6 @@
     <record id="view_dir_props_filter" model="ir.ui.view">
             <field name="name">Search View: Directory DAV properties</field>
             <field name="model">document.webdav.dir.property</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document properties">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]" string="Document property"/>
@@ -73,7 +70,6 @@
         <field name="name">document.directory.webdav.inherit</field>
         <field name="model">document.directory</field>
         <field name="inherit_id" ref="document.view_document_directory_form" />
-        <field name="type">form</field>
         <field name="arch" type="xml">
         <xpath expr="/form/notebook/page[@string='Dynamic context']" position="after" version="7.0">
         <page string="WebDAV properties">
@@ -103,7 +99,6 @@
     <record model="ir.ui.view" id="view_file_props_form">
         <field name="name">document.webdav.file.property.form</field>
         <field name="model">document.webdav.file.property</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Properties">
                 <group col="4">
@@ -121,7 +116,6 @@
     <record model="ir.ui.view" id="view_file_props_tree">
         <field name="name">document.webdav.file.property.tree</field>
         <field name="model">document.webdav.file.property</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Properties" toolbar="1">
         <field name="file_id" />
@@ -134,7 +128,6 @@
     <record id="view_file_props_filter" model="ir.ui.view">
             <field name="name">Search View: File DAV properties</field>
             <field name="model">document.webdav.file.property</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Document properties">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]" string="Document Property"/>
diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
index f17261a4244..24bf17a2f88 100644
--- a/addons/edi/static/src/js/edi.js
+++ b/addons/edi/static/src/js/edi.js
@@ -1,7 +1,7 @@
 openerp.edi = function(openerp) {
 openerp.edi = {}
 
-openerp.edi.EdiView = openerp.web.OldWidget.extend({
+openerp.edi.EdiView = openerp.web.Widget.extend({
     init: function(parent, db, token) {
         this._super();
         this.db = db;
@@ -113,7 +113,7 @@ openerp.edi.edi_view = function (db, token) {
     });
 }
 
-openerp.edi.EdiImport = openerp.web.OldWidget.extend({
+openerp.edi.EdiImport = openerp.web.Widget.extend({
     init: function(parent,url) {
         this._super();
         this.url = url;
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index daa4d028651..a04790d1c1c 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="email_template_form">
             <field name="name">email.template.form</field>
             <field name="model">email.template</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Templates" version="7.0">
                   <sheet>
@@ -102,7 +101,6 @@
         <record model="ir.ui.view" id="email_template_tree">
             <field name="name">email.template.tree</field>
             <field name="model">email.template</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Templates">
                     <field name="model_id"/>
@@ -119,7 +117,6 @@
         <record id="view_email_template_search" model="ir.ui.view">
            <field name="name">email.template.search</field>
            <field name="model">email.template</field>
-           <field name="type">search</field>
            <field name="arch" type="xml">
                <search string="Templates">
                     <field name="name" filter_domain="['|', '|', '|',('name','ilike',self), ('report_name','ilike',self), ('subject','ilike',self), ('email_to','ilike',self)]" string="Templates"/>
diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml
index 96b6dccb09d..3d17120d69e 100644
--- a/addons/email_template/res_partner_view.xml
+++ b/addons/email_template/res_partner_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="res_partner_opt_out_form">
             <field name="name">res.partner.opt_out.form</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='active']" position="after">
diff --git a/addons/email_template/wizard/email_template_preview_view.xml b/addons/email_template/wizard/email_template_preview_view.xml
index a7c37e9b5a9..39fb413fcde 100644
--- a/addons/email_template/wizard/email_template_preview_view.xml
+++ b/addons/email_template/wizard/email_template_preview_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="email_template_preview_form">
             <field name="name">email_template.preview.form</field>
             <field name="model">email_template.preview</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Email Preview">
                     <field name="model_id" invisible="1"/>
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index a2f38a890c2..0d4362d350e 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="email_compose_message_wizard_inherit_form">
             <field name="name">mail.compose.message.form</field>
             <field name="model">mail.compose.message</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
                 <data>
@@ -29,7 +28,6 @@
         <record model="ir.ui.view" id="email_compose_message_wizard_inherit_form_chatter">
             <field name="name">mail.compose.message.form</field>
             <field name="model">mail.compose.message</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form_chatter"/>
             <field name="arch" type="xml">
                 <data>
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index a00b4b20f04..b38a78afac9 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -5,7 +5,6 @@
         <record model ="ir.ui.view" id="view_report_event_reg_graph">
             <field name="name">Registration Event report</field>
             <field name="model">report.event.registration</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Events Filling Status" type="bar" >
                     <field name="event_id"/>
@@ -46,7 +45,6 @@
         <record model="ir.ui.view" id="board_associations_manager_form">
             <field name="name">board.associations.manager.form</field>
             <field name="model">board.board</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Association Dashboard" version="7.0">
                     <board style="2-1">
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f3a0c5b321e..289316110e6 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -24,7 +24,6 @@
         <record model="ir.ui.view" id="view_event_type_form">
             <field name="name">Event type</field>
             <field name="model">event.type</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Event Type">
                     <group col="4">
@@ -42,7 +41,6 @@
         <record model="ir.ui.view" id="view_event_type_tree">
             <field name="name">Event type</field>
             <field name="model">event.type</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Event Type">
                     <field name="name"/>
@@ -100,7 +98,6 @@
         <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Events" version="7.0">
                     <header>
@@ -209,7 +206,6 @@
         <record model="ir.ui.view" id="view_event_tree">
             <field name="name">event.event.tree</field>
             <field name="model">event.event</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Events" fonts="bold:needaction_pending==True" colors="red:(register_min and register_min&gt;register_current) or (register_max and register_max&lt;register_current);grey:state=='cancel'">
                     <field name="name" string="Name"/>
@@ -233,7 +229,6 @@
         <record model="ir.ui.view" id="view_event_kanban">
             <field name="name">event.event.kanban</field>
             <field name="model">event.event</field>
-            <field name="type">kanban</field>
             <field name="arch" type="xml">
                 <kanban>
                     <field name="register_max"/>
@@ -299,7 +294,6 @@
         <record id="view_event_calendar" model="ir.ui.view">
             <field name="name">event.event.calendar</field>
             <field name="model">event.event</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="type" date_start="date_begin" date_stop="date_end" string="Event Organization">
@@ -314,7 +308,6 @@
         <record model="ir.ui.view" id="view_event_graph">
             <field name="name">Event Graph</field>
             <field name="model">event.event</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Event by Registration" type="bar" orientation="horizontal">
                     <field name="name"/>
@@ -329,7 +322,6 @@
         <record model="ir.ui.view" id="view_event_search">
             <field name="name">Events</field>
             <field name="model">event.event</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Events">
                     <field name="name" string="Events"/>
@@ -427,7 +419,6 @@
         <record model="ir.ui.view" id="view_event_registration_tree">
             <field name="name">event.registration.tree</field>
             <field name="model">event.registration</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Registration" fonts="bold:needaction_pending==True">
                     <field name="create_date"/>
@@ -447,9 +438,8 @@
         <record model="ir.ui.view" id="view_event_registration_form">
             <field name="name">event.registration.form</field>
             <field name="model">event.registration</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Event Registration" version="7.0">
                     <header>
                         <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
                         <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
@@ -496,7 +486,6 @@
         <record id="view_event_registration_calendar" model="ir.ui.view">
             <field name="name">event.registration.calendar</field>
             <field name="model">event.registration</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="event_id" date_start="event_begin_date" date_stop="event_end_date" string="Event Registration">
@@ -509,7 +498,6 @@
         <record model="ir.ui.view" id="view_event_registration_graph">
             <field name="name">Registration Graph</field>
             <field name="model">event.registration</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Registration" type="bar" orientation="horizontal">
                     <field name="event_id"/>
@@ -523,7 +511,6 @@
         <record model="ir.ui.view" id="view_registration_search">
             <field name="name">Registrations</field>
             <field name="model">event.registration</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <field name="name" string="Participant" filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index f05fdcc09e1..6ce2c199332 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -6,7 +6,6 @@
         <record model="ir.ui.view" id="report_event_registration_tree">
             <field name="name">report.event.registration.tree</field>
             <field name="model">report.event.registration</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:event_state == 'draft';black:event_state == 'confirm';gray:event_state in('done','cancel')" string="Events Analysis">
                     <field name="event_date" invisible="1"/>
@@ -33,7 +32,6 @@
         <record model ="ir.ui.view" id="report_event_registration_graph">
             <field name="name">report.event.registration.graph</field>
             <field name="model">report.event.registration</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Event on Registration"  type="bar" >
                     <field name="event_id"/>
@@ -49,7 +47,6 @@
         <record model="ir.ui.view" id="view_report_event_registration_search">
             <field name="name">report.event.registration.search</field>
             <field name="model">report.event.registration</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Event on Registration">
                     <filter icon="terp-document-new" string="New" domain="[('event_state','=','draft')]" help="Events which are in New state"/>
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index c8760c0b07f..8e5ff480c2c 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -7,7 +7,6 @@
        <record id="view_event_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.event.info.inherit</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <field name="supplier" position="after">
diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml
index 12d8555b0ab..a78c6895996 100644
--- a/addons/event/wizard/event_confirm_view.xml
+++ b/addons/event/wizard/event_confirm_view.xml
@@ -5,7 +5,6 @@
         <record id="view_event_confirm" model="ir.ui.view">
             <field name="name">Event Confirmation</field>
             <field name="model">event.confirm</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Event Confirmation" version="7.0">
                   <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml
index 4324990a1d8..252e805a6ab 100644
--- a/addons/event_moodle/event_view.xml
+++ b/addons/event_moodle/event_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="moodle_information">
             <field name="name">event.moodle.registration</field>
             <field name="model">event.registration</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="event.view_event_registration_form" />
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='user_id']" position="after">
@@ -24,7 +23,6 @@
         <record model="ir.ui.view" id="moodle_information_event">
             <field name="name">event.moodle.event</field>
             <field name="model">event.event</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="event.view_event_form" />
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='registration_ids']/tree/field[@name='name']" position="replace">
diff --git a/addons/event_moodle/wizard_moodle.xml b/addons/event_moodle/wizard_moodle.xml
index 998517c8636..d9e7266d055 100644
--- a/addons/event_moodle/wizard_moodle.xml
+++ b/addons/event_moodle/wizard_moodle.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="create_moodle_config_view">
             <field name="name">moodle.config.wizard.form</field>
             <field name="model">event.moodle.config.wiz</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Moodle" version="7.0">
                     <header>
diff --git a/addons/event_project/event_project_view.xml b/addons/event_project/event_project_view.xml
index ede99dbaffb..e3b761aea30 100644
--- a/addons/event_project/event_project_view.xml
+++ b/addons/event_project/event_project_view.xml
@@ -8,7 +8,6 @@
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="inherit_id" ref="event.view_event_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <notebook position="inside">
                 <page string="Tasks">
diff --git a/addons/event_project/wizard/event_project_retro_view.xml b/addons/event_project/wizard/event_project_retro_view.xml
index b7ab7a55357..886b33ef4ef 100644
--- a/addons/event_project/wizard/event_project_retro_view.xml
+++ b/addons/event_project/wizard/event_project_retro_view.xml
@@ -5,7 +5,6 @@
         <record id="view_event_project" model="ir.ui.view">
             <field name="name">Retro-Planning</field>
             <field name="model">event.project</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Retro-Planning" version="7.0">
                    <group col="4">
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index c25a10bb52f..82c1c05b714 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="event_sale_order">
              <field name="name">event.product</field>
              <field name="model">product.product</field>
-             <field name="type">form</field>
              <field name="inherit_id" ref="product.product_normal_form_view" />
              <field name="arch" type="xml">
                 <field name="purchase_ok" position="after">
@@ -19,7 +18,6 @@
         <record model="ir.ui.view" id="event_order_line">
              <field name="name">event.sale.order</field>
              <field name="model">sale.order</field>
-             <field name="type">form</field>
              <field name="inherit_id" ref="sale.view_order_form" />
              <field name="arch" type="xml">
                 <xpath expr="//field[@name='discount']" position="after">
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 62b2775a056..544a4f81b96 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -189,14 +189,11 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
                     result, data = imap_server.search(None, '(UNSEEN)')
                     for num in data[0].split():
                         result, data = imap_server.fetch(num, '(RFC822)')
-                        if server.object_id:
-                            res_id = mail_thread.message_process(cr, uid, server.object_id.model, 
-                                                                 data[0][1],
-                                                                 save_original=server.original,
-                                                                 strip_attachments=(not server.attach),
-                                                                 context=context)
-                        else:
-                            res_id = mail_thread.message_catchall(cr, uid, data[0][1])
+                        res_id = mail_thread.message_process(cr, uid, server.object_id.model, 
+                                                             data[0][1],
+                                                             save_original=server.original,
+                                                             strip_attachments=(not server.attach),
+                                                             context=context)
                         if res_id and server.action_id:
                             action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
                             imap_server.store(num, '+FLAGS', '\\Seen')
@@ -217,14 +214,11 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
                     for num in range(1, numMsgs + 1):
                         (header, msges, octets) = pop_server.retr(num)
                         msg = '\n'.join(msges)
-                        if server.object_id:
-                            res_id = mail_thread.message_process(cr, uid, server.object_id.model,
-                                                                 msg,
-                                                                 save_original=server.original,
-                                                                 strip_attachments=(not server.attach),
-                                                                 context=context)
-                        else:
-                            res_id = mail_thread.message_catchall(cr, uid, data[0][1])
+                        res_id = mail_thread.message_process(cr, uid, server.object_id.model,
+                                                             msg,
+                                                             save_original=server.original,
+                                                             strip_attachments=(not server.attach),
+                                                             context=context)
                         if res_id and server.action_id:
                             action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
                         pop_server.dele(num)
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 3325ae38c0b..cf651b5fd3d 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="view_email_server_tree">
             <field name="name">fetchmail.server.list</field>
             <field name="model">fetchmail.server</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft'" string="POP/IMAP Servers">
                     <field name="name"/>
@@ -22,7 +21,6 @@
         <record model="ir.ui.view" id="view_email_server_form">
             <field name="name">fetchmail.server.form</field>
             <field name="model">fetchmail.server</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Incoming Mail Server" version="7.0">
                     <header attrs="{'invisible' : [('type', '=', 'local')]}">
@@ -76,7 +74,6 @@
         <record model="ir.ui.view" id="view_email_server_search">
             <field name="name">fetchmail.server.search</field>
             <field name="model">fetchmail.server</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Incoming Mail Servers">
                     <field name="name" string="Incoming Mail Server"/>
@@ -109,7 +106,6 @@
       <record model="ir.ui.view" id="email_message_tree_view">
           <field name="name">mail.message.list.fetchmail</field>
           <field name="model">mail.message</field>
-          <field name="type">tree</field>
           <field name="inherit_id" ref="mail.view_email_message_tree"/>
           <field name="arch" type="xml">
               <field name="user_id" position="after">
@@ -121,7 +117,6 @@
       <record model="ir.ui.view" id="email_message_search_view">
           <field name="name">mail.message.inherit.search</field>
           <field name="model">mail.message</field>
-          <field name="type">search</field>
           <field name="inherit_id" ref="mail.view_email_message_search"/>
           <field name="arch" type="xml">
             <xpath expr="/search/group/filter[@string='Thread']" position="before">
diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
index ec4aa9669fb..8613582692f 100644
--- a/addons/google_base_account/google_base_account_view.xml
+++ b/addons/google_base_account/google_base_account_view.xml
@@ -4,7 +4,6 @@
         <record id="view_users_gogole_form" model="ir.ui.view">
             <field name="name">res.users.google.form1</field>
             <field name="model">res.users</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook" position="inside">
diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml
index 19ef202d7a4..ed345ab5a0f 100644
--- a/addons/google_base_account/wizard/google_login_view.xml
+++ b/addons/google_base_account/wizard/google_login_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="view_google_login_form">
             <field name="name">google.login.form</field>
             <field name="model">google.login</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Google login"  version="7.0">
                     <group>
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 46abe5b2d80..4aabba3ac5a 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -7,7 +7,6 @@
         <record model="ir.ui.view" id="view_google_docs_config_tree">
             <field name="name">google_docs.config.tree</field>
             <field name="model">google.docs.config</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <group name="default_filters" position="inside">
                     <field name="model_id"/>
@@ -18,7 +17,6 @@
         <record model="ir.ui.view" id="view_google_docs_config_form">
             <field name="name">google_docs.config.form</field>
             <field name="model">google.docs.config</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <group colspan='4'>
                 <field name="model_id"/>
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index e7d429877f7..4d01038b671 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -5,7 +5,6 @@
     <record id="board_hr_form" model="ir.ui.view">
         <field name="name">board.hr.form</field>
         <field name="model">board.board</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Human Resources Dashboard"  version="7.0">
                 <board style="2-1">
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 43712518cd2..6ea43e45b66 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -6,7 +6,6 @@
         <record id="view_department_form" model="ir.ui.view">
             <field name="name">hr.department.form</field>
             <field name="model">hr.department</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="department" version="7.0">
                     <sheet>
@@ -23,7 +22,6 @@
         <record id="view_department_tree" model="ir.ui.view">
             <field name="name">hr.department.tree</field>
             <field name="model">hr.department</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree string="Companies">
@@ -36,7 +34,6 @@
         <record id="view_department_filter" model="ir.ui.view">
             <field name="name">Departments</field>
             <field name="model">hr.department</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Departments">
                     <field name="name" string="Department"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5d34d428726..0dcc675e665 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -17,7 +17,6 @@
         <record id="view_employee_form" model="ir.ui.view">
             <field name="name">hr.employee.form</field>
             <field name="model">hr.employee</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee" version="7.0">
                     <sheet>
@@ -85,7 +84,6 @@
         <record id="view_employee_tree" model="ir.ui.view">
             <field name="name">hr.employee.tree</field>
             <field name="model">hr.employee</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Employees">
                     <field name="name"/>
@@ -103,7 +101,6 @@
         <record id="view_employee_filter" model="ir.ui.view">
             <field name="name">Employees</field>
             <field name="model">hr.employee</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Employees">
                     <field name="name" string="Employees"/>
@@ -126,7 +123,6 @@
     <record model="ir.ui.view" id="hr_kanban_view_employees">
         <field name="name">HR - Employess Kanban</field>
         <field name="model">hr.employee</field>
-        <field name="type">kanban</field>
         <field name="arch" type="xml">
             <kanban>
                 <field name="last_login"/>
@@ -234,7 +230,6 @@
         <record id="view_partner_tree2" model="ir.ui.view">
             <field name="name">hr.employee.tree</field>
             <field name="model">hr.employee</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
@@ -273,7 +268,6 @@
        <record id="view_employee_category_form" model="ir.ui.view">
             <field name="name">hr.employee.category.form</field>
             <field name="model">hr.employee.category</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee Category" version="7.0">
                     <group>
@@ -287,7 +281,6 @@
         <record id="view_employee_category_list" model="ir.ui.view">
             <field name="name">hr.employee.category.list</field>
             <field name="model">hr.employee.category</field>
-            <field name="type">tree</field>
             <field eval="8" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Employees Categories">
@@ -299,7 +292,6 @@
         <record id="view_employee_category_tree" model="ir.ui.view">
             <field name="name">hr.employee.category.tree</field>
             <field name="model">hr.employee.category</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree string="Employees Categories">
@@ -348,7 +340,6 @@
         <record id="view_hr_job_form" model="ir.ui.view">
             <field name="name">hr.job.form</field>
             <field name="model">hr.job</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Job" version="7.0">
                     <header>
@@ -392,7 +383,6 @@
         <record id="view_hr_job_tree" model="ir.ui.view">
             <field name="name">hr.job.tree</field>
             <field name="model">hr.job</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Job">
                     <field name="name"/>
@@ -409,7 +399,6 @@
         <record id="view_job_filter" model="ir.ui.view">
             <field name="name">Job</field>
             <field name="model">hr.job</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Jobs">
                     <field name="name" string="Job"/>
@@ -428,7 +417,6 @@
         <record id="view_hr_job_employee_form" model="ir.ui.view">
             <field name="name">hr.job.employee.form</field>
             <field name="model">hr.job</field>
-            <field name="type">form</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Job" version="7.0">
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index e5818bf9fcb..ad36818e525 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -25,7 +25,6 @@
         <record id="view_human_resources_configuration" model="ir.ui.view">
             <field name="name">hr settings</field>
             <field name="model">hr.config.settings</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Human Resources" version="7.0" class="oe_form_configuration">
                     <header>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 8a671e8438f..bda89fd9d63 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -5,7 +5,6 @@
         <record id="view_attendance_form" model="ir.ui.view">
             <field name="name">hr.attendance.form</field>
             <field name="model">hr.attendance</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee attendances" version="7.0">
                     <sheet>
@@ -23,7 +22,6 @@
         <record id="view_attendance_tree" model="ir.ui.view">
             <field name="name">hr.attendance.tree</field>
             <field name="model">hr.attendance</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Employee attendances">
                     <field name="name"/>
@@ -36,7 +34,6 @@
         <record id="view_attendance_who" model="ir.ui.view">
             <field name="name">hr.attendance.tree</field>
             <field name="model">hr.attendance</field>
-            <field name="type">tree</field>
             <field eval="3" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Employee attendances">
@@ -51,7 +48,6 @@
         <record model="ir.ui.view" id="view_hr_attendance_filter">
             <field name="name">view_hr_attendance_filter</field>
             <field name="model">hr.attendance</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Hr Attendance Search">
                     <field name="name" string="Attendance"/>
@@ -87,7 +83,6 @@
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
             <field name="model">hr.action.reason</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Define attendance reason" version="7.0">
                     <group col="4">
@@ -101,7 +96,6 @@
         <record id="view_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.tree</field>
             <field name="model">hr.action.reason</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Attendance reasons">
                     <field name="name" />
@@ -127,7 +121,6 @@
         <record id="hr_attendance_employee" model="ir.ui.view">
             <field name="name">hr.employee.form1</field>
             <field name="model">hr.employee</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="before">
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index c9daaffbe4c..d34a65fd05f 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -5,7 +5,6 @@
         <record id="view_hr_attendance_month" model="ir.ui.view">
             <field name="name">Attendances Report Monthly</field>
             <field name="model">hr.attendance.month</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Monthly" version="7.0">
                 <group col="4">
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index 554355edbb1..accbf6304c5 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -4,7 +4,6 @@
         <record id="view_hr_attendance_week" model="ir.ui.view">
             <field name="name">Attendances Report Weekly</field>
             <field name="model">hr.attendance.week</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Weekly" version="7.0">
                 <group>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 4e284cd396c..4027df49f68 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -5,7 +5,6 @@
         <record id="view_hr_attendance_error" model="ir.ui.view">
             <field name="name">Attendance Report Error</field>
             <field name="model">hr.attendance.error</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Error" version="7.0">
                 <group string="Analysis Information" col="4">
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index 96d924f88a7..5c84be5107f 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -4,7 +4,6 @@
         <record id="view_hr_attendance_sigh_in_out" model="ir.ui.view">
             <field name="name">hr.sign.in.out.form</field>
             <field name="model">hr.sign.in.out</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign in / Sign out" version="7.0">
                     <group>
@@ -29,7 +28,6 @@
        <record id="view_hr_attendance_message" model="ir.ui.view">
             <field name="name">hr.sign.in.out.form</field>
             <field name="model">hr.sign.in.out</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign in / Sign out" version="7.0">
                     <separator string="Sign-out Entry Must Follow Sign-in." colspan="4" />
@@ -53,7 +51,6 @@
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
             <field name="name">hr.sign.in.out.ask.form</field>
             <field name="model">hr.sign.in.out.ask</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="hr.sign.out.ask" version="7.0">
                     <header>
@@ -73,7 +70,6 @@
        <record id="view_hr_attendance_si_ask" model="ir.ui.view">
             <field name="name">hr.sign.in.out.ask.form</field>
             <field name="model">hr.sign.in.out.ask</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="hr.sign.in.out.ask" version="7.0">
                     <header>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 2009e500bf9..10620cb9a4b 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -37,7 +37,6 @@
         <record id="hr_contract_view_search" model="ir.ui.view">
             <field name="name">hr.contract.view.search</field>
             <field name="model">hr.contract</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <field name="name" string="Contracts"/>
@@ -58,7 +57,6 @@
         <record id="hr_contract_view_form" model="ir.ui.view">
             <field name="name">hr.contract.view.form</field>
             <field name="model">hr.contract</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Contract" version="7.0">
                     <sheet>
@@ -114,7 +112,6 @@
         <record id="hr_contract_view_tree" model="ir.ui.view">
             <field name="name">hr.contract.view.tree</field>
             <field name="model">hr.contract</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Contracts">
                     <field name="name"/>
@@ -142,7 +139,6 @@
         <record id="hr_contract_type_view_form" model="ir.ui.view">
             <field name="name">hr.contract.type.view.form</field>
             <field name="model">hr.contract.type</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Contract Type">
                     <field colspan="4" name="name"/>
@@ -153,7 +149,6 @@
          <record id="hr_contract_type_view_tree" model="ir.ui.view">
             <field name="name">hr.contract.type.view.tree</field>
             <field name="model">hr.contract.type</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Contract Type">
                     <field colspan="4" name="name"/>
@@ -164,7 +159,6 @@
         <record id="hr_contract_type_view_search" model="ir.ui.view">
             <field name="name">hr.contract.type.view.search</field>
             <field name="model">hr.contract.type</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Contract Type">
                     <field name="name" string="Contract Type"/>
diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml
index 7ed11beb98c..3ad39d3805b 100644
--- a/addons/hr_evaluation/board_hr_evaluation_view.xml
+++ b/addons/hr_evaluation/board_hr_evaluation_view.xml
@@ -15,7 +15,6 @@
             <field name="name">board.hr.evaluation.form</field>
             <field name="model">board.board</field>
             <field name="inherit_id" ref="hr.board_hr_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="/form/board/column[2]" position="inside">
                     <action name="%(action_hr_evaluation_interview_board)d" string="Interview Requests"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 0e1710bbab0..47b0c323622 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -5,7 +5,6 @@
       <record id="view_hr_evaluation_plan_search" model="ir.ui.view">
             <field name="name">hr_evaluation.plan.search</field>
             <field name="model">hr_evaluation.plan</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Appraisal Plan">
                    <field name="name" string="Appraisal Plans"/>
@@ -20,7 +19,6 @@
         <record model="ir.ui.view" id="view_hr_evaluation_plan_form">
             <field name="name">hr_evaluation.plan.form</field>
             <field name="model">hr_evaluation.plan</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Appraisal Plan" version="7.0">
                     <group col="4">
@@ -45,7 +43,6 @@
         <record model="ir.ui.view" id="view_hr_evaluation_plan_tree">
             <field name="name">hr_evaluation.plan.form</field>
             <field name="model">hr_evaluation.plan</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Appraisal Plan">
                     <field name="name"/>
@@ -70,7 +67,6 @@
         <record model="ir.ui.view" id="view_hr_evaluation_plan_phase_form">
             <field name="name">hr_evaluation.plan.phase.form</field>
             <field name="model">hr_evaluation.plan.phase</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Appraisal Plan Phases" version="7.0">
                  <notebook>
@@ -116,7 +112,6 @@
         <record model="ir.ui.view" id="view_hr_evaluation_plan_phase_tree">
             <field name="name">hr_evaluation.plan.phase.form</field>
             <field name="model">hr_evaluation.plan.phase</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Appraisal Plan Phases" editable="bottom" >
                     <field name="sequence"/>
@@ -147,7 +142,6 @@
         <record model="ir.ui.view" id="view_hr_evaluation_form">
             <field name="name">hr_evaluation.evaluation.form</field>
             <field name="model">hr_evaluation.evaluation</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Appraisal" version="7.0">
                 <header>
@@ -211,7 +205,6 @@
         <record model="ir.ui.view" id="view_hr_evaluation_tree">
             <field name="name">hr_evaluation.evaluation.tree</field>
             <field name="model">hr_evaluation.evaluation</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state in ('wait','progress');gray:state in('done','cancel')" string="Appraisal">
                     <field name="employee_id"/>
@@ -227,7 +220,6 @@
        <record id="hr_evaluation.evaluation_search" model="ir.ui.view">
             <field name="name">hr_evaluation.evaluation_search</field>
             <field name="model">hr_evaluation.evaluation</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
                     <field name="date"/>
@@ -272,7 +264,6 @@
         <record model="ir.ui.view" id="view_hr_evaluation_interview_form">
             <field name="name">hr_evaluation.interview.form</field>
             <field name="model">hr.evaluation.interview</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Interview Appraisal" version="7.0">
                     <header>
@@ -309,7 +300,6 @@
         <record model="ir.ui.view" id="view_hr_evaluation_interview_tree">
             <field name="name">hr_evaluation.interview.tree</field>
             <field name="model">hr.evaluation.interview</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Interview Appraisal">
                     <field name="date_deadline" string="Deadline Date"/>
@@ -330,7 +320,6 @@
        <record id="view_hr_evaluation_interview_search" model="ir.ui.view">
             <field name="name">view_hr_evaluation_interview_search</field>
             <field name="model">hr.evaluation.interview</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
                     <field name="date_deadline"/>
@@ -349,7 +338,6 @@
         <record id="view_evaluation_calendar" model="ir.ui.view">
             <field name="name">Interview Requests</field>
             <field name="model">hr.evaluation.interview</field>
-            <field name="type">calendar</field>
             <field name="arch" type="xml">
                 <calendar string="Interview Request" color="user_to_review_id" date_start="date_deadline">
                     <field name="request_id"/>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index f92ff1efedb..fb1186ae401 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -5,7 +5,6 @@
     <record id="view_evaluation_report_tree" model="ir.ui.view">
         <field name="name">hr.evaluation.report.tree</field>
         <field name="model">hr.evaluation.report</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="blue:state == 'draft';black:state in ('wait','progress');gray:state in('done','cancel')"
              string="Appraisal Analysis">
@@ -29,7 +28,6 @@
     <record id="view_evaluation_report_graph" model="ir.ui.view">
             <field name="name">hr.evaluation.report.graph</field>
             <field name="model">hr.evaluation.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
             <graph string="Appraisal Analysis" type="bar">
                  <field name="employee_id"/>
@@ -42,7 +40,6 @@
     <record id="view_evaluation_report_search" model="ir.ui.view">
         <field name="name">hr.evaluation.report.search</field>
         <field name="model">hr.evaluation.report</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Appraisal Analysis">
                 <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]" help = "In progress Evaluations"/>
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index fffdf76f0e9..89ae99bb6c3 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -5,7 +5,6 @@
     <record id="view_hr_evaluation_send_mail" model="ir.ui.view">
         <field name="name">hr.evaluation.send.mail</field>
         <field name="model">hr.evaluation.reminder</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Evaluation Reminders" version="7.0">
                 <group string="Send Evaluation Reminder">
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index 667cccf54f2..fe89a4afc7a 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -15,7 +15,6 @@
             <field name="name">board.hr.expense.form</field>
             <field name="model">board.board</field>
             <field name="inherit_id" ref="hr.board_hr_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="/form/board/column[1]" position="inside">
                      <action name="%(action_my_expense)d" string="My Expenses" creatable="true"/>
diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index 717f9b94b2c..c2d1d88d1bf 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -16,7 +16,6 @@
         <record id="product_expense_installer_tree_view" model="ir.ui.view">
             <field name="name">product.product.tree</field>
             <field name="model">product.product</field>
-            <field name="type">tree</field>
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Products">
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 67c08ee8a65..506b9d7183f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -6,7 +6,6 @@
 
         <record id="view_expenses_line_tree" model="ir.ui.view">
             <field name="name">hr.expense.line.tree</field>
-            <field name="type">tree</field>
             <field name="model">hr.expense.line</field>
             <field name="arch" type="xml">
                 <tree string="Expense Lines">
@@ -25,7 +24,6 @@
         <record id="view_expenses_tree" model="ir.ui.view">
             <field name="name">hr.expense.expense.tree</field>
             <field name="model">hr.expense.expense</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Expenses" colors="blue:state=='draft'">
                     <field name="employee_id"/>
@@ -43,7 +41,6 @@
         <record id="view_editable_expenses_tree" model="ir.ui.view">
             <field name="name">hr.expense.expense.tree</field>
             <field name="model">hr.expense.expense</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'"  string="Expenses" editable="top">
                     <field name="employee_id"/>
@@ -60,7 +57,6 @@
 
         <record id="view_expenses_form" model="ir.ui.view">
             <field name="name">hr.expense.form</field>
-            <field name="type">form</field>
             <field name="model">hr.expense.expense</field>
             <field name="arch" type="xml">
                 <form string="Expenses Sheet" version="7.0">
@@ -133,7 +129,6 @@
         <record id="view_hr_expense_filter" model="ir.ui.view">
             <field name="name">hr.expense.expense.filter</field>
             <field name="model">hr.expense.expense</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Expense">
                     <field name="name" string="Expenses"/>
@@ -178,7 +173,6 @@
             <field name="name">product.product.expense.form</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <field name="purchase_ok" position="after">
             <field name="hr_expense_ok" on_change="on_change_hr_expense_ok(hr_expense_ok)"/>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 73ec45bde02..890568abc44 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -5,7 +5,6 @@
     <record id="view_hr_expense_report_tree" model="ir.ui.view">
         <field name="name">hr.expense.report.tree</field>
         <field name="model">hr.expense.report</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'" string="Expenses Analysis">
                 <field name="employee_id" invisible="1"/>
@@ -35,7 +34,6 @@
     <record id="view_hr_expense_report_graph" model="ir.ui.view">
          <field name="name">hr.expense.report.graph</field>
          <field name="model">hr.expense.report</field>
-         <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Expenses Analysis" type="bar">
                  <field name="employee_id"/>
@@ -48,7 +46,6 @@
     <record id="view_hr_expense_report_search" model="ir.ui.view">
         <field name="name">hr.expense.report.search</field>
         <field name="model">hr.expense.report</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Expenses Analysis">
                 <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]" help = "Confirm Expenses"/>
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index eb3b671af6b..c90ee32c396 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -15,7 +15,6 @@
         <record id="board_hr_holidays_leave_by_month_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.leave.month.form</field>
             <field name="model">board.board</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/board/column[1]" position="inside">
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index de9c65fe042..0030a2b0187 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -41,7 +41,6 @@
         <record id="view_hr_holidays_filter" model="ir.ui.view">
             <field name="name">hr.holidays.filter</field>
             <field name="model">hr.holidays</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <field name="date_from"/>
@@ -77,7 +76,6 @@
         <record id="view_holiday_new_calendar" model="ir.ui.view">
             <field name="name">Leave Request</field>
             <field name="model">hr.holidays</field>
-            <field name="type">calendar</field>
             <field name="arch" type="xml">
                 <calendar string="Leave Request" color="user_id" date_start="date_from" date_stop="date_to">
                     <field name="user_id"/>
@@ -89,10 +87,9 @@
         <record model="ir.ui.view" id="edit_holiday_new">
             <field name="name">Leave Request</field>
             <field name="model">hr.holidays</field>
-            <field name="type">form</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Leave Request" version="7.0">
                 <header>
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
@@ -149,7 +146,6 @@
         <record model="ir.ui.view" id="allocation_leave_new">
             <field name="name">Allocation Request</field>
             <field name="model">hr.holidays</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Allocation Request" version="7.0">
                 <header>
@@ -195,7 +191,6 @@
         <record model="ir.ui.view" id="view_holiday_allocation_tree">
             <field name="name">hr.holidays.allocation.tree</field>
             <field name="model">hr.holidays</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == 'draft';black:state in ('confirm','validate','validate1')" string="Allocation Requests">
                     <field name="needaction_pending" invisible="1"/>
@@ -218,7 +213,6 @@
         <record model="ir.ui.view" id="allocation_company_new">
             <field name="name">Leaves Management</field>
             <field name="model">hr.holidays</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leaves Management" version="7.0">
                     <header>
@@ -245,7 +239,6 @@
         <record model="ir.ui.view" id="view_holiday_simple">
             <field name="name">hr.holidays.report_tree</field>
             <field name="model">hr.holidays</field>
-            <field name="type">tree</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leaves Summary">
@@ -270,7 +263,6 @@
         <record model="ir.ui.view" id="view_holiday">
             <field name="name">hr.holidays.tree</field>
             <field name="model">hr.holidays</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leave Requests">
                     <field name="needaction_pending" invisible="1"/>
@@ -405,7 +397,6 @@
         <record id="view_holidays_status_filter" model="ir.ui.view">
             <field name="name">hr.holidays.status.filter</field>
             <field name="model">hr.holidays.status</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Leave Type">
                     <field name="name" string="Leave Types"/>
@@ -417,7 +408,6 @@
         <record model="ir.ui.view" id="edit_holiday_status_form">
             <field name="name">hr.holidays.status.form</field>
             <field name="model">hr.holidays.status</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Type" version="7.0">
                     <group col="4">
@@ -445,7 +435,6 @@
         <record model="ir.ui.view" id="view_holiday_status_tree">
             <field name="name">hr.holidays.status.tree</field>
             <field name="model">hr.holidays.status</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Leave Type">
                     <field name="name"/>
@@ -458,7 +447,6 @@
         <record model="ir.ui.view" id="view_holiday_status_normal_tree">
             <field name="name">hr.holidays.status.normal.tree</field>
             <field name="model">hr.holidays.status</field>
-            <field name="type">tree</field>
             <field name="priority">35</field>
             <field name="arch" type="xml">
                 <tree string="Leave Type">
@@ -471,7 +459,6 @@
         <record id="view_hr_holidays_status_search" model="ir.ui.view">
             <field name="name">hr.holidays.status.search</field>
             <field name="model">hr.holidays.status</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leave Type">
                     <field name="name" string="Leave Types"/>
@@ -497,7 +484,6 @@
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.form.inherit</field>
             <field name="model">resource.calendar.leaves</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="resource.resource_calendar_leave_form"/>
             <field name="arch" type="xml">
                 <field name="name" position="after">
@@ -524,7 +510,6 @@
         <record id="hr_holidays_leaves_assign_tree_view" model="ir.ui.view">
             <field name="name">hr.employee.leave.tree</field>
             <field name="model">hr.employee</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Assign Leaves" editable="bottom">
                     <field name="name" string="Employee"/>
@@ -553,14 +538,12 @@
         <record id="view_employee_form_leave_inherit" model="ir.ui.view">
             <field name="name">hr.employee.leave.form.inherit</field>
             <field name="model">hr.employee</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="before">
                     <label for="remaining_leaves"/>
                     <div>
                         <field name="remaining_leaves" class="oe_inline"/>
-                        <label/>
                         <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline oe_right"/>
                     </div>
                 </field>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 21e19897f22..8af7075f109 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -5,7 +5,6 @@
     <record id="view_hr_holidays_remaining_leaves_user_tree" model="ir.ui.view">
         <field name="name">hr.holidays.remaining.leaves.user.tree</field>
         <field name="model">hr.holidays.remaining.leaves.user</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Leaves by Type">
                 <field name="name"/>
@@ -18,7 +17,6 @@
     <record id="view_hr_holidays_remaining_leaves_user_graph" model="ir.ui.view">
         <field name="name">hr.holidays.remaining.leaves.user.graph</field>
         <field name="model">hr.holidays.remaining.leaves.user</field>
-        <field name="type">graph</field>
         <field name="arch" type="xml">
             <graph string="Leaves by Type" orientation = "horizontal" type="bar">
                 <field name="name" />
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index c0bbf741277..d5847fa54ee 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -5,7 +5,6 @@
         <record id="view_hr_holidays_summary_dept" model="ir.ui.view">
             <field name="name">hr.holidays.summary.dept.form</field>
             <field name="model">hr.holidays.summary.dept</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Leaves by Department" version="7.0">
                 <group>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index 976d732ee69..d7b46f38e6d 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -5,7 +5,6 @@
         <record id="view_hr_holidays_summary_employee" model="ir.ui.view">
             <field name="name">hr.holidays.summary.employee.form</field>
             <field name="model">hr.holidays.summary.employee</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leaves Summary" version="7.0">
                     <group col="4" colspan="6">
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index ed0eb49ee71..58484a91567 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -11,7 +11,6 @@
         <record id="hr_contract_form_inherit" model="ir.ui.view">
             <field name="name">hr.contract.view.form.inherit</field>
             <field name="model">hr.contract</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
@@ -31,7 +30,6 @@
         <record id="view_hr_payroll_structure_list_view" model="ir.ui.view">
             <field name="name">hr.payroll.structure.tree</field>
             <field name="model">hr.payroll.structure</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Employee Function">
                     <field name="name"/>
@@ -44,7 +42,6 @@
         <record id="view_hr_payroll_structure_tree" model="ir.ui.view">
             <field name="name">hr.payroll.structure.tree</field>
             <field name="model">hr.payroll.structure</field>
-            <field name="type">tree</field>
             <field name="field_parent">children_ids</field>
             <field name="arch" type="xml">
                 <tree string="Salary Structure">
@@ -58,7 +55,6 @@
         <record id="view_hr_payroll_structure_filter" model="ir.ui.view">
             <field name="name">hr.payroll.structure.select</field>
             <field name="model">hr.payroll.structure</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Payroll Structures">
                     <field name="name" string="Payroll Structures" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
@@ -69,7 +65,6 @@
         <record id="view_hr_employee_grade_form" model="ir.ui.view">
             <field name="name">hr.payroll.structure.form</field>
             <field name="model">hr.payroll.structure</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee Function" version="7.0">
                     <group col="4">
@@ -127,7 +122,6 @@
         <record id="view_hr_payslip_line_tree" model="ir.ui.view">
             <field name="name">hr.payslip.line.tree</field>
             <field name="model">hr.payslip.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Salary Structure" editable="bottom" colors="blue:total == 0">
                     <field name="category_id"/>
@@ -147,7 +141,6 @@
         <record id="view_hr_payslip_line_form" model="ir.ui.view">
             <field name="name">hr.payslip.line.form</field>
             <field name="model">hr.payslip.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payslip Line">
                 <group>
@@ -173,7 +166,6 @@
         <record id="view_hr_payslip_line_filter" model="ir.ui.view">
             <field name="name">hr.payslip.line.select</field>
             <field name="model">hr.payslip.line</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payslip Lines">
                     <field name="name" string="Payslip Lines" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
@@ -195,7 +187,6 @@
         <record id="view_hr_payslip_tree" model="ir.ui.view">
             <field name="name">hr.payslip.tree</field>
             <field name="model">hr.payslip</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('confirm','hr_check','accont_check');black:state == 'new';gray:state == 'cancel'" string="Payslips">
                     <field name="number"/>
@@ -219,7 +210,6 @@
         <record id="view_hr_payslip_form" model="ir.ui.view">
             <field name="name">hr.payslip.form</field>
             <field name="model">hr.payslip</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payslip" version="7.0">
                 <header>
@@ -355,7 +345,6 @@
         <record id="view_hr_payslip_filter" model="ir.ui.view">
             <field name="name">hr.payslip.select</field>
             <field name="model">hr.payslip</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payslips">
                     <field name="name" string="Payslips" filter_domain="['|',('name','ilike',self),('number','ilike',self)]"/>
@@ -406,7 +395,6 @@
         <record id="hr_salary_rule_category_form" model="ir.ui.view">
             <field name="name">hr.salary.rule.category.form</field>
             <field name="model">hr.salary.rule.category</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Salary Categories">
                     <group col="4">
@@ -423,7 +411,6 @@
         <record id="hr_salary_rule_category_tree" model="ir.ui.view">
             <field name="name">hr.salary.rule.category.tree</field>
             <field name="model">hr.salary.rule.category</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Salary Rule Categories">
                     <field name="name"/>
@@ -435,7 +422,6 @@
         <record id="hr_salary_rule_category_tree_view" model="ir.ui.view">
             <field name="name">hr.salary.rule.category.tree.view</field>
             <field name="model">hr.salary.rule.category</field>
-            <field name="type">tree</field>
             <field name="field_parent">children_ids</field>
             <field name="arch" type="xml">
                 <tree string="Salary Rule Categories">
@@ -449,7 +435,6 @@
         <record id="view_hr_salary_rule_category_filter" model="ir.ui.view">
             <field name="name">hr.salary.rule.category.select</field>
             <field name="model">hr.salary.rule.category</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Salary Rule Categories">
                     <field name="name" string="Salary Rule Categories" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
@@ -493,7 +478,6 @@
         <record id="hr_contribution_register_tree" model="ir.ui.view">
             <field name="name">hr.contribution.register.tree</field>
             <field name="model">hr.contribution.register</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Contribution Registers">
                     <field name="name" />
@@ -504,7 +488,6 @@
         <record id="hr_contribution_register_filter" model="ir.ui.view">
             <field name="name">hr.contribution.register.search</field>
             <field name="model">hr.contribution.register</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Contribution Registers">
                     <field name="name" string="Contribution Registers"/>
@@ -515,7 +498,6 @@
         <record id="hr_contribution_register_form" model="ir.ui.view">
             <field name="name">hr.contribution.register.form</field>
             <field name="model">hr.contribution.register</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Contribution">
                     <field name="name"/>
@@ -552,7 +534,6 @@
         <record id="hr_salary_rule_list" model="ir.ui.view">
             <field name="name">hr.salary.rule.list</field>
             <field name="model">hr.salary.rule</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Salary Rules">
                     <field name="name"/>
@@ -567,7 +548,6 @@
         <record id="hr_salary_rule_tree" model="ir.ui.view">
             <field name="name">hr.salary.rule.tree</field>
             <field name="model">hr.salary.rule</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
@@ -582,7 +562,6 @@
         <record id="hr_salary_rule_form" model="ir.ui.view">
             <field name="name">hr.salary.rule.form</field>
             <field name="model">hr.salary.rule</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Salary Rules" version="7.0">
                     <label for="name" class="oe_edit_only"/>
@@ -641,7 +620,6 @@
         <record id="view_hr_rule_filter" model="ir.ui.view">
             <field name="name">hr.salary.rule.select</field>
             <field name="model">hr.salary.rule</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Salary Rule">
                     <field name="name" string="Salary Rules" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
@@ -678,7 +656,6 @@
         <record id="hr_payslip_run_filter" model="ir.ui.view">
             <field name="name">hr.payslip.run.search</field>
             <field name="model">hr.payslip.run</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Payslip Batches">
                     <field name="name" string="Payslip Batches"/>
@@ -693,7 +670,6 @@
         <record id="hr_payslip_run_tree" model="ir.ui.view">
             <field name="name">hr.payslip.run.tree</field>
             <field name="model">hr.payslip.run</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Payslips Batches">
                     <field name="name"/>
@@ -708,7 +684,6 @@
         <record id="hr_payslip_run_form" model="ir.ui.view">
             <field name="name">hr.payslip.run.form</field>
             <field name="model">hr.payslip.run</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payslips Batches" version="7.0">
                 <header>
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml
index 23b4adde536..c40980d1d1f 100644
--- a/addons/hr_payroll/res_config_view.xml
+++ b/addons/hr_payroll/res_config_view.xml
@@ -4,7 +4,6 @@
         <record id="view_hr_config_inherit" model="ir.ui.view">
             <field name="name">hr settings for payroll</field>
             <field name="model">hr.config.settings</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='hr_payroll']" position="after">
diff --git a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
index 5e344e6553a..8cfaa85518a 100644
--- a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
@@ -5,7 +5,6 @@
         <record id="view_payslip_lines_contribution_register" model="ir.ui.view">
             <field name="name">payslip.lines.contribution.register</field>
             <field name="model">payslip.lines.contribution.register</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Contribution Register's Payslip Lines" version="7.0">
                 <header>
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
index b29b80104df..4ef6ab577de 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
@@ -5,7 +5,6 @@
         <record id="view_hr_payslip_by_employees" model="ir.ui.view">
             <field name="name">hr_payroll_payslip_employees</field>
             <field name="model">hr.payslip.employees</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payslips by Employees" version="7.0">
                     <header>
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index d481ae3cdde..370238be502 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -6,7 +6,6 @@
             <field name="name">hr.payslip.inherit.form</field>
             <field name="model">hr.payslip</field>
             <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="paid" position="after">
                     <field name="period_id"/>
@@ -41,7 +40,6 @@
         <record id="hr_contract_form_inherit" model="ir.ui.view">
             <field name="name">hr.contract.view.form.inherit</field>
             <field name="model">hr.contract</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='duration_group']" position="after">
@@ -58,7 +56,6 @@
         <record id="hr_payslip_run_search_inherit" model="ir.ui.view">
             <field name="name">hr.payslip.run.search.inherit</field>
             <field name="model">hr.payslip.run</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
             <field name="arch" type="xml">
                 <filter name='done_filter' position="after">
@@ -70,7 +67,6 @@
         <record id="hr_payslip_run_tree_inherit" model="ir.ui.view">
             <field name="name">hr.payslip.run.tree.inherit</field>
             <field name="model">hr.payslip.run</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_tree"/>
             <field name="arch" type="xml">
                 <field name="date_end" position="after">
@@ -82,7 +78,6 @@
         <record id="hr_payslip_run_form_inherit" model="ir.ui.view">
             <field name="name">hr.payslip.run.form.inherit</field>
             <field name="model">hr.payslip.run</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
             <field name="arch" type="xml">
                 <field name="credit_note" position="before">
diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
index 468d3a8d66e..461ccdf0bbe 100644
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@@ -5,7 +5,6 @@
     <record id="view_applicants_status_tree" model="ir.ui.view">
         <field name="name">applicants.status.tree</field>
         <field name="model">hr.applicant</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="blue:state == 'draft';black:state in ('open','pending','done','cancel');" string="Applicants Status">
                 <field name="create_date"/>
@@ -31,7 +30,6 @@
         <field name="name">board.hr.applicants.status.form</field>
         <field name="model">board.board</field>
         <field name="inherit_id" ref="hr.board_hr_form"/>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <xpath expr="/form/board/column[1]" position="inside">
                 <action name="%(action_applicants_status)d" string="Applicants To be Processed"/>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index ee85ecc22a3..2e5b7b6403e 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -518,37 +518,55 @@ class hr_job(osv.osv):
                                          "create new applicants for this job position."),
     }
 
-    def init(self, cr):
-        # Installation hook to create aliases for all jobs, right after _auto_init
+    _defaults = {
+        'alias_domain': False, # always hide alias during creation
+    }
+
+    def _auto_init(self, cr, context=None):
+        """Installation hook to create aliases for all jobs and avoid constraint errors."""
+        
+        # disable the unique alias_id not null constraint, to avoid spurious warning during 
+        # super.auto_init. We'll reinstall it afterwards.
+        self._columns['alias_id'].required = False
+
+        super(hr_job,self)._auto_init(cr, context=context)
+        
         registry = RegistryManager.get(cr.dbname)
         mail_alias = registry.get('mail.alias')
-        hr_job = registry.get('hr.job')
-        jobs_no_alias = hr_job.search(cr, SUPERUSER_ID, [('alias_id', '=', False)])
+        hr_jobs = registry.get('hr.job')
+        jobs_no_alias = hr_jobs.search(cr, SUPERUSER_ID, [('alias_id', '=', False)])
         # Use read() not browse(), to avoid prefetching uninitialized inherited fields
-        for job_data in hr_job.read(cr, SUPERUSER_ID, jobs_no_alias, ['name']):
-            alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, {'alias_name': 'job_'+job_data['name'],
-                                                                         'alias_force_id': job_data['id']},
-                                                      model_name=self._name)
-            hr_job.write(cr, SUPERUSER_ID, job_data['id'], {'alias_id': alias_id})
+        for job_data in hr_jobs.read(cr, SUPERUSER_ID, jobs_no_alias, ['name']):
+            alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, {'alias_name': 'job+'+job_data['name'],
+                                                                         'alias_defaults': {'job_id': job_data['id']}},
+                                                      model_name='hr.applicant')
+            hr_jobs.write(cr, SUPERUSER_ID, job_data['id'], {'alias_id': alias_id})
             _logger.info('Mail alias created for hr.job %s (uid %s)', job_data['name'], job_data['id'])
 
         # Finally attempt to reinstate the missing constraint
         try:
             cr.execute('ALTER TABLE hr_job ALTER COLUMN alias_id SET NOT NULL')
         except Exception:
-            pass
-    
+            _logger.warning("Table '%s': unable to set a NOT NULL constraint on column '%s' !\n"\
+                            "If you want to have it, you should update the records and execute manually:\n"\
+                            "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL",
+                            self._table, 'alias_id', self._table, 'alias_id')
+
+        self._columns['alias_id'].required = True
+
     def create(self, cr, uid, vals, context=None):
-        alias_pool = self.pool.get('mail.alias')
+        mail_alias = self.pool.get('mail.alias')
         if not vals.get('alias_id'):
-            name = vals.pop('alias_name', None) or vals['name']
-            alias_id = alias_pool.create_unique_alias(cr, uid, 
-                          {'alias_name': "job_"+name},
+            vals.pop('alias_name', None) # prevent errors during copy()
+            alias_id = mail_alias.create_unique_alias(cr, uid, 
+                          # Using '+' allows using subaddressing for those who don't
+                          # have a catchall domain setup.
+                          {'alias_name': 'jobs+'+vals['name']},
                           model_name="hr.applicant",
                           context=context)
             vals['alias_id'] = alias_id
-        res = super( hr_job, self).create(cr, uid, vals, context)
-        alias_pool.write(cr, uid, [vals['alias_id']], {"alias_defaults": {'job_id': res}}, context)
+        res = super(hr_job, self).create(cr, uid, vals, context)
+        mail_alias.write(cr, uid, [vals['alias_id']], {"alias_defaults": {'job_id': res}}, context)
         return res
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 21f4e48e42d..d90f5ab596a 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -458,7 +458,6 @@ You can automatically create application records from an email gateway, that you
         <field name="alias_name">jobs</field>
         <field name="alias_model_id" ref="model_hr_applicant"/>
         <field name="alias_user_id" ref="base.user_root"/>
-        <field name="alias_defaults">{}</field>
     </record>
     
 </data>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index d3bd6e28438..8a6296cd230 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -75,7 +75,6 @@
     <record model="ir.ui.view" id="crm_case_tree_view_job">
         <field name="name">Applicants</field>
         <field name="model">hr.applicant</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Applicants" fonts="bold:needaction_pending==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
                 <field name="needaction_pending" invisible="1"/>
@@ -104,7 +103,6 @@
     <record model="ir.ui.view" id="crm_case_form_view_job">
         <field name="name">Jobs - Recruitment Form</field>
         <field name="model">hr.applicant</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
           <form string="Jobs - Recruitment Form" version="7.0">
             <header>
@@ -191,7 +189,6 @@
     <record model="ir.ui.view" id="crm_case_graph_view_job">
         <field name="name">Jobs - Recruitment Graph</field>
         <field name="model">hr.applicant</field>
-        <field name="type">graph</field>
         <field name="arch" type="xml">
               <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
                 <field name="job_id"/>
@@ -204,7 +201,6 @@
     <record id="view_crm_case_jobs_filter" model="ir.ui.view">
         <field name="name">Jobs - Recruitment Search</field>
         <field name="model">hr.applicant</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Jobs">
                 <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
@@ -240,7 +236,6 @@
     <record model="ir.ui.view" id="hr_applicant_calendar_view">
         <field name="name">Hr Applicants Calendar</field>
         <field name="model">hr.applicant</field>
-        <field name="type">calendar</field>
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
             <calendar string="Applicants"
@@ -256,7 +251,6 @@
     <record model="ir.ui.view" id="hr_kanban_view_applicant">
         <field name="name">Hr Applicants kanban</field>
         <field name="model">hr.applicant</field>
-        <field name="type">kanban</field>
         <field name="arch" type="xml">
             <kanban default_group_by="stage_id">
                 <field name="color"/>
@@ -326,7 +320,6 @@
     <record id="hr_job_survey" model="ir.ui.view">
         <field name="name">hr.job.form1</field>
         <field name="model">hr.job</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
             <field name="no_of_recruitment" version="7.0" position="after">
@@ -341,7 +334,7 @@
             </field>
             <xpath expr="/form/sheet/h1" version="7.0" position="after">
                 <div colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
-                    <field name="alias_id" invisible="1"/>
+                    <field name="alias_id" invisible="1" required="0"/>
                     <label for="alias_name" class="oe_edit_only"/>
                     <field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
                 </div>
@@ -353,7 +346,6 @@
     <record model="ir.ui.view" id="hr_recruitment_stage_tree">
         <field name="name">hr.recruitment.stage.tree</field>
         <field name="model">hr.recruitment.stage</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Stages">
                 <field name="sequence" invisible="1"/>
@@ -368,7 +360,6 @@
     <record model="ir.ui.view" id="hr_recruitment_stage_form">
         <field name="name">hr.recruitment.stage.form</field>
         <field name="model">hr.recruitment.stage</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Stage" version="7.0">
                 <group string="Stage Definition">
@@ -410,7 +401,6 @@
     <record model="ir.ui.view" id="hr_recruitment_degree_tree">
         <field name="name">hr.recruitment.degree.tree</field>
         <field name="model">hr.recruitment.degree</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Degree">
                 <field name="sequence" invisible="1"/>
@@ -423,7 +413,6 @@
     <record model="ir.ui.view" id="hr_recruitment_degree_form">
         <field name="name">hr.recruitment.degree.form</field>
         <field name="model">hr.recruitment.degree</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Degree" version="7.0">
                 <group>
@@ -453,7 +442,6 @@
     <record model="ir.ui.view" id="hr_recruitment_source_tree">
         <field name="name">hr.recruitment.source.tree</field>
         <field name="model">hr.recruitment.source</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Sources of Applicants">
                 <field name="name"/>
@@ -463,7 +451,6 @@
     <record model="ir.ui.view" id="hr_recruitment_source_form">
         <field name="name">hr.recruitment.source.form</field>
         <field name="model">hr.recruitment.source</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Sources of Applicants">
                 <field name="name"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index afb87aba4ff..30a20a25eb8 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -4,7 +4,6 @@
     <record id="view_hr_recruitment_report_tree" model="ir.ui.view">
         <field name="name">hr.recruitment.report.tree</field>
         <field name="model">hr.recruitment.report</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Recruitment Analysis">
                 <field name="date" invisible="1"/>
@@ -34,7 +33,6 @@
     <record id="view_hr_recruitment_report_graph" model="ir.ui.view">
          <field name="name">hr.recruitment.report.graph</field>
          <field name="model">hr.recruitment.report</field>
-         <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Recruitment Analysis" type="bar">
                  <field name="job_id"/>
@@ -46,7 +44,6 @@
     <record id="view_hr_recruitment_report_search" model="ir.ui.view">
         <field name="name">hr.recruitment.report.search</field>
         <field name="model">hr.recruitment.report</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
                 <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft recruitment"/>
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index 950d998b92b..449246bd343 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -16,7 +16,6 @@
         <record id="view_hr_apll_config_settings" model="ir.ui.view">
             <field name="name">hr settings for recruitment</field>
             <field name="model">hr.config.settings</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <div name="recruitment" position="inside">
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
index cf8a30c9847..09d8fff7bf0 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
@@ -5,7 +5,6 @@
         <record id="view_hr_recruitment_partner_create" model="ir.ui.view">
             <field name="name">hr.recruitment.partner.create.form</field>
             <field name="model">hr.recruitment.partner.create</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Partner" version="7.0">
                     <label string="Are you sure you want to create a contact based on this job request ?"/>
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
index 0ea98657a61..d014bd54aa8 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
@@ -5,7 +5,6 @@
         <record id="view_hr_recruitment_hired_employee" model="ir.ui.view">
             <field name="name">hr.recruitment.hired2employee.form</field>
             <field name="model">hired.employee</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create New Employee" version="7.0">
                     <header>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index b141cef1bb4..d364d605b5f 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -5,7 +5,6 @@
         <record id="hr_timesheet_line_tree" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.tree</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Timesheet Lines">
                     <field name="date" on_change="on_change_date(date)"/>
@@ -24,7 +23,6 @@
         <record id="hr_timesheet_line_form" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet Lines" version="7.0">
                     <sheet>
@@ -65,7 +63,6 @@
         <record id="hr_timesheet_line_search" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.search</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <field name="date"/>
@@ -84,7 +81,6 @@
         <record id="account_analytic_account_timesheet_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index afcf64808b7..9079735aaae 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -6,7 +6,6 @@
         <record id="view_hr_timesheet_employee" model="ir.ui.view">
             <field name="name">hr.analytical.timesheet.employee.form</field>
             <field name="model">hr.analytical.timesheet.employee</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Monthly Employee Timesheet" version="7.0">
                     <group colspan="4">
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index 8ead6ea63d6..93015a76503 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -6,7 +6,6 @@
         <record id="view_hr_timesheet_users" model="ir.ui.view">
             <field name="name">hr.analytical.timesheet.users.form</field>
             <field name="model">hr.analytical.timesheet.users</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Monthly Employees Timesheet" version="7.0">
                     <sheet>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index dc2a6c47b8d..ea8d37ad454 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -4,7 +4,6 @@
         <record id="view_hr_timesheet_sign_in_message" model="ir.ui.view">
             <field name="name">hr.sign.in.project.message.form</field>
             <field name="model">hr.sign.in.project</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
                     <group>
@@ -23,7 +22,6 @@
         <record id="view_hr_timesheet_sign_in" model="ir.ui.view">
             <field name="name">hr.sign.in.project.form</field>
             <field name="model">hr.sign.in.project</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
                     <group colspan="4" >
@@ -57,7 +55,6 @@
         <record id="view_hr_timesheet_sign_out" model="ir.ui.view">
             <field name="name">hr.sign.out.project.form</field>
             <field name="model">hr.sign.out.project</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
                     <group colspan="4" >
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 3ea1f23a7a8..b752ade8da0 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -4,7 +4,6 @@
         <record id="account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
             <field name="priority">30</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
@@ -34,7 +33,6 @@
         <record id="hr_timesheet_line_form" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group[@string='Accounting']" position='after'>
@@ -49,7 +47,6 @@
         <record id="hr_timesheet_line_form2" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.form2</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id" position="replace">
@@ -61,7 +58,6 @@
         <record id="hr_timesheet_line_tree" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.tree</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
             <field name="arch" type="xml">
                 <field name="amount" position="after">
@@ -73,7 +69,6 @@
         <record id="hr_timesheet_line_tree2" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.tree2</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
             <field name="arch" type="xml">
                 <field name="account_id" position="replace">
@@ -86,7 +81,6 @@
         <record id="view_account_analytic_line_search_inherit" model="ir.ui.view">
             <field name="name">account.analytic.line.search.to_invoice</field>
             <field name="model">account.analytic.line</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
                 <xpath expr="//filter[@name='others']" position="after">
@@ -100,7 +94,6 @@
         <record id="view_account_analytic_line_tree_inherit" model="ir.ui.view">
             <field name="name">account.analytic.line.tree.to_invoice</field>
             <field name="model">account.analytic.line</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
             <field name="arch" type="xml">
                 <field name="account_id" position="after">
@@ -111,7 +104,6 @@
           <record id="view_account_analytic_line_form_inherit" model="ir.ui.view">
             <field name="name">account.analytic.line.form.to_invoice</field>
             <field name="model">account.analytic.line</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
             <field name="arch" type="xml">
                 <field name="amount" position="before">
@@ -149,7 +141,6 @@
         <record id="view_hr_timesheet_invoice_factor_search" model="ir.ui.view">
             <field name="name">hr_timesheet_invoice.factor.search</field>
             <field name="model">hr_timesheet_invoice.factor</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Type of invoicing">
                     <field name="name" string="Type of invoicing"/>
@@ -159,7 +150,6 @@
         <record id="view_hr_timesheet_invoice_factor_form" model="ir.ui.view">
             <field name="name">hr_timesheet_invoice.factor.form</field>
             <field name="model">hr_timesheet_invoice.factor</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Type of invoicing" version="7.0">
                     <group col="4">
@@ -173,7 +163,6 @@
         <record id="view_hr_timesheet_invoice_factor_tree" model="ir.ui.view">
             <field name="name">hr_timesheet_invoice.factor.tree</field>
             <field name="model">hr_timesheet_invoice.factor</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Types of invoicing">
                     <field name="name"/>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 5048f2c9193..2d4b0debde8 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -10,7 +10,6 @@
         <record id="view_timesheet_line_graph" model="ir.ui.view">
             <field name="name">report.timesheet.line.graph</field>
             <field name="model">report.timesheet.line</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet Line" type="bar">
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
@@ -23,7 +22,6 @@
         <record id="view_timesheet_line_tree" model="ir.ui.view">
             <field name="name">report.timesheet.line.tree</field>
             <field name="model">report.timesheet.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Timesheet Line">
                     <field name="date" invisible="1"/>
@@ -43,7 +41,6 @@
         <record id="view_timesheet_line_search" model="ir.ui.view">
             <field name="name">report.timesheet.line.search</field>
             <field name="model">report.timesheet.line</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <filter icon="terp-personal" string="Non Assigned timesheets to users" help="Non Assigned timesheets to users" domain="[('user_id','=',False)]"/>
@@ -82,7 +79,6 @@
         <record id="view_timesheet_user_graph" model="ir.ui.view">
             <field name="name">report_timesheet.user.graph</field>
             <field name="model">report_timesheet.user</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet by user" type="bar">
                     <field name="name"/>
@@ -95,7 +91,6 @@
         <record id="view_timesheet_user_form" model="ir.ui.view">
             <field name="name">report_timesheet.timesheet.user.form</field>
             <field name="model">report_timesheet.user</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet by user">
                     <field name="name"/>
@@ -108,7 +103,6 @@
         <record id="view_timesheet_user_tree" model="ir.ui.view">
             <field name="name">report_timesheet.timesheet.user.tree</field>
             <field name="model">report_timesheet.user</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Timesheet by user">
                     <field name="name"/>
@@ -123,7 +117,6 @@
         <record id="view_timesheet_account_date_graph_account" model="ir.ui.view">
             <field name="name">report_timesheet.account.date.graph</field>
             <field name="model">report_timesheet.account.date</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Daily timesheet per account" type="bar">
                     <field name="name"/>
@@ -136,7 +129,6 @@
         <record id="view_timesheet_user_search" model="ir.ui.view">
             <field name="name">report_timesheet.timesheet.user.search</field>
             <field name="model">report_timesheet.user</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
                     <field name="name" string="Timesheet by users"/>
@@ -160,7 +152,6 @@
         <record id="view_timesheet_invoice_graph" model="ir.ui.view">
             <field name="name">report_timesheet.invoice.graph</field>
             <field name="model">report_timesheet.invoice</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet by invoice">
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
@@ -172,7 +163,6 @@
         <record id="view_timesheet_invoice_form" model="ir.ui.view">
             <field name="name">report_timesheet.timesheet.invoice.form</field>
             <field name="model">report_timesheet.invoice</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet by invoice">
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
@@ -185,7 +175,6 @@
         <record id="view_timesheet_invoice_search" model="ir.ui.view">
             <field name="name">report_timesheet.timesheet.invoice.search</field>
             <field name="model">report_timesheet.invoice</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by invoice">
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
@@ -198,7 +187,6 @@
         <record id="view_timesheet_invoice_tree" model="ir.ui.view">
             <field name="name">report_timesheet.timesheet.invoice.tree</field>
             <field name="model">report_timesheet.invoice</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Timesheets to invoice">
                     <field name="user_id"/>
@@ -224,7 +212,6 @@
         <record id="view_timesheet_account_date_tree" model="ir.ui.view">
             <field name="name">report_timesheet.account.date.tree</field>
             <field name="model">report_timesheet.account.date</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Daily timesheet per account">
                     <field name="name"/>
@@ -238,7 +225,6 @@
         <record id="view_timesheet_account_date_graph" model="ir.ui.view">
             <field name="name">report_timesheet.account.date.graph</field>
             <field name="model">report_timesheet.account.date</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Daily timesheet per account">
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
@@ -250,7 +236,6 @@
         <record id="view_timesheet_account_date_form" model="ir.ui.view">
             <field name="name">report_timesheet.timesheet.account.date.form</field>
             <field name="model">report_timesheet.account.date</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Daily timesheet by account">
                     <field name="name"/>
@@ -265,7 +250,6 @@
         <record id="view_timesheet_account_date_search" model="ir.ui.view">
             <field name="name">report_timesheet.timesheet.account.date.search</field>
             <field name="model">report_timesheet.account.date</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
                     <field name="name" string="Timesheet by account"/>
@@ -290,7 +274,6 @@
         <record id="view_timesheet_account_tree" model="ir.ui.view">
             <field name="name">report_timesheet.account.tree</field>
             <field name="model">report_timesheet.account</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Timesheet per account">
                     <field name="name"/>
@@ -304,7 +287,6 @@
         <record id="view_timesheet_account_graph" model="ir.ui.view">
             <field name="name">report_timesheet.account.graph</field>
             <field name="model">report_timesheet.account</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet per account">
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
@@ -316,7 +298,6 @@
         <record id="view_timesheet_account_form" model="ir.ui.view">
             <field name="name">report_timesheet.timesheet.account.form</field>
             <field name="model">report_timesheet.account</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet by account">
                     <field name="name"/>
@@ -331,7 +312,6 @@
         <record id="view_timesheet_account_search" model="ir.ui.view">
             <field name="name">report_timesheet.timesheet.account.search</field>
             <field name="model">report_timesheet.account</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by account">
                     <field name="name" string="Timesheet by account"/>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index 6dbbb85aea9..9e0b8dd59ee 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -5,7 +5,6 @@
         <record id="view_analytic_account_close_form" model="ir.ui.view">
             <field name="name">report.analytic.account.close.form</field>
             <field name="model">report.analytic.account.close</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Expired analytic accounts">
                     <field name="name" groups="analytic.group_analytic_accounting"/>
@@ -23,7 +22,6 @@
         <record id="view_analytic_account_close_tree" model="ir.ui.view">
             <field name="name">report.analytic.account.close.tree</field>
             <field name="model">report.analytic.account.close</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Expired analytic accounts">
                     <field name="name" groups="analytic.group_analytic_accounting"/>
@@ -40,7 +38,6 @@
         <record id="view_analytic_account_graph" model="ir.ui.view">
             <field name="name">report.analytic.account.close.graph</field>
             <field name="model">report.analytic.account.close</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Expired analytic accounts" type="bar">
                     <field name="partner_id"/>
@@ -61,7 +58,6 @@
         <record id="account_analytic_line_to_invoice_view_form" model="ir.ui.view">
             <field name="name">report.account.analytic.line.to.invoice</field>
             <field name="model">report.account.analytic.line.to.invoice</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Analytic Lines to Invoice">
                     <field name="name"/>
@@ -80,7 +76,6 @@
         <record id="account_analytic_line_to_invoice_view_tree" model="ir.ui.view">
             <field name="name">report.account.analytic.line.to.invoice</field>
             <field name="model">report.account.analytic.line.to.invoice</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Analytic Lines to Invoice">
                     <field name="name"/>
@@ -98,7 +93,6 @@
         <record id="account_analytic_line_to_invoice_view_graph" model="ir.ui.view">
             <field name="name">report.account.analytic.line.to.invoice.graph</field>
             <field name="model">report.account.analytic.line.to.invoice</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Analytic Lines to Invoice" type="bar">
                     <field name="name"/>
@@ -110,7 +104,6 @@
         <record id="account_analytic_line_to_invoice_view_filter" model="ir.ui.view">
             <field name="name">report.account.analytic.line.to.invoice.select</field>
             <field name="model">report.account.analytic.line.to.invoice</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Lines to Invoice">
                     <field name="name" string="Analytic Lines"/>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index f0679de8d95..65cbe360598 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -5,7 +5,6 @@
         <record id="view_hr_timesheet_analytic_profit" model="ir.ui.view">
             <field name="name">Timesheet Profit</field>
             <field name="model">hr.timesheet.analytic.profit</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet Profit" version="7.0">
                    <sheet>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index 85d9538cc5b..a0a0ceea2ac 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -24,7 +24,6 @@
         <record id="view_hr_timesheet_invoice_create_final" model="ir.ui.view">
             <field name="name">hr.timesheet.invoice.create.final.form</field>
             <field name="model">hr.timesheet.invoice.create.final</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Invoice contract" version="7.0">
                     <separator string="Do you want to display work details on the invoice?" colspan="4"/>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index 1c163a1ac0e..74d0fa1daf6 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -5,7 +5,6 @@
         <record id="view_hr_timesheet_invoice_create" model="ir.ui.view">
             <field name="name">hr.timesheet.invoice.create.form</field>
             <field name="model">hr.timesheet.invoice.create</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Create Invoice" version="7.0">
                 <notebook>
diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index 2b165334739..145d118ceb7 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -5,7 +5,6 @@
         <record id="view_hr_timesheet_sheet_graph" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.sheet.graph</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Available Attendance" type="bar">
                     <field name="name"/>
@@ -27,7 +26,6 @@
             <field name="name">board.hr.timesheet.sheet.form</field>
             <field name="model">board.board</field>
             <field name="inherit_id" ref="hr.board_hr_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="/form/board/column[2]" position="inside">
                     <action name="%(action_week_attendance_graph)d" string="My Total Attendance By Week"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index aa81b715e55..6c4ee63cbe6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -5,7 +5,6 @@
         <record id="hr_timesheet_account_form" model="ir.ui.view">
             <field name="name">hr.timesheet.account.form</field>
             <field name="model">hr_timesheet_sheet.sheet.account</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet by Accounts" version="7.0">
                     <group col="4">
@@ -20,7 +19,6 @@
         <record id="hr_timesheet_account_filter" model="ir.ui.view">
             <field name="name">hr.timesheet.account.filter</field>
             <field name="model">hr_timesheet_sheet.sheet.account</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Account">
                     <field name="name" groups="analytic.group_analytic_accounting"/>
@@ -32,7 +30,6 @@
         <record id="hr_timesheet_account_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.account.tree</field>
             <field name="model">hr_timesheet_sheet.sheet.account</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Timesheet by Accounts">
                     <field name="sheet_id"/>
@@ -46,7 +43,6 @@
         <record id="hr_timesheet_sheet_form" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.form</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet" version="7.0">
                 <header>
@@ -153,7 +149,6 @@
         <record id="view_hr_timesheet_sheet_filter" model="ir.ui.view">
             <field name="name">hr_timesheet_sheet.sheet.filter</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <field name="date_from"/>
@@ -201,7 +196,6 @@
         <record id="hr_timesheet_sheet_company" model="ir.ui.view">
             <field name="name">res.company.sheet</field>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='account_grp']" position="after">
@@ -220,7 +214,6 @@
         <record id="hr_timesheet_line_form" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <field name="date" position="after">
@@ -232,7 +225,6 @@
         <record id="hr_timesheet_line_search" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.search</field>
             <field name="model">hr.analytic.timesheet</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="arch" type="xml">
                 <field name="date" position="before">
@@ -248,7 +240,6 @@
         <record model="ir.ui.view" id="view_hr_attendance_filter">
             <field name="name">view_hr_attendance_filter</field>
             <field name="model">hr.attendance</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
             <field name="arch" type="xml">
                 <field name="employee_id" position="after">
@@ -260,7 +251,6 @@
         <record id="view_attendance_form" model="ir.ui.view">
             <field name="name">hr.attendance.form</field>
             <field name="model">hr.attendance</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr_attendance.view_attendance_form"/>
             <field name="arch" type="xml">
                 <field name="action_desc" position="after">
@@ -271,7 +261,6 @@
         <record id="view_attendance_tree" model="ir.ui.view">
             <field name="name">hr.attendance.tree</field>
             <field name="model">hr.attendance</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="hr_attendance.view_attendance_tree"/>
             <field name="arch" type="xml">
                 <field name="action" position="after">
@@ -282,7 +271,6 @@
         <record id="view_attendance_tree_who" model="ir.ui.view">
             <field name="name">hr.attendance.tree</field>
             <field name="model">hr.attendance</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="hr_attendance.view_attendance_who"/>
             <field name="arch" type="xml">
                 <field name="action" position="after">
@@ -323,7 +311,6 @@
         <record id="hr_timesheet_sheet_tree_simplified" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.tree</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="type">tree</field>
             <field eval="10" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'done'" string="Timesheets">
@@ -342,7 +329,6 @@
         <record id="hr_timesheet_day_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.day.tree</field>
             <field name="model">hr_timesheet_sheet.sheet.day</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:total_difference&lt;0.1;red:total_difference&gt;=0.1" string="Period">
                     <field name="name"/>
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 2c66c6cde56..37c40f60f6d 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -4,7 +4,6 @@
         <record id="view_hr_timesheet_report_graph" model="ir.ui.view">
             <field name="name">hr.timesheet.report.graph</field>
             <field name="model">hr.timesheet.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet" type="bar">
                     <field name="user_id" />
@@ -15,7 +14,6 @@
         <record id="view_hr_timesheet_report_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.report.tree</field>
             <field name="model">hr.timesheet.report</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Timesheet Analysis">
                     <field name="year" invisible="1"/>
@@ -37,7 +35,6 @@
         <record id="view_hr_timesheet_report_search" model="ir.ui.view">
             <field name="name">hr.timesheet.report.search</field>
             <field name="model">hr.timesheet.report</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 9956ed2655e..7b31f72235b 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -4,7 +4,6 @@
         <record id="view_timesheet_report_graph" model="ir.ui.view">
             <field name="name">timesheet.report.graph</field>
             <field name="model">timesheet.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet" type="bar">
                     <field name="user_id" />
@@ -16,7 +15,6 @@
         <record id="view_timesheet_report_tree" model="ir.ui.view">
             <field name="name">timesheet.report.tree</field>
             <field name="model">timesheet.report</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'cancel'" string="Timesheet">
                     <field name="date_current" invisible="1"/>
@@ -45,7 +43,6 @@
         <record id="view_timesheet_report_search" model="ir.ui.view">
             <field name="name">timesheet.report.search</field>
             <field name="model">timesheet.report</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
diff --git a/addons/hr_timesheet_sheet/res_config_view.xml b/addons/hr_timesheet_sheet/res_config_view.xml
index 07ad6fb135b..d265a145342 100644
--- a/addons/hr_timesheet_sheet/res_config_view.xml
+++ b/addons/hr_timesheet_sheet/res_config_view.xml
@@ -15,7 +15,6 @@
         <record id="view_hr_timehseet_config_settings" model="ir.ui.view">
             <field name="name">hr settings for timesheets</field>
             <field name="model">hr.config.settings</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='hr_timesheet']" position="after">
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index b2dfabb310e..c982a9bbd39 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -4,7 +4,6 @@
       <record id="view_hr_timesheet_current_open" model="ir.ui.view">
         <field name="name">hr_timesheet_current_open.form</field>
         <field name="model">hr.timesheet.current.open</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="My Current Timesheet" version="7.0">
                <group>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 4508301ca8c..18c81a497d0 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -5,7 +5,6 @@
     <record model="ir.ui.view" id="view_idea_category_search">
         <field name="name">idea.category.search</field>
         <field name="model">idea.category</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Ideas Categories">
                 <field name="name" string="Category"/>
@@ -17,7 +16,6 @@
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
             <field name="model">idea.category</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Category of Ideas" version="7.0">
                     <group>
@@ -31,7 +29,6 @@
         <record model="ir.ui.view" id="view_idea_category_tree">
             <field name="name">idea.category.tree</field>
             <field name="model">idea.category</field>
-            <field name="type">tree</field>
             <field name="field_parent"></field>
             <field name="arch" type="xml">
                 <tree string="Category of ideas">
@@ -63,7 +60,6 @@
     <record model="ir.ui.view" id="view_idea_idea_form">
         <field name="name">idea.idea.form</field>
         <field name="model">idea.idea</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Idea" version="7.0">
                 <header>
@@ -92,7 +88,6 @@
     <record model="ir.ui.view" id="view_idea_idea_tree">
         <field name="name">idea.idea.tree</field>
         <field name="model">idea.idea</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
         <tree colors="blue:state == 'draft';black:state in ('open','close');gray:state == 'cancel'" string="Ideas">
             <field name="name"/>
@@ -107,7 +102,6 @@
     <record model="ir.ui.view" id="view_idea_idea_search">
         <field name="name">idea.idea.search</field>
         <field name="model">idea.idea</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Ideas">
                 <field name="name" string="Idea"/>
diff --git a/addons/import_google/sync_google_calendar_view.xml b/addons/import_google/sync_google_calendar_view.xml
index c7f68de15a7..e44c6ea8c21 100644
--- a/addons/import_google/sync_google_calendar_view.xml
+++ b/addons/import_google/sync_google_calendar_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="view_crm_meeting_form">
             <field name="name">CRM - Meetings Form (Inherited)</field>
             <field name="model">crm.meeting</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
             <field name="arch" type="xml">
                 <field name="categ_ids" position="attributes">
diff --git a/addons/import_google/wizard/google_import_message_view.xml b/addons/import_google/wizard/google_import_message_view.xml
index 250239ea10c..158aff29bf3 100644
--- a/addons/import_google/wizard/google_import_message_view.xml
+++ b/addons/import_google/wizard/google_import_message_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="view_google_import_message_form">
             <field name="name">google.import.message.form</field>
             <field name="model">google.import.message</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Google Data" version="7.0">
                     <group>
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index b8adc71f2a5..f8e110e6a5d 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="view_synchronize_google_contact_import_form">
             <field name="name">synchronize.base.form</field>
             <field name="model">synchronize.google.import</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import contacts from a google account" version="7.0">
                     <group colspan="4" col="4" width="430">
@@ -30,7 +29,6 @@
         <record model="ir.ui.view" id="view_synchronize_google_calendar_import_form">
             <field name="name">synchronize.google.calendar.form</field>
             <field name="model">synchronize.google.import</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Google Calendar Events" version="7.0">
                     <group colspan="4" col="4" width="320">
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 6ef9be1a5bd..7206233569a 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -6,7 +6,6 @@
     <record model="ir.ui.view" id="view_import_sugarcrm_form">
       <field name="name">import.sugarcrm.form</field>
       <field name="model">import.sugarcrm</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Import Data From SugarCRM" version="7.0">
             <header>
diff --git a/addons/import_sugarcrm/wizard/import_message_view.xml b/addons/import_sugarcrm/wizard/import_message_view.xml
index 6f1f3fad3c1..cae8e9cabda 100644
--- a/addons/import_sugarcrm/wizard/import_message_view.xml
+++ b/addons/import_sugarcrm/wizard/import_message_view.xml
@@ -6,7 +6,6 @@
         <record model="ir.ui.view" id="view_import_message_form">
             <field name="name">import.message.form</field>
             <field name="model">import.message</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Message" version="7.0">
                    <label colspan="4" nolabel="1" string="Data are importing, the process is running in the background, an email will be sent to the given email address if it was defined."/>
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index b1b76dd1d0b..ec7f51af2b4 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -5,7 +5,6 @@
         <record id="view_knowledge_configuration" model="ir.ui.view">
             <field name="name">Configure Knowledge</field>
             <field name="model">knowledge.config.settings</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Knowledge" class= "oe_form_configuration" version="7.0">
                     <header>
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 30ff9a9ed8f..b533d569aef 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -5,7 +5,6 @@
         <record id="view_vat_declaration" model="ir.ui.view">
             <field name="name">Vat Declaraion</field>
             <field name="model">l1on_be.vat.declaration</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Periodical VAT Declaration" version="7.0">
                     <group>
@@ -33,7 +32,6 @@
         <record id="view_vat_save" model="ir.ui.view">
             <field name="name">Save XML</field>
             <field name="model">l1on_be.vat.declaration</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Save xml" version="7.0">
                     <label string="Save the File with '.xml' extension."/>
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
index 1c48bb53a77..563396c8a03 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
@@ -4,7 +4,6 @@
     <record id="l10n_be.view_partner_vat_listing" model="ir.ui.view">
       <field name="name">Partner VAT Listing</field>
       <field name="model">partner.vat</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Partner VAT Listing" version="7.0">
           <header>
@@ -38,7 +37,6 @@
     <record id="l10n_be.view_vat_listing" model="ir.ui.view">
       <field name="name">Vat Listing</field>
       <field name="model">partner.vat.list</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Annual Listing of VAT-Subjected Customers">
           <notebook colspan="4">
@@ -63,7 +61,6 @@
     <record id="l10n_be.view_vat_listing_result" model="ir.ui.view">
       <field name="name">VAT List - XML File Created</field>
       <field name="model">partner.vat.list</field>
-      <field name="type">form</field>
       <field name="priority" eval="1"/>
       <field name="arch" type="xml">
         <form string="XML File has been Created." version="7.0">
@@ -84,7 +81,6 @@
     <record id="l10n_be.view_vat_listing_form" model="ir.ui.view">
       <field name="name">step.vat.listing</field>
       <field name="model">vat.listing.clients</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="VAT listing">
           <field name="name"/>
@@ -98,7 +94,6 @@
     <record id="l10n_be.view_vat_listing_tree" model="ir.ui.view">
       <field name="name">step.vat.listing</field>
       <field name="model">vat.listing.clients</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="VAT listing">
           <field name="name"/>
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index f0bdb2a2a3f..7054c155695 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -5,7 +5,6 @@
         <record id="view_vat_intra" model="ir.ui.view">
             <field name="name">Partner VAT intra</field>
             <field name="model">partner.vat.intra</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Partner VAT intra" version="7.0">
                     <group>
@@ -40,7 +39,6 @@
         <record id="view_vat_intra_save" model="ir.ui.view">
             <field name="name">Partner VAT intra Save</field>
             <field name="model">partner.vat.intra</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Save XML" version="7.0">
                     <separator string="Note: "/>
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
index 79c7c08ffca..893a977e62c 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
@@ -4,7 +4,6 @@
         <record id="hr_contract_form_l10n_be_inherit" model="ir.ui.view">
             <field name="name">hr.contract.form.inherit</field>
             <field name="model">hr.contract</field>
-            <field name="type">form</field>
             <field name="priority">20</field>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
@@ -28,7 +27,6 @@
        <!-- <record id="view_employee_marital_required_form" model="ir.ui.view">
             <field name="name">hr.employee.inherit.form</field>
             <field name="model">hr.employee</field>
-            <field name="type">form</field>
             <field name="priority">25</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/account_invoice_view.xml
index bf1cf96f537..c344f1e9b6f 100644
--- a/addons/l10n_be_invoice_bba/account_invoice_view.xml
+++ b/addons/l10n_be_invoice_bba/account_invoice_view.xml
@@ -6,7 +6,6 @@
     <record id="customer_invoice_bbacomm_form" model="ir.ui.view">
       <field name="name">account.invoice.form.inherit</field>
       <field name="model">account.invoice</field>
-      <field name="type">form</field>
       <field name="inherit_id" ref="account.invoice_form"/>
       <field name="arch" type="xml">
         <field name="payment_term" position="after">
diff --git a/addons/l10n_be_invoice_bba/partner_view.xml b/addons/l10n_be_invoice_bba/partner_view.xml
index d78df2d7a42..f0b516fb376 100644
--- a/addons/l10n_be_invoice_bba/partner_view.xml
+++ b/addons/l10n_be_invoice_bba/partner_view.xml
@@ -6,7 +6,6 @@
     <record id="view_partner_inv_comm_type_form" model="ir.ui.view">
       <field name="name">res.partner.inv_comm_type.form.inherit</field>
       <field name="model">res.partner</field>
-      <field name="type">form</field>
       <field name="inherit_id" ref="base.view_partner_form"/>
       <field name="arch" type="xml">
         <field name="last_reconciliation_date" position="after">
diff --git a/addons/l10n_br/l10n_br_view.xml b/addons/l10n_br/l10n_br_view.xml
index 65fcd0c401b..2bce1362302 100644
--- a/addons/l10n_br/l10n_br_view.xml
+++ b/addons/l10n_br/l10n_br_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="view_l10n_br_cst_template_form">
             <field name="name">l10n_br.cst.form</field>
             <field name="model">l10n_br_account.cst.template</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Tax Situation Code Template" version="7.0">
                     <group col="4">
@@ -20,7 +19,6 @@
         <record model="ir.ui.view" id="view_l10n_br_cst_template_tree">
             <field name="name">l10n_br.cst.tree</field>
             <field name="model">l10n_br_account.cst.template</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Tax Situation Code Template">
                     <field name="code"/>
@@ -42,7 +40,6 @@
         <record model="ir.ui.view" id="view_l10n_br_cst_form">
             <field name="name">l10n_br.cst.form</field>
             <field name="model">l10n_br_account.cst</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Tax Situation Code" version="7.0">
                     <group col="4">
@@ -57,7 +54,6 @@
         <record model="ir.ui.view" id="view_l10n_br_cst_tree">
             <field name="name">l10n_br.cst.tree</field>
             <field name="model">l10n_br_account.cst</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Tax Situation Code">
                     <field name="code"/>
diff --git a/addons/l10n_ch/account_invoice.xml b/addons/l10n_ch/account_invoice.xml
index 353f695bc8e..21d421ca40c 100644
--- a/addons/l10n_ch/account_invoice.xml
+++ b/addons/l10n_ch/account_invoice.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="invoice_supplier_form6">
             <field name="name">account.invoice.supplier.form.inherit</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <field name="partner_id" position="replace">
@@ -18,7 +17,6 @@
         <record model="ir.ui.view" id="invoice_supplier_form8">
             <field name="name">account.invoice.supplier.form.inherit</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="priority" eval="18"/>
             <field name="arch" type="xml">
@@ -32,7 +30,6 @@
         <record model="ir.ui.view" id="invoice_form">
             <field name="name">account.invoice.form.inherit</field>
             <field name="model">account.invoice</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
                 <field name="partner_bank_id" position="replace">
diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml
index 0b9dab471ed..da1badd7fe8 100644
--- a/addons/l10n_ch/bank_view.xml
+++ b/addons/l10n_ch/bank_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="view_res_bank_form">
             <field name="name">res.bank.form</field>
             <field name="model">res.bank</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_res_bank_form"/>
             <field name="arch" type="xml">
                 <field name="name" position="after">
@@ -21,7 +20,6 @@
         <record model="ir.ui.view" id="l10nch_view_res_bank_tree">
             <field name="name">res.bank.tree</field>
             <field name="model">res.bank</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="base.view_res_bank_tree"/>
             <field name="arch" type="xml">
                 <field name="name" position="after">
@@ -37,7 +35,6 @@
         <record model="ir.ui.view" id="l10nch_view_res_partner_bank_add_groups">
             <field name="name">res.partner_bank.form.hide.f2</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_partner_property_form"/>
             <field name="arch" type="xml">
                 <field name="state" position="after">
@@ -67,7 +64,6 @@
         <record model="ir.ui.view" id="l10nch_view_res_partner_bank_from_invoice">
             <field name="name">res.partner_bank.form.hide.frominvoice</field>
             <field name="model">res.partner.bank</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_bank_form"/>
             <field name="arch" type="xml">
                 <field name="state" position="after">
@@ -108,7 +104,6 @@
             <field name="name">res.partner.form.bank_details.list</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="account.view_partner_property_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                  <xpath expr="//field[@name='bank_ids']/tree/field[@name='acc_number']" position="before">
                     <field name="state" />
@@ -123,7 +118,6 @@
             <field name="name">res.partner.bank.tree.from_invoice</field>
             <field name="model">res.partner.bank</field>
             <field name="inherit_id" ref="base.view_partner_bank_tree"/>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <field name="acc_number" position="before">
                     <field name="state" />
diff --git a/addons/l10n_ch/company_view.xml b/addons/l10n_ch/company_view.xml
index 108982526b6..7b14d54330b 100644
--- a/addons/l10n_ch/company_view.xml
+++ b/addons/l10n_ch/company_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="company_form_view">
             <field name="name">res.company.form.inherit.bvr</field>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook" position="inside">
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index 18ee44efcf9..721663f26cf 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -5,7 +5,6 @@
         <record id="bvr_import_view" model="ir.ui.view">
             <field name="name">BVR Import Wizard</field>
             <field name="model">bvr.import.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="BVR Import" version="7.0">
                     <group>
@@ -33,7 +32,6 @@
         <record model="ir.ui.view" id="view_bank_statement_form_bvr">
             <field name="name">account.bank.statement.form.inherit</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='import_buttons']" position="inside">
diff --git a/addons/l10n_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml
index 7e9d5894dfc..d75567256b0 100644
--- a/addons/l10n_ch/wizard/create_dta_view.xml
+++ b/addons/l10n_ch/wizard/create_dta_view.xml
@@ -5,7 +5,6 @@
         <record id="dta_create_view" model="ir.ui.view">
             <field name="name">Create DTA</field>
             <field name="model">create.dta.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="DTA file creation - Results" version="7.0">
                     <group>
diff --git a/addons/l10n_fr/l10n_fr_view.xml b/addons/l10n_fr/l10n_fr_view.xml
index 793cb7de813..660138734b3 100755
--- a/addons/l10n_fr/l10n_fr_view.xml
+++ b/addons/l10n_fr/l10n_fr_view.xml
@@ -5,7 +5,6 @@
         <record id="res_company_form_l10n_fr" model="ir.ui.view">
             <field name="name">res.company.form.l10n.fr</field>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="priority">20</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index f5358d9dd42..d5f9463bb3f 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -5,7 +5,6 @@
         <record id="bilan_report_view" model="ir.ui.view">
             <field name="name">Bilan Report</field>
             <field name="model">account.bilan.report</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bilan Report" version="7.0">
                    <group>
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index 9d9b3b91c71..355c9e2a8fc 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -5,7 +5,6 @@
         <record id="cdr_report_view" model="ir.ui.view">
             <field name="name">Compte de resultat Report</field>
             <field name="model">account.cdr.report</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string='Compte de resultat' version="7.0">
                     <group>
diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
index eb407917d81..755c7d5451f 100755
--- a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
+++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
@@ -6,7 +6,6 @@
         <record id="res_company_form_l10n_fr_payroll" model="ir.ui.view">
             <field name="name">res.company.form.l10n.fr.payroll</field>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="priority">20</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
@@ -28,7 +27,6 @@
         <record id="hr_contract_view_form_l10n_fr_payroll" model="ir.ui.view">
             <field name="name">hr.contract.view.form.l10n.fr.payroll</field>
             <field name="model">hr.contract</field>
-            <field name="type">form</field>
             <field name="priority">20</field>
             <field name="inherit_id" ref="hr_payroll.hr_contract_form_inherit"/>
             <field name="arch" type="xml">
@@ -43,7 +41,6 @@
         <record id="hr_payslip_form_l10n_fr_payroll" model="ir.ui.view">
             <field name="name">hr.payslip.form.l10n.fr.payroll</field>
             <field name="model">hr.payslip</field>
-            <field name="type">form</field>
             <field name="priority">20</field>
             <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
             <field name="arch" type="xml">
diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
index 627c2eacf04..a25867ffa6a 100644
--- a/addons/l10n_fr_rib/bank_view.xml
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -6,7 +6,6 @@
             <field name="name">res.partner.form.rib1.inherit</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="account.view_partner_property_form" />
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
@@ -29,7 +28,6 @@
             <field name="name">res.partner.bank.form.rib.inherit</field>
             <field name="model">res.partner.bank</field>
             <field name="inherit_id" ref="base.view_partner_bank_form" />
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="acc_number" position="before">
                     <field name="bank_code" />
@@ -47,7 +45,6 @@
             <field name="name">res.partner.bank.tree.rib.inherit</field>
             <field name="model">res.partner.bank</field>
             <field name="inherit_id" ref="base.view_partner_bank_tree" />
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <field name="acc_number" position="after">
                     <field name="rib_acc_number" />
@@ -60,7 +57,6 @@
             <field name="name">res.bank.form.rib.inherit</field>
             <field name="model">res.bank</field>
             <field name="inherit_id" ref="base.view_res_bank_form" />
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="bic" position="before">
                     <field name="rib_code" />
diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index 1f60096e815..80f5312e500 100644
--- a/addons/l10n_lu/wizard/print_vat_view.xml
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -4,7 +4,6 @@
         <record id="vat_report_view" model="ir.ui.view">
             <field name="name">VAT Declaration Report</field>
             <field name="model">vat.declaration.report</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Print Tax Statements" version="7.0">
                    <group col="4">
diff --git a/addons/l10n_ro/partner_view.xml b/addons/l10n_ro/partner_view.xml
index d5862ce5247..448f9b49639 100644
--- a/addons/l10n_ro/partner_view.xml
+++ b/addons/l10n_ro/partner_view.xml
@@ -5,7 +5,6 @@
             <field name="name">res.partner.form.ro</field>
             <field name="inherit_id" ref="base_vat.view_partner_form"/>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="vat" position="after">
                     <field name="nrc"/>
diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml
index 7640dee6f56..cb947163ab3 100644
--- a/addons/l10n_uk/l10n_uk_wizard.xml
+++ b/addons/l10n_uk/l10n_uk_wizard.xml
@@ -5,7 +5,6 @@
         <record id="view_wizard_multi_chart_uk" model="ir.ui.view">
             <field name="name">Generate Chart of Accounts from a Chart Template</field>
             <field name="model">wizard.multi.charts.accounts</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_wizard_multi_chart"/>
             <field name="arch" type="xml">
               <data>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index d953dfbd1a9..bf438a538f9 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -23,7 +23,7 @@
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Lunch Order" version="7.0">
                 <header>
                     <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" states="draft" class="oe_highlight"/>
                     <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" states="confirmed" />
@@ -53,7 +53,6 @@
         <record model="ir.ui.view" id="view_lunch_order_tree">
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state == 'confirmed'" string="Order">
                     <field name="date"/>
@@ -72,7 +71,6 @@
         <record id="view_lunch_order_filter" model="ir.ui.view">
             <field name="name">lunch.order.list.select</field>
             <field name="model">lunch.order</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Lunch Order">
                     <field name="date"/>
@@ -119,7 +117,6 @@
         <record model="ir.ui.view" id="view_lunch_cashbox_tree">
             <field name="name">Cashboxes</field>
             <field name="model">lunch.cashbox</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Cashboxes" colors="red:sum_remain&lt;=0">
                     <field name="name"/>
@@ -167,7 +164,6 @@
         <record model="ir.ui.view" id="view_lunch_cashmove_tree">
             <field name="name">CashMove</field>
             <field name="model">lunch.cashmove</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="CashMove" editable="top">
                     <field name="create_date"/>
@@ -184,7 +180,6 @@
         <record id="view_lunch_cashmove_filter" model="ir.ui.view">
             <field name="name">lunch.cashmove.list.select</field>
             <field name="model">lunch.cashmove</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search CashMove">
                     <field name="create_date"/>
@@ -230,7 +225,6 @@
         <record model="ir.ui.view" id="view_lunch_category_tree">
             <field name="name">Category</field>
             <field name="model">lunch.category</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Order">
                     <field name="name"/>
@@ -249,7 +243,6 @@
 
         <record model="ir.ui.view" id="view_lunch_product_form">
             <field name="name">Products</field>
-            <field name="type">form</field>
             <field name="model">lunch.product</field>
             <field name="arch" type="xml">
                 <form string="Products" version="7.0">
@@ -275,7 +268,6 @@
         <record model="ir.ui.view" id="view_lunch_product_tree">
             <field name="name">Products</field>
             <field name="model">lunch.product</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Products">
                     <field name="name"/>
@@ -291,7 +283,6 @@
         <record model="ir.ui.view" id="view_lunch_product_search">
             <field name="name">Products</field>
             <field name="model">lunch.product</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Products">
                     <field name="name" string="Product"/>
@@ -328,7 +319,6 @@
         <record model="ir.ui.view" id="view_report_lunch_amount_tree">
             <field name="name">Lunch amount</field>
             <field name="model">report.lunch.amount</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Box Amount by User">
                     <field name="date" invisible="1"/>
@@ -347,7 +337,6 @@
         <record model="ir.ui.view" id="view_report_lunch_amount_form">
             <field name="name">Lunch amount</field>
             <field name="model">report.lunch.amount</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Box Amount by User" version="7.0">
                  <sheet>
@@ -366,7 +355,6 @@
         <record model="ir.ui.view" id="view_report_lunch_amount_search">
             <field name="name">Lunch amount</field>
             <field name="model">report.lunch.amount</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Box Amount by User">
                     <field name="date"/>
diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml
index 717573687df..e92007592ac 100644
--- a/addons/lunch/report/report_lunch_order_view.xml
+++ b/addons/lunch/report/report_lunch_order_view.xml
@@ -5,7 +5,6 @@
        <record id="view_report_lunch_order_tree" model="ir.ui.view">
         <field name="name">report.lunch.order.tree</field>
         <field name="model">report.lunch.order</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Sales Analysis">
                 <field name="date" invisible="1"/>
@@ -22,7 +21,6 @@
     <record id="view_report_lunch_order_search" model="ir.ui.view">
         <field name="name">report.lunch.order.search</field>
         <field name="model">report.lunch.order</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Lunch Order Analysis">
                 <field name="date"/>
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index eb05c0dc304..5ba2a6ff3bf 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -7,7 +7,6 @@
           <record id="view_lunch_cashbox_clean" model="ir.ui.view">
             <field name="name">lunch.cashbox.clean.form</field>
             <field name="model">lunch.cashbox.clean</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reset cashbox" version="7.0">
                     <group>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index cb10eb57fd0..8421dd74f9b 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -7,7 +7,6 @@
         <record id="view_lunch_order_cancel" model="ir.ui.view">
             <field name="name">lunch.order.cancel.form</field>
             <field name="model">lunch.order.cancel</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cancel Order" version="7.0">
                     <group col="4" >
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index 282b79539f8..dadde4ed089 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -7,7 +7,6 @@
         <record id="view_lunch_order_confirm" model="ir.ui.view">
             <field name="name">lunch.order.confirm.form</field>
             <field name="model">lunch.order.confirm</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Confirm" version="7.0">
                     <group col="4">
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index cbd477f55e6..b19aad1afe3 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -30,6 +30,7 @@ import res_partner
 import report
 import wizard
 import res_config
+import mail_group_menu
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 8be63f22804..e3d7c2ab1e1 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -2,49 +2,22 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="message_blogpost0_attachment0" model="ir.attachment">
-            <field name="name">A cool attachment</field>
-            <field name="datas">PT1Tb21lIGNvb2wgYXR0YWNobWVudD09ClByYWVzZW50IHZlbCBtYXNzYSBzZWQgbWFzc2EgY29uc2VxdWF0IGVnZXN0YXMgaW4gdHJpc3RpcXVlIG9yY2ku</field>
-            <field name="datas_fname">a_cool_attachment</field>
-            <field name="description"></field>
-            <field name="res_name">Mail group</field>
-            <field name="res_model">mail.group</field>
-            <field name="res_id" ref="group_all_company"/>
-            <field name="type">binary</field>
-        </record>
-
-        <record id="message_blogpost0_attachment1" model="ir.attachment">
-            <field name="name">Another clean attachment</field>
-            <field name="datas">PT1Tb21lIGNsZWFuIGF0dGFjaG1lbnQ9PQpOdWxsYSB0dXJwaXMgbGVvLCByaG9uY3VzIHV0IGVnZXN0YXMgc2l0IGFtZXQsIGNvbnNlY3RldHVyIHZpdGFlIHVybmEu</field>
-            <field name="datas_fname">a_clean_attachment</field>
-            <field name="description"></field>
-            <field name="res_name">Mail group</field>
-            <field name="res_model">mail.group</field>
-            <field name="res_id" ref="group_all_company"/>
-            <field name="type">binary</field>
-        </record>
-
         <record id="message_blogpost0" model="mail.message">
             <field name="subject">Internal company announce</field>
             <field name="model">mail.group</field>
-            <field name="res_id" ref="group_all_company"/>
+            <field name="res_id" ref="group_all_employees"/>
             <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Lorem ipsum dolor <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
-Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla.
-
-Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur.
-
-Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field>
+            <field name="body_html"><![CDATA[Your monthly meal vouchers arrived. You can get them at Christine's office.
+This month you also have 250 EUR of eco-checks for all employees that worked with us since 1 year minimum.]]></field>
             <field name="type">comment</field>
             <field name="user_id" ref="base.user_root"/>
-            <field name="attachment_ids" eval="[(6,0,[ref('message_blogpost0_attachment0'),ref('message_blogpost0_attachment1')])]"/>
         </record>
 
         <record id="message_blogpost0_comment0" model="mail.message">
             <field name="model">mail.group</field>
-            <field name="res_id" ref="group_all_company"/>
+            <field name="res_id" ref="group_all_employees"/>
             <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[That was such a <b>tremendous</b> blogpost !  (first comment)]]></field>
+            <field name="body_html"><![CDATA[Great.]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="user_id" ref="base.user_root"/>
@@ -52,29 +25,17 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in
 
         <record id="message_blogpost0_comment1" model="mail.message">
             <field name="model">mail.group</field>
-            <field name="res_id" ref="group_all_company"/>
+            <field name="res_id" ref="group_all_employees"/>
             <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Agreed !
-Would it be possible to learn more about the author ?  (second comment)]]></field>
+            <field name="body_html"><![CDATA[Yes, that's a good news.]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="user_id" ref="base.user_demo"/>
         </record>
 
-        <record id="message_blogpost0_comment2_attachment0" model="ir.attachment">
-            <field name="name">Author's full biography</field>
-            <field name="datas">PT1BYm91dCB0aGUgYXV0aG9yPT0KSW50ZWdlciBzb2RhbGVzIGRvbG9yIGV1IGVsaXQgZnJpbmdpbGxhIGJsYW5kaXQu</field>
-            <field name="datas_fname">blogpost_author_biography</field>
-            <field name="description"></field>
-            <field name="res_name">Mail group</field>
-            <field name="res_model">mail.group</field>
-            <field name="res_id" ref="group_all_company"/>
-            <field name="type">binary</field>
-        </record>
-
         <record id="message_blogpost0_comment2" model="mail.message">
             <field name="model">mail.group</field>
-            <field name="res_id" ref="group_all_company"/>
+            <field name="res_id" ref="group_all_employees"/>
             <field name="content_subtype">html</field>
             <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel.
 
@@ -85,7 +46,6 @@ Check the file in attachment for more information !  (third comment)]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="user_id" ref="base.user_root"/>
-            <field name="attachment_ids" eval="[(4,ref('message_blogpost0_comment2_attachment0'))]"/>
         </record>
 
         <record model="ir.config_parameter" id="user_mail_alias">
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 49c6fbdc1b6..2152706d056 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -2,16 +2,14 @@
 <openerp>
     <data noupdate="1">
 
-        <record model="mail.group" id="group_all_company">
-            <field name="name">All Company</field>
-            <field name="description">All company users can come here and discuss.</field>
-        </record>
         <record model="mail.group" id="group_sales">
             <field name="name">Sales</field>
+            <field name="description">Discussion about best sales practices and deals.</field>
         </record>
         <record model="mail.group" id="group_all_employees">
             <field name="name">All Employees</field>
             <field name="group_ids" eval="[(4, ref('base.group_user'))]"/>
+            <field name="description">Discussion about best sales practices and deals.</field>
         </record>
 
         <!-- notify all employees of module installation -->
diff --git a/addons/mail/doc/mail_openchatter_howto.rst b/addons/mail/doc/mail_openchatter_howto.rst
index 4c8797e7f8b..789acdd87eb 100644
--- a/addons/mail/doc/mail_openchatter_howto.rst
+++ b/addons/mail/doc/mail_openchatter_howto.rst
@@ -45,7 +45,6 @@ Use the thread viewer widget inside your form view by using the mail_thread widg
   <record model="ir.ui.view" id="my_task_form_view">
     <field name="name">My Task</field>
     <field name="model">my.task</field>
-    <field name="type">form</field>
     <field name="priority">1</field>
     <field name="arch" type="xml">
       <form>
diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 807ed5dbe61..82b20f39480 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -20,9 +20,19 @@
 ##############################################################################
 
 import re
+import unicodedata
 
 from openerp.osv import fields, osv
+from openerp.tools import ustr
 
+# Inspired by http://stackoverflow.com/questions/517923
+def remove_accents(input_str):
+    """Suboptimal-but-better-than-nothing way to replace accented
+    latin letters by an ASCII equivalent. Will obviously change the
+    meaning of input_str and work only for some cases"""
+    input_str = ustr(input_str)
+    nkfd_form = unicodedata.normalize('NFKD', input_str)
+    return u''.join([c for c in nkfd_form if not unicodedata.combining(c)])
 
 class mail_alias(osv.Model):
     """A Mail Alias is a mapping of an email address with a given OpenERP Document
@@ -40,6 +50,7 @@ class mail_alias(osv.Model):
     _name = 'mail.alias'
     _description = "Email Aliases"
     _rec_name = 'alias_name'
+    _order = 'alias_model_id, alias_name'
 
     def _get_alias_domain(self, cr, uid, ids, name, args, context=None):
         ir_config_parameter = self.pool.get("ir.config_parameter")
@@ -55,10 +66,9 @@ class mail_alias(osv.Model):
                                                "corresponds. Any incoming email that does not reply to an "
                                                "existing record will cause the creation of a new record "
                                                "of this model (e.g. a Project Task)",
-                                          # only allow selecting mail_thread models!
-                                          #TODO kept doamin temporarily in comment, need to redefine domain
-                                          #domain="[('field_id', 'in', 'message_ids')]"
-                                          ),
+                                          # hack to only allow selecting mail_thread models (we might
+                                          # (have a few false positives, though)
+                                          domain="[('field_id.name', '=', 'message_ids')]"),
         'alias_user_id': fields.many2one('res.users', 'Owner',
                                            help="The owner of records created upon receiving emails on this alias. "
                                                 "If this field is not set the system will attempt to find the right owner "
@@ -76,7 +86,10 @@ class mail_alias(osv.Model):
 
     _defaults = {
         'alias_defaults': '{}',
-        'alias_user_id': lambda self,cr,uid, context: uid
+        'alias_user_id': lambda self,cr,uid,context: uid,
+        
+        # looks better when creating new aliases - even if the field is informative only
+        'alias_domain': lambda self,cr,uid,context: self._get_alias_domain(cr,1,[1],None,None)[1]
     }
 
     _sql_constraints = [
@@ -122,12 +135,10 @@ class mail_alias(osv.Model):
         make it unique, and the ``alias_model_id`` value will set to the
         model ID of the ``model_name`` value, if provided, 
         """
-        alias_name = re.sub(r'\W+', '_', vals['alias_name']).lower()
+        alias_name = re.sub(r'[^\w+]', '-', remove_accents(vals['alias_name'])).lower()
         alias_name = self._find_unique(cr, uid, alias_name, context=context)
         vals['alias_name'] = alias_name
         if model_name:
             model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', model_name)], context=context)[0]
             vals['alias_model_id'] = model_id
         return self.create(cr, uid, vals, context=context)
-
-
diff --git a/addons/mail/mail_alias_view.xml b/addons/mail/mail_alias_view.xml
index 61a89b774ca..e0d8e173ebc 100644
--- a/addons/mail/mail_alias_view.xml
+++ b/addons/mail/mail_alias_view.xml
@@ -6,19 +6,16 @@
         <record  model="ir.ui.view" id="view_mail_alias_form">
             <field name="name">mail.alias.form</field>
             <field name="model">mail.alias</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Alias" version="7.0">
                     <sheet>
                         <label for="alias_name" class="oe_edit_only"/>
-                        <h2><field name="alias_name"  class="oe_inline"/>@<field name="alias_domain" class="oe_inline"/></h2>
-                        <group colspan="4" col="4">
-                            <field name="alias_model_id" readonly="1"/>
-                            <field name="alias_user_id" readonly="1"/>
-                            <field name="alias_force_thread_id" readonly="1"/>
-                            <newline/>
-                            <separator string="Default Values" colspan="4"/>
-                            <field name="alias_defaults" colspan="4" nolabel="1" readonly="1"/>
+                        <h2><field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline"/></h2>
+                        <group>
+                            <field name="alias_model_id"/>
+                            <field name="alias_user_id"/>
+                            <field name="alias_force_thread_id"/>
+                            <field name="alias_defaults"/>
                         </group>
                     </sheet>
                 </form>
@@ -29,7 +26,6 @@
         <record  model="ir.ui.view" id="view_mail_alias_tree">
             <field name="name">mail.alias.tree</field>
             <field name="model">mail.alias</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Alias">
                     <field name="alias_name"/>
@@ -44,7 +40,6 @@
         <record  model="ir.ui.view" id="view_mail_alias_search">
             <field name="name">mail.alias.search</field>
             <field name="model">mail.alias</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Alias">
                     <field name="alias_name"/>
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index b850f1c29f7..61bd21439a1 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -25,9 +25,7 @@ import openerp.tools as tools
 from operator import itemgetter
 from osv import osv
 from osv import fields
-import tools
 from tools.translate import _
-from lxml import etree
 
 class mail_group(osv.osv):
     """
@@ -46,7 +44,7 @@ class mail_group(osv.osv):
     _description = 'Discussion group'
     _name = 'mail.group'
     _inherit = ['mail.thread']
-    _inherits = {'mail.alias': 'alias_id'}
+    _inherits = {'mail.alias': 'alias_id', 'ir.ui.menu': 'menu_id'}
 
     def _get_image(self, cr, uid, ids, name, args, context=None):
         result = dict.fromkeys(ids, False)
@@ -78,7 +76,6 @@ class mail_group(osv.osv):
     
     def get_last_month_msg_nbr(self, cr, uid, ids, name, args, context=None):
         result = {}
-        message_obj = self.pool.get('mail.message')
         for id in ids:
             lower_date = (DT.datetime.now() - DT.timedelta(days=30)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
             result[id] = self.message_search(cr, uid, [id], limit=None, domain=[('date', '>=', lower_date)], count=True, context=context)
@@ -89,15 +86,18 @@ class mail_group(osv.osv):
         return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
     
     _columns = {
-        'name': fields.char('Name', size=64, required=True),
+        #'name': fields.char('Group Name', size=64, required=True),
         'description': fields.text('Description'),
+        'menu_id': fields.many2one('ir.ui.menu', string='Related Menu', required=True, ondelete="cascade"),
         'responsible_id': fields.many2one('res.users', string='Responsible',
             ondelete='set null', required=True, select=1,
             help="Responsible of the group that has all rights on the record."),
-        'public': fields.boolean('Visible by non members', help='This group is visible by non members. \
+        'public': fields.selection([('public','Public'),('private','Private'),('groups','Selected Group Only')], 'Privacy', required=True,
+            help='This group is visible by non members. \
             Invisible groups can add members through the invite button.'),
+        'group_public_id': fields.many2one('res.groups', string='Authorized Group'),
         'group_ids': fields.many2many('res.groups', rel='mail_group_res_group_rel',
-            id1='mail_group_id', id2='groups_id', string='Linked groups',
+            id1='mail_group_id', id2='groups_id', string='Auto Subscription',
             help="Members of those groups will automatically added as followers. "\
                     "Note that they will be able to manage their subscription manually "\
                     "if necessary."),
@@ -122,22 +122,35 @@ class mail_group(osv.osv):
                  "resized as a 50x50px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
         'member_ids': fields.function(get_member_ids, fnct_search=search_member_ids,
-            type='many2many', relation='res.users', string='Group members', multi='get_member_ids'),
+            type='many2many', relation='res.users', string='Group members', multi='get_member_ids',
+            deprecated='This field will be deleted in a few hours or days, so please do not use it.'),
         'member_count': fields.function(get_member_ids, type='integer',
-            string='Member count', multi='get_member_ids'),
+            string='Member count', multi='get_member_ids',
+            deprecated='This field will be deleted in a few hours or days, so please do not use it.'),
         'is_subscriber': fields.function(get_member_ids, type='boolean',
             string='Joined', multi='get_member_ids'),
         'last_month_msg_nbr': fields.function(get_last_month_msg_nbr, type='integer',
             string='Messages count for last month'),
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True, 
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", 
                                     help="The email address associated with this group. New emails received will automatically "
                                          "create new topics."),
     }
 
+    def _get_default_employee_group(self, cr, uid, context=None):
+        ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
+        return ref and ref[1] or False
+
+    def _get_menu_parent(self, cr, uid, context=None):
+        ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'mail_group_root')
+        return ref and ref[1] or False
+
     _defaults = {
-        'public': True,
+        'public': 'groups',
+        'group_public_id': _get_default_employee_group,
         'responsible_id': (lambda s, cr, uid, ctx: uid),
         'image': _get_default_image,
+        'parent_id': _get_menu_parent,
+        'alias_domain': False, # always hide alias during creation 
     }
 
     def _subscribe_user_with_group_m2m_command(self, cr, uid, ids, group_ids_command, context=None):
@@ -153,15 +166,34 @@ class mail_group(osv.osv):
         return self.message_subscribe(cr, uid, ids, user_ids, context=context)
 
     def create(self, cr, uid, vals, context=None):
-        alias_pool = self.pool.get('mail.alias')
+        mail_alias = self.pool.get('mail.alias')
         if not vals.get('alias_id'):
-            name = vals.get('alias_name') or vals['name']
-            alias_id = alias_pool.create_unique_alias(cr, uid, 
-                    {'alias_name': "group_"+name}, 
-                    model_name=self._name, context=context)
+            vals.pop('alias_name', None) # prevent errors during copy()
+            alias_id = mail_alias.create_unique_alias(cr, uid, 
+                          # Using '+' allows using subaddressing for those who don't
+                          # have a catchall domain setup.
+                          {'alias_name': "group+"+vals['name']},
+                          model_name=self._name, context=context)
             vals['alias_id'] = alias_id
+
         mail_group_id = super(mail_group, self).create(cr, uid, vals, context)
-        alias_pool.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context)
+
+        # Create client action for this group and link the menu to it
+        ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'action_mail_group_feeds')
+        if ref:
+            search_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'view_message_search_wall')
+            params = {
+                'search_view_id': search_ref and search_ref[1] or False,
+                'domain': [('model','=','mail.group'),('res_id','=',mail_group_id)],
+                'res_model': 'mail.group',
+                'res_id': mail_group_id,
+                'thread_level': 2
+            }
+            cobj = self.pool.get('ir.actions.client')
+            newref = cobj.copy(cr, uid, ref[1], default={'params': str(params), 'name': vals['name']}, context=context)
+            self.write(cr, uid, [mail_group_id], {'action': 'ir.actions.client,'+str(newref), 'mail_group_id': mail_group_id}, context=context)
+
+        mail_alias.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context)
        
         if vals.get('group_ids'):
             self._subscribe_user_with_group_m2m_command(cr, uid, [mail_group_id], vals.get('group_ids'), context=context)
diff --git a/addons/mail/mail_group_menu.py b/addons/mail/mail_group_menu.py
new file mode 100644
index 00000000000..38756f69928
--- /dev/null
+++ b/addons/mail/mail_group_menu.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+class ir_ui_menu(osv.osv):
+    _inherit = 'ir.ui.menu'
+    _columns = {
+        'mail_group_id': fields.many2one('mail.group', 'Mail Group')
+    }
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        ids = super(ir_ui_menu, self).search(cr, uid, args, offset=0, limit=None, order=order, context=context, count=False)
+
+        subs = self.pool.get('mail.subscription')
+        for menu in self.browse(cr, uid, ids, context=context):
+            if menu.mail_group_id:
+                sub_ids = subs.search(cr, uid, [
+                    ('user_id','=',uid),('res_model','=','mail.group'),
+                    ('res_id','=',menu.mail_group_id.id)
+                    ], context=context)
+                if not sub_ids:
+                    ids.remove(menu.id)
+        return ids
+
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 5c81d426d6a..7df68bf399e 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+        <record id="action_mail_group_feeds" model="ir.actions.client">
+            <field name="name">Discussion Group</field>
+            <field name="tag">mail.wall</field>
+            <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
+        </record>
 
         <!-- Group Kanban View  !-->
         <record model="ir.ui.view" id="view_group_kanban">
             <field name="name">mail.group.kanban</field>
             <field name="model">mail.group</field>
-            <field name="type">kanban</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <kanban>
@@ -46,40 +50,38 @@
         <record  model="ir.ui.view" id="view_group_form">
             <field name="name">mail.group.form</field>
             <field name="model">mail.group</field>
-            <field name="type">form</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <form string="Group Form" version="7.0">
                     <sheet class="openerp_mail_group_sheet">
-                        <group colspan="4" col="8">
-                            <group colspan="1" col="2">
-                                <field name="image_small" widget='image' class="oe_image_small" nolabel="1"/>
+                        <field name="image_small" widget='image' class="oe_avatar oe_left"/>
+                        <div class="oe_title">
+                            <div class="oe_edit_only">
+                                <label for="name" string="Group Name"/> 
+                            </div> 
+                            <h1><field name="name"/></h1>
+                            <div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                    <field name="alias_id" invisible="1" required="0"/>
+                                    <label for="alias_name" class="oe_edit_only"/>
+                                    <field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
+                            </div>
+                            <field name="description" placeholder="Topics discussed in this group..."/>
+                        </div>
+                        <div class="oe_clear"/>
+                        <group col="1">
+                            <group class="oe_edit_only">
+                                <field name="public" class="oe_inline"/>
+                                <field name="group_public_id" class="oe_inline"
+                                    attrs="{'invisible': [('public','&lt;&gt;','groups')], 'required': [('public','=','groups')]}"
+                                    />
+                                <field name="group_ids" widget="many2many_tags" class="oe_inline"/>
                             </group>
-                            <group colspan="7" col="6">
-                                <div class="oe_edit_only">
-                                    <label for="name"/> 
-                                </div> 
-                                <div>
-                                    <h2><field name="name" colspan="4"/></h2>
-                                    <div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}" class="oe_edit_only">
-                                        <field name="alias_id" invisible="1"/>
-                                        <label for="alias_name" class="oe_edit_only"/>
-                                        <field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
-                                    </div>
-                                </div>
-                                <newline/>
-                                <group colspan="4" col="4">
-                                    <field name="description" colspan="4" nolabel="1"/>
-                                    <field name="group_ids" colspan="4" widget="many2many_tags" class="oe_edit_only"/>
-                                </group>
-                                <group colspan="2" col="2" class="oe_edit_only">
-                                    <field name="responsible_id" colspan="2"/>
-                                    <field name="public" colspan="2"/>
-                                </group>
+                            <group class="oe_edit_only">
+                                <field name="responsible_id" class="oe_inline"/>
                             </group>
                         </group>
                     </sheet>
-                    <div class="oe_chatter oe_mail_group_footer">
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"
                                 options='{"thread_level": 1}'/>
                     </div>
@@ -91,11 +93,10 @@
         <record  model="ir.ui.view" id="view_group_tree">
             <field name="name">mail.group.tree</field>
             <field name="model">mail.group</field>
-            <field name="type">tree</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <tree string="Groups">
-                    <field name="name"/>
+                    <field name="name" string="Group Name"/>
                     <field name="responsible_id"/>
                 </tree>
             </field>
@@ -105,7 +106,6 @@
         <record  model="ir.ui.view" id="view_group_search">
             <field name="name">mail.group.search</field>
             <field name="model">mail.group</field>
-            <field name="type">search</field>
             <field name="priority" eval="10"/>
             <field name="arch" type="xml">
                 <search string="Search Groups">
@@ -125,6 +125,7 @@
         </record>
 
         <!-- left-side menu: Groups !-->
-        <menuitem id="mail_allgroups" name="All Groups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
+        <menuitem id="mail_group_root" parent="mail_feeds_main" sequence="12" name="My Groups"/>
+        <menuitem id="mail_allgroups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
     </data>
 </openerp>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 8845b3750b9..7801a9b42d9 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -132,7 +132,7 @@ class mail_message_common(osv.TransientModel):
             help="Type of message, usually 'html' or 'plain', used to select "\
                   "plain-text or rich-text contents accordingly"),
         'body_text': fields.text('Text Contents', help="Plain-text version of the message"),
-        'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML version of the message"),
+        'body_html': fields.html('Rich-text Contents', help="Rich-text/HTML version of the message"),
         'body': fields.function(get_body, fnct_search = search_body, type='text',
             string='Message Content', store=True,
             help="Content of the message. This content equals the body_text field "\
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index b967035bec3..0aa5261d7e7 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="view_message_tree_short">
             <field name="name">mail.message.tree.short</field>
             <field name="model">mail.message</field>
-            <field name="type">tree</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <tree string="Messages">
@@ -22,7 +21,6 @@
         <record model="ir.ui.view" id="view_message_form_short">
             <field name="name">mail.message.form.short</field>
             <field name="model">mail.message</field>
-            <field name="type">form</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Message" version="7.0">
@@ -44,7 +42,7 @@
                         </group>
                         <notebook>
                             <page string="Body (Rich)">
-                                <field name="body_html" widget="text_html"/>
+                                <field name="body_html"/>
                             </page>
                             <page string="Body (Plain)">
                                 <field name="body_text" widget="text"/>
@@ -59,7 +57,6 @@
         <record model="ir.ui.view" id="view_message_search_short">
             <field name="name">mail.message.search.short</field>
             <field name="model">mail.message</field>
-            <field name="type">search</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
@@ -74,7 +71,6 @@
         <record model="ir.ui.view" id="view_message_search_wall">
             <field name="name">mail.message.search.wall</field>
             <field name="model">mail.message</field>
-            <field name="type">search</field>
             <field name="priority">25</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
@@ -110,7 +106,6 @@
         <record model="ir.ui.view" id="view_email_message_form">
             <field name="name">mail.message.form</field>
             <field name="model">mail.message</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Email message" version="7.0">
                     <sheet>
@@ -138,7 +133,7 @@
                                 </group>
                                 <notebook>
                                     <page string="Body (Rich)">
-                                        <field name="body_html" widget="text_html"/>
+                                        <field name="body_html"/>
                                     </page>
                                     <page string="Body (Plain)">
                                         <field name="body_text" widget="text"/>
@@ -178,7 +173,6 @@
         <record model="ir.ui.view" id="view_email_message_tree">
             <field name="name">mail.message.tree</field>
             <field name="model">mail.message</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Emails" colors="grey:state in ('sent', 'cancel');blue:state=='outgoing';red:state=='exception';black:state=='received'">
                     <field name="date"/>
@@ -202,7 +196,6 @@
         <record model="ir.ui.view" id="view_email_message_search">
             <field name="name">mail.message.search</field>
             <field name="model">mail.message</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Email Search">
                     <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
diff --git a/addons/mail/mail_subscription_view.xml b/addons/mail/mail_subscription_view.xml
index c3d79d48308..19e31cf8fc9 100644
--- a/addons/mail/mail_subscription_view.xml
+++ b/addons/mail/mail_subscription_view.xml
@@ -9,7 +9,6 @@
         <record model="ir.ui.view" id="view_subscription_tree">
             <field name="name">mail.subscription.tree</field>
             <field name="model">mail.subscription</field>
-            <field name="type">tree</field>
             <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Subscription">
@@ -27,7 +26,6 @@
         <record model="ir.ui.view" id="view_notification_tree">
             <field name="name">mail.notification.tree</field>
             <field name="model">mail.notification</field>
-            <field name="type">tree</field>
             <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Subscription">
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index bc5e441e8a1..a6a8cc6146a 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -21,19 +21,26 @@
 
 import base64
 import email
-from email.utils import parsedate
 import logging
-from mail_message import decode, to_email
-from operator import itemgetter
-from osv import osv, fields
 import re
 import time
+import xmlrpclib
+from email.utils import parsedate
+from email.message import Message
+
+from osv import osv, fields
+from mail_message import decode, to_email
 import tools
 from tools.translate import _
-import xmlrpclib
+from tools.safe_eval import safe_eval as eval
 
 _logger = logging.getLogger(__name__)
 
+
+def decode_header(message, header, separator=' '):
+    return separator.join(map(decode,message.get_all(header, [])))
+
+
 class mail_thread(osv.Model):
     '''Mixin model, meant to be inherited by any model that needs to
        act as a discussion topic on which messages can be attached.
@@ -151,10 +158,9 @@ class mail_thread(osv.Model):
         
         message_obj = self.pool.get('mail.message')
         notification_obj = self.pool.get('mail.notification')
-        body = vals.get('body_html', '') if vals.get('content_subtype') == 'html' else vals.get('body_text', '')
         
         # automatically subscribe the writer of the message
-        if vals['user_id']:
+        if vals.get('user_id'):
             self.message_subscribe(cr, uid, [thread_id], [vals['user_id']], context=context)
         
         # create message
@@ -173,12 +179,11 @@ class mail_thread(osv.Model):
             notification_obj.create(cr, uid, {'user_id': id, 'message_id': msg_id}, context=context)
         
         # create the email to send
-        email_id = self.message_create_notify_by_email(cr, uid, vals, user_to_push_ids, context=context)
+        self.message_create_notify_by_email(cr, uid, vals, user_to_push_ids, context=context)
         
         return msg_id
     
     def message_get_user_ids_to_notify(self, cr, uid, thread_ids, new_msg_vals, context=None):
-        subscription_obj = self.pool.get('mail.subscription')
         # get body
         body = new_msg_vals.get('body_html', '') if new_msg_vals.get('content_subtype') == 'html' else new_msg_vals.get('body_text', '')
         
@@ -301,7 +306,6 @@ class mail_thread(osv.Model):
             threads = model_pool.browse(cr, uid, threads, context=context)
 
         ir_attachment = self.pool.get('ir.attachment')
-        mail_message = self.pool.get('mail.message')
 
         new_msg_ids = []
         for thread in threads:
@@ -501,10 +505,6 @@ class mail_thread(osv.Model):
 
         """ Retrieve all attachments names """
         map_id_to_name = dict((attachment_id, '') for message in messages for attachment_id in message['attachment_ids'])
-        map_id_to_name = {}
-        for msg in messages:
-            for attach_id in msg["attachment_ids"]:
-                map_id_to_name[attach_id] = '' # use empty string as a placeholder
 
         ids = map_id_to_name.keys()
         names = self.pool.get('ir.attachment').name_get(cr, uid, ids, context=context)
@@ -560,79 +560,127 @@ class mail_thread(osv.Model):
         msgs = msg_obj.read(cr, uid, msg_ids, context=context)
         return msgs
 
-
-    def _get_user(self, cr, uid, alias, context):
-        """
-            param alias: browse record of alias.
-            return: int user_id.
-        """
-
-        user_obj = self.pool.get('res.user')
-        user_id = 1
-        if alias.alias_user_id:
-            user_id = alias.alias_user_id.id
-        #if user_id not defined in the alias then search related user using name of Email sender
-        else:
-            from_email = msg.get('from')
-            user_ids = user_obj.search(cr, uid, [('name','=',from_email)], context)
-            if user_ids:
-                user_id = user_obj.browse(cr, uid, user_ids[0], context).id
-        return user_id
-
-    def message_catchall(self, cr, uid, message, context=None):
-        """
-            Process incoming mail and call messsage_process using details of the mail.alias model
-            else raise Exception so that mailgate script will reject the mail and
-            send notification mail sender that this mailbox does not exist so your mail have been rejected.
-        """
-        mail_alias = self.pool.get('mail.alias')
-        mail_message = self.pool.get('mail.message')
-        if isinstance(message, xmlrpclib.Binary):
-            message = str(message.data)
-        if isinstance(message, unicode):
-            message = message.encode('utf-8')
-        msg_txt = email.message_from_string(message)
-        msg = mail_message.parse_message(msg_txt)
-        alias_name = msg.get('to').split("@")[0] # @@@@
-        alias_ids = mail_alias.search(cr, uid, [('alias_name','=',alias_name)])
-        #if alias found then call message_process method. # @@@@
-        if alias_ids:
-            alias_id = mail_alias.browse(cr, uid, alias_ids[0], context)
-            user_id = self._get_user( cr, uid, alias_id, context)
-            alias_defaults = dict(eval(alias_id.alias_defaults or {}))
-            self.message_process(cr, user_id, alias_id.alias_model_id.model, message, 
-                                 custom_values=alias_defaults, 
-                                 thread_id=alias_id.alias_force_thread_id or False,
-                                 context=context)
-        else:
-            #if Mail box for the intended Mail Alias then give logger warning
-            _logger.warning("No Mail Alias Found for the name '%s'."%(alias_name))
-            raise # @@@@
-        return True
+    def _message_find_user_id(self, cr, uid, message, context=None):
+        from_local_part = to_email(decode(message.get('From')))[0]
+        user_ids = self.pool.get('res.users').search(cr, uid, [('login', '=', from_local_part)], context=context)
+        return user_ids[0] if user_ids else uid
 
     #------------------------------------------------------
     # Mail gateway
     #------------------------------------------------------
     # message_process will call either message_new or message_update.
 
+    def message_route(self, cr, uid, message, model=None, thread_id=None,
+                      custom_values=None, context=None):
+        """Attempt to figure out the correct target model, thread_id,
+        custom_values and user_id to use for an incoming message.
+        Multiple values may be returned, if a message had multiple
+        recipients matching existing mail.aliases, for example.
+
+        The following heuristics are used, in this order: 
+             1. If the message replies to an existing thread_id, and
+                properly contains the thread model in the 'In-Reply-To'
+                header, use this model/thread_id pair, and ignore
+                custom_value (not needed as no creation will take place) 
+             2. Look for a mail.alias entry matching the message
+                recipient, and use the corresponding model, thread_id,
+                custom_values and user_id.
+             3. Fallback to the ``model``, ``thread_id`` and ``custom_values``
+                provided.
+             4. If all the above fails, raise an exception.
+
+           :param string message: an email.message instance
+           :param string model: the fallback model to use if the message
+               does not match any of the currently configured mail aliases
+               (may be None if a matching alias is supposed to be present)
+           :type dict custom_values: optional dictionary of default field values
+                to pass to ``message_new`` if a new record needs to be created.
+                Ignored if the thread record already exists, and also if a
+                matching mail.alias was found (aliases define their own defaults)
+           :param int thread_id: optional ID of the record/thread from ``model``
+               to which this mail should be attached. Only used if the message
+               does not reply to an existing thread and does not match any mail alias.
+           :return: list of [model, thread_id, custom_values, user_id]
+        """
+        assert isinstance(message, Message), 'message must be an email.message.Message at this point'
+        message_id = message.get('Message-Id')
+
+        # 1. Verify if this is a reply to an existing thread
+        references = decode_header(message, 'References') or decode_header(message, 'In-Reply-To')
+        ref_match = references and tools.reference_re.search(references)
+        if ref_match:
+            thread_id = int(ref_match.group(1))
+            model = ref_match.group(2) or model
+            model_pool = self.pool.get(model)
+            if thread_id and model and model_pool and model_pool.exists(cr, uid, thread_id) \
+                and hasattr(model_pool, 'message_update'):
+                _logger.debug('Routing mail with Message-Id %s: direct reply to model: %s, thread_id: %s, custom_values: %s, uid: %s',
+                              message_id, model, thread_id, custom_values, uid)
+                return [(model, thread_id, custom_values, uid)]
+        
+        # 2. Look for a matching mail.alias entry
+        # Delivered-To is a safe bet in most modern MTAs, but we have to fallback on To + Cc values
+        # for all the odd MTAs out there, as there is no standard header for the envelope's `rcpt_to` value.
+        rcpt_tos = decode_header(message, 'Delivered-To') or \
+             ','.join([decode_header(message, 'To'),
+                       decode_header(message, 'Cc'),
+                       decode_header(message, 'Resent-To'),
+                       decode_header(message, 'Resent-Cc')])
+        local_parts = [e.split('@')[0] for e in to_email(rcpt_tos)]
+        if local_parts:
+            mail_alias = self.pool.get('mail.alias')
+            alias_ids = mail_alias.search(cr, uid, [('alias_name', 'in', local_parts)])
+            if alias_ids:
+                routes = []
+                for alias in mail_alias.browse(cr, uid, alias_ids, context=context):
+                    user_id = alias.alias_user_id.id
+                    if not user_id:
+                        user_id = self._message_find_user_id(cr, uid, message, context=context)
+                    routes.append((alias.alias_model_id.model, alias.alias_force_thread_id, \
+                                   eval(alias.alias_defaults), user_id))
+                _logger.debug('Routing mail with Message-Id %s: direct alias match: %r', message_id, routes)
+                return routes
+        
+        # 3. Fallback to the provided parameters, if they work
+        model_pool = self.pool.get(model)
+        if not thread_id:
+            # Legacy: fallback to matching [ID] in the Subject
+            match = tools.res_re.search(decode_header(message, 'Subject'))
+            thread_id = match and match.group(1)
+        assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
+            "No possible route found for incoming message with Message-Id %s. " \
+            "Create an appropriate mail.alias or force the destination model." % message_id
+        if thread_id and not model_pool.exists(cr, uid, thread_id):
+            _logger.warning('Received mail reply to missing document %s! Ignoring and creating new document instead for Message-Id %s',
+                            thread_id, message_id)
+            thread_id = None
+        _logger.debug('Routing mail with Message-Id %s: fallback to model:%s, thread_id:%s, custom_values:%s, uid:%s',
+                      message_id, model, thread_id, custom_values, uid)
+        return [(model, thread_id, custom_values, uid)]
+
+
     def message_process(self, cr, uid, model, message, custom_values=None,
                         save_original=False, strip_attachments=False,
                         thread_id=None, context=None):
-        """Process an incoming RFC2822 email message related to the
-           given thread model, relying on ``mail.message.parse()``
-           for the parsing operation, and then calling ``message_new``
-           (if the thread record did not exist) or ``message_update``
-           (if it did), then calling ``message_forward`` to automatically
-           notify other people that should receive this message.
+        """Process an incoming RFC2822 email message, relying on
+           ``mail.message.parse()`` for the parsing operation,
+           and ``message_route()`` to figure out the target model. 
+           
+           Once the target model is known, its ``message_new`` method
+           is called with the new message (if the thread record did not exist)
+            or its ``message_update`` method (if it did). Finally,
+           ``message_forward`` is called to automatically notify other
+           people that should receive this message.
 
-           :param string model: the thread model for which a new message
-                                must be processed
-           :param message: source of the RFC2822 mail
+           :param string model: the fallback model to use if the message
+               does not match any of the currently configured mail aliases
+               (may be None if a matching alias is supposed to be present)
+           :param message: source of the RFC2822 message
            :type message: string or xmlrpclib.Binary
            :type dict custom_values: optional dictionary of field values
-                                    to pass to ``message_new`` if a new
-                                    record needs to be created. Ignored
-                                    if the thread record already exists.
+                to pass to ``message_new`` if a new record needs to be created.
+                Ignored if the thread record already exists, and also if a
+                matching mail.alias was found (aliases define their own defaults)
            :param bool save_original: whether to keep a copy of the original
                 email source attached to the message after it is imported.
            :param bool strip_attachments: whether to strip all attachments
@@ -642,66 +690,41 @@ class mail_thread(osv.Model):
                overrides the automatic detection based on the message
                headers.
         """
+        if context is None: context = {}
+
         # extract message bytes - we are forced to pass the message as binary because
         # we don't know its encoding until we parse its headers and hence can't
         # convert it to utf-8 for transport between the mailgate script and here.
         if isinstance(message, xmlrpclib.Binary):
             message = str(message.data)
-
-        if context is None: context = {}
-
-        mail_message = self.pool.get('mail.message')
-        model_pool = self.pool.get(model)
-        if self._name != model:
-            context.update({'thread_model': model})
-
-        # Parse Message
         # Warning: message_from_string doesn't always work correctly on unicode,
         # we must use utf-8 strings here :-(
         if isinstance(message, unicode):
             message = message.encode('utf-8')
         msg_txt = email.message_from_string(message)
-        msg = mail_message.parse_message(msg_txt, save_original=save_original, context=context)
-
-        # update state
-        msg['state'] = 'received'
-        
+        routes = self.message_route(cr, uid, msg_txt, model,
+                                    thread_id, custom_values,
+                                    context=context)
+        msg = self.pool.get('mail.message').parse_message(msg_txt, save_original=save_original, context=context)
+        msg['state'] = 'received'     
         if strip_attachments and 'attachments' in msg:
             del msg['attachments']
-
-        # Create New Record into particular model
-        def create_record(msg):
-            if hasattr(model_pool, 'message_new'):
-                return model_pool.message_new(cr, uid, msg,
-                                              custom_values,
-                                              context=context)
-        if not thread_id and (msg.get('references') or msg.get('in-reply-to')):
-            references = msg.get('references') or msg.get('in-reply-to')
-            if '\r\n' in references:
-                references = references.split('\r\n')
+        for model, thread_id, custom_values, user_id in routes:   
+            if self._name != model:
+                context.update({'thread_model': model})
+            model_pool = self.pool.get(model)
+            assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
+                "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" % \
+                    (msg['message-id'], model)
+            if thread_id and hasattr(model_pool, 'message_update'):
+                model_pool.message_update(cr, user_id, [thread_id], msg, context=context)
             else:
-                references = references.split(' ')
-            for ref in references:
-                ref = ref.strip()
-                thread_id = tools.reference_re.search(ref)
-                if not thread_id:
-                    thread_id = tools.res_re.search(msg['subject'])
-                if thread_id:
-                    thread_id = int(thread_id.group(1))
-                    if not model_pool.exists(cr, uid, thread_id) or \
-                        not hasattr(model_pool, 'message_update'):
-                            # referenced thread not found or not updatable,
-                            # -> create a new one
-                            thread_id = False
-        if not thread_id:
-            thread_id = create_record(msg)
-        else:
-            model_pool.message_update(cr, uid, [thread_id], msg, {}, context=context)
-        # To forward the email to other followers
-        self.message_forward(cr, uid, model, [thread_id], msg_txt, context=context)
-        # Set as Unread
-        model_pool.message_mark_as_unread(cr, uid, [thread_id], context=context)
-        return thread_id
+                thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
+    
+            # Forward the email to other followers
+            self.message_forward(cr, uid, model, [thread_id], msg_txt, context=context)
+            model_pool.message_mark_as_unread(cr, uid, [thread_id], context=context)
+        return True
 
     def message_new(self, cr, uid, msg_dict, custom_values=None, context=None):
         """Called by ``message_process`` when a new message is received
@@ -735,7 +758,7 @@ class mail_thread(osv.Model):
         fields = model_pool.fields_get(cr, uid, context=context)
         data = model_pool.default_get(cr, uid, fields, context=context)
         if 'name' in fields and not data.get('name'):
-            data['name'] = msg_dict.get('from', '')
+            data['name'] = msg_dict.get('subject', '')
         if custom_values and isinstance(custom_values, dict):
             data.update(custom_values)
         res_id = model_pool.create(cr, uid, data, context=context)
@@ -791,7 +814,6 @@ class mail_thread(osv.Model):
         """
         model_pool = self.pool.get(model)
         smtp_server_obj = self.pool.get('ir.mail_server')
-        mail_message = self.pool.get('mail.message')
         for res in model_pool.browse(cr, uid, thread_ids, context=context):
             if hasattr(model_pool, 'message_thread_followers'):
                 followers = model_pool.message_thread_followers(cr, uid, [res.id])[res.id]
diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml
index a17a1f22a80..c4bc23c9357 100644
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/res_config_view.xml
@@ -5,7 +5,6 @@
             <field name="name">base.config.settings.mail.alias</field>
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="/form/group[last()]/div[last()]/div[last()]" position='after' version="7.0">
                     <div>
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index 8b4d89f89f4..2b8d38f2b99 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -5,7 +5,6 @@
         <record id="view_emails_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.emails.info.inherit</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 30337c84fe4..184eb2b502e 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -53,6 +53,7 @@ class res_users(osv.osv):
     
     _defaults = {
         'notification_email_pref': 'to_me',
+        'alias_domain': False, # always hide alias during creation
     }
 
     def __init__(self, pool, cr):
@@ -66,31 +67,44 @@ class res_users(osv.osv):
         self.SELF_WRITEABLE_FIELDS.append('notification_email_pref')
         return init_res
 
-    def init(self, cr):
-        # Installation hook to create aliases for all users, right after _auto_init
+    def _auto_init(self, cr, context=None):
+        """Installation hook to create aliases for all users and avoid constraint errors."""
+        
+        # disable the unique alias_id not null constraint, to avoid spurious warning during 
+        # super.auto_init. We'll reinstall it afterwards.
+        self._columns['alias_id'].required = False
+
+        super(res_users,self)._auto_init(cr, context=context)
+        
         registry = RegistryManager.get(cr.dbname)
         mail_alias = registry.get('mail.alias')
-        res_users = registry.get('res.users')
-        users_no_alias = res_users.search(cr, SUPERUSER_ID, [('alias_id', '=', False)])
+        res_users_model = registry.get('res.users')
+        users_no_alias = res_users_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)])
         # Use read() not browse(), to avoid prefetching uninitialized inherited fields
-        for user_data in res_users.read(cr, SUPERUSER_ID, users_no_alias, ['login']):
+        for user_data in res_users_model.read(cr, SUPERUSER_ID, users_no_alias, ['login']):
             alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, {'alias_name': user_data['login'],
                                                                          'alias_force_id': user_data['id']},
                                                       model_name=self._name)
-            res_users.write(cr, SUPERUSER_ID, user_data['id'], {'alias_id': alias_id})
+            res_users_model.write(cr, SUPERUSER_ID, user_data['id'], {'alias_id': alias_id})
             _logger.info('Mail alias created for user %s (uid %s)', user_data['login'], user_data['id'])
 
         # Finally attempt to reinstate the missing constraint
         try:
             cr.execute('ALTER TABLE res_users ALTER COLUMN alias_id SET NOT NULL')
         except Exception:
-            pass
-    
+            _logger.warning("Table '%s': unable to set a NOT NULL constraint on column '%s' !\n"\
+                            "If you want to have it, you should update the records and execute manually:\n"\
+                            "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL",
+                            self._table, 'alias_id', self._table, 'alias_id')
+
+        self._columns['alias_id'].required = True
+
     def create(self, cr, uid, data, context=None):
         # create default alias same as the login
         mail_alias = self.pool.get('mail.alias')
         alias_id = mail_alias.create_unique_alias(cr, uid, {'alias_name': data['login']}, model_name=self._name, context=context)
         data['alias_id'] = alias_id
+        data.pop('alias_name', None) # prevent errors during copy()
         user_id = super(res_users, self).create(cr, uid, data, context=context)
         mail_alias.write(cr, SUPERUSER_ID, [alias_id], {"alias_force_thread_id": user_id}, context)
 
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 48ba3d98a59..527bf041948 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -33,7 +33,7 @@
                 </xpath>
                 <field name="email" position="after">
                     <field name="alias_domain" invisible="1"/>
-                    <field name="alias_id" readonly="1" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                    <field name="alias_id" readonly="1" required="0" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
                 </field>
             </data>
             </field>
diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml
index 34fcbac3088..e73279b1ad7 100644
--- a/addons/mail/security/mail_security.xml
+++ b/addons/mail/security/mail_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
 
         <!-- CATEGORY -->
         <record model="ir.module.category" id="module_category_social">
@@ -20,23 +20,8 @@
         <record id="group_rule_public_and_joined" model="ir.rule">
             <field name="name">Mail.group: access only public and joined groups</field>
             <field name="model_id" ref="model_mail_group"/>
-            <field name="domain_force">['|', ('public', '=', True), ('member_ids', 'in', user.id)]</field>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_unlink" eval="False"/>
-        </record>
-        <record id="group_rule_delete_mygroup" model="ir.rule">
-            <field name="name">Mail.group: delete my groups only</field>
-            <field name="model_id" ref="model_mail_group"/>
-            <field name="domain_force">[('responsible_id', '=', user.id)]</field>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-        </record>
-        <record id="group_rule_all" model="ir.rule">
-            <field name="name">Mail.group: all groups</field>
-            <field name="model_id" ref="model_mail_group"/>
-            <field name="domain_force">[(1,'=',1)]</field>
-            <field name="groups" eval="[(4, ref('group_mail_manager'))]"/>
+            <!-- This rule has to be improved for employee only groups -->
+            <field name="domain_force">['|', '|', ('public', '=', 'public'), ('member_ids', 'in', [user.id]), '&amp;', ('public','=','groups'), ('group_public_id','in', [x.id for x in user.groups_id])]</field>
         </record>
 
     </data>
diff --git a/addons/mail/static/scripts/openerp_mailgate.py b/addons/mail/static/scripts/openerp_mailgate.py
index 64dafc56785..99ebc8f770b 100755
--- a/addons/mail/static/scripts/openerp_mailgate.py
+++ b/addons/mail/static/scripts/openerp_mailgate.py
@@ -106,15 +106,15 @@ class EmailParser(object):
             self.email_default = email_default
 
 
-    def parse(self, method, message, custom_values=None, save_original=None):
+    def parse(self, message, custom_values=None, save_original=None):
         # pass message as bytes because we don't know its encoding until we parse its headers
         # and hence can't convert it to utf-8 for transport
-        res_id = self.rpc('mail.thread',
-                          method,
-                          self.model,
-                          xmlrpclib.Binary(message),
-                          custom_values or {},
-                          save_original or False)
+        return self.rpc('mail.thread',
+                        'message_process',
+                        self.model,
+                        xmlrpclib.Binary(message),
+                        custom_values or {},
+                        save_original or False)
 
 def configure_parser():
     parser = optparse.OptionParser(usage='usage: %prog [options]', version='%prog v1.1')
@@ -123,32 +123,32 @@ def configure_parser():
         "with the OpenERP server for case management in the CRM module.")
     parser.add_option_group(group)
     parser.add_option("-u", "--user", dest="userid",
-                      help="ID of the user in OpenERP",
+                      help="OpenERP user id to connect with",
                       default=config.OPENERP_DEFAULT_USER_ID, type='int')
     parser.add_option("-p", "--password", dest="password",
-                      help="Password of the user in OpenERP",
+                      help="OpenERP user password",
                       default=config.OPENERP_DEFAULT_PASSWORD)
     parser.add_option("-o", "--model", dest="model",
-                      help="Name or ID of crm model",
+                      help="Name or ID of destination model",
                       default="crm.lead")
     parser.add_option("-m", "--default", dest="default",
-                      help="Default eMail in case of any trouble.",
+                      help="Admin email for error notifications.",
                       default=None)
     parser.add_option("-d", "--dbname", dest="dbname",
-                      help="Database name (default: %default)",
+                      help="OpenERP database name (default: %default)",
                       default=config.OPENERP_DEFAULT_DATABASE)
     parser.add_option("--host", dest="host",
-                      help="Hostname of the OpenERP Server",
+                      help="OpenERP Server hostname",
                       default=config.OPENERP_HOSTNAME)
     parser.add_option("--port", dest="port",
-                      help="Port of the OpenERP Server",
+                      help="OpenERP Server XML-RPC port number",
                       default=config.OPENERP_PORT)
     parser.add_option("--custom-values", dest="custom_values",
-                      help="Add Custom Values to the object",
+                      help="Dictionary of extra values to pass when creating records",
                       default=None)
     parser.add_option("-s", dest="save_original",
                       action="store_true",
-                      help="Attach a copy of original email to the message entry",
+                      help="Keep a full copy of the email source attached to each message",
                       default=False)
 
     return parser
@@ -160,7 +160,6 @@ def main():
 
     parser = configure_parser()
     (options, args) = parser.parse_args()
-    method = "message_process"
     email_parser = EmailParser(options.userid,
                                options.password,
                                options.dbname,
@@ -170,8 +169,6 @@ def main():
                                email_default= options.default)
     msg_txt = sys.stdin.read()
     custom_values = {}
-    if not options.model:
-        method = "message_catchall"  
     try:
         custom_values = dict(eval(options.custom_values or "{}" ))
     except:
@@ -179,7 +176,7 @@ def main():
         traceback.print_exc()
 
     try:
-        email_parser.parse(method, msg_txt, custom_values, options.save_original or False)
+        email_parser.parse(msg_txt, custom_values, options.save_original or False)
     except Exception:
         msg = '\n'.join([
             'parameters',
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index da6816d3441..c068074b457 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -972,8 +972,11 @@ openerp.mail = function(session) {
             this.params.limit = params.limit || 25;
             this.params.domain = params.domain || [];
             this.params.context = params.context || {};
+            this.params.res_model = params.res_model || false;
+            this.params.res_id = params.res_id || false;
             this.params.search_view_id = params.search_view_id || false;
             this.params.thread_level = params.thread_level || 1;
+	    this.params.title = params.title || false;
             this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
             this.display_show_more = true;
             this.thread_list = [];
@@ -1018,9 +1021,10 @@ openerp.mail = function(session) {
             if (this.compose_message_widget) {
                 this.compose_message_widget.destroy();
             }
+	    debugger;
             this.compose_message_widget = new mail.ComposeMessage(this, {
-                'extended_mode': false, 'uid': this.session.uid, 'res_model': 'res.users',
-                'res_id': this.session.uid, 'mode': mode || 'comment', 'msg_id': msg_id });
+                'extended_mode': false, 'uid': this.session.uid, 'res_model': this.params.res_model,
+                'res_id': this.params.res_id, 'mode': mode || 'comment', 'msg_id': msg_id });
             var composition_node = this.$element.find('div.oe_mail_wall_action');
             composition_node.empty();
             var compose_done = this.compose_message_widget.appendTo(composition_node);
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 86d115f29c8..6959a179194 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -16,7 +16,10 @@
             <tr class="oe_header_row oe_header_row_top">
                 <td colspan="2">
                     <h2 class="oe_view_title">
-                        <span class="oe_view_title_text">All Feeds</span>
+                        <span class="oe_view_title_text">
+                            <t t-if="! widget.params.res_model">News Feeds</t>
+                            <t t-if="widget.params.res_model" t-esc="widget.params.res_model"/>
+                        </span>
                     </h2>
                 </td>
                 <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
diff --git a/addons/mail/tests/__init__.py b/addons/mail/tests/__init__.py
new file mode 100644
index 00000000000..d63c5634cc3
--- /dev/null
+++ b/addons/mail/tests/__init__.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from . import test_mail
+
+checks = [
+    test_mail,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
new file mode 100644
index 00000000000..0940d72c490
--- /dev/null
+++ b/addons/mail/tests/test_mail.py
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests import common
+
+MAIL_TEMPLATE = """Return-Path: <whatever-2a840@postmaster.twitter.com>
+To: {to}
+Received: by mail1.openerp.com (Postfix, from userid 10002)
+    id 5DF9ABFB2A; Fri, 10 Aug 2012 16:16:39 +0200 (CEST)
+From: Sylvie Lelitre <sylvie.lelitre@agrolait.com>
+Subject: {subject}
+MIME-Version: 1.0
+Content-Type: multipart/alternative; 
+    boundary="----=_Part_4200734_24778174.1344608186754"
+Date: Fri, 10 Aug 2012 14:16:26 +0000
+Message-ID: <1198923581.41972151344608186760.JavaMail@agrolait.com>
+{extra}
+------=_Part_4200734_24778174.1344608186754
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+Please call me as soon as possible this afternoon!
+
+--
+Sylvie
+------=_Part_4200734_24778174.1344608186754
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+ <head>=20
+  <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-8" />
+ </head>=20
+ <body style=3D"margin: 0; padding: 0; background: #ffffff;-webkit-text-size-adjust: 100%;">=20
+  
+  <p>Please call me as soon as possible this afternoon!</p>
+  
+  <p>--<br/>
+     Sylvie
+  <p>
+ </body>
+</html>
+------=_Part_4200734_24778174.1344608186754--
+"""
+
+
+class test_mail(common.TransactionCase):
+
+    def setUp(self):
+        super(test_mail, self).setUp()
+        self.ir_model = self.registry('ir.model')
+        self.mail_alias = self.registry('mail.alias')
+        self.mail_thread = self.registry('mail.thread')
+        self.mail_group = self.registry('mail.group')
+        self.res_users = self.registry('res.users')
+
+        # groups@.. will cause the creation of new mail groups
+        self.mail_group_model_id = self.ir_model.search(self.cr, self.uid, [('model','=', 'mail.group')])[0]
+        self.mail_alias.create(self.cr, self.uid, {'alias_name': 'groups',
+                                                   'alias_model_id': self.mail_group_model_id})
+        
+        # tech@... will append new messages to the 'tech' group 
+        self.group_tech_id = self.mail_group.create(self.cr, self.uid, {'name': 'tech'})
+
+    def test_message_process(self):
+        # Incoming mail creates a new mail_group "frogs"
+        self.assertEqual(self.mail_group.search(self.cr, self.uid, [('name','=','frogs')]), [])
+        mail_frogs = MAIL_TEMPLATE.format(to='groups@example.com, other@gmail.com', subject='frogs', extra='')
+        self.mail_thread.message_process(self.cr, self.uid, None, mail_frogs)
+        frog_groups = self.mail_group.search(self.cr, self.uid, [('name','=','frogs')])
+        self.assertTrue(len(frog_groups) == 1)
+
+        # Previously-created group can be emailed now - it should have an implicit alias group+frogs@...
+        frog_group = self.mail_group.browse(self.cr, self.uid, frog_groups[0])
+        group_messages = frog_group.message_ids
+        self.assertTrue(len(group_messages) == 1, 'New group should only have the original message')
+        mail_frog_news = MAIL_TEMPLATE.format(to='Friendly Frogs <group+frogs@example.com>', subject='news', extra='')
+        self.mail_thread.message_process(self.cr, self.uid, None, mail_frog_news)
+        frog_group.refresh()
+        self.assertTrue(len(frog_group.message_ids) == 2, 'Group should contain 2 messages now')
+
+        # Even with a wrong destination, a reply should end up in the correct thread
+        mail_reply = MAIL_TEMPLATE.format(to='erroneous@example.com>', subject='Re: news',
+                                          extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n'%frog_group.id)
+        self.mail_thread.message_process(self.cr, self.uid, None, mail_reply)
+        frog_group.refresh()
+        self.assertTrue(len(frog_group.message_ids) == 3, 'Group should contain 3 messages now')
+        
+        # No model passed and no matching alias must raise
+        mail_spam = MAIL_TEMPLATE.format(to='noone@example.com', subject='spam', extra='')
+        self.assertRaises(Exception,
+                          self.mail_thread.message_process,
+                          self.cr, self.uid, None, mail_spam)
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 8fa4eaa9c50..73fb03cdc28 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="email_compose_message_wizard_form">
             <field name="name">mail.compose.message.form</field>
             <field name="model">mail.compose.message</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
                     <group>
@@ -41,7 +40,6 @@
             <field name="name">mail.compose.message.form</field>
             <field name="model">mail.compose.message</field>
             <field name="priority">18</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0" >
                     <group>
@@ -50,7 +48,7 @@
                         <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
                                 class="oe_mail_compose_message_body_text"/>
                         <field name="body_html" colspan="2" nolabel="1" placeholder="What are you working on HTML ?"
-                                class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible" widget="text_html"/>
+                                class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible"/>
                         <field name="dest_partner_ids" colspan="2" nolabel="1" widget="many2many_tags"
                                 placeholder="Add contacts to notify..."
                                 class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index a759fa9c8bf..78144843f82 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -5,7 +5,6 @@
         <record id="view_marketing_configuration" model="ir.ui.view">
             <field name="name">Configure Marketing</field>
             <field name="model">marketing.config.settings</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Marketing" class="oe_form_configuration" version="7.0">
                     <header>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 9af709c19a5..19b9536c432 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -24,9 +24,8 @@
     <record model="ir.ui.view" id="view_marketing_campaign_form">
         <field name="name">marketing.campaign.form</field>
         <field name="model">marketing.campaign</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
-            <form version="7.0">
+            <form string="Marketing Campaign" version="7.0">
             <header>
                 <button name="state_running_set" string="Run" states="draft" class="oe_highlight"/>
                 <button name="state_done_set" string="Done" states="running" class="oe_highlight"/>
@@ -68,7 +67,6 @@
     <record model="ir.ui.view" id="view_marketing_campaign_tree">
         <field name="name">marketing.campaign.tree</field>
         <field name="model">marketing.campaign</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="blue:state == 'draft';black:state == 'running';gray:state in ('done','cancelled')" string="Campaigns">
                 <field name="name"/>
@@ -83,7 +81,6 @@
     <record id="view_marketing_campaign_diagram" model="ir.ui.view">
         <field name="name">marketing.campaign.diagram</field>
         <field name="model">marketing.campaign</field>
-        <field name="type">diagram</field>
         <field name="arch" type="xml">
             <diagram string="Campaign Editor">
                 <node object="marketing.campaign.activity" shape="rectangle:type=='subcampaign'" bgcolor="gray:start==True">
@@ -105,7 +102,6 @@
     <record id="view_marketing_campaign_search" model="ir.ui.view">
         <field name="name">marketing.campaign.search</field>
         <field name="model">marketing.campaign</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Campaigns">
                 <field name="name" string="Campaign"/>
@@ -156,9 +152,8 @@
     <record model="ir.ui.view" id="view_marketing_campaign_segment_form">
         <field name="name">marketing.campaign.segment.form</field>
         <field name="model">marketing.campaign.segment</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
-            <form version="7.0">
+            <form string="Marketing Campaign Segment" version="7.0">
             <header>
                 <button name="state_running_set" string="Run" states="draft" class="oe_highlight"/>
                 <button name="state_done_set" string="Close" states="running" class="oe_highlight"/>
@@ -194,7 +189,6 @@
     <record model="ir.ui.view" id="view_marketing_campaign_segment_tree">
         <field name="name">marketing.campaign.segment.tree</field>
         <field name="model">marketing.campaign.segment</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="blue:state == 'draft';black:state == 'running';gray:state in ('done','cancelled')" string="Segments">
                 <field name="name"/>
@@ -209,7 +203,6 @@
     <record id="view_marketing_campaign_segment_search" model="ir.ui.view">
         <field name="name">marketing.campaign.segment.search</field>
         <field name="model">marketing.campaign.segment</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Segments">
                 <field name="name" string="Segment"/>
@@ -251,7 +244,6 @@
     <record model="ir.ui.view" id="view_marketing_campaign_activity_form">
         <field name="name">marketing.campaign.activity.form</field>
         <field name="model">marketing.campaign.activity</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Activities" version="7.0">
                 <group>
@@ -322,7 +314,6 @@
     <record model="ir.ui.view" id="view_marketing_campaign_activity_tree">
         <field name="name">marketing.campaign.activity.tree</field>
         <field name="model">marketing.campaign.activity</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Activities">
                 <field name="name"/>
@@ -338,7 +329,6 @@
     <record model="ir.ui.view" id="view_marketing_campaign_workitem_tree">
         <field name="name">marketing.campaign.workitem.tree</field>
         <field name="model">marketing.campaign.workitem</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="red:state == 'exception';black:state == 'todo';gray:state == 'cancelled'" string="Marketing Campaign Activities">
                 <field name="campaign_id"/>
@@ -360,7 +350,6 @@
     <record model="ir.ui.view" id="view_marketing_campaign_workitem_form">
         <field name="name">marketing.campaign.workitem.form</field>
         <field name="model">marketing.campaign.workitem</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Marketing Campaign Activities" version="7.0">
             <header>
@@ -396,7 +385,6 @@
     <record id="view_marketing_campaign_workitem_search" model="ir.ui.view">
         <field name="name">marketing.campaign.workitem.search</field>
         <field name="model">marketing.campaign.workitem</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Marketing Campaign Activities">
                 <field name="res_name" string="Marketing Campaign Activity"/>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index 30913f1b532..db79ce44132 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -4,7 +4,6 @@
     <record id="view_campaign_analysis_tree" model="ir.ui.view">
         <field name="name">campaign.analysis.tree</field>
         <field name="model">campaign.analysis</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Marketing Reports">
                 <field name="year" invisible="1"/>
@@ -28,7 +27,6 @@
     <record id="view_campaign_analysis_search" model="ir.ui.view">
         <field name="name">campaign.analysis.search</field>
         <field name="model">campaign.analysis</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Campaign Analysis">
                 <field name="date"/>
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index ee619f041e8..5b959625086 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -6,7 +6,6 @@
         <record id="view_workitem_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.workitem.info.inherit</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//page[@name='page_history']" position="attributes">
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index a06bcfcce5e..fb128585fd2 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -9,7 +9,6 @@
         <record model="ir.ui.view" id="membership_product_search_form_view">
             <field name="name">membership.product.search.form</field>
             <field name="model">product.product</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Membership Products">
                     <field name="name" filter_domain="['|',('name','ilike',self),('code','ilike',self)]" string="Membership Product"/>
@@ -26,7 +25,6 @@
         <record model="ir.ui.view" id="membership_products_tree">
             <field name="name">Membership products</field>
             <field name="model">product.product</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Membership products">
                     <field name="code"/>
@@ -44,7 +42,6 @@
         <record model="ir.ui.view" id="membership_products_form">
             <field name="name">Membership Products</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Membership products" version="7.0">
                     <sheet>
@@ -146,7 +143,6 @@
         <record model="ir.ui.view" id="membership_members_tree">
             <field name="name">Members</field>
             <field name="model">res.partner</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Members">
                     <field name="name"/>
@@ -162,7 +158,6 @@
         <record id="view_res_partner_member_filter" model="ir.ui.view">
             <field name="name">res.partner.select</field>
             <field name="model">res.partner</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Membership Partners">
                     <field name="membership_start" invisible="1"/>
@@ -278,7 +273,6 @@
         <!-- View for product.product object inherited from product module -->
         <record model="ir.ui.view" id="view_product_form_inherit1">
             <field name="name">product.normal.form</field>
-            <field name="type">form</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 71e1c6f7876..81e1a3db97c 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -7,7 +7,6 @@
         <record model="ir.ui.view" id="view_report_membership_tree1">
             <field name="name">report.membership.tree</field>
             <field name="model">report.membership</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:membership_state == 'draft';black:membership_state in ('open','free');gray:membership_state in ('done','cancel') " string="Membership">
                     <field name="partner_id"/>
@@ -32,7 +31,6 @@
         <record model="ir.ui.view" id="view_report_membership_search">
             <field name="name">report.membership.search</field>
             <field name="model">report.membership</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Membership">
                     <field name="date_from"/>
@@ -64,7 +62,6 @@
         <record model="ir.ui.view" id="view_report_membership_graph1">
             <field name="name">report.membership.graph1</field>
             <field name="model">report.membership</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Membership" type="bar">
                     <field name="year" />
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index e97ad7445df..bfb687d893c 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -5,7 +5,6 @@
         <record id="view_membership_invoice_view" model="ir.ui.view">
             <field name="name">membership.invoice.view.form</field>
             <field name="model">membership.invoice</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Membership Invoice" version="7.0">
                     <group>
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index 0ac0c02540f..e7668517a70 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -4,7 +4,6 @@
         <record id="board_mrp_manager_form" model="ir.ui.view">
             <field name="name">board.mrp.manager.form</field>
             <field name="model">board.board</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Manufacturing board" version="7.0">
                     <board style="2-1">
diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index e7b24ecce29..559f5f02330 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -5,7 +5,6 @@
         <record id="mrp_company" model="ir.ui.view">
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="priority">22</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 708e60e818b..6de9a9a0bbc 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -25,12 +25,11 @@
         <record id="mrp_property_group_form_view" model="ir.ui.view">
             <field name="name">mrp.property.group.form</field>
             <field name="model">mrp.property.group</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Properties categories" version="7.0">
                     <label for="name"/>
                     <field name="name"/>
-                    <label name="description"/>
+                    <label for="description"/>
                     <field name="description"/>
                 </form>
             </field>
@@ -67,7 +66,6 @@
         <record id="mrp_property_tree_view" model="ir.ui.view">
             <field name="name">mrp.property.tree</field>
             <field name="model">mrp.property</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Properties">
                     <field name="name"/>
@@ -79,7 +77,6 @@
         <record id="mrp_property_form_view" model="ir.ui.view">
             <field name="name">mrp.property.form</field>
             <field name="model">mrp.property</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Properties" version="7.0">
                     <group col="4">
@@ -96,7 +93,6 @@
         <record id="view_mrp_property_search" model="ir.ui.view">
             <field name="name">mrp.property.search</field>
             <field name="model">mrp.property</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
                     <field name="name" string="Name"/>
@@ -156,7 +152,6 @@
         <record id="mrp_workcenter_tree_view" model="ir.ui.view">
             <field name="name">mrp.workcenter.tree</field>
             <field name="model">mrp.workcenter</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Work Center">
                     <field name="code"/>
@@ -169,7 +164,6 @@
         <record id="mrp_workcenter_view" model="ir.ui.view">
             <field name="name">mrp.workcenter.form</field>
             <field name="model">mrp.workcenter</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Work Center" version="7.0">
                     <group col="4">
@@ -217,7 +211,6 @@
         <record id="view_mrp_workcenter_search" model="ir.ui.view">
             <field name="name">mrp.workcenter.search</field>
             <field name="model">mrp.workcenter</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search for mrp workcenter">
                     <field name="name" string="Mrp Workcenter" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
@@ -238,7 +231,6 @@
         <record id="mrp_routing_workcenter_tree_view" model="ir.ui.view">
             <field name="name">mrp.routing.workcenter.tree</field>
             <field name="model">mrp.routing.workcenter</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Routing Work Centers">
                     <field name="sequence"/>
@@ -254,7 +246,6 @@
         <record id="mrp_routing_workcenter_form_view" model="ir.ui.view">
             <field name="name">mrp.routing.workcenter.form</field>
             <field name="model">mrp.routing.workcenter</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Routing Work Centers" version="7.0">
                     <group col="4" string="General Information">
@@ -274,7 +265,6 @@
         <record id="mrp_routing_form_view" model="ir.ui.view">
             <field name="name">mrp.routing.form</field>
             <field name="model">mrp.routing</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Routing" version="7.0">
                     <group col="4">
@@ -302,7 +292,6 @@
         <record id="mrp_routing_tree_view" model="ir.ui.view">
             <field name="name">mrp.routing.tree</field>
             <field name="model">mrp.routing</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Routing">
                     <field name="code"/>
@@ -315,7 +304,6 @@
         <record id="mrp_routing_search_view" model="ir.ui.view">
             <field name="name">mrp.routing.search</field>
             <field name="model">mrp.routing</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Routing">
                     <field name="name" string="Routing" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
@@ -355,7 +343,6 @@
         <record id="mrp_bom_form_view" model="ir.ui.view">
             <field name="name">mrp.bom.form</field>
             <field name="model">mrp.bom</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bill of Material" version="7.0">
                     <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
@@ -427,7 +414,6 @@
         <record id="view_mrp_bom_filter" model="ir.ui.view">
             <field name="name">mrp.bom.select</field>
             <field name="model">mrp.bom</field>
-           <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bill Of Material">
                     <field name="name" string="Bill Of Material" filter_domain="['|',('name','ilike',self),('code','ilike',self)]"/>
@@ -447,7 +433,6 @@
        <record id="mrp_bom_tree_view" model="ir.ui.view">
             <field name="name">mrp.bom.tree</field>
             <field name="model">mrp.bom</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
                 <tree string="Bill of Materials" colors="blue:method">
@@ -468,7 +453,6 @@
        <record id="mrp_bom_component_tree_view" model="ir.ui.view">
             <field name="name">mrp.bom.component.tree</field>
             <field name="model">mrp.bom</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
                 <tree string="BoM Structure" colors="blue:method">
@@ -557,7 +541,6 @@
         <record id="mrp_bom_revision_tree" model="ir.ui.view">
             <field name="name">mrp.bom.revision</field>
             <field name="model">mrp.bom.revision</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="BoM Revisions">
                     <field name="indice"/>
@@ -570,7 +553,6 @@
         <record id="mrp_bom_revision_form" model="ir.ui.view">
             <field name="name">mrp.bom.revision</field>
             <field name="model">mrp.bom.revision</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="BoM Revisions" version="7.0">
                     <group col="4">
@@ -591,7 +573,6 @@
         <record id="mrp_production_tree_view" model="ir.ui.view">
             <field name="name">mrp.production.tree</field>
             <field name="model">mrp.production</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree fonts="bold:needaction_pending==True" colors="blue:state in ('draft','confirmed');red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;gray:state in ('done','cancel') " string="Manufacturing Orders">
                     <field name="needaction_pending" invisible="1"/>
@@ -612,7 +593,6 @@
         <record id="view_production_calendar" model="ir.ui.view">
             <field name="name">mrp.production.calendar</field>
             <field name="model">mrp.production</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="routing_id" date_start="date_planned" string="Manufacturing Orders">
@@ -627,7 +607,6 @@
         <record id="view_production_gantt" model="ir.ui.view">
             <field name="name">mrp.production.gantt</field>
             <field name="model">mrp.production</field>
-            <field name="type">gantt</field>
             <field name="arch" type="xml">
                 <gantt date_stop="date_finished" date_start="date_start" string="Productions" default_group_by="routing_id">
                 </gantt>
@@ -638,7 +617,6 @@
         <record model="ir.ui.view" id="view_production_graph">
             <field name="name">mrp.production.graph</field>
             <field name="model">mrp.production</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Manufacturing Orders" type="bar">
                     <field name="date_planned_date"/>
@@ -651,7 +629,6 @@
         <record id="mrp_production_form_view" model="ir.ui.view">
             <field name="name">mrp.production.form</field>
             <field name="model">mrp.production</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Manufacturing Orders" version="7.0">
                 <header>
@@ -849,7 +826,6 @@
         <record id="view_mrp_production_filter" model="ir.ui.view">
             <field name="name">mrp.production.select</field>
             <field name="model">mrp.production</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Production">
                     <field name="name" string="Production" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
@@ -956,7 +932,6 @@
         <record id="mrp_production_product_form_view" model="ir.ui.view">
             <field name="name">mrp.production.product.line.form</field>
             <field name="model">mrp.production.product.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scheduled Products" version="7.0">
                     <group col="4">
@@ -973,7 +948,6 @@
         <record id="mrp_production_product_tree_view" model="ir.ui.view">
             <field name="name">mrp.production.product.line.tree</field>
             <field name="model">mrp.production.product.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Scheduled Products">
                     <field name="product_id"/>
@@ -993,7 +967,6 @@
             <field name="name">procurement.order.form.inherit</field>
             <field name="model">procurement.order</field>
             <field name="inherit_id" ref="procurement.procurement_form_view"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <data>
                 <xpath expr="//field[@name='move_id']" position="before">
@@ -1011,7 +984,6 @@
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.mrp.inherit</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <page string="Procurement &amp; Locations" position="inside">
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index 99571903dde..72e07074665 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -5,7 +5,6 @@
         <record id="view_workcenter_load_tree" model="ir.ui.view">
             <field name="name">report.workcenter.load.tree</field>
             <field name="model">report.workcenter.load</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Work Center Loads">
                     <field name="name"/>
@@ -19,7 +18,6 @@
         <record id="view_workcenter_load_graph" model="ir.ui.view">
             <field name="name">report.workcenter.load.graph</field>
             <field name="model">report.workcenter.load</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Work Center load" type="bar">
                     <field name="name"/>
@@ -33,7 +31,6 @@
         <record id="view_workcenter_load_search" model="ir.ui.view">
             <field name="name">report.workcenter.load.search</field>
             <field name="model">report.workcenter.load</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Work Center load">
                     <field name="name" string="Week"/>
@@ -49,7 +46,6 @@
         <record id="view_report_in_out_picking_tree" model="ir.ui.view">
             <field name="name">report.mrp.inout.tree</field>
             <field name="model">report.mrp.inout</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Stock value variation">
                     <field name="date"/>
@@ -61,7 +57,6 @@
         <record id="view_report_in_out_picking_form" model="ir.ui.view">
             <field name="name">report.mrp.inout.form</field>
             <field name="model">report.mrp.inout</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock value variation" version="7.0">
                     <group col="4">
@@ -76,7 +71,6 @@
         <record id="view_report_in_out_picking_graph" model="ir.ui.view">
             <field name="name">report.mrp.inout.graph</field>
             <field name="model">report.mrp.inout</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Stock value variation" type="bar">
                     <field name="date"/>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 34e273eddd0..4d94e611fdf 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -17,7 +17,6 @@
         <record id="view_mrp_config" model="ir.ui.view">
             <field name="name">mrp settings</field>
             <field name="model">mrp.config.settings</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Manufacturing" class= "oe_form_configuration" version="7.0">
                     <header>
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index 87b180f0aad..ef01f2b5719 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -7,7 +7,6 @@
         <record id="view_change_production_qty_wizard" model="ir.ui.view">
             <field name="name">Change Product Qty</field>
             <field name="model">change.production.qty</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Change Product Qty" version="7.0">
                     <group>
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index f8aaa7e3c5d..faaadbb524a 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -7,7 +7,6 @@
         <record id="view_mrp_product_price_wizard" model="ir.ui.view">
             <field name="name">Product Cost Structure</field>
             <field name="model">mrp.product_price</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Cost Structure" version="7.0">
                     <group string="Print Cost Structure of Product.">
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index 72d0ccfcaa2..f3e892a1b0a 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -8,7 +8,6 @@
         <record id="view_mrp_product_produce_wizard" model="ir.ui.view">
             <field name="name">MRP Product Produce</field>
             <field name="model">mrp.product.produce</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Produce" version="7.0">
                     <group string="Produce">
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index 439e180ca3c..101db26bce1 100644
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -7,7 +7,6 @@
         <record id="view_mrp_workcenter_load_wizard" model="ir.ui.view">
             <field name="name">Work Center Load</field>
             <field name="model">mrp.workcenter.load</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select time unit" version="7.0">
                     <sheet>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index f8726782980..658c284bce4 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -5,7 +5,6 @@
     <record id="mrp_production_form_inherit_view" model="ir.ui.view">
         <field name="name">mrp.production.form.inherit</field>
         <field name="model">mrp.production</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='workcenter_lines']/form//field[@name='name']" position="before">
@@ -25,7 +24,6 @@
     <record id="mrp_production_form_inherit_view2" model="ir.ui.view">
         <field name="name">mrp.production.form.inherit2</field>
         <field name="model">mrp.production</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
            <xpath expr="//field[@name='workcenter_lines']/tree/field[@name='hour']" position="after">
@@ -42,7 +40,6 @@
     <record model="ir.ui.view" id="mrp_production_workcenter_tree_view_inherit">
         <field name="name">mrp.production.workcenter.line.tree</field>
         <field name="model">mrp.production.workcenter.line</field>
-        <field name="type">tree</field>
         <field name="inherit_id" eval="False"/>
         <field name="arch" type="xml">
             <tree string="Work Orders" colors="gray:state in ('done','cancel');black:state in ('draft','startworking') and date_planned&gt;=current_date;red:date_planned&lt;current_date and state in ('draft', 'confirmed', 'ready')">
@@ -63,10 +60,9 @@
     <record model="ir.ui.view" id="mrp_production_workcenter_form_view_inherit">
         <field name="name">mrp.production.workcenter.line.form</field>
         <field name="model">mrp.production.workcenter.line</field>
-        <field name="type">form</field>
         <field name="inherit_id" eval="False"/>
         <field name="arch" type="xml">
-            <form version="7.0">
+            <form string="Production Workcenter" version="7.0">
             <header>
                 <button name="button_start_working" string="Start" states="draft" class="oe_highlight"/>
                 <button name="button_resume" string="Resume" states="pause" class="oe_highlight"/>
@@ -120,7 +116,6 @@
     <record id="view_mrp_production_workcenter_form_view_filter" model="ir.ui.view">
         <field name="name">mrp.production.workcenter.line.select</field>
         <field name="model">mrp.production.workcenter.line</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Work Orders">
                 <field name="name" string="Work Orders"/>
@@ -147,7 +142,6 @@
     <record id="workcenter_line_calendar" model="ir.ui.view">
         <field name="name">mrp.production.workcenter.line.calendar</field>
         <field name="model">mrp.production.workcenter.line</field>
-        <field name="type">calendar</field>
         <field name="arch" type="xml">
             <calendar color="product" date_stop="date_finished" date_start="date_start" string="Operations">
                 <field name="workcenter_id"/>
@@ -160,7 +154,6 @@
     <record id="workcenter_line_gantt" model="ir.ui.view">
         <field name="name">mrp.production.workcenter.line.gantt</field>
         <field name="model">mrp.production.workcenter.line</field>
-        <field name="type">gantt</field>
         <field name="arch" type="xml">
             <gantt date_delay="hour" date_start="date_planned" string="Operations" default_group_by="production_id">
             </gantt>
@@ -215,7 +208,6 @@
     <record id="workcenter_line_resource_gantt" model="ir.ui.view">
         <field name="name">mrp.production.workcenter.line.resource.gantt</field>
         <field name="model">mrp.production.workcenter.line</field>
-        <field name="type">gantt</field>
         <field name="arch" type="xml">
             <gantt date_delay="hour" date_start="date_planned" default_group_by="workcenter_id">
             </gantt>
@@ -282,7 +274,6 @@
     <record model="ir.ui.view" id="mrp_production_code_tree_view">
         <field name="name">mrp.production.code.tree</field>
         <field name="model">mrp_operations.operation.code</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Production Operation Code">
                 <field name="name"/>
@@ -294,7 +285,6 @@
     <record model="ir.ui.view" id="mrp_production_code_form_view">
         <field name="name">mrp.production.code.form</field>
         <field name="model">mrp_operations.operation.code</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Production Operation Code" version="7.0">
                 <group col="4">
@@ -320,7 +310,6 @@
     <record model="ir.ui.view" id="mrp_production_operation_tree_view">
         <field name="name">mrp.production.operation.tree</field>
         <field name="model">mrp_operations.operation</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Production Operation" editable="top">
                 <field name="production_id"/>
@@ -336,7 +325,6 @@
      <record id="graph_in_hrs_workcenter" model="ir.ui.view">
             <field name="name">graph.in.hrs.workcenter</field>
             <field name="model">mrp.production.workcenter.line</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Hours by Work Center" type="bar">
                      <field name="date_start_date"/>
@@ -358,7 +346,6 @@
         <field name="name">mrp.production.allow_reorder.form</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="model">mrp.production</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <field name="date_finished" position="after">
                 <field name="allow_reorder"/>
@@ -369,7 +356,6 @@
     <record model="ir.ui.view" id="operation_calendar_view">
             <field name="name">mrp.perations.calendar</field>
             <field name="model">mrp_operations.operation</field>
-            <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <calendar string="Calendar View" date_start="order_date" color="workcenter_id">
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index 0c9ee4c6726..cca9a7e3b24 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -8,7 +8,6 @@
         <record id="view_report_mrp_workorder_tree" model="ir.ui.view">
             <field name="name">mrp.workorder.tree</field>
             <field name="model">mrp.workorder</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree string="Work Orders">
                       <field name="date" invisible="1"/>
@@ -31,7 +30,6 @@
         <record id="view_report_mrp_workorder_graph" model="ir.ui.view">
             <field name="name">mrp.workorder.graph</field>
             <field name="model">mrp.workorder</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Work Orders" type="bar">
                     <field name="state"/>
@@ -43,7 +41,6 @@
         <record id="view_report_mrp_workorder_filter" model="ir.ui.view">
             <field name="name">mrp.workorder.select</field>
             <field name="model">mrp.workorder</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
                     <field name="date"/>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 6c47a5c002f..c9268a55428 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -5,7 +5,6 @@
     <record id="view_repair_order_tree" model="ir.ui.view">
         <field name="name">mrp.repair.tree</field>
         <field name="model">mrp.repair</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Repairs order" colors="gray:state in ('done','cancel');black:state not in ('done','cancel');blue:state=='draft'">
                 <field name="name" />
@@ -25,9 +24,8 @@
     <record id="view_repair_order_form" model="ir.ui.view">
         <field name="name">mrp.repair.form</field>
         <field name="model">mrp.repair</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
-            <form version="7.0">
+            <form string="Repair Order" version="7.0">
                <header>
                    <button name="repair_confirm" states="draft" string="Confirm Repair" class="oe_highlight"/>
                    <button name="repair_ready" states="confirmed,ready" string="Start Repair" class="oe_highlight"/>
@@ -202,7 +200,6 @@
     <record id="view_repair_order_form_filter" model="ir.ui.view">
           <field name="name">mrp.repair.select</field>
           <field name="model">mrp.repair</field>
-          <field name="type">search</field>
           <field name="arch" type="xml">
               <search string="Search Reair Orders">
                   <field name="name" string="Reair Orders"/>
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index b90d822121a..04f85e055be 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -7,7 +7,6 @@
         <record id="view_cancel_repair" model="ir.ui.view">
             <field name="name">Cancel Repair</field>
             <field name="model">mrp.repair.cancel</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cancel Repair Order" version="7.0">
                     <group>
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index ca4690df210..431cf0d54b4 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -7,7 +7,6 @@
         <record id="view_make_invoice" model="ir.ui.view">
             <field name="name">Make Invoice</field>
             <field name="model">mrp.repair.make_invoice</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Create invoices" version="7.0">
                 <group string="Do you really want to create the invoice(s)?">
diff --git a/addons/mrp_subproduct/mrp_subproduct_view.xml b/addons/mrp_subproduct/mrp_subproduct_view.xml
index 42f9c7b4060..94da87ef0de 100644
--- a/addons/mrp_subproduct/mrp_subproduct_view.xml
+++ b/addons/mrp_subproduct/mrp_subproduct_view.xml
@@ -5,7 +5,6 @@
             <field name="name">mrp.bom.sub.product</field>
             <field name="model">mrp.bom</field>
             <field name="inherit_id" ref="mrp.mrp_bom_form_view"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
              <notebook position="inside">
                  <page string="Sub Products" position="inside">
diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index 5ea323175e6..d69eb6e533d 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -5,7 +5,6 @@
         <record id="view_inventory_tree" model="ir.ui.view">
             <field name="name">multi_company.default.tree</field>
             <field name="model">multi_company.default</field>
-            <field name="type">tree</field>
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <tree string="Multi Company">
@@ -22,7 +21,6 @@
         <record id="view_inventory_form" model="ir.ui.view">
             <field name="name">multi_company.default.form</field>
             <field name="model">multi_company.default</field>
-            <field name="type">form</field>
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <form string="Multi Company">
@@ -46,7 +44,6 @@
         <record id="view_inventory_search" model="ir.ui.view">
             <field name="name">multi_company.default.search</field>
             <field name="model">multi_company.default</field>
-            <field name="type">search</field>
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Multi Company">
diff --git a/addons/pad/res_company.xml b/addons/pad/res_company.xml
index 12f14b0f5bd..017561aaec3 100644
--- a/addons/pad/res_company.xml
+++ b/addons/pad/res_company.xml
@@ -3,7 +3,6 @@
     <record id="view_company_form_with_pad" model="ir.ui.view">
       <field name="name">res.company.form.pad</field>
       <field name="model">res.company</field>
-      <field name="type">form</field>
       <field name="inherit_id" ref="base.view_company_form"/>
       <field name="arch" type="xml">
         <xpath expr="//group[@name='account_grp']" position="after">
diff --git a/addons/pad_project/project_task.xml b/addons/pad_project/project_task.xml
index d18f43a92f4..24efbc9dad0 100644
--- a/addons/pad_project/project_task.xml
+++ b/addons/pad_project/project_task.xml
@@ -3,7 +3,6 @@
         <record id="view_task_form_with_pad" model="ir.ui.view">
             <field name="name">project.task.form.pad</field>
             <field name="model">project.task</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
                 <field name="description" position="replace">
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index f42d17e51c0..e99fbf72b6d 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -4,7 +4,6 @@
         <record id="view_outlook_installer" model="ir.ui.view">
             <field name="name">outlook.installer.view</field>
             <field name="model">outlook.installer</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
                 <data>
@@ -46,7 +45,6 @@
         <record id="view_config_outlook_installer" model="ir.ui.view">
             <field name="name">Sales Application</field>
             <field name="model">sale.config.settings</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <div name="module_plugin_outlook" version="7.0" position="replace">
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 7a323ce33f5..5ea5fc38219 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -4,7 +4,6 @@
         <record id="view_thunderbird_installer" model="ir.ui.view">
             <field name="name">plugin_thunderbird.installer.view</field>
             <field name="model">plugin_thunderbird.installer</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
                 <data>
@@ -52,7 +51,6 @@
         <record id="view_config_thunderbird_installer" model="ir.ui.view">
             <field name="name">Sales Application</field>
             <field name="model">sale.config.settings</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <div name="module_plugin_thunderbird" version="7.0" position="replace">
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index 8568c8d60d9..d7f3be2a8d6 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="view_account_journal_pos_user_form">
             <field name="name">POS Journal</field>
             <field name="model">account.journal</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_journal_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook[last()]" position="inside">
@@ -24,7 +23,6 @@
         <record id="view_pos_open_cash_statement_filter" model="ir.ui.view">
             <field name="name">account.bank.statement.inherit</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
                     <field name="name" string="Cash Statement"/>
@@ -43,7 +41,6 @@
         <record id="view_pos_confirm_cash_statement_filter" model="ir.ui.view">
             <field name="name">account.bank.statement.inherit2</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Cash Statements">
                     <field name="name" string="Cash Statement"/>
@@ -86,7 +83,6 @@
         <record id="view_cash_statement_pos_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
             <field name="model">account.bank.statement</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="account.view_cash_statement_tree"/>
             <field name="arch" type="xml">
                 <field name="journal_id" position="after">
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 1168faa21ac..47a41260378 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -15,7 +15,6 @@
         <record model="ir.ui.view" id="view_pos_pos_form">
             <field name="name">pos.order</field>
             <field name="model">pos.order</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Point of Sale Orders" version="7.0">
                     <header>
@@ -125,7 +124,6 @@
         <record model="ir.ui.view" id="view_pos_order_tree">
             <field name="name">Sales</field>
             <field name="model">pos.order</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS Orders" colors="blue:state == 'draft';gray:state in ('done','cancel');black:state not in('done','cancel')">
                     <field name="name"/>
@@ -142,7 +140,6 @@
         <record id="view_pos_order_filter" model="ir.ui.view">
             <field name="name">pos.order.list.select</field>
             <field name="model">pos.order</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order"/>
@@ -198,7 +195,6 @@
         <record model="ir.ui.view" id="view_pos_order_line">
             <field name="name">Sale lines</field>
             <field name="model">pos.order.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS Order lines">
                     <field name="product_id" readonly="1"/>
@@ -215,7 +211,6 @@
         <record model="ir.ui.view" id="view_pos_order_line_form">
             <field name="name">Sale line</field>
             <field name="model">pos.order.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS Order line" version="7.0">
                     <group col="4">
@@ -264,7 +259,6 @@
         <record model="ir.ui.view" id="view_pos_trans_user_form">
             <field name="name">report.trans.pos.user.form</field>
             <field name="model">report.transaction.pos</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS " version="7.0">
                     <group col="4">
@@ -284,7 +278,6 @@
         <record model="ir.ui.view" id="view_trans_pos_user_tree">
             <field name="name">Sales by user</field>
             <field name="model">report.transaction.pos</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
                     <field name="date_create" widget="date" />
@@ -303,7 +296,6 @@
         <record model="ir.ui.view" id="view_report_transaction_pos_calendar">
             <field name="name">report.transaction.pos.calendar</field>
             <field name="model">report.transaction.pos</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_create" string="POS Report">
@@ -316,7 +308,6 @@
          <record model="ir.ui.view" id="view_report_transaction_pos_graph">
             <field name="name">report.transaction.pos.graph</field>
             <field name="model">report.transaction.pos</field>
-            <field name="type">graph</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <graph  type="bar" string="POS Report">
@@ -357,7 +348,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_form">
             <field name="name">report.sales.by.user.pos.form</field>
             <field name="model">report.sales.by.user.pos</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS " version="7.0">
                     <group col="4">
@@ -374,7 +364,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_tree">
             <field name="name">report.sales.by.user.pos.tree</field>
             <field name="model">report.sales.by.user.pos</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
                     <field name="date_order" widget="date"/>
@@ -388,7 +377,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_calendar">
             <field name="name">report.sales.by.user.pos.calendar</field>
             <field name="model">report.sales.by.user.pos</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_order" string="POS Report">
@@ -401,7 +389,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_graph">
             <field name="name">report.sales.by.user.pos.graph</field>
             <field name="model">report.sales.by.user.pos</field>
-            <field name="type">graph</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <graph  type="bar" string="Sales by User">
@@ -425,7 +412,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_form">
             <field name="name">report.sales.by.user.pos.month.form</field>
             <field name="model">report.sales.by.user.pos.month</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS " version="7.0">
                     <group col="4">
@@ -442,7 +428,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_tree">
             <field name="name">report.sales.by.user.pos.month.tree</field>
             <field name="model">report.sales.by.user.pos.month</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
                     <field name="date_order" widget="date"/>
@@ -456,7 +441,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_calendar">
             <field name="name">report.sales.by.user.pos.month.calendar</field>
             <field name="model">report.sales.by.user.pos.month</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_order" string="POS Report">
@@ -469,7 +453,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_user_pos_month_graph">
             <field name="name">report.sales.by.user.pos.month.graph</field>
             <field name="model">report.sales.by.user.pos.month</field>
-            <field name="type">graph</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <graph  type="bar" string="Sales by User">
@@ -493,7 +476,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_form">
             <field name="name">report.sales.by.margin.pos.form</field>
             <field name="model">report.sales.by.margin.pos</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS " version="7.0">
                     <group col="4">
@@ -512,7 +494,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_tree">
             <field name="name">report.sales.by.margin.pos.tree</field>
             <field name="model">report.sales.by.margin.pos</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
                     <field name="user_id"/>
@@ -528,7 +509,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_calendar">
             <field name="name">report.sales.by.margin.pos.calendar</field>
             <field name="model">report.sales.by.margin.pos</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
@@ -541,7 +521,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_graph">
             <field name="name">report.sales.by.margin.pos.graph</field>
             <field name="model">report.sales.by.margin.pos</field>
-            <field name="type">graph</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <graph  type="bar" string="Sales by User Margin" orientation="horizontal">
@@ -562,7 +541,6 @@
          <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_form">
             <field name="name">report.sales.by.margin.pos.month.form</field>
             <field name="model">report.sales.by.margin.pos.month</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS " version="7.0">
                     <group col="4">
@@ -581,7 +559,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_tree">
             <field name="name">report.sales.by.margin.pos.month.tree</field>
             <field name="model">report.sales.by.margin.pos.month</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS">
                     <field name="user_id"/>
@@ -597,7 +574,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_calendar">
             <field name="name">report.sales.by.margin.pos.month.calendar</field>
             <field name="model">report.sales.by.margin.pos.month</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_order" string="Sales by User Margin">
@@ -610,7 +586,6 @@
         <record model="ir.ui.view" id="view_report_sales_by_margin_pos_month_graph">
             <field name="name">report.sales.by.margin.pos.month.graph</field>
             <field name="model">report.sales.by.margin.pos.month</field>
-            <field name="type">graph</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <graph  type="bar" string="Sales by User Margin" orientation="horizontal">
@@ -631,7 +606,6 @@
         <record id="product_normal_form_pos_view" model="ir.ui.view">
             <field name="name">product.normal.pos.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                   <group name="status" position="after">
@@ -647,7 +621,6 @@
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="misc" position="after">
@@ -664,7 +637,6 @@
         <record id="pos_category_form_view" model="ir.ui.view">
             <field name="name">pos.category.form</field>
             <field name="model">pos.category</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product PoS Categories" version="7.0">
                     <sheet>
@@ -683,7 +655,6 @@
         <record id="pos_category_tree_view" model="ir.ui.view">
             <field name="name">pos.category.tree</field>
             <field name="model">pos.category</field>
-            <field name="type">tree</field>
             <field name="field_parent" eval="False"/>
             <field name="arch" type="xml">
                 <tree string="Product PoS Categories">
@@ -745,7 +716,6 @@
         <record model="ir.ui.view" id="view_pos_order_tree_all_sales_lines">
             <field name="name">POS Sales Lines</field>
             <field name="model">pos.order.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="POS Orders lines">
                     <field name="order_id" />
@@ -789,7 +759,6 @@
         <record model="ir.ui.view" id="view_pos_config_form">
             <field name="name">pos.config.form.view</field>
             <field name="model">pos.config</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Point of Sale Configuration" version="7.0">
                     <header>
@@ -843,7 +812,6 @@
         <record model="ir.ui.view" id="view_pos_config_tree">
             <field name="name">pos.config.tree.view</field>
             <field name="model">pos.config</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Point of Sale Configuration" colors="grey:state == 'inactive'">
                     <field name="name" />
@@ -856,7 +824,6 @@
         <record model="ir.ui.view" id="view_pos_config_search">
             <field name="name">pos.config.search.view</field>
             <field name="model">pos.config</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Config">
                     <field name="name" />
@@ -902,7 +869,6 @@
         <record model="ir.ui.view" id="view_pos_session_form">
             <field name="name">pos.session.form.view</field>
             <field name="model">pos.session</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Point of Sale Session" version="7.0">
                     <header>
@@ -1002,7 +968,6 @@
         <record model="ir.ui.view" id="view_pos_session_tree">
             <field name="name">pos.session.tree.view</field>
             <field name="model">pos.session</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Point of Sale Session">
                     <field name="config_id" />
@@ -1018,7 +983,6 @@
         <record model="ir.ui.view" id="view_pos_session_search">
             <field name="name">pos.session.search.view</field>
             <field name="model">pos.session</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Session">
                     <field name="name" />
@@ -1068,7 +1032,6 @@
         <record id="view_pos_order_filter" model="ir.ui.view">
             <field name="name">pos.order.list.select</field>
             <field name="model">pos.order</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name"/>
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index e103fe4e6c0..fee47312610 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -4,7 +4,6 @@
         <record id="view_report_pos_order_tree" model="ir.ui.view">
             <field name="name">report.pos.order.tree</field>
             <field name="model">report.pos.order</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Point of Sale Analysis">
                     <field name="date" invisible="1"/>
@@ -31,7 +30,6 @@
         <record id="view_report_pos_order_search" model="ir.ui.view">
             <field name="name">report.pos.order.search</field>
             <field name="model">report.pos.order</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Point of Sale Analysis">
                     <field name="date"/>
diff --git a/addons/point_of_sale/res_users_view.xml b/addons/point_of_sale/res_users_view.xml
index def4a578252..f561ccf9b80 100644
--- a/addons/point_of_sale/res_users_view.xml
+++ b/addons/point_of_sale/res_users_view.xml
@@ -5,7 +5,6 @@
     <record id="res_users_form_preference_view" model="ir.ui.view">
         <field name="name">res.users.form.view</field>
         <field name="model">res.users</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="base.view_users_form_simple_modif" />
         <field name="arch" type="xml">
             <xpath expr="//group[@name='preferences']" position="inside">
@@ -17,7 +16,6 @@
     <record id="res_users_form_view" model="ir.ui.view">
         <field name="name">res.users.form.view</field>
         <field name="model">res.users</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="base.view_users_form" />
         <field name="arch" type="xml">
             <notebook position="inside">
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index ae80722474e..913f3b17b20 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -6,7 +6,6 @@
         <record id="view_box_entries" model="ir.ui.view">
             <field name="name">Box Entries</field>
             <field name="model">pos.box.entries</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Put Money" version="7.0">
                     <separator string="Fill in this form if you put money in the cash register:"/>
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index 29c9df57b36..750630ac4db 100644
--- a/addons/point_of_sale/wizard/pos_box_out.xml
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -6,7 +6,6 @@
         <record id="view_pos_box_out" model="ir.ui.view">
             <field name="name">Box Out</field>
             <field name="model">pos.box.out</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Output Operation" version="7.0">
                     <separator string="Describe why you take money from the cash register:"/>
diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
index f7baa27f439..626c99e1069 100644
--- a/addons/point_of_sale/wizard/pos_confirm.xml
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -5,7 +5,6 @@
         <record id="view_pos_confirm" model="ir.ui.view">
             <field name="name">Post Sale Journal Entries</field>
             <field name="model">pos.confirm</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Post All Orders" version="7.0">
                     <separator string="Generate Journal Entries"/>
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 85f71c63433..15e0449d4d9 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -6,7 +6,6 @@
         <record id="view_pos_details" model="ir.ui.view">
             <field name="name">POS Details</field>
             <field name="model">pos.details</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS Details" version="7.0">
                     <group col="4" string="Dates">
diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml
index d17bea7f454..05a7949b48f 100644
--- a/addons/point_of_sale/wizard/pos_discount.xml
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -6,7 +6,6 @@
         <record id="view_pos_discount" model="ir.ui.view">
             <field name="name">Apply Discount</field>
             <field name="model">pos.discount</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Apply Discount" version="7.0">
                     <group>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 6c4c96edcc9..0aa28a33b32 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -6,7 +6,6 @@
         <record id="view_pos_open_statement" model="ir.ui.view">
             <field name="name">Open Statements</field>
             <field name="model">pos.open.statement</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open Statements" version="7.0">
                     <separator string="Do you want to open cash registers?"/>
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 4a8b0dfba84..3b1cde3e488 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -5,7 +5,6 @@
         <record id="view_pos_payment" model="ir.ui.view">
             <field name="name">Pay Order</field>
             <field name="model">pos.make.payment</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Pay Order" version="7.0">
                 <group>
diff --git a/addons/point_of_sale/wizard/pos_payment_report.xml b/addons/point_of_sale/wizard/pos_payment_report.xml
index df56f76a70b..6ba34ffab8c 100644
--- a/addons/point_of_sale/wizard/pos_payment_report.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report.xml
@@ -6,7 +6,6 @@
         <record id="view_pos_payment_report" model="ir.ui.view">
             <field name="name">Payment Report</field>
             <field name="model">pos.payment.report</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payment Report" version="7.0">
                     <header>
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.xml b/addons/point_of_sale/wizard/pos_payment_report_user.xml
index cd06b6a6992..3f109616b34 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.xml
@@ -6,7 +6,6 @@
         <record id="view_pos_payment_report" model="ir.ui.view">
             <field name="name">Payment Report</field>
             <field name="model">pos.payment.report</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Pyament Report " version="7.0">
                     <header>
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
index 850ae6729a6..3ec4db98305 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -4,7 +4,6 @@
         <record id="pos_payment_report_user_form" model="ir.ui.view">
             <field name="name">pos.payment.report.user.form</field>
             <field name="model">pos.payment.report.user</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sale by User" version="7.0">
                     <group>
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index 79031e5012f..ed7c4ac1d93 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -5,7 +5,6 @@
         <record id="view_pos_receipt" model="ir.ui.view">
               <field name="name">Receipt</field>
               <field name="model">pos.receipt</field>
-              <field name="type">form</field>
               <field name="arch" type="xml">
                 <form string="Receipt :" version="7.0">
                     <group>
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index 09005712b78..62e2f3012d9 100644
--- a/addons/point_of_sale/wizard/pos_return_view.xml
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -4,7 +4,6 @@
         <record id="pos_return_form" model="ir.ui.view">
             <field name="name">pos.return</field>
             <field name="model">pos.return</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
                     <footer>
@@ -27,7 +26,6 @@
         <record id="pos_return_tree_in" model="ir.ui.view">
             <field name="name">pos.return.memory</field>
             <field name="model">pos.return.memory</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Return Product">
                     <field name="product_id" />
@@ -40,7 +38,6 @@
         <record id="pos_return_form_in" model="ir.ui.view">
             <field name="name">pos.return.memory</field>
             <field name="model">pos.return.memory</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
                     <group col="4">
diff --git a/addons/point_of_sale/wizard/pos_sales_user.xml b/addons/point_of_sale/wizard/pos_sales_user.xml
index cf39f3bb4ec..2623c426cb8 100644
--- a/addons/point_of_sale/wizard/pos_sales_user.xml
+++ b/addons/point_of_sale/wizard/pos_sales_user.xml
@@ -6,7 +6,6 @@
         <record id="view_pos_sale_user" model="ir.ui.view">
             <field name="name">Sale By User</field>
             <field name="model">pos.sale.user</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sale By User" version="7.0">
                     <group col="4">
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index b56b9a32bd1..831db25e26a 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -6,7 +6,6 @@
         <record id="portal_list_view" model="ir.ui.view">
             <field name="name">Portal List</field>
             <field name="model">res.portal</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Portals">
                     <field name="name" string="Portal Name"/>
@@ -18,7 +17,6 @@
         <record id="portal_form_view" model="ir.ui.view">
             <field name="name">Portal Form</field>
             <field name="model">res.portal</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_groups_form"/>
             <field name="arch" type="xml">
                 <page string="Users" position="before">
@@ -32,7 +30,7 @@
                                 <field name="override_menu"/>
                                 <field name="parent_menu_id"
                                     context="{'ir.ui.menu.full_list': True}"/>
-                                <label colspan="1"/>
+                                <label for="partent_menu_id" colspan="1"/>
                                 <button name="do_create_menu" type="object"
                                     string="Create Parent Menu"/>
                             </group>
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index e78bbaad266..f3cd5c98bb4 100644
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -14,7 +14,6 @@
         <record id="wizard_view" model="ir.ui.view">
             <field name="name">Add Portal Access</field>
             <field name="model">res.portal.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Portal Access" version="7.0">
                     <group col="4">
@@ -37,7 +36,6 @@
         <record id="wizard_user_tree_view" model="ir.ui.view">
             <field name="name">Portal Users</field>
             <field name="model">res.portal.wizard.user</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <!-- the attribute 'editable' is set below to make the elements
                      editable in the web client 6.0 -->
@@ -53,7 +51,6 @@
         <record id="wizard_user_form_view" model="ir.ui.view">
             <field name="name">Portal User</field>
             <field name="model">res.portal.wizard.user</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Portal User" version="7.0">
                     <group colspan="2" col="2">
diff --git a/addons/portal/wizard/share_wizard_view.xml b/addons/portal/wizard/share_wizard_view.xml
index cf294285f4f..72ae857eaaf 100644
--- a/addons/portal/wizard/share_wizard_view.xml
+++ b/addons/portal/wizard/share_wizard_view.xml
@@ -5,7 +5,6 @@
         <record id="share_step1_form_portal" model="ir.ui.view">
             <field name="name">share.step1.form.portal</field>
             <field name="model">share.wizard</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="share.share_step1_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='user_type']" position="attributes">
@@ -34,7 +33,6 @@
         <record id="share_step2_form_portal" model="ir.ui.view">
             <field name="name">share.step2.form.portal</field>
             <field name="model">share.wizard</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="share.share_step2_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='result_line_ids']//field[@name='login']" position="after">
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 918d29fcd02..1776632d7ab 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -6,7 +6,6 @@
         <record id="wizard_contact_form_view" model="ir.ui.view">
             <field name="name">Wizard form view</field>
             <field name="model">portal_crm.crm_contact_us</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Contact wizard view" version="7.0">
                     <div class="oe_portal_crm_contact">
@@ -80,7 +79,6 @@
         <record id="wizard_contact_form_view_thanks" model="ir.ui.view">
             <field name="name">Wizard thanks message</field>
             <field name="model">portal_crm.crm_contact_us</field>
-            <field name="type">form</field>
             <!-- give it a low priority to ensure this won't be the default view -->
             <field name="priority">99</field>
             <field name="arch" type="xml">
diff --git a/addons/portal_event/event_view.xml b/addons/portal_event/event_view.xml
index 6966add58e8..1dd9fee7181 100644
--- a/addons/portal_event/event_view.xml
+++ b/addons/portal_event/event_view.xml
@@ -6,7 +6,6 @@
         <record id="view_employee_form" model="ir.ui.view">
             <field name="name">portal.event.form</field>
             <field name="model">event.event</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="event.view_event_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//page[last()]" position="after">
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index 849157ad44a..f36e2a4d2d8 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -6,7 +6,6 @@
         <record id="view_employee_form" model="ir.ui.view">
             <field name="name">portal_hr_employees.employee.form</field>
             <field name="model">hr.employee</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//page[last()]" position="after">
@@ -23,7 +22,6 @@
         <record id="wizard_contact_form_view_employees_list" model="ir.ui.view">
             <field name="name">portal_hr_employees.employees_list</field>
             <field name="model">portal_crm.crm_contact_us</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="portal_crm.wizard_contact_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@class='oe_portal_crm_team']" position="inside">
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 268de4f0792..14e944ab32e 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -5,7 +5,6 @@
         <record id="portal_project_issue_kanban_view" model="ir.ui.view">
             <field name="name">Project Issue Kanban</field>
             <field name="model">project.issue</field>
-            <field name="type">kanban</field>
             <field name="arch" type="xml">
                 <kanban version="7.0" class="oe_portal_project_issue">
                     <field name="priority"/>
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 66dcb87289a..7e0f9c25f47 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -11,7 +11,6 @@
     <record model="ir.ui.view" id="view_process_form">
         <field name="name">process.process.form</field>
         <field name="model">process.process</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process" version="7.0">
                 <sheet>
@@ -97,7 +96,6 @@
     <record model="ir.ui.view" id="view_process_tree">
         <field name="name">process.process.tree</field>
         <field name="model">process.process</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Process">
                 <field name="name"/>
@@ -110,7 +108,6 @@
     <record id="view_process_filter" model="ir.ui.view">
             <field name="name">process.process.filter</field>
             <field name="model">process.process</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Process">
                     <field name="name" string="Process"/>
@@ -138,7 +135,6 @@
     <record model="ir.ui.view" id="view_process_node_tree">
         <field name="name">process.node.tree</field>
         <field name="model">process.node</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Process Nodes">
                 <field name="name"/>
@@ -153,7 +149,6 @@
     <record model="ir.ui.view" id="view_process_node_form">
         <field name="name">process.node.form</field>
         <field name="model">process.node</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Node" version="7.0">
                 <sheet layout="auto">
@@ -210,7 +205,6 @@
     <record id="view_process_node_filter" model="ir.ui.view">
         <field name="name">process.node.filter</field>
         <field name="model">process.node</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search ProcessNode">
                 <field name="name" string="Process Node"/>
@@ -242,7 +236,6 @@
     <record model="ir.ui.view" id="view_process_transition_tree">
         <field name="name">process.transition.tree</field>
         <field name="model">process.transition</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Process Transition">
                 <field name="name"/>
@@ -255,7 +248,6 @@
     <record model="ir.ui.view" id="view_process_transition_form">
         <field name="name">process.transition.form</field>
         <field name="model">process.transition</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Transition" version="7.0">
                 <sheet >
@@ -299,7 +291,6 @@
     <record id="view_process_transition_filter" model="ir.ui.view">
         <field name="name">process.transition.filter</field>
         <field name="model">process.transition</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Process Transition">
                 <field name="name" string="Process Transition"/>
diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml
index 7381bdffd99..a01ec168efa 100644
--- a/addons/procurement/board_mrp_procurement_view.xml
+++ b/addons/procurement/board_mrp_procurement_view.xml
@@ -14,7 +14,6 @@
             <field name="name">board.mrp.procurement.form</field>
             <field name="model">board.board</field>
             <field name="inherit_id" ref="stock.board_warehouse_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
               <xpath expr="/form/board/column/action[@string='Incoming Shipments']" position="before">
                 <action name="%(procurement_action_board)d" string="Procurements in Exception"/>
diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml
index c2c99fa5d52..dadd24a0860 100644
--- a/addons/procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
@@ -5,7 +5,6 @@
         <record id="mrp_company" model="ir.ui.view">
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="priority">17</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 485792fdd8f..2d734b32cfb 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -9,7 +9,6 @@
         <record id="procurement_tree_view" model="ir.ui.view">
             <field name="name">procurement.order.tree</field>
             <field name="model">procurement.order</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state == 'exception';black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state == 'ready'">
                     <field name="date_planned" widget="date"/>
@@ -27,7 +26,6 @@
          <record id="procurement_tree_view_board" model="ir.ui.view">
             <field name="name">procurement.order.tree.board</field>
             <field name="model">procurement.order</field>
-            <field name="type">tree</field>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Procurement Lines" colors="red:date_planned&lt;current_date and state == 'exception';black:state=='running';darkgreen:state=='confirmed';gray:state in ['done','cancel'];blue:state == 'ready'">
@@ -44,7 +42,6 @@
         <record id="procurement_form_view" model="ir.ui.view">
             <field name="name">procurement.order.form</field>
             <field name="model">procurement.order</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Procurement" version="7.0">
                     <header>
@@ -114,7 +111,6 @@
         <record id="view_procurement_filter" model="ir.ui.view">
             <field name="name">procurement.order.select</field>
             <field name="model">procurement.order</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Procurement">
                     <field name="origin" string="Procurement"/>
@@ -185,7 +181,6 @@
         <record id="view_warehouse_orderpoint_tree" model="ir.ui.view">
             <field name="name">stock.warehouse.orderpoint.tree</field>
             <field name="model">stock.warehouse.orderpoint</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Reordering Rules">
                     <field name="name"/>
@@ -202,7 +197,6 @@
         <record model="ir.ui.view" id="warehouse_orderpoint_search">
             <field name="name">stock.warehouse.orderpoint.search</field>
             <field name="model">stock.warehouse.orderpoint</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Reordering Rules Search">
                     <field name="name" string="Reordering Rules"/>
@@ -221,7 +215,6 @@
         <record id="view_warehouse_orderpoint_form" model="ir.ui.view">
             <field name="name">stock.warehouse.orderpoint.form</field>
             <field name="model">stock.warehouse.orderpoint</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reordering Rules" version="7.0">
                     <sheet>
@@ -292,7 +285,6 @@
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.orderpoint.inherit</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <page string="Procurement &amp; Locations" position="inside">
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 5f2fc6ab40c..4d2e7553371 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -7,7 +7,6 @@
         <record id="view_make_procurment_wizard" model="ir.ui.view">
             <field name="name">Procurement Request</field>
             <field name="model">make.procurement</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Procurement Request" version="7.0">
                     <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders."/>
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index ab98e598a3d..89ba76d291b 100644
--- a/addons/procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
@@ -7,7 +7,6 @@
         <record id="view_compute_procurment_wizard" model="ir.ui.view">
             <field name="name">Compute Procurements</field>
             <field name="model">procurement.order.compute</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters" version="7.0">
                     <group>
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index 5a29959949e..227b79b3234 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -7,7 +7,6 @@
         <record id="view_procurement_compute_wizard" model="ir.ui.view">
             <field name="name">Compute Stock Minimum Rules Only</field>
             <field name="model">procurement.orderpoint.compute</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters" version="7.0">
                     <group>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index ee2a5d33e25..2e72dfdbadc 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -7,7 +7,6 @@
         <record id="view_compute_schedulers_wizard" model="ir.ui.view">
             <field name="name">Compute Schedulers</field>
             <field name="model">procurement.order.compute.all</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters" version="7.0">
                     <group>
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 4aa53511460..acb087533ac 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -4,7 +4,6 @@
         <record id="view_partner_property_form" model="ir.ui.view">
             <field name="name">res.partner.product.property.form.inherit</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 57e200fb878..adefd9e5d3c 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -10,7 +10,6 @@
         <record id="product_pricelist_version_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.version.form</field>
             <field name="model">product.pricelist.version</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Pricelist Version" version="7.0">
                     <group col="4">
@@ -28,7 +27,6 @@
         <record id="product_pricelist_version_tree_view" model="ir.ui.view">
             <field name="name">product.pricelist.version.tree</field>
             <field name="model">product.pricelist.version</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Pricelist Version">
                     <field name="name"/>
@@ -63,7 +61,6 @@
         <record id="product_pricelist_item_tree_view" model="ir.ui.view">
             <field name="name">product.pricelist.item.tree</field>
             <field name="model">product.pricelist.item</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Products Listprices Items">
                     <field name="sequence"/>
@@ -80,7 +77,6 @@
         <record id="product_pricelist_item_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.item.form</field>
             <field name="model">product.pricelist.item</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Products Listprices Items" version="7.0">
                     <label for="name" class="oe_edit_only"/>
@@ -118,7 +114,6 @@
         <record model="ir.ui.view" id="product_pricelist_view_search">
             <field name="name">product.pricelist.search</field>
             <field name="model">product.pricelist</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Products Price Search">
                     <field name="name" string="Products Price"/>
@@ -133,7 +128,6 @@
         <record id="product_pricelist_view_tree" model="ir.ui.view">
             <field name="name">product.pricelist.tree</field>
             <field name="model">product.pricelist</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Products Price List">
                     <field name="name"/>
@@ -146,7 +140,6 @@
         <record id="product_pricelist_view" model="ir.ui.view">
             <field name="name">product.pricelist.form</field>
             <field name="model">product.pricelist</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Products Price List" version="7.0">
                     <label for="name" class="oe_edit_only"/>
@@ -231,7 +224,6 @@
         <record id="product_price_type_view" model="ir.ui.view">
             <field name="name">product.price.type.form</field>
             <field name="model">product.price.type</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Products Price Type" version="7.0">
                     <group col="4">
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 5fdb968c239..7a4c66ec52a 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -6,7 +6,6 @@
         <record id="product_search_form_view" model="ir.ui.view">
             <field name="name">product.search.form</field>
             <field name="model">product.product</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product">
                    <field name="name" string="Product" filter_domain="['|',('name','ilike',self),('default_code','ilike',self)]"/>
@@ -36,7 +35,6 @@
         <record id="product_product_tree_view" model="ir.ui.view">
             <field name="name">product.product.tree</field>
             <field name="model">product.product</field>
-            <field name="type">tree</field>
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="red:virtual_available&lt;0;blue:virtual_available&gt;=0 and state in ('draft', 'end', 'obsolete');black:virtual_available&gt;=0 and state not in ('draft', 'end', 'obsolete')" string="Products">
@@ -59,7 +57,6 @@
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field eval="7" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Product" version="7.0">
@@ -188,7 +185,6 @@
         <record model="ir.ui.view" id="product_kanban_view">
             <field name="name">Product Kanban</field>
             <field name="model">product.product</field>
-            <field name="type">kanban</field>
             <field name="arch" type="xml">
                 <kanban>
                     <field name="color"/>
@@ -322,7 +318,6 @@
         <record id="product_category_search_view" model="ir.ui.view">
             <field name="name">product.category.search</field>
             <field name="model">product.category</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product Categories">
                     <field name="name" string="Product Categories"/>
@@ -333,7 +328,6 @@
         <record id="product_category_form_view" model="ir.ui.view">
             <field name="name">product.category.form</field>
             <field name="model">product.category</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Categories" version="7.0">
                     <sheet>
@@ -362,7 +356,6 @@
         <record id="product_category_list_view" model="ir.ui.view">
             <field name="name">product.category.list</field>
             <field name="model">product.category</field>
-            <field name="type">tree</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <tree string="Product Categories">
@@ -373,7 +366,6 @@
         <record id="product_category_tree_view" model="ir.ui.view">
             <field name="name">product.category.tree</field>
             <field name="model">product.category</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_id</field>
             <field name="arch" type="xml">
                 <tree toolbar="True" string="Product Categories">
@@ -436,7 +428,6 @@
         <record id="product_uom_tree_view" model="ir.ui.view">
             <field name="name">product.uom.tree</field>
             <field name="model">product.uom</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Units of Measure">
                     <field name="name"/>
@@ -449,7 +440,6 @@
         <record id="product_uom_form_view" model="ir.ui.view">
             <field name="name">product.uom.form</field>
             <field name="model">product.uom</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Units of Measure" version="7.0">
                     <group>
@@ -491,7 +481,6 @@
         <record id="product_uom_categ_form_view" model="ir.ui.view">
             <field name="name">product.uom.categ.form</field>
             <field name="model">product.uom.categ</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Units of Measure categories" version="7.0">
                     <group>
@@ -522,7 +511,6 @@
         <record id="product_ul_form_view" model="ir.ui.view">
             <field name="name">product.ul.form.view</field>
             <field name="model">product.ul</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Packaging" version="7.0">
                     <group>
@@ -535,7 +523,6 @@
         <record id="product_ul_tree" model="ir.ui.view">
             <field name="name">product.ul.tree</field>
             <field name="model">product.ul</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Packaging">
                     <field name="name"/>
@@ -565,7 +552,6 @@
         <record id="product_packaging_tree_view" model="ir.ui.view">
             <field name="name">product.packaging.tree.view</field>
             <field name="model">product.packaging</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Packaging">
                     <field name="sequence" invisible="1"/>
@@ -579,7 +565,6 @@
         <record id="product_packaging_form_view" model="ir.ui.view">
             <field name="name">product.packaging.form.view</field>
             <field name="model">product.packaging</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Packaging" version="7.0">
                     <group col="4">
@@ -609,7 +594,6 @@
         <record id="product_supplierinfo_form_view" model="ir.ui.view">
             <field name="name">product.supplierinfo.form.view</field>
             <field name="model">product.supplierinfo</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Supplier Information" version="7.0">
                     <group col="4">
@@ -640,7 +624,6 @@
         <record id="product_supplierinfo_tree_view" model="ir.ui.view">
             <field name="name">product.supplierinfo.tree.view</field>
             <field name="model">product.supplierinfo</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Supplier Information">
                     <field name="sequence" string="Seq"/>
@@ -655,7 +638,6 @@
         <record id="product_variant_form_view" model="ir.ui.view">
             <field name="name">product.variant.form</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Variant" version="7.0">
                     <group col="4">
@@ -673,7 +655,6 @@
         <record id="product_variant_tree_view" model="ir.ui.view">
             <field name="name">product.variant.tree</field>
             <field name="model">product.product</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Product Variant">
                     <field name="product_tmpl_id"/>
@@ -689,7 +670,6 @@
         <record id="product_template_tree_view" model="ir.ui.view">
             <field name="name">product.template.product.tree</field>
             <field name="model">product.template</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Product Template">
                     <field name="name"/>
@@ -703,7 +683,6 @@
         <record id="product_template_form_view" model="ir.ui.view">
             <field name="name">product.template.product.form</field>
             <field name="model">product.template</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Template" version="7.0">
                     <label for="name" class="oe_edit_only"/>
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index dbc57c4f6e7..2de5859bd78 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -7,7 +7,6 @@
         <record id="view_product_price_list" model="ir.ui.view">
               <field name="name">Price per unit</field>
               <field name="model">product.price_list</field>
-              <field name="type">form</field>
               <field name="arch" type="xml">
                 <form string="Price List" version="7.0">
                     <group string="Calculate Product Price per Unit Based on Pricelist Version.">
diff --git a/addons/product_expiry/product_expiry_view.xml b/addons/product_expiry/product_expiry_view.xml
index 3e2d6573443..f883ca55fe0 100644
--- a/addons/product_expiry/product_expiry_view.xml
+++ b/addons/product_expiry/product_expiry_view.xml
@@ -5,7 +5,6 @@
             <field name="name">stock.production.lot.form</field>
             <field name="model">stock.production.lot</field>
             <field name="inherit_id" ref="stock.view_production_lot_form" />
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="date" position="after">
                     <field name="life_date" />
@@ -21,7 +20,6 @@
             <field name="name">product.normal.form</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view" />
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Dates">
diff --git a/addons/product_manufacturer/product_manufacturer_view.xml b/addons/product_manufacturer/product_manufacturer_view.xml
index 655dc841d17..5f620747d64 100644
--- a/addons/product_manufacturer/product_manufacturer_view.xml
+++ b/addons/product_manufacturer/product_manufacturer_view.xml
@@ -6,7 +6,6 @@
             <field name="name">product.normal.form</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view" />
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Manufacturer">
@@ -31,7 +30,6 @@
         <record model="ir.ui.view" id="product_manufacturer_attribute_tree_view">
             <field name="name">product.manufacturer.attribute.tree</field>
             <field name="model">product.manufacturer.attribute</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Product Attributes" editable="bottom">
                     <field name="name"/>
@@ -42,7 +40,6 @@
         <record model="ir.ui.view" id="product_manufacturer_attribute_form_view">
             <field name="name">product.manufacturer.attribute.form</field>
             <field name="model">product.manufacturer.attribute</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Template Name" version="7.0">
                     <group>
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index c3dc2526e63..3ebdf252e8e 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -4,7 +4,6 @@
     <record model="ir.ui.view" id="view_product_margin_graph">
             <field name="name">product.margin.graph</field>
             <field name="model">product.product</field>
-            <field name="type">graph</field>
             <field name="priority" eval="50"/>
             <field name="arch" type="xml">
                 <graph string="Product Margins" type="bar">
@@ -18,7 +17,6 @@
      <record id="view_product_margin_form" model="ir.ui.view">
             <field name="name">product.margin.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="priority">50</field>
             <field name="arch" type="xml">
                  <form string="Product Margins" version="7.0">
@@ -65,7 +63,6 @@
         <record id="view_product_margin_tree" model="ir.ui.view">
             <field name="name">product.margin.tree</field>
             <field name="model">product.product</field>
-            <field name="type">tree</field>
             <field name="priority" eval="50"/>
             <field name="arch" type="xml">
                 <tree string="Product Margins">
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index f174c6af445..7c11133ce7d 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -4,7 +4,6 @@
          <record id="product_margin_form_view" model="ir.ui.view">
             <field name="name">product.margin.form</field>
             <field name="model">product.margin</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Properties categories" version="7.0">
                     <group col="4" string="General Information">
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 9e532438a7c..2023ba5a0b9 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -5,7 +5,6 @@
         <record id="view_task_tree" model="ir.ui.view">
             <field name="name">project.task.tree</field>
             <field name="model">project.task</field>
-            <field name="type">tree</field>
             <field eval="99" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="red:date_deadline&lt;current_date;blue:date_deadline==current_date;black:date_deadline&gt;current_date" string="My Tasks">
@@ -34,7 +33,6 @@
         <record id="board_project_form" model="ir.ui.view">
             <field name="name">board.project.form</field>
             <field name="model">board.board</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="My Board" version="7.0">
                     <board style="2-1">
diff --git a/addons/project/project.py b/addons/project/project.py
index a3f1c85bb7e..fcc340d94ec 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -267,6 +267,7 @@ class project(osv.osv):
         'type_ids': _get_type_common,
         'alias_model': 'project.task',
         'privacy_visibility': 'public',
+        'alias_domain': False, # always hide alias during creation
     }
 
     # TODO: Why not using a SQL contraints ?
@@ -337,11 +338,11 @@ class project(osv.osv):
         context['active_test'] = False
         default['state'] = 'open'
         default['tasks'] = []
-        default['alias_id'] = False
+        default.pop('alias_name', None)
+        default.pop('alias_id', None)
         proj = self.browse(cr, uid, id, context=context)
         if not default.get('name', False):
             default['name'] = proj.name + _(' (copy)')
-        default['alias_name'] = default['name']
         res = super(project, self).copy(cr, uid, id, default, context)
         self.map_tasks(cr,uid,id,res,context)
         return res
@@ -527,11 +528,13 @@ def Project():
         context = dict(context, project_creation_in_progress=True)
         mail_alias = self.pool.get('mail.alias')
         if not vals.get('alias_id'):
-            name = vals.pop('alias_name', None) or vals['name']
-            alias_id = mail_alias.create_unique_alias(cr, uid,
-                    {'alias_name': "project_"+short_name(name)},
-                    model_name=vals.get('alias_model', 'project.task'),
-                    context=context)
+            vals.pop('alias_name', None) # prevent errors during copy()
+            alias_id = mail_alias.create_unique_alias(cr, uid, 
+                          # Using '+' allows using subaddressing for those who don't
+                          # have a catchall domain setup.
+                          {'alias_name': "project+"+short_name(vals['name'])},
+                          model_name=vals.get('alias_model', 'project.task'),
+                          context=context)
             vals['alias_id'] = alias_id
         project_id = super(project, self).create(cr, uid, vals, context)
         mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'project_id': project_id} }, context)
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 41e9ae51923..7d78a040b7e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -61,7 +61,6 @@
         <record id="edit_project" model="ir.ui.view">
             <field name="name">project.project.form</field>
             <field name="model">project.project</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
@@ -82,7 +81,7 @@
                         <field name="name" string="Project Name"/>
                     </h1>
                     <div attrs="{'invisible': [('alias_domain', '=', False)]}">
-                        <field name="alias_id" invisible="1"/>
+                        <field name="alias_id" invisible="1" required="0"/>
                         <label for="alias_name" class="oe_edit_only "/>
                         <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
                     </div>
@@ -157,7 +156,6 @@
        <record id="view_project_project_filter" model="ir.ui.view">
             <field name="name">project.project.select</field>
             <field name="model">project.project</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Project">
                     <field name="complete_name" string="Project Name"/>
@@ -184,7 +182,6 @@
         <record id="view_project" model="ir.ui.view">
             <field name="name">project.project.tree</field>
             <field name="model">project.project</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree fonts="bold:needaction_pending==True" colors="red:date and (date&lt;current_date) and (state == 'open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
@@ -216,7 +213,6 @@
         <record model="ir.ui.view" id="view_project_kanban">
             <field name="name">project.project.kanban</field>
             <field name="model">project.project</field>
-            <field name="type">kanban</field>
             <field name="arch" type="xml">
                 <kanban>
                     <field name="effective_hours"/>
@@ -277,7 +273,6 @@
        <record id="view_project_project_gantt" model="ir.ui.view">
             <field name="name">project.project.gantt</field>
             <field name="model">project.project</field>
-            <field name="type">gantt</field>
             <field name="arch" type="xml">
                 <gantt date_delay="planned_hours" date_start="date_start" string="Projects">
                 </gantt>
@@ -321,7 +316,6 @@
         <record id="view_task_work_form" model="ir.ui.view">
             <field name="name">project.task.work.form</field>
             <field name="model">project.task.work</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Task Work" version="7.0">
                     <group col="4">
@@ -338,7 +332,6 @@
         <record id="view_task_work_tree" model="ir.ui.view">
             <field name="name">project.task.work.tree</field>
             <field name="model">project.task.work</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="top" string="Task Work">
                     <field name="date"/>
@@ -391,7 +384,6 @@
         <record id="view_task_form2" model="ir.ui.view">
             <field name="name">project.task.form</field>
             <field name="model">project.task</field>
-            <field name="type">form</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
@@ -498,7 +490,6 @@
         <record model="ir.ui.view" id="view_task_kanban">
             <field name="name">project.task.kanban</field>
             <field name="model">project.task</field>
-            <field name="type">kanban</field>
             <field name="arch" type="xml">
                 <kanban default_group_by="stage_id" >
                     <field name="color"/>
@@ -576,7 +567,6 @@
         <record id="view_task_tree2" model="ir.ui.view">
             <field name="name">project.task.tree</field>
             <field name="model">project.task</field>
-            <field name="type">tree</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <tree fonts="bold:needaction_pending==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
@@ -603,7 +593,6 @@
         <record id="view_task_calendar" model="ir.ui.view">
             <field name="name">project.task.calendar</field>
             <field name="model">project.task</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_deadline" string="Tasks">
@@ -616,7 +605,6 @@
         <record id="view_task_gantt" model="ir.ui.view">
             <field name="name">project.task.gantt</field>
             <field name="model">project.task</field>
-            <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <gantt date_start="date_start" date_stop="date_end" string="Tasks" default_group_by="project_id">
@@ -627,7 +615,6 @@
         <record id="view_project_task_graph" model="ir.ui.view">
             <field name="name">project.task.graph</field>
             <field name="model">project.task</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Project Tasks" type="bar">
                     <field name="project_id"/>
@@ -640,7 +627,6 @@
         <record id="view_task_search_form" model="ir.ui.view">
             <field name="name">project.task.search.form</field>
             <field name="model">project.task</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                <search string="Tasks">
                     <field name="name" string="Tasks"/>
@@ -675,7 +661,6 @@
         <record id="analytic_account_inherited_form" model="ir.ui.view">
             <field name="name">account.analytic.account.form.inherit</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
@@ -751,7 +736,6 @@
         <record id="task_type_search" model="ir.ui.view">
             <field name="name">project.task.type.search</field>
             <field name="model">project.task.type</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks Stages">
                    <field name="name" string="Tasks Stages"/>
@@ -763,7 +747,6 @@
         <record id="task_type_edit" model="ir.ui.view">
             <field name="name">project.task.type.form</field>
             <field name="model">project.task.type</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Task Stage" version="7.0">
                     <group>
@@ -785,7 +768,6 @@
         <record id="task_type_tree" model="ir.ui.view">
             <field name="name">project.task.type.tree</field>
             <field name="model">project.task.type</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Task Stage">
                     <field name="sequence"/>
@@ -824,7 +806,6 @@
          <record id="task_company" model="ir.ui.view">
             <field name="name">res.company.task.config</field>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='account_grp']" position="after">
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index ae87b3f2fe2..8fd9c3ee1b6 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -5,7 +5,6 @@
         <record id="view_task_history_tree" model="ir.ui.view">
             <field name="name">project.task.history.cumulative.tree</field>
             <field name="model">project.task.history.cumulative</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Tasks's Cumulative Flow">
                     <field name="date"/>
@@ -22,7 +21,6 @@
         <record id="view_task_history_graph" model="ir.ui.view">
             <field name="name">project.task.history.cumulative.graph</field>
             <field name="model">project.task.history.cumulative</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Project Tasks" type="bar">
                     <field name="date"/>
@@ -37,7 +35,6 @@
         <!--<record id="view_task_history_burndown_graph" model="ir.ui.view">-->
         <!--    <field name="name">project.task.history.burndown.graph</field>-->
         <!--    <field name="model">project.task.history.burndown</field>-->
-        <!--    <field name="type">graph</field>-->
         <!--    <field name="arch" type="xml">-->
         <!--        <graph string="Burndown Chart of Tasks" type="bar">-->
         <!--            <field name="date"/>-->
@@ -51,7 +48,6 @@
         <record id="view_task_history_search" model="ir.ui.view">
             <field name="name">project.task.history.cumulative.search</field>
             <field name="model">project.task.history.cumulative</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Task's Analysis">
                     <field name="date"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 9383a588e3a..5d6132b1b8f 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -9,7 +9,6 @@
         <record id="view_task_project_user_tree" model="ir.ui.view">
             <field name="name">report.project.task.user.tree</field>
             <field name="model">report.project.task.user</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Tasks Analysis">
                     <field name="name" invisible="1"/>
@@ -42,7 +41,6 @@
         <record id="view_task_project_user_graph" model="ir.ui.view">
             <field name="name">report.project.task.user.graph</field>
             <field name="model">report.project.task.user</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Tasks Analysis" type="bar">
                      <field name="name"/>
@@ -55,7 +53,6 @@
         <record id="view_task_project_user_search" model="ir.ui.view">
             <field name="name">report.project.task.user.search</field>
             <field name="model">report.project.task.user</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
                     <field name="date_start"/>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index a3783bc7e3b..821d7a58fd4 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -17,7 +17,6 @@
         <record id="view_config_settings" model="ir.ui.view">
             <field name="name">project settings</field>
             <field name="model">project.config.settings</field>
-            <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <form string="Configure Project" version="7.0" class="oe_form_configuration">
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index e16c18d1582..d668e3c7092 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -6,7 +6,6 @@
         <record id="view_task_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.task.info.inherit</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//page[@name='page_history']" position="attributes">
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 4bd7e4b5b1d..700740d12f3 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -5,7 +5,6 @@
         <record id="view_project_task_delegate" model="ir.ui.view">
             <field name="name">Project Task Delegate</field>
             <field name="model">project.task.delegate</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
                     <group>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 84436c045a6..6dfe58e8cfd 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -5,7 +5,6 @@
     <record id="view_project_task_reevaluate" model="ir.ui.view">
             <field name="name">Re-evaluate Task</field>
             <field name="model">project.task.reevaluate</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
                     <separator string="Reevaluation Task"/>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index a76b90e2f08..fdb8ae8495c 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -4,7 +4,6 @@
     <record model="ir.ui.view" id="view_gtd_context_tree">
         <field name="name">project.gtd.context.tree</field>
         <field name="model">project.gtd.context</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Context">
                 <field name="sequence" invisible="1"/>
@@ -16,7 +15,6 @@
     <record model="ir.ui.view" id="view_gtd_context_form">
         <field name="name">project.gtd.context.form</field>
         <field name="model">project.gtd.context</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Context" version="7.0">
                 <group col="4">
@@ -39,7 +37,6 @@
     <record model="ir.ui.view" id="view_gtd_timebox_tree">
         <field name="name">project.gtd.timebox.tree</field>
         <field name="model">project.gtd.timebox</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Timebox">
                 <field name="sequence" invisible="1"/>
@@ -52,7 +49,6 @@
     <record model="ir.ui.view" id="view_gtd_timebox_form">
         <field name="name">project.gtd.timebox.form</field>
         <field name="model">project.gtd.timebox</field>
-        <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Timeboxes" version="7.0">
                 <group col="4" string="Timebox Definition">
@@ -78,7 +74,6 @@
     <record model="ir.ui.view" id="project_task_tree">
         <field name="name">project.task.tree.timebox</field>
         <field name="model">project.task</field>
-        <field name="type">tree</field>
         <field name="inherit_id" ref="project.view_task_tree2" />
         <field name="arch" type="xml">
             <field name="remaining_hours" position="after">
@@ -94,7 +89,6 @@
     <record model="ir.ui.view" id="project_task">
         <field name="name">project.task.form.timebox</field>
         <field name="model">project.task</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="project.view_task_form2" />
         <field name="arch" type="xml">
             <field name="progress" position="after">
@@ -107,7 +101,6 @@
     <record id="view_task_gtd_search" model="ir.ui.view">
         <field name="name">project.task.gtd.search</field>
         <field name="model">project.task</field>
-        <field name="type">search</field>
         <field name="priority">50</field>
         <field name="arch" type="xml">
            <search string="My Tasks">
diff --git a/addons/project_gtd/wizard/project_gtd_empty_view.xml b/addons/project_gtd/wizard/project_gtd_empty_view.xml
index e166d997226..053c0013e73 100644
--- a/addons/project_gtd/wizard/project_gtd_empty_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_empty_view.xml
@@ -5,7 +5,6 @@
         <record id="view_project_gtd_empty" model="ir.ui.view">
             <field name="name">Empty Timebox</field>
             <field name="model">project.timebox.empty</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Empty Timebox" version="7.0">
                     <label string="Timebox Empty Process Completed Successfully." />
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index 7b01dc519c3..8807c00a76b 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -5,7 +5,6 @@
         <record id="view_project_gtd_fill" model="ir.ui.view">
             <field name="name">Plannify Timebox</field>
             <field name="model">project.timebox.fill.plan</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Plannify Timebox" version="7.0">
                       <group col="4">
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 8bc34177d7d..3b4fa57fc58 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="project_issue_board_tree_view">
             <field name="name">Project Issue Board Tree</field>
             <field name="model">project.issue</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Issue Tracker Tree" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
                     <field name="id"/>
@@ -36,7 +35,6 @@
         <record id="board_my_project_issue_form" model="ir.ui.view">
             <field name="name">board.my.project.issue.form.inherit</field>
             <field name="model">board.board</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.board_project_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/board/column/action[@string='My Tasks']" position="after">
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index ace56a1df91..74298223ed3 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -267,9 +267,6 @@ class project_issue(base_stage, osv.osv):
             }),
     }
 
-    def on_change_project(self, cr, uid, ids, project_id, context=None):
-        return {}
-
     _defaults = {
         'active': 1,
         'partner_id': lambda s, cr, uid, c: s._get_default_partner(cr, uid, c),
@@ -496,7 +493,7 @@ class project_issue(base_stage, osv.osv):
                 key = maps.get(res.group(1).lower())
                 update_vals[key] = res.group(2).lower()
 
-        return super(project_issue, self).message_update(cr, uid, ids, update_vals=update_vals, context=context)
+        return super(project_issue, self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
 
     # -------------------------------------------------------
     # OpenChatter methods and notifications
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 0322a9d8f26..08a2ae0b1d0 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -44,7 +44,6 @@
         <record model="ir.ui.view" id="project_issue_version_search_view">
             <field name="name">Issue Version</field>
             <field name="model">project.issue.version</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Issue Version">
                     <field name="name" string="Issue Version"/>
@@ -55,7 +54,6 @@
         <record model="ir.ui.view" id="project_issue_version_form_view">
             <field name="name">Issue Version</field>
             <field name="model">project.issue.version</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Issue Version" version="7.0">
                     <group col="2">
@@ -94,9 +92,8 @@
         <record model="ir.ui.view" id="project_issue_form_view">
             <field name="name">Project Issue Tracker Form</field>
             <field name="model">project.issue</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Issue" version="7.0">
                 <header>
                     <span groups="base.group_user">
                         <button name="case_close" string="Done" type="object"
@@ -171,7 +168,6 @@
         <record model="ir.ui.view" id="project_issue_tree_view">
             <field name="name">Project Issue Tracker Tree</field>
             <field name="model">project.issue</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Issue Tracker Tree" fonts="bold:needaction_pending==True" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
                     <field name="needaction_pending" invisible="1"/>
@@ -195,7 +191,6 @@
         <record id="view_project_issue_filter" model="ir.ui.view">
             <field name="name">Project Issue Tracker Search</field>
             <field name="model">project.issue</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
@@ -226,7 +221,6 @@
         <record model="ir.ui.view" id="project_issue_calendar_view">
             <field name="name">Project Issue Tracker Calendar</field>
             <field name="model">project.issue</field>
-            <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <calendar string="Issues" date_start="date" color="user_id" date_delay="duration">
@@ -242,7 +236,6 @@
         <record model="ir.ui.view" id="project_issue_kanban_view">
             <field name="name">Project Issue Kanban</field>
             <field name="model">project.issue</field>
-            <field name="type">kanban</field>
             <field name="arch" type="xml">
                 <kanban default_group_by="stage_id">
                     <field name="color"/>
@@ -315,7 +308,6 @@
         <record model="ir.ui.view" id="project_feature_tree_view">
             <field name="name">Project Issue- Feature Tracker Tree</field>
             <field name="model">project.issue</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Feature Tracker Tree" fonts="bold:needaction_pending==True" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                     <field name="id"/>
@@ -334,7 +326,6 @@
         <record id="view_project_feature_filter" model="ir.ui.view">
             <field name="name">Project Issue - Feature Tracker Search</field>
             <field name="model">project.issue</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Feature Tracker Search">
                     <field name="name" string="Feature description"/>
@@ -360,7 +351,6 @@
         <record id="view_project_form_inherited" model="ir.ui.view">
             <field name="name">project.project.form.inherited</field>
             <field name="model">project.project</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
@@ -381,7 +371,6 @@
         <record id="view_project_kanban_inherited" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
             <field name="model">project.project</field>
-            <field name="type">kanban</field>
             <field name="inherit_id" ref="project.view_project_kanban"/>
             <field name="arch" type="xml">
                 <field name="use_tasks" position="after">
@@ -399,7 +388,6 @@
         <record id="analytic_account_inherited_issue_form" model="ir.ui.view">
             <field name="name">account.analytic.account.issue.form.inherit</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.analytic_account_inherited_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 076e542b827..625e6e64374 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -5,7 +5,6 @@
         <record id="view_project_issue_report_tree" model="ir.ui.view">
             <field name="name">project.issue.report.tree</field>
             <field name="model">project.issue.report</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Issues Analysis">
                     <field name="name" invisible="1"/>
@@ -35,7 +34,6 @@
         <record id="view_project_issue_report_graph" model="ir.ui.view">
             <field name="name">project.issue.report.graph</field>
             <field name="model">project.issue.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Project Issue" type="bar">
                     <field name="state"/>
@@ -48,7 +46,6 @@
         <record id="view_project_issue_report_filter" model="ir.ui.view">
             <field name="name">project.issue.report.select</field>
             <field name="model">project.issue.report</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
                     <field name="creation_date"/>
diff --git a/addons/project_issue/res_config_view.xml b/addons/project_issue/res_config_view.xml
index 956106b6d6b..a37b2ba0c3d 100644
--- a/addons/project_issue/res_config_view.xml
+++ b/addons/project_issue/res_config_view.xml
@@ -12,7 +12,6 @@
         <record id="view_config_settings" model="ir.ui.view">
             <field name="name">Project Application</field>
             <field name="model">project.config.settings</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.view_config_settings"/>
             <field name="arch" type="xml">
                 <div name="module_project_issue_sheet" position="after">
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index cb2d1f70c96..4fc12ab0747 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -5,7 +5,6 @@
             <field name="name">Project Issue Tracker Form</field>
             <field name="model">project.issue</field>
             <field name="inherit_id" ref="project_issue.project_issue_form_view" />
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="project_id" position="attributes">
                     <attribute name="on_change">on_change_project(project_id)</attribute>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 3b814cbab6e..b4b98e8fe4a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -8,7 +8,6 @@
         <record id="view_project_user_allocation_gantt" model="ir.ui.view">
             <field name="name">project.user.allocation.gantt</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">gantt</field>
             <field name="arch" type="xml">
               <gantt date_start="date_start" date_stop="date_end" default_group_by="user_id">
               </gantt>
@@ -18,7 +17,6 @@
         <record id="view_project_user_allocation_calendar" model="ir.ui.view">
             <field name="name">project.user.allocation.calendar</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_start" date_stop="date_end" day_length="12" string="Users">
@@ -32,7 +30,6 @@
         <record id="view_project_user_allocation_form" model="ir.ui.view">
             <field name="name">project.user.allocation.form</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project User Allocation" version="7.0">
                     <group col="4">
@@ -49,7 +46,6 @@
         <record id="view_project_user_allocation_list" model="ir.ui.view">
             <field name="name">project.user.allocation.list</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Project User Allocation">
@@ -63,7 +59,6 @@
        <record id="view_project_user_allocation_search" model="ir.ui.view">
             <field name="name">project.user.allocation.search</field>
             <field name="model">project.user.allocation</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Planning of Users">
                     <field name="user_id"/>
@@ -99,7 +94,6 @@
         <record id="project_phase_form" model="ir.ui.view">
             <field name="name">Inherit project form : Phase</field>
             <field name="model">project.project</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
@@ -114,7 +108,6 @@
         <record id="view_project_kanban_phase" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
             <field name="model">project.project</field>
-            <field name="type">kanban</field>
             <field name="inherit_id" ref="project.view_project_kanban"/>
             <field name="arch" type="xml">
                 <field name="use_tasks" position="after">
@@ -131,7 +124,6 @@
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
             <field name="model">project.phase</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project Phase" version="7.0">
                 <header>
@@ -220,7 +212,6 @@
         <record id="view_project_phase_list" model="ir.ui.view">
             <field name="name">project.phase.list</field>
             <field name="model">project.phase</field>
-            <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state in ('cancelled','done');blue:state == 'pending'" string="Project Phases">
@@ -237,7 +228,6 @@
         <record id="view_project_phase_calendar" model="ir.ui.view">
             <field name="name">project.phase.calendar</field>
             <field name="model">project.phase</field>
-            <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="project_id" date_start="date_start" date_stop="date_end" day_length="12">
@@ -249,7 +239,6 @@
         <record id="view_project_phase_gantt" model="ir.ui.view">
             <field name="name">project.phase.gantt</field>
             <field name="model">project.phase</field>
-            <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <gantt date_stop="date_end" date_start="date_start" default_group_by="project_id">
@@ -260,7 +249,6 @@
         <record id="view_project_phase_search" model="ir.ui.view">
             <field name="name">project.phase.search</field>
             <field name="model">project.phase</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <field name="name" string="Project Phases"/>
@@ -305,7 +293,6 @@
         <record id="view_phase_task_form2" model="ir.ui.view">
             <field name="name">phase.task.form2</field>
             <field name="model">project.task</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='user_id']" position="after">
@@ -316,7 +303,6 @@
         <record id="view_phase_task_search_form" model="ir.ui.view">
             <field name="name">phase.task.search.form</field>
             <field name="model">project.task</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="before">
@@ -328,7 +314,6 @@
          <record id="view_phase_task_search_form_group" model="ir.ui.view">
             <field name="name">phase.task.search.form.group</field>
             <field name="model">project.task</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
             <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" position="after">
@@ -340,7 +325,6 @@
          <record id="view_phase_task_search_form_tree" model="ir.ui.view">
             <field name="name">phase.task.search.form.tree</field>
             <field name="model">project.task</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="project.view_task_tree2"/>
             <field name="arch" type="xml">
                 <field name="project_id" position="after">
@@ -360,7 +344,6 @@
         <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
             <field name="name">account.analytic.account.phase.form.inherit</field>
             <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 0d5c81984ba..c9fcf5aca70 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -5,7 +5,6 @@
         <record id="view_project_compute_phases_select" model="ir.ui.view">
             <field name="name">Schedule Phases</field>
             <field name="model">project.compute.phases</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
                       <group>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 8eb9db762dd..8b807806cde 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -5,7 +5,6 @@
         <record id="view_project_compute_tasks" model="ir.ui.view">
             <field name="name">Schedule Tasks</field>
             <field name="model">project.compute.tasks</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
                      <group>
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index 93417cf2ac8..ffceb33a611 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -4,7 +4,6 @@
         <record id="view_procurement_task_form" model="ir.ui.view">
             <field name="name">procurement.procurement.form.view.inherit</field>
             <field name="model">procurement.order</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="procurement.procurement_form_view"/>
             <field name="arch" type="xml">
                 <field name="close_move" position="after">
@@ -15,7 +14,6 @@
         <record id="view_product_task_form" model="ir.ui.view">
             <field name="name">product.form.view.inherit</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="active" position="after">
@@ -26,7 +24,6 @@
         <record id="view_project_mrp_inherit_form2" model="ir.ui.view">
             <field name="name">project.mrp.form.view.inherit</field>
             <field name="model">project.task</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
                 <field name="state" position="after">
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 1c6ba1a05f4..c47c411f6c9 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -5,7 +5,6 @@
         <record id="view_project_kanban_inherited" model="ir.ui.view">
             <field name="name">project.project.kanban.inherited</field>
             <field name="model">project.project</field>
-            <field name="type">kanban</field>
             <field name="inherit_id" ref="project.view_project_kanban"/>
             <field name="arch" type="xml">
                 <field name="use_tasks" position="after">
@@ -32,7 +31,6 @@
         <record id="project_invoice_form_cutomer" model="ir.ui.view">
             <field name="name">Inherit project form : Customer</field>
             <field name="model">project.project</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="analytic_contract_project.project_invoice_form"/>
             <field name="arch" type="xml">
                 <field name="partner_id" position="replace">
@@ -44,7 +42,6 @@
         <record id="project_invoice_search" model="ir.ui.view">
             <field name="name">Inherit project search view : Invoicing Data</field>
             <field name="model">project.project</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="project.view_project_project_filter"/>
             <field name="arch" type="xml">
                 <xpath expr='//filter[@string="Project(s) Manager"]' position='after'>
@@ -56,7 +53,6 @@
         <record id="view_account_analytic_line_search_account_inherit" model="ir.ui.view">
             <field name="name">account.analytic.line.search.account_id</field>
             <field name="model">account.analytic.line</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
                  <field name="account_id" position="replace">
@@ -67,7 +63,6 @@
         <record id="view_account_analytic_line_form_inherit_account_id" model="ir.ui.view">
             <field name="name">account.analytic.line.form.account_id</field>
             <field name="model">account.analytic.line</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id"  position="replace">
@@ -78,7 +73,6 @@
        <record id="view_account_analytic_line_tree_inherit_account_id" model="ir.ui.view">
             <field name="name">account.analytic.line.tree.account_id</field>
             <field name="model">account.analytic.line</field>
-            <field name="type">tree</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
             <field name="arch" type="xml">
                 <field name="account_id"  position="replace">
diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml
index 32f8719e9a3..2c8a34c656e 100644
--- a/addons/project_timesheet/report/task_report_view.xml
+++ b/addons/project_timesheet/report/task_report_view.xml
@@ -12,7 +12,6 @@
         <record id="view_report_timesheet_task_user_tree" model="ir.ui.view">
             <field name="name">report.timesheet.task.user.tree</field>
             <field name="model">report.timesheet.task.user</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Timesheet/Task hours Report Per Month" >
                     <field name="name"/>
@@ -27,7 +26,6 @@
       <record id="view_report_timesheet_task_user_search" model="ir.ui.view">
             <field name="name">report.timesheet.task.user.search</field>
             <field name="model">report.timesheet.task.user</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Tasks by User">
                     <field name="name" string="Date"/>
@@ -44,7 +42,6 @@
         <record id="view_task_hour_per_month_graph" model="ir.ui.view">
             <field name="name">report.timesheet.task.user.graph</field>
             <field name="model">report.timesheet.task.user</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Task Hours Per Month" type="bar">
                      <field name="user_id"/>
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index c76defe468f..67c3981f383 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -15,7 +15,6 @@
         <record model="ir.ui.view" id="view_purchase_order_monthly_categ_tree">
             <field name="name">purchase.order.monthly.categ.tree</field>
             <field name="model">purchase.report</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Monthly Purchase by Category">
                     <field name="month"/>
@@ -38,7 +37,6 @@
         <record model="ir.ui.view" id="view_purchase_order_monthly_categ_graph">
             <field name="name">purchase.order.monthly.categ.graph</field>
             <field name="model">purchase.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Monthly Purchase by Category" type="bar">
                     <field name="month"/>
@@ -60,7 +58,6 @@
         <record id="board_purchase_form" model="ir.ui.view">
             <field name="name">board.purchase.form</field>
             <field name="model">board.board</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Purchase Dashboard" version="7.0">
                     <board style="2-1">
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
index 30c6bfa1abf..e35bf1c24b5 100644
--- a/addons/purchase/company_view.xml
+++ b/addons/purchase/company_view.xml
@@ -5,7 +5,6 @@
         <record id="mrp_company" model="ir.ui.view">
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="priority">19</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 7cd0a790e17..da1f841ba9e 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -4,7 +4,6 @@
         <record id="view_partner_property_form" model="ir.ui.view">
             <field name="name">res.partner.purchase.property.form.inherit</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="priority">36</field>
             <field name="arch" type="xml">
@@ -34,7 +33,6 @@
         <record model="ir.ui.view" id="purchase_partner_kanban_view">
             <field name="name">res.partner.kanban.purchaseorder.inherit</field>
             <field name="model">res.partner</field>
-            <field name="type">kanban</field>
             <field name="inherit_id" ref="base.res_partner_kanban_view"/>
             <field name="arch" type="xml">
                 <field name="mobile" position="after">
@@ -67,7 +65,6 @@
         <record id="res_partner_view_purchase_buttons" model="ir.ui.view">
             <field name="name">res.partner.view.purchase.buttons</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 47216a11cac..6730e32913e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -151,7 +151,6 @@
         <record model="ir.ui.view" id="purchase_order_calendar">
             <field name="name">purchase.order.calendar</field>
             <field name="model">purchase.order</field>
-            <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <calendar string="Calendar View" date_start="minimum_planned_date" color="partner_id">
@@ -164,7 +163,6 @@
         <record model="ir.ui.view" id="purchase_order_graph">
             <field name="name">purchase.order.graph</field>
             <field name="model">purchase.order</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Purchase Order" type="bar">
                     <field name="partner_id"/>
@@ -176,7 +174,6 @@
         <record id="purchase_order_form" model="ir.ui.view">
             <field name="name">purchase.order.form</field>
             <field name="model">purchase.order</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Purchase Order" version="7.0">
                 <header>
@@ -273,7 +270,6 @@
        <record id="view_request_for_quotation_filter" model="ir.ui.view">
             <field name="name">request.quotation.select</field>
             <field name="model">purchase.order</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                     <field name="name" string="Reference"/>
@@ -299,7 +295,6 @@
         <record id="view_purchase_order_filter" model="ir.ui.view">
             <field name="name">purchase.order.list.select</field>
             <field name="model">purchase.order</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                     <field name="name" string="Reference"/>
@@ -327,7 +322,6 @@
         <record id="purchase_order_tree" model="ir.ui.view">
             <field name="name">purchase.order.tree</field>
             <field name="model">purchase.order</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree fonts="bold:needaction_pending==True" colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
                     <field name="needaction_pending" invisible="1"/>
@@ -391,7 +385,6 @@
         <record id="purchase_order_line_form" model="ir.ui.view">
             <field name="name">purchase.order.line.form</field>
             <field name="model">purchase.order.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Purchase Order Line" version="7.0">
                     <sheet>
@@ -428,7 +421,6 @@
         <record id="purchase_order_line_tree" model="ir.ui.view">
             <field name="name">purchase.order.line.tree</field>
             <field name="model">purchase.order.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Purchase Order Lines">
                     <field name="order_id"/>
@@ -448,7 +440,6 @@
         <record id="purchase_order_line_form2" model="ir.ui.view">
             <field name="name">purchase.order.line.form2</field>
             <field name="model">purchase.order.line</field>
-            <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <form string="Purchase Order Line" version="7.0">
@@ -492,7 +483,6 @@
           <record id="purchase_order_line_search" model="ir.ui.view">
             <field name="name">purchase.order.line.search</field>
             <field name="model">purchase.order.line</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                     <field name="order_id"/>
@@ -558,7 +548,6 @@
             <field name="name">procurement.order.form.inherit</field>
             <field name="model">procurement.order</field>
             <field name="inherit_id" ref="procurement.procurement_form_view"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='close_move']" position="before">
                     <field name="purchase_id"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index aa915c620f5..842de65b68e 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="view_purchase_order_graph">
             <field name="name">product.month.graph</field>
             <field name="model">purchase.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Purchase Orders Statistics" type="bar">
                     <field name="product_id"/>
@@ -16,7 +15,6 @@
         <record id="view_purchase_order_tree" model="ir.ui.view">
             <field name="name">purchase.order.tree</field>
             <field name="model">purchase.report</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Purchase Orders Statistics">
                     <field name="date" invisible="1"/>
@@ -50,7 +48,6 @@
         <record id="view_purchase_order_search" model="ir.ui.view">
         <field name="name">report.purchase.order.search</field>
         <field name="model">purchase.report</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Purchase Orders">
                 <filter icon="terp-document-new" string="Quotations" name="quotes" domain="[('state','=','draft')]"/>
@@ -92,7 +89,6 @@
     <record model="ir.ui.view" id="view_purchase_order_qty_amount_graph">
             <field name="name">purchase.order.qty.amount.graph</field>
             <field name="model">purchase.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Total Qty and Amount by month" type="bar">
                     <field name="month"/>
@@ -105,7 +101,6 @@
     <record model="ir.ui.view" id="view_purchase_order_by_user_graph">
             <field name="name">purchase.order.by.user.graph</field>
             <field name="model">purchase.report</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Total Orders Lines by User per month" orientation="vertical" type="bar">
                     <field name="month" />
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 3682c9eefee..a490bea557c 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -17,7 +17,6 @@
         <record id="view_purchase_configuration" model="ir.ui.view">
             <field name="name">purchase settings</field>
             <field name="model">purchase.config.settings</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Purchases" class="oe_form_configuration" version="7.0">
                     <header>
@@ -96,7 +95,6 @@
         <record id="view_account_config" model="ir.ui.view">
             <field name="name">account settings</field>
             <field name="model">account.config.settings</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_config_settings"/>
             <field name="priority" eval="18"/>
             <field name="arch" type="xml">
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index ffb09b669ae..ad1c26a84c1 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -4,7 +4,6 @@
         <record id="stock_move_purchase" model="ir.ui.view">
             <field name="name">stock.move.form</field>
             <field name="model">stock.move</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
                  <xpath expr="//group[@name='destination_grp']" position="inside">
@@ -15,7 +14,6 @@
         <record id="stock_picking_inherit_purchase" model="ir.ui.view">
             <field name="name">Picking list</field>
             <field name="model">stock.picking</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
                 <field name="auto_picking" position="after">
@@ -27,7 +25,6 @@
         <record id="stock_picking_in_inherit_purchase" model="ir.ui.view">
             <field name="name">Incoming Picking Inherited</field>
             <field name="model">stock.picking.in</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='date']" position="before">
@@ -43,7 +40,6 @@
         <record id="view_picking_in_search_picking_to_invoice" model="ir.ui.view">
             <field name="name">stock.picking.in.search</field>
             <field name="model">stock.picking.in</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Picking to Invoice">
                     <field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
@@ -100,7 +96,6 @@
         <record id="purchase_order_2_stock_picking" model="ir.ui.view">
             <field name="name">Purchase Picking Inherited</field>
             <field name="model">purchase.order</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="purchase.purchase_order_form"/>
             <field name="arch" type="xml">
                  <xpath expr="//div[contains(@class, 'oe_title')]" position="before">
diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml
index c15c8e4fe09..3093ec5a95a 100644
--- a/addons/purchase/wizard/purchase_line_invoice_view.xml
+++ b/addons/purchase/wizard/purchase_line_invoice_view.xml
@@ -7,7 +7,6 @@
         <record id="view_purchase_line_invoice" model="ir.ui.view">
             <field name="name">Create invoices</field>
             <field name="model">purchase.order.line_invoice</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select an Open Sale Order" version="7.0">
                     <group>
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index 17b1f7eea5f..46aecf76244 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -4,7 +4,6 @@
         <record id="view_purchase_order_group" model="ir.ui.view">
             <field name="name">Merger Purchase Orders</field>
             <field name="model">purchase.order.group</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Merge orders" version="7.0">
                     <group>
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
index 498ceb2bd0a..d224b9800f7 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
@@ -5,7 +5,6 @@
     <record model="ir.ui.view" id="purchase_order_line_form_inherit">
         <field name="name">purchase.order.line.form.inherit</field>
         <field name="model">purchase.order.line</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="purchase.purchase_order_line_form"/>
         <field name="arch" type="xml">
             <field name="account_analytic_id" position="replace">
diff --git a/addons/purchase_double_validation/board_purchase_view.xml b/addons/purchase_double_validation/board_purchase_view.xml
index d093dcc6937..0557963fcb1 100644
--- a/addons/purchase_double_validation/board_purchase_view.xml
+++ b/addons/purchase_double_validation/board_purchase_view.xml
@@ -14,7 +14,6 @@
         <record id="board_purchase_form2" model="ir.ui.view">
             <field name="name">board.purchase.form</field>
             <field name="model">board.board</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="purchase.board_purchase_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/board/column/action[@string='Request for Quotations']" position="after">
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index efba6bf9d76..5ad03705035 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -5,7 +5,6 @@
         <record id="view_double_purchase_configuration" model="ir.ui.view">
             <field name="name">Purchase Application</field>
             <field name="model">purchase.config.settings</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="purchase.view_purchase_configuration"/>
             <field name="arch" type="xml">
                 <div name="module_purchase_double_validation" position="inside">
diff --git a/addons/purchase_double_validation/purchase_double_validation_view.xml b/addons/purchase_double_validation/purchase_double_validation_view.xml
index e6b255e3245..8a22c3be868 100644
--- a/addons/purchase_double_validation/purchase_double_validation_view.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_view.xml
@@ -3,7 +3,6 @@
     <data>
      <record model="ir.ui.view" id="purchase_order_search_inherit">
         <field name="name">purchase.order.list.select.inherit</field>
-        <field name="type">form</field>
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
         <field name="arch" type="xml">
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 797494e9442..0a442c3f9aa 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -4,7 +4,6 @@
 
     <record model="ir.ui.view" id="purchase_order_form_inherit">
         <field name="name">purchase.order.form.inherit</field>
-        <field name="type">form</field>
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.purchase_order_form"/>
         <field name="arch" type="xml">
@@ -16,7 +15,6 @@
 
     <record model="ir.ui.view" id="purchase_order_search_inherit">
         <field name="name">purchase.order.list.select.inherit</field>
-        <field name="type">form</field>
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.view_purchase_order_filter"/>
         <field name="arch" type="xml">
@@ -28,7 +26,6 @@
 
     <record model="ir.ui.view" id="view_purchase_requisition_form">
         <field name="name">purchase.requisition.form</field>
-        <field name="type">form</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
             <form string="Purchase Requisition" version="7.0">
@@ -112,7 +109,6 @@
     </record>
     <record model="ir.ui.view" id="view_purchase_requisition_tree">
         <field name="name">purchase.requisition.tree</field>
-        <field name="type">tree</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
             <tree fonts="bold:needaction_pending==True" colors="grey:state == 'cancel';red:date_end and date_end&lt;current_date;black:date_end&gt;current_date;" string="Purchase Requisition">
@@ -131,7 +127,6 @@
     <record id="view_purchase_requisition_filter" model="ir.ui.view">
             <field name="name">purchase.requisition.list.select</field>
             <field name="model">purchase.requisition</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Requisition">
                     <field name="name" string="Purchase Requisition"/>
@@ -183,7 +178,6 @@
 
     <record model="ir.ui.view" id="product_normal_form_view_inherit">
         <field name="name">product.form.inherit</field>
-        <field name="type">form</field>
         <field name="model">product.product</field>
         <field name="inherit_id" ref="product.product_normal_form_view"/>
         <field name="arch" type="xml">
@@ -197,7 +191,6 @@
 
     <record model="ir.ui.view" id="procurement_normal_form_view_inherit">
         <field name="name">procurement.form.inherit</field>
-        <field name="type">form</field>
         <field name="model">procurement.order</field>
         <field name="inherit_id" ref="procurement.procurement_form_view"/>
         <field name="arch" type="xml">
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index aab257827c2..9e8c0893d30 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -4,7 +4,6 @@
         <record id="view_purchase_requisition_partner" model="ir.ui.view">
             <field name="name">Purchase Requisition</field>
             <field name="model">purchase.requisition.partner</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Purchase Requisition" version="7.0">
                     <group>
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 73cf99bec34..4f02c8f8c75 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -40,7 +40,6 @@
         <record id="view_report_intrastat_code_tree" model="ir.ui.view">
             <field name="name">report.intrastat.code.tree</field>
             <field name="model">report.intrastat.code</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Intrastat code">
                     <field name="name"/>
@@ -51,7 +50,6 @@
         <record id="view_report_intrastat_code_form" model="ir.ui.view">
             <field name="name">report.intrastat.code.form</field>
             <field name="model">report.intrastat.code</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Intrastat Code" version="7.0">
                     <group>
@@ -76,7 +74,6 @@
         <record id="view_report_intrastat_tree" model="ir.ui.view">
             <field name="name">report.intrastat.view</field>
             <field name="model">report.intrastat</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Intrastat Data">
                     <field name="name" />
@@ -96,7 +93,6 @@
         <record id="view_report_intrastat_search" model="ir.ui.view">
             <field name="name">report.intrastat.search</field>
             <field name="model">report.intrastat</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Intrastat Data">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Intrastat Data"/>
diff --git a/addons/report_webkit/company_view.xml b/addons/report_webkit/company_view.xml
index 04c21037e8e..bfbf2b2d79b 100644
--- a/addons/report_webkit/company_view.xml
+++ b/addons/report_webkit/company_view.xml
@@ -4,7 +4,6 @@
             <field name="name">res.company.form.inherit</field>
             <field name="model">res.company</field>
             <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Webkit">
diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/header_view.xml
index 0a052b8de20..30407f89385 100644
--- a/addons/report_webkit/header_view.xml
+++ b/addons/report_webkit/header_view.xml
@@ -3,9 +3,8 @@
         <record model="ir.ui.view" id="header_img">
             <field name="name">res.company.header.img</field>
             <field name="model">ir.header_img</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Header Image" version="7.0">
                     <group>
                         <field name="name"/>
                         <field name="type"/>
@@ -19,9 +18,8 @@
         <record model="ir.ui.view" id="header_webkit">
             <field name="name">res.company.header.html</field>
             <field name="model">ir.header_webkit</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="HTML Header" version="7.0">
                     <group>
                         <group>
                             <field name="name"/>
diff --git a/addons/report_webkit/ir_report_view.xml b/addons/report_webkit/ir_report_view.xml
index fed94c92d70..e9f9ebd2234 100644
--- a/addons/report_webkit/ir_report_view.xml
+++ b/addons/report_webkit/ir_report_view.xml
@@ -4,7 +4,6 @@
             <field name="name">ir.actions.report.xml.inherit</field>
             <field name="model">ir.actions.report.xml</field>
             <field name="inherit_id" ref="base.act_report_xml_view"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//page[@string='Security']" position="before" >
                     <page string="Webkit" attrs="{'invisible':[('report_type','!=','webkit')]}">
diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml
index 3d4b5bce6bb..f4ae735916e 100644
--- a/addons/report_webkit/wizard/report_webkit_actions_view.xml
+++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="view_report_webkit_actions">
             <field name="name">Report Webkit actions wizard</field>
             <field name="model">report.webkit.actions</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Print Buttons" col="4" version="7.0">
                     <group>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 5b388469f3c..58f7789dc07 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -7,7 +7,6 @@
         <record id="view_resource_resource_search" model="ir.ui.view">
             <field name="name">resource.resource.search</field>
             <field name="model">resource.resource</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Resource">
                    <field name="name" string="Resource"/>
@@ -28,7 +27,6 @@
            <record id="view_resource_calendar_search" model="ir.ui.view">
             <field name="name">resource.calendar.search</field>
             <field name="model">resource.calendar</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Working Time">
                    <field name="name" string="Working Time"/>
@@ -41,7 +39,6 @@
         <record id="view_resource_calendar_leaves_search" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.search</field>
             <field name="model">resource.calendar.leaves</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Working Period Leaves">
                     <field name="name" string="Reason"/>
@@ -60,7 +57,6 @@
         <record id="resource_calendar_form" model="ir.ui.view">
             <field name="name">resource.calendar.form</field>
             <field name="model">resource.calendar</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Working Time" version="7.0">
                     <sheet>
@@ -78,7 +74,6 @@
         <record id="view_resource_calendar_tree" model="ir.ui.view">
             <field name="name">resource.calendar.tree</field>
             <field name="model">resource.calendar</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Working Time">
                     <field name="name"/>
@@ -101,7 +96,6 @@
         <record id="view_resource_calendar_attendance_tree" model="ir.ui.view">
             <field name="name">resource.calendar.attendance.tree</field>
             <field name="model">resource.calendar.attendance</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Working Time" editable="top">
                     <field name="name"/>
@@ -116,7 +110,6 @@
         <record id="view_resource_calendar_attendance_form" model="ir.ui.view">
             <field name="name">resource.calendar.attendance.form</field>
             <field name="model">resource.calendar.attendance</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Working Time" version="7.0">
                     <group>
@@ -135,7 +128,6 @@
         <record id="view_resource_calendar" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.calendar</field>
             <field name="model">resource.calendar.leaves</field>
-            <field name="type">calendar</field>
             <field name="arch" type="xml">
                 <calendar color="resource_id" date_start="date_from" date_stop="date_to" string="Resource">
                     <field name="name"/>
@@ -164,7 +156,6 @@
         <record id="resource_resource_form" model="ir.ui.view">
             <field name="name">resource.resource.form</field>
             <field name="model">resource.resource</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Resource" version="7.0">
                    <group>
@@ -187,7 +178,6 @@
         <record id="resource_resource_tree" model="ir.ui.view">
             <field name="name">resource.resource.tree</field>
             <field name="model">resource.resource</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Resources">
                     <field name="name" />
@@ -212,7 +202,6 @@
         <record id="resource_calendar_leave_form" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.form</field>
             <field name="model">resource.calendar.leaves</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Detail" version="7.0">
                     <group>
@@ -241,7 +230,6 @@
         <record id="resource_calendar_leave_tree" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.tree</field>
             <field name="model">resource.calendar.leaves</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Leave Detail">
                     <field name="name" string="Reason"/>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index c989beba2d4..702bc0c61cc 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -14,7 +14,6 @@
         <record id="view_turnover_by_month_tree" model="ir.ui.view">
             <field name="name">turnover.by.month.tree</field>
             <field name="model">account.invoice.report</field>
-            <field name="type">tree</field>
             <field name="priority" eval="32"/>
             <field name="arch" type="xml">
                 <tree string="Monthly Turnover">
@@ -27,7 +26,6 @@
             <field name="name">turnover.by.month.graph</field>
             <field name="model">account.invoice.report</field>
             <field name="priority" eval="32"/>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Monthly Turnover" type="bar">
                     <field name="month"/>
@@ -49,7 +47,6 @@
         <record id="board_sales_form" model="ir.ui.view">
             <field name="name">board.sales.form</field>
             <field name="model">board.board</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales Dashboard" version="7.0">
                     <board style="2-1">
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
index fd4289a5bf6..032c264ebd6 100644
--- a/addons/sale/company_view.xml
+++ b/addons/sale/company_view.xml
@@ -4,7 +4,6 @@
         <record id="mrp_company" model="ir.ui.view">
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
-            <field name="type">form</field>
             <field name="priority">24</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 1ac6d425530..2a60a9157dd 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -6,7 +6,6 @@
         <field eval="1" name="priority"/>
         <field name="name">sale.report.tree</field>
         <field name="model">sale.report</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Sales Analysis">
                 <field name="date" invisible="1"/>
@@ -34,7 +33,6 @@
     <record id="view_order_product_graph" model="ir.ui.view">
          <field name="name">sale.report.graph</field>
          <field name="model">sale.report</field>
-         <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Sales Analysis" type="bar">
                  <field name="product_id"/>
@@ -47,7 +45,6 @@
     <record id="view_order_product_search" model="ir.ui.view">
         <field name="name">sale.report.search</field>
         <field name="model">sale.report</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Sales Analysis">
                 <field name="date"/>
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 37dcd47b7fd..37d58be5f0f 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -5,7 +5,6 @@
         <record id="view_sales_config" model="ir.ui.view">
             <field name="name">sale settings</field>
             <field name="model">sale.config.settings</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <div name="customer feature" position="before">
@@ -143,7 +142,6 @@
         <record id="view_account_config" model="ir.ui.view">
             <field name="name">account settings</field>
             <field name="model">account.config.settings</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="account.view_account_config_settings"/>
             <field name="priority" eval="16"/>
             <field name="arch" type="xml">
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index d5062441d3f..f076bfda67c 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -27,7 +27,6 @@
         <record model="ir.ui.view" id="crm_lead_partner_kanban_view">
             <field name="name">res.partner.kanban.saleorder.inherit</field>
             <field name="model">res.partner</field>
-            <field name="type">kanban</field>
             <field name="inherit_id" ref="base.res_partner_kanban_view"/>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
@@ -45,7 +44,6 @@
         <record id="res_partner_view_buttons" model="ir.ui.view">
             <field name="name">res.partner.view.buttons</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form" />
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2257240dd10..a4a049fdbc5 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -17,7 +17,6 @@
         <record id="view_shop_form" model="ir.ui.view">
             <field name="name">sale.shop</field>
             <field name="model">sale.shop</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales Shop" version="7.0">
                     <label for="name" class="oe_edit_only"/>
@@ -40,7 +39,6 @@
         <record id="view_shop_tree" model="ir.ui.view">
             <field name="name">sale.shop</field>
             <field name="model">sale.shop</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sales Shop">
                     <field name="name"/>
@@ -112,7 +110,6 @@
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
             <field name="model">sale.order</field>
-            <field name="type">calendar</field>
             <field name="arch" type="xml">
                 <calendar string="Sales Orders" color="state" date_start="date_order">
                     <field name="partner_id"/>
@@ -123,7 +120,6 @@
         <record model="ir.ui.view" id="view_sale_order_graph">
             <field name="name">sale.order.graph</field>
             <field name="model">sale.order</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Sales Orders" type="bar">
                     <field name="partner_id"/>
@@ -135,7 +131,6 @@
         <record id="view_order_tree" model="ir.ui.view">
             <field name="name">sale.order.tree</field>
             <field name="model">sale.order</field>
-            <field name="type">tree</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
                 <tree string="Sales Orders" fonts="bold:needaction_pending==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
@@ -153,7 +148,6 @@
         <record id="view_order_form" model="ir.ui.view">
             <field name="name">sale.order.form</field>
             <field name="model">sale.order</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales Order" version="7.0">
                     <header>
@@ -365,7 +359,6 @@
         <record id="view_sales_order_filter" model="ir.ui.view">
             <field name="name">sale.order.list.select</field>
             <field name="model">sale.order</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
@@ -472,7 +465,6 @@
         <record id="view_order_line_graph" model="ir.ui.view">
             <field name="name">sale.order.line.graph</field>
             <field name="model">sale.order.line</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Sales Order Lines">
                     <field name="product_id"/>
@@ -484,7 +476,6 @@
         <record id="view_order_line_tree" model="ir.ui.view">
             <field name="name">sale.order.line.tree</field>
             <field name="model">sale.order.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sales Order Lines">
                     <field name="order_id"/>
@@ -502,7 +493,6 @@
         <record id="view_order_line_form2" model="ir.ui.view">
             <field name="name">sale.order.line.form2</field>
             <field name="model">sale.order.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales Order Lines" version="7.0">
                     <header>
@@ -521,7 +511,7 @@
                     <group>
                         <group>
                             <field name="product_id" readonly="1"/>
-                            <label name="product_uom_qty"/>
+                            <label for="product_uom_qty"/>
                             <div>
                                 <field name="product_uom_qty" readonly="1" class="oe_inline"/>
                                 <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
@@ -545,7 +535,6 @@
         <record id="view_sales_order_line_filter" model="ir.ui.view">
             <field name="name">sale.order.line.select</field>
             <field name="model">sale.order.line</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('invoiced','&lt;&gt;', 1),('state','=','done')]"  help="Sale Order Lines ready to be invoiced"/>
@@ -568,7 +557,6 @@
         <record id="view_sales_order_uninvoiced_line_filter" model="ir.ui.view">
             <field name="name">sale.order.uninvoiced.line</field>
             <field name="model">sale.order.line</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
                     <filter icon="terp-gtk-go-back-rtl" string="To Do" domain="[('state','=','confirmed')]" name="sale order" help="Confirmed sale order lines, not yet delivered"/>
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 40de6872be0..eb0f1e415f5 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -4,7 +4,6 @@
         <record id="stock_picking_inherit_sale" model="ir.ui.view">
             <field name="name">stock.picking.form</field>
             <field name="model">stock.picking</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
                 <field name="move_type" position="before">
@@ -19,7 +18,6 @@
         <record id="stock_move_sale" model="ir.ui.view">
             <field name="name">stock.move.form</field>
             <field name="model">stock.move</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_move_form"/>
             <field name="arch" type="xml">
                  <xpath expr="//group[@name='origin_grp']"  position="inside">
@@ -57,7 +55,6 @@
         <record id="stock_picking_out_inherit_sale" model="ir.ui.view">
             <field name="name">Outgoing picking Inherited</field>
             <field name="model">stock.picking</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
                 <field name="move_type" position="after">
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 0da5b8825d0..2eb5d1ae47f 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -4,7 +4,6 @@
         <record id="view_sale_order_line_make_invoice" model="ir.ui.view">
             <field name="name">Sales OrderLine Make Invoice</field>
             <field name="model">sale.order.line.make.invoice</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
              <form string="Create invoices" version="7.0">
                 <header>
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index 826249aa3bb..ced64a0f79d 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -4,7 +4,6 @@
         <record id="view_sale_order_make_invoice" model="ir.ui.view">
             <field name="name">Create invoices</field>
             <field name="model">sale.make.invoice</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create invoices" version="7.0">
                     <header>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 28f5dc093cd..5bb7d231e94 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -4,7 +4,6 @@
         <record id="view_sale_advance_payment_inv" model="ir.ui.view">
             <field name="name">Advance Invoice</field>
             <field name="model">sale.advance.payment.inv</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Advance Invoice" version="7.0">
                     <group>
diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index ca4b71653ff..6701ede5ae5 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -5,7 +5,6 @@
     <record model="ir.ui.view" id="view_order_form_inherit">
         <field name="name">sale.order.form.inherit</field>
         <field name="model">sale.order</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
             <field name="project_id" position="replace"/>
@@ -15,7 +14,6 @@
     <record model="ir.ui.view" id="view_order_form_inherit2">
         <field name="name">sale.order.form.inherit2</field>
         <field name="model">sale.order</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
            <xpath expr="//field[@name='order_line']/form//field[@name='tax_id']" position="after">
@@ -27,7 +25,6 @@
     <record model="ir.ui.view" id="view_order_line_form2_inherit">
         <field name="name">sale.order.line.form2.inherit</field>
         <field name="model">sale.order.line</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="sale.view_order_line_form2"/>
         <field name="arch" type="xml">
             <field name="product_id" position="after">
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 977e82c4b69..be871b87796 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="crm_case_form_view_oppor">
             <field name="name">CRM - Opportunities - Quote Inherit</field>
             <field name="model">crm.lead</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
                 <data>
@@ -20,7 +19,6 @@
         <record model="ir.ui.view" id="sale_view_inherit123">
             <field name="name">sale.order.inherit</field>
             <field name="model">sale.order</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
@@ -33,7 +31,6 @@
         <record id="view_sales_order_filter_inherit" model="ir.ui.view">
             <field name="name">sale.order.list.select</field>
             <field name="model">sale.order</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="sale.view_sales_order_filter"/>
             <field name="arch" type="xml">
                 <xpath expr="//filter[@name='my_sale_orders_filter']" position="after">
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index fe645b3e1a4..2207cf536e2 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -6,7 +6,6 @@
        <record id="view_crm_make_sale" model="ir.ui.view">
           <field name="name">crm.make.sale.form</field>
           <field name="model">crm.make.sale</field>
-          <field name="type">form</field>
           <field name="arch" type="xml">
             <form string="Convert to Quotation"  version="7.0">
                 <group col="4">
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 90b1959aff7..98f2933d6f3 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
             <field name="name">sale_journal.invoice.type.form</field>
             <field name="model">sale_journal.invoice.type</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice Type" version="7.0">
                     <group col="4">
@@ -24,7 +23,6 @@
         <record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
             <field name="name">sale_journal.invoice.type.tree</field>
             <field name="model">sale_journal.invoice.type</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Invoice Type">
                     <field name="name"/>
@@ -50,7 +48,6 @@
 
         <record model="ir.ui.view" id="sale_journal_sale_order">
             <field name="name">sale.order.journal.view.form</field>
-            <field name="type">form</field>
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form" />
             <field name="arch" type="xml">
@@ -64,7 +61,6 @@
 
         <record model="ir.ui.view" id="sale_journal_sale_order_tree">
             <field name="name">sale.order.journal.view.tree</field>
-            <field name="type">tree</field>
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_tree" />
             <field name="arch" type="xml">
@@ -78,7 +74,6 @@
 
         <record model="ir.ui.view" id="sale_journal_picking_order">
             <field name="name">stock.picking.journal.view.form</field>
-            <field name="type">form</field>
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form" />
             <field name="arch" type="xml">
@@ -92,7 +87,6 @@
 
         <record model="ir.ui.view" id="sale_journal_picking_order_tree">
             <field name="name">stock.picking.journal.view.tree</field>
-            <field name="type">tree</field>
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.vpicktree" />
             <field name="arch" type="xml">
@@ -104,7 +98,6 @@
 
         <record model="ir.ui.view" id="sale_journal_picking_order_in">
             <field name="name">stock.picking.journal.view.form</field>
-            <field name="type">form</field>
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_in_form" />
             <field name="arch" type="xml">
@@ -116,7 +109,6 @@
 
         <record model="ir.ui.view" id="sale_journal_picking_order_tree_in">
             <field name="name">stock.picking.journal.view.tree</field>
-            <field name="type">tree</field>
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_in_tree" />
             <field name="arch" type="xml">
@@ -128,7 +120,6 @@
 
         <record model="ir.ui.view" id="sale_journal_picking_order_out">
             <field name="name">stock.picking.journal.view.form</field>
-            <field name="type">form</field>
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form" />
             <field name="arch" type="xml">
@@ -140,7 +131,6 @@
 
         <record model="ir.ui.view" id="sale_journal_picking_order_tree_out">
             <field name="name">stock.picking.journal.view.tree</field>
-            <field name="type">tree</field>
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_tree" />
             <field name="arch" type="xml">
@@ -153,7 +143,6 @@
         <record id="view_partner_property_form" model="ir.ui.view">
             <field name="name">res.partner.journal.property.form.inherit</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 30c2a0dea14..69f49bd48ea 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -4,7 +4,6 @@
 
     <record model="ir.ui.view" id="sale_margin_sale_order">
         <field name="name">sale.order.margin.view.form</field>
-        <field name="type">form</field>
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
@@ -21,7 +20,6 @@
 
     <record model="ir.ui.view" id="sale_margin_sale_order_line">
         <field name="name">sale.order.line.margin.view.form</field>
-        <field name="type">form</field>
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
@@ -33,7 +31,6 @@
 
     <record model="ir.ui.view" id="sale_margin_sale_order_line_form">
         <field name="name">sale.order.line.tree.margin.view.form</field>
-        <field name="type">form</field>
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
diff --git a/addons/sale_mrp/sale_mrp_view.xml b/addons/sale_mrp/sale_mrp_view.xml
index 882663680c5..3c2771f55a5 100644
--- a/addons/sale_mrp/sale_mrp_view.xml
+++ b/addons/sale_mrp/sale_mrp_view.xml
@@ -6,7 +6,6 @@
             <field name="name">mrp.production.form</field>
             <field name="model">mrp.production</field>
             <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='company_id']" position="after">
                     <field name="sale_ref"/>
diff --git a/addons/sale_order_dates/sale_order_dates_view.xml b/addons/sale_order_dates/sale_order_dates_view.xml
index 672a1cadd0e..b2863f644e0 100644
--- a/addons/sale_order_dates/sale_order_dates_view.xml
+++ b/addons/sale_order_dates/sale_order_dates_view.xml
@@ -5,7 +5,6 @@
         <record id="view_sale_orderfor" model="ir.ui.view">
             <field name="name">sale.order.form.inherit5</field>
             <field name="model">sale.order</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <group name="sale_pay" position="after">
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index 3af69bb025b..9a657ffdbb6 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="res_users_search_sharing">
             <field name="name">res.users.search.share</field>
             <field name="model">res.users</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="base.view_users_search"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='company_ids']" position="after">
@@ -26,7 +25,6 @@
         <record model="ir.ui.view" id="res_groups_search_sharing">
             <field name="name">res.groups.search.share</field>
             <field name="model">res.groups</field>
-            <field name="type">search</field>
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Groups">
@@ -45,7 +43,6 @@
         <record id="view_groups_form_share" model="ir.ui.view">
             <field name="name">res.groups.form</field>
             <field name="model">res.groups</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_groups_form"/>
             <field name="arch" type="xml">
                 <field name="users" position="attributes">
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index ad4df1a5193..859245b46a9 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -5,7 +5,6 @@
         <record id="share_step0_form" model="ir.ui.view">
             <field name="name">share.step0.form</field>
             <field name="model">share.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sharing: preparation" version="7.0">
                     <separator
@@ -28,9 +27,8 @@
         <record id="share_step1_form" model="ir.ui.view">
             <field name="name">share.step1.form</field>
             <field name="model">share.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Configuration" version="7.0">
                     <group>
                         <field name="user_type" invisible="1"/>
                         <field name="invite" invisible="1"/>
@@ -67,7 +65,6 @@
         <record id="share_step2_form" model="ir.ui.view">
             <field name="name">share.step2.form</field>
             <field name="model">share.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Access granted!" version="7.0">
                     <group attrs="{'invisible':[('user_type','=','embedded')]}"
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 1c416287e84..4258721dc03 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -5,7 +5,6 @@
         <record id="view_stock_graph_board" model="ir.ui.view">
             <field name="name">report.stock.move.graph</field>
             <field name="model">report.stock.move</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Moves Analysis" type="bar">
                     <field name="day"/>
@@ -56,7 +55,6 @@
         <record id="board_warehouse_form" model="ir.ui.view">
             <field name="name">board.warehouse.form</field>
             <field name="model">board.board</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Warehouse board" version="7.0">
                     <board style="2-1">
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 1c229121e1c..69d833d0ecd 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -8,7 +8,6 @@
     <record id="view_partner_property_form" model="ir.ui.view">
         <field name="name">res.partner.stock.property.form.inherit</field>
         <field name="model">res.partner</field>
-        <field name="type">form</field>
         <field name="inherit_id" ref="product.view_partner_property_form"/>
         <field name="arch" type="xml">
             <group name="pricelists" position="after">
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 7dcdae56f40..1efc552bfa6 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -5,7 +5,6 @@
         <record id="product_search_form_view_stock" model="ir.ui.view">
             <field name="name">product.search.stock.form</field>
             <field name="model">product.product</field>
-            <field name="type">search</field>
             <field name="inherit_id" ref="product.product_search_form_view"/>
             <field name="arch" type="xml">
                 <field name="pricelist_id" position="before">
@@ -18,7 +17,6 @@
         <record id="view_category_property_form" model="ir.ui.view">
             <field name="name">product.category.stock.property.form.inherit</field>
             <field name="model">product.category</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
                 <data>
@@ -35,7 +33,6 @@
         <record id="view_template_property_form" model="ir.ui.view">
             <field name="name">product.template.stock.property.form.inherit</field>
             <field name="model">product.template</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
                 <page position="after" string="Information">
@@ -57,7 +54,6 @@
         <record id="view_product_standard_price_form" model="ir.ui.view">
             <field name="name">product.product.standard.price.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="standard_price" position="replace" version="7.0">
@@ -75,7 +71,6 @@
         <record id="view_normal_property_acc_form" model="ir.ui.view">
             <field name="name">product.normal.stock.acc.property.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="priority">26</field>
             <field name="arch" type="xml">
@@ -100,7 +95,6 @@
         <record id="view_normal_stock_property_form" model="ir.ui.view">
             <field name="name">product.normal.stock.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="status" position="before" version="7.0">
@@ -172,7 +166,6 @@
         <record model="ir.ui.view" id="product.product_kanban_view">
             <field name="name">Product Kanban</field>
             <field name="model">product.product</field>
-            <field name="type">kanban</field>
             <field name="arch" type="xml">
                 <kanban>
                     <field name="color"/>
@@ -220,7 +213,6 @@
         <record id="view_normal_property_form" model="ir.ui.view">
             <field name="name">product.normal.stock.property.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="store" position="after">
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 56d17976aad..a0227788d97 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -11,7 +11,6 @@
     <record id="view_stock_tree" model="ir.ui.view">
         <field name="name">report.stock.move.tree</field>
         <field name="model">report.stock.move</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Moves Analysis">
                 <field name="date" invisible="1"/>
@@ -41,7 +40,6 @@
     <record id="view_stock_graph" model="ir.ui.view">
          <field name="name">report.stock.move.graph</field>
          <field name="model">report.stock.move</field>
-         <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Moves Analysis" type="bar">
                  <field name="product_id"/>
@@ -53,7 +51,6 @@
     <record id="view_stock_search" model="ir.ui.view">
         <field name="name">report.stock.move.search</field>
         <field name="model">report.stock.move</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Moves Analysis">
                 <filter string="Done" name="done" icon="terp-dialog-close" domain="[('state','=','done')]" help = "Completed Stock-Moves"/>
@@ -106,7 +103,6 @@
     <record id="view_stock_inventory_tree" model="ir.ui.view">
         <field name="name">report.stock.inventory.tree</field>
         <field name="model">report.stock.inventory</field>
-        <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Inventory Analysis">
                 <field name="date" invisible="1"/>
@@ -129,7 +125,6 @@
     <record id="view_stock_inventory_graph" model="ir.ui.view">
          <field name="name">report.stock.inventory.graph</field>
          <field name="model">report.stock.inventory</field>
-         <field name="type">graph</field>
          <field name="arch" type="xml">
              <graph string="Inventory Analysis" type="bar">
                  <field name="product_id"/>
@@ -141,7 +136,6 @@
     <record id="view_stock_inventory_search" model="ir.ui.view">
         <field name="name">report.stock.inventory.search</field>
         <field name="model">report.stock.inventory</field>
-        <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Inventory Analysis">
                 <filter string="Real" name="real" icon="terp-check" domain="[('state','=','done')]"
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 15dafbfdbc1..f87a212d43b 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -19,7 +19,6 @@
         <record model="ir.ui.view" id="report_stock_lines_date_tree">
             <field name="name">report.stock.lines.date.tree</field>
             <field name="model">report.stock.lines.date</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Dates of Inventories">
                     <field name="product_id"/>
@@ -31,7 +30,6 @@
         <record model="ir.ui.view" id="report_stock_lines_date_search">
             <field name="name">report.stock.lines.date.search</field>
             <field name="model">report.stock.lines.date</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Dates of Inventories">
                     <field name="date"/>
@@ -47,7 +45,6 @@
         <record model="ir.ui.view" id="report_stock_lines_date_form">
             <field name="name">report.stock.lines.date.form</field>
             <field name="model">report.stock.lines.date</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Dates of Inventories" version="7.0">
                     <group>
@@ -72,7 +69,6 @@
         <record id="view_location_graph" model="ir.ui.view">
             <field name="name">stock.location.graph</field>
             <field name="model">stock.location</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Stock Location">
                     <field name="complete_name"/>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index f6668eff316..f3abb9bbc95 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -5,7 +5,6 @@
         <record id="view_stock_config_settings" model="ir.ui.view">
             <field name="name">stock settings</field>
             <field name="model">stock.config.settings</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Configure Warehouse" version="7.0" class="oe_form_configuration">
                     <header>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ff9a295ff04..fb90b47fcb2 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -39,7 +39,6 @@
         <record id="stock_inventory_line_tree" model="ir.ui.view">
             <field name="name">stock.inventory.line.tree</field>
             <field name="model">stock.inventory.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Stock Inventory Lines">
                     <field name="product_id"/>
@@ -56,7 +55,6 @@
         <record id="view_inventory_line_form" model="ir.ui.view">
             <field name="name">stock.inventory.line.form</field>
             <field name="model">stock.inventory.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Inventory Lines" version="7.0">
                     <group col="4">
@@ -76,7 +74,6 @@
          <record id="view_inventory_filter" model="ir.ui.view">
             <field name="name">stock.inventory.filter</field>
             <field name="model">stock.inventory</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Inventory">
                     <field name="name" string="Inventory Reference"/>
@@ -94,7 +91,6 @@
         <record id="view_inventory_tree" model="ir.ui.view">
             <field name="name">stock.inventory.tree</field>
             <field name="model">stock.inventory</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Lot Inventory" colors="grey:state == 'cancel'">
                     <field name="name"/>
@@ -107,7 +103,6 @@
         <record id="view_inventory_form" model="ir.ui.view">
             <field name="name">stock.inventory.form</field>
             <field name="model">stock.inventory</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Physical Inventory" version="7.0">
                 <header>
@@ -225,7 +220,6 @@
         <record id="view_tracking_form" model="ir.ui.view">
             <field name="name">stock.tracking.form</field>
             <field name="model">stock.tracking</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Packs" version="7.0">
                     <group>
@@ -249,7 +243,6 @@
         <record id="view_tracking_tree" model="ir.ui.view">
             <field name="name">stock.tracking.tree</field>
             <field name="model">stock.tracking</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Packs">
                     <field name="name"/>
@@ -283,7 +276,6 @@
         <record id="lot_line_tree" model="ir.ui.view">
             <field name="name">stock.tracking.tree</field>
             <field name="model">stock.tracking</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree colors="grey:not active" string="Packs">
@@ -297,7 +289,6 @@
         <record model="ir.ui.view" id="search_stock_packs">
             <field name="name">Pack Search</field>
             <field name="model">stock.tracking</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Pack Search">
                     <field name="name" string="Pack" filter_domain="['|',('name','ilike',self),('serial','ilike',self)]"/>
@@ -310,7 +301,6 @@
         <record id="view_production_lot_revision_form" model="ir.ui.view">
             <field name="name">stock.production.lot.revision.form</field>
             <field name="model">stock.production.lot.revision</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Serial Number Revisions" version="7.0">
                     <group col="4">
@@ -327,7 +317,6 @@
         <record id="view_production_lot_revision_tree" model="ir.ui.view">
             <field name="name">stock.production.lot.revision.tree</field>
             <field name="model">stock.production.lot.revision</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Serial Number Revisions">
                     <field name="indice"/>
@@ -340,7 +329,6 @@
         <record id="view_production_lot_form" model="ir.ui.view">
             <field name="name">stock.production.lot.form</field>
             <field name="model">stock.production.lot</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
                     <div class="oe_button_box oe_right">
@@ -392,7 +380,6 @@
         <record id="view_production_lot_tree" model="ir.ui.view">
             <field name="name">stock.production.lot.tree</field>
             <field name="model">stock.production.lot</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Serial Number">
                     <field name="prefix"/>
@@ -408,7 +395,6 @@
         <record model="ir.ui.view" id="search_product_lot_filter">
             <field name="name">Production Lots Filter</field>
             <field name="model">stock.production.lot</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Product Lots Filter">
                     <field name="name" string="Product Lots" filter_domain="['|','|',('name','ilike',self),('prefix','ilike',self),('ref','ilike',self)]"/>
@@ -454,7 +440,6 @@
         <record id="stock_move_tree" model="ir.ui.view">
             <field name="name">Stock Moves</field>
             <field name="model">stock.move</field>
-            <field name="type">tree</field>
             <field name="field_parent">move_history_ids</field>
             <field name="arch" type="xml">
                 <tree colors="grey:state == 'cancel'" string="Moves">
@@ -478,7 +463,6 @@
         <record id="stock_move_tree2" model="ir.ui.view">
             <field name="name">Stock Moves</field>
             <field name="model">stock.move</field>
-            <field name="type">tree</field>
             <field name="field_parent">move_history_ids2</field>
             <field name="arch" type="xml">
                 <tree colors="grey:state == 'cancel'" string="Moves">
@@ -534,7 +518,6 @@
         <record id="view_location_form" model="ir.ui.view">
             <field name="name">stock.location.form</field>
             <field name="model">stock.location</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Location" version="7.0">
                     <label for="name" class="oe_edit_only"/>
@@ -577,7 +560,6 @@
         <record id="view_location_search" model="ir.ui.view">
             <field name="name">stock.location.search</field>
             <field name="model">stock.location</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Locations">
                     <field name="name" string="Stock Locations"/>
@@ -593,7 +575,6 @@
         <record id="view_location_tree2" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
-            <field name="type">tree</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <tree string="Stock Location" colors="blue:usage=='view';darkred:usage=='internal'">
@@ -638,10 +619,9 @@
         <record id="view_location_tree" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
-            <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree toolbar="1">
+                <tree toolbar="1" string="Locations" >
                     <field icon="icon" name="name"/>
                 </tree>
             </field>
@@ -673,7 +653,6 @@
         <record id="view_warehouse" model="ir.ui.view">
             <field name="name">stock.warehouse</field>
             <field name="model">stock.warehouse</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Warehouse" version="7.0">
                     <label for="name" class="oe_edit_only"/>
@@ -695,7 +674,6 @@
         <record id="view_warehouse_tree" model="ir.ui.view">
             <field name="name">stock.warehouse.tree</field>
             <field name="model">stock.warehouse</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Warehouse">
                     <field name="name"/>
@@ -729,7 +707,6 @@
         <record model="ir.ui.view" id="stock_picking_calendar">
             <field name="name">stock.picking.calendar</field>
             <field name="model">stock.picking</field>
-            <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <calendar string="Calendar View" date_start="min_date" date_stop="max_date" color="partner_id">
@@ -743,7 +720,6 @@
         <record id="vpicktree" model="ir.ui.view">
             <field name="name">stock.picking.tree</field>
             <field name="model">stock.picking</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
@@ -761,7 +737,6 @@
         <record id="view_picking_form" model="ir.ui.view">
             <field name="name">stock.picking.form</field>
             <field name="model">stock.picking</field>
-            <field name="type">form</field>
             <field eval="12" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Internal Picking List" version="7.0">
@@ -926,7 +901,6 @@
         <record id="view_picking_internal_search" model="ir.ui.view">
             <field name="name">stock.picking.internal.search</field>
             <field name="model">stock.picking</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Internal Picking List">
                     <field name="name" string="Internal Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
@@ -984,7 +958,6 @@
         <record model="ir.ui.view" id="stock_picking_out_calendar">
             <field name="name">stock.picking.out.calendar</field>
             <field name="model">stock.picking.out</field>
-            <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <calendar string="Calendar View" date_start="min_date" date_stop="max_date" color="partner_id">
@@ -998,7 +971,6 @@
         <record id="view_picking_out_tree" model="ir.ui.view">
             <field name="name">stock.picking.out.tree</field>
             <field name="model">stock.picking</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
                     <field name="name"/>
@@ -1017,7 +989,6 @@
             <field name="name">stock.picking.out.form</field>
             <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="view_picking_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/header//button[@name='%(act_stock_return_picking)d']" position="replace">
@@ -1049,7 +1020,6 @@
         <record id="view_picking_out_search" model="ir.ui.view">
             <field name="name">stock.picking.out.search</field>
             <field name="model">stock.picking</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <field name="name" string="Picking List" filter_domain="['|',('name','ilike', self),('origin','ilike',self)]"/>
@@ -1115,7 +1085,6 @@
         <record model="ir.ui.view" id="stock_picking_in_calendar">
             <field name="name">stock.picking.in.calendar</field>
             <field name="model">stock.picking.in</field>
-            <field name="type">calendar</field>
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <calendar string="Calendar View" date_start="min_date" date_stop="max_date" color="partner_id">
@@ -1129,7 +1098,6 @@
         <record id="view_picking_in_tree" model="ir.ui.view">
             <field name="name">stock.picking.in.tree</field>
             <field name="model">stock.picking.in</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';grey:state == 'done';red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
@@ -1148,7 +1116,6 @@
             <field name="name">stock.picking.in.form</field>
             <field name="model">stock.picking.in</field>
             <field name="inherit_id" ref="view_picking_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/header//button[@name='%(act_stock_return_picking)d']" position="replace">
@@ -1174,7 +1141,6 @@
         <record id="view_picking_in_search" model="ir.ui.view">
             <field name="name">stock.picking.in.search</field>
             <field name="model">stock.picking.in</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Incoming Shipments">
                     <field name="name" string="Incoming Shipments" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
@@ -1242,7 +1208,6 @@
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
             <field name="model">stock.move</field>
-            <field name="type">tree</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state == 'cancel';red:(state not in ('cancel','done')) and date > current_date" string="Moves" editable="top">
@@ -1285,7 +1250,6 @@
         <record id="view_move_form" model="ir.ui.view">
             <field name="name">stock.move.form</field>
             <field name="model">stock.move</field>
-            <field name="type">form</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Stock Moves" version="7.0">
@@ -1364,7 +1328,6 @@
         <record id="view_move_search" model="ir.ui.view">
             <field name="name">stock.move.search</field>
             <field name="model">stock.move</field>
-            <field name="type">search</field>
             <field eval="3" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
@@ -1421,7 +1384,6 @@
         <record id="view_move_tree_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.tree2</field>
             <field name="model">stock.move</field>
-            <field name="type">tree</field>
             <field name="priority" eval="6"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state == 'cancel'" string="Moves">
@@ -1459,7 +1421,6 @@
         <record id="view_move_tree_reception_picking_board" model="ir.ui.view">
             <field name="name">stock.move.tree3</field>
             <field name="model">stock.move</field>
-            <field name="type">tree</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <tree string="Moves">
@@ -1475,7 +1436,6 @@
         <record id="view_move_search_reception_incoming_picking" model="ir.ui.view">
             <field name="name">stock.move.incoming.search2</field>
             <field name="model">stock.move</field>
-            <field name="type">search</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
@@ -1500,7 +1460,6 @@
         <record id="view_move_search_reception_outcoming_picking" model="ir.ui.view">
             <field name="name">stock.move.outgoing.search2</field>
             <field name="model">stock.move</field>
-            <field name="type">search</field>
             <field eval="6" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
@@ -1563,7 +1522,6 @@
         <record id="view_incoterms_tree" model="ir.ui.view">
             <field name="name">stock.incoterms.tree</field>
             <field name="model">stock.incoterms</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Incoterms">
                     <field name="code"/>
@@ -1574,7 +1532,6 @@
         <record id="stock_incoterms_form" model="ir.ui.view">
             <field name="name">stock.incoterms.form</field>
             <field name="model">stock.incoterms</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Incoterms" version="7.0">
                     <group>
@@ -1701,7 +1658,6 @@
          <record id="view_stock_journal_filter" model="ir.ui.view">
             <field name="name">stock.journal.filter</field>
             <field name="model">stock.journal</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Journal">
                     <field name="name" string="Stock Journal"/>
@@ -1712,7 +1668,6 @@
         <record model="ir.ui.view" id="view_stock_journal_tree">
             <field name="name">Stock Journals</field>
             <field name="model">stock.journal</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Stock Journal">
                     <field name="name"/>
@@ -1723,7 +1678,6 @@
         <record model="ir.ui.view" id="view_stock_journal_form">
             <field name="name">Stock Journals</field>
             <field name="model">stock.journal</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Journal" version="7.0">
                     <group>
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index 6713194f90b..a533d9f837b 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -4,7 +4,6 @@
         <record id="view_change_product_quantity" model="ir.ui.view">
             <field name="name">Change Product Quantity</field>
             <field name="model">stock.change.product.qty</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Change Product Quantity" version="7.0">
                     <group string="Select Quantity">
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index 6062c946d07..85e1f7f81da 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -4,7 +4,6 @@
         <record id="view_change_standard_price" model="ir.ui.view">
             <field name="name">Change Standard Price</field>
             <field name="model">stock.change.standard.price</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Change Standard Price" version="7.0">
                   <separator string="Change Price"/>
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 75a7b13233b..47e6355bcdc 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -4,7 +4,6 @@
            <record id="view_stock_fill_inventory" model="ir.ui.view">
             <field name="name">Import Inventory</field>
             <field name="model">stock.fill.inventory</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Import Inventory" version="7.0">
                   <separator string="Import current product inventory from the following location"/>
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index 5072007f210..fdc3aa03a60 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -4,7 +4,6 @@
         <record id="view_split_in_lots_inherit" model="ir.ui.view">
             <field name="name">Split Inventory Line</field>
             <field name="model">stock.inventory.line.split</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
                     <group>
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index 0386e429ee6..bf661b426a2 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -5,7 +5,6 @@
         <record id="name_form" model="ir.ui.view">
             <field name="name">stock.inventory.merge.form</field>
             <field name="model">stock.inventory.merge</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Merge Inventories" version="7.0">
                     <separator string="Merge Inventories" />
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 20f05f394fd..10d748624fc 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -4,7 +4,6 @@
         <record id="view_stock_invoice_onshipping" model="ir.ui.view">
             <field name="name">Stock Invoice Onshipping</field>
             <field name="model">stock.invoice.onshipping</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Create invoice" version="7.0">
                   <group string="Create Invoice">
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index 756c3782ea1..d6141752636 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -4,7 +4,6 @@
         <record id="view_stock_location_product" model="ir.ui.view">
             <field name="name">Products by Location</field>
             <field name="model">stock.location.product</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="View Stock of Products" version="7.0">
                     <group>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 5ecfc9a85a1..b3a7fbee885 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -6,7 +6,6 @@
         <record id="view_stock_move_consume_wizard" model="ir.ui.view">
             <field name="name">Consume Move</field>
             <field name="model">stock.move.consume</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Consume Move" version="7.0">
                     <group string="Consume Products">
@@ -39,7 +38,6 @@
        <record id="view_stock_move_scrap_wizard" model="ir.ui.view">
             <field name="name">Scrap Move</field>
             <field name="model">stock.move.scrap</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scrap Move" version="7.0">
                     <separator string="Scrap Products"/>
@@ -73,7 +71,6 @@
         <record id="view_split_in_lots" model="ir.ui.view">
                 <field name="name">Split in lots</field>
                 <field name="model">stock.move.split</field>
-                <field name="type">form</field>
                 <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
                     <group>
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index 3e0699ec3d8..acfc4b1923c 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -18,9 +18,8 @@
         <record id="stock_partial_move_form" model="ir.ui.view">
             <field name="name">stock.partial.move.form</field>
             <field name="model">stock.partial.move</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Stock Move" version="7.0">
                     <separator string="Products"/>
                     <field name="move_ids"/>
                     <footer>
@@ -35,7 +34,6 @@
         <record id="stock_partial_move_line_list" model="ir.ui.view">
             <field name="name">stock.partial.move.line.list</field>
             <field name="model">stock.partial.move.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Product Moves">
                     <field name="product_id" />
@@ -54,9 +52,8 @@
         <record id="stock_partial_move_line_form" model="ir.ui.view">
             <field name="name">stock.partial.move.line.form</field>
             <field name="model">stock.partial.move.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Stock Partial Move Line" version="7.0">
                     <group>
                         <field name="product_id" />
                         <field name="quantity" />
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index fdbcabb9ed7..7de85594a26 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -13,9 +13,8 @@
         <record id="stock_partial_picking_form" model="ir.ui.view">
             <field name="name">stock.partial.picking.form</field>
             <field name="model">stock.partial.picking</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Stock partial Picking" version="7.0">
                     <field name="hide_tracking" invisible="1"/>
                     <separator string="Transfer Products" name="product_separator"/>
                     <field name="move_ids" context="{'hide_tracking': hide_tracking}">
@@ -43,7 +42,6 @@
         <record id="stock_partial_picking_line_list" model="ir.ui.view">
             <field name="name">stock.partial.picking.line.list</field>
             <field name="model">stock.partial.picking.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Product Moves">
                     <field name="product_id" />
@@ -61,9 +59,8 @@
         <record id="stock_partial_picking_line_form" model="ir.ui.view">
             <field name="name">stock.partial.picking.line.form</field>
             <field name="model">stock.partial.picking.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Stock Picking Line" version="7.0">
                     <group col="4">
                         <field name="product_id" />
                         <field name="quantity" />
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index 5cdad44f681..0dbfbc1ef54 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -29,7 +29,6 @@
         <record id="stock_return_memory_tree_in" model="ir.ui.view">
             <field name="name">stock.return.picking.memory.tree</field>
             <field name="model">stock.return.picking.memory</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Product Moves">
                     <field name="product_id" />
@@ -42,9 +41,8 @@
         <record id="stock_return_memory_form_in" model="ir.ui.view">
             <field name="name">stock.return.picking.memory.from</field>
             <field name="model">stock.return.picking.memory</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Return Picking Memory" version="7.0">
                     <group col="4">
                         <field name="product_id" />
                         <field name="quantity" />
@@ -56,7 +54,6 @@
         <record id="view_stock_return_picking_form" model="ir.ui.view">
             <field name="name">Return lines</field>
             <field name="model">stock.return.picking</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
                     <label string="Provide the quantities of the returned products."/>
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index 52b182a3f27..541a0fd7200 100644
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -4,7 +4,6 @@
         <record id="view_stock_move_split_wizard" model="ir.ui.view">
             <field name="name">Split move</field>
             <field name="model">stock.split.into</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Split Move" version="7.0">
                 <separator string="Quantity to Leave in the Current Pack"/>
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index 6d1314209e3..720c7753df6 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -5,7 +5,6 @@
        <record id="stock_location_path_tree" model="ir.ui.view">
             <field name="name">stock.location.path.tree</field>
             <field name="model">stock.location.path</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Location Paths">
                     <field name="location_from_id"/>
@@ -18,7 +17,6 @@
        <record id="stock_location_path_form" model="ir.ui.view">
             <field name="name">stock.location.path.form</field>
             <field name="model">stock.location.path</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Location Paths" version="7.0">
                     <group col="4">
@@ -38,7 +36,6 @@
        <record id="product_normal_form_inherit_location" model="ir.ui.view">
             <field name="name">product.product.form</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
diff --git a/addons/stock_no_autopicking/stock_no_autopicking_view.xml b/addons/stock_no_autopicking/stock_no_autopicking_view.xml
index 94ab02a662d..9fb2b703efe 100644
--- a/addons/stock_no_autopicking/stock_no_autopicking_view.xml
+++ b/addons/stock_no_autopicking/stock_no_autopicking_view.xml
@@ -6,7 +6,6 @@
             <field name="name">product.normal.auto_pick.form</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view" />
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="product_manager" position="after">
                     <field name="auto_pick" />
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 8c1cb0d2c80..56c3b9a1eaa 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -10,9 +10,8 @@
         <record id="view_stock_period_form" model="ir.ui.view">
             <field name="name">stock.period.form</field>
             <field name="model">stock.period</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Stock Period" version="7.0">
                     <header>
                         <button name="button_open" string="Open" states="draft" type="object"/>
                         <button name="button_close" string="Close" states="open" type="object"/>
@@ -33,7 +32,6 @@
         <record id="view_stock_period_tree" model="ir.ui.view">
             <field name="name">stock.period.tree</field>
             <field name="model">stock.period</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Stock and Sales Period" editable="bottom" colors="gray:state == 'close';black:state in ('draft','open')">
                     <field name="name"/>
@@ -47,7 +45,6 @@
         <record id="view_stock_period_search" model="ir.ui.view">
             <field name="name">stock.period.search</field>
             <field name="model">stock.period</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Periods">
                     <field name="name" string="Stock Periods"/>
@@ -78,9 +75,8 @@
         <record id="view_stock_sale_forecast_form" model="ir.ui.view">
             <field name="name">stock.sale.forecast.form</field>
             <field name="model">stock.sale.forecast</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Stock and Sale Forecast" version="7.0">
                 <header>
                     <button name="action_validate" string="Approve" states="draft" type="object" class="oe_highlight"/>
                     <field name="state" widget="statusbar"/>
@@ -158,7 +154,6 @@
         <record id="view_stock_sale_forecast_tree" model="ir.ui.view">
              <field name="name">stock.sale.forecast.tree</field>
             <field name="model">stock.sale.forecast</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sales Forecasts" colors="gray:state=='validated';black:state=='draft'">
                     <field name="period_id"/>
@@ -175,7 +170,6 @@
        <record id="view_stock_sale_forecast_graph" model="ir.ui.view">
              <field name="name">stock.sale.forecast.graph</field>
             <field name="model">stock.sale.forecast</field>
-            <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Stock and Sales Forecast" type = "bar">
                     <field name="period_id"/>
@@ -193,7 +187,6 @@
         <record id="view_stock_sale_forecast_filter" model="ir.ui.view">
             <field name="name">stock.sale.forecast.list.select</field>
             <field name="model">stock.sale.forecast</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search  Sales Forecast">
                     <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" />
@@ -234,7 +227,6 @@
         <record id="view_stock_planning_form" model="ir.ui.view">
             <field name="name">stock.planning.form</field>
             <field name="model">stock.planning</field>
-            <field name="type">form</field>
             <field name="priority">50</field>
             <field name="arch" type="xml">
                 <form string="Stock Planning" version="7.0">
@@ -299,7 +291,6 @@
        <record id="view_stock_planning_filter" model="ir.ui.view">
             <field name="name">stock.planning.list.select</field>
             <field name="model">stock.planning</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Stock Planning">
                     <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
@@ -320,7 +311,6 @@
         <record id="view_stock_planning_tree" model="ir.ui.view">
              <field name="name">stock.planning.tree</field>
             <field name="model">stock.planning</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Master Procurement Schedule" colors ="blue:line_time=='Past';black:line_time=='Future'">
                     <field name="period_id"/>
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
index 72d70ae5203..4db5379c491 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -6,7 +6,6 @@
         <record id="view_stock_period_createlines_form" model="ir.ui.view">
             <field name="name">stock.period.createlines.form</field>
             <field name="model">stock.period.createlines</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Periods" version="7.0">
                     <group col="4">
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index be744987a45..2befba6d820 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -5,7 +5,6 @@
         <record id="view_stock_planning_createlines_form" model="ir.ui.view">
             <field name="name">stock.planning.createlines.form</field>
             <field name="model">stock.planning.createlines</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Stock Planning Lines" version="7.0">
                     <group col="4">
diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
index 0f3018350c0..705e0a8cfb7 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
@@ -6,7 +6,6 @@
         <record id="view_stock_sale_forecast_createlines_form" model="ir.ui.view">
             <field name="name">stock.sale.forecast.createlines</field>
             <field name="model">stock.sale.forecast.createlines</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Forecasts Lines" version="7.0">
                     <group col="4">
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 8b9be319ea6..dd3e1634420 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -7,7 +7,6 @@
         <record id="view_subscription_form" model="ir.ui.view">
             <field name="name">subscription.subscription.form</field>
             <field name="model">subscription.subscription</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscriptions" version="7.0">
                 <header>
@@ -51,7 +50,6 @@
         <record id="view_subscription_tree" model="ir.ui.view">
             <field name="name">subscription.subscription.tree</field>
             <field name="model">subscription.subscription</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Subscriptions">
                     <field name="name"/>
@@ -66,7 +64,6 @@
         <record id="view_subscription_filter" model="ir.ui.view">
             <field name="name">subscription.subscription.filter</field>
             <field name="model">subscription.subscription</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Subscription">
                     <field name="name" string="Subscription"/>
@@ -99,7 +96,6 @@
         <record id="subscription_subscription_history_tree" model="ir.ui.view">
             <field name="name">subscription.subscription.history.tree</field>
             <field name="model">subscription.subscription.history</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Subscription History">
                     <field name="date"/>
@@ -110,7 +106,6 @@
         <record id="subscription_subscription_history_form" model="ir.ui.view">
             <field name="name">subscription.subscription.history.form</field>
             <field name="model">subscription.subscription.history</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription History" version="7.0">
                     <group col="4">
@@ -124,7 +119,6 @@
         <record id="document_form" model="ir.ui.view">
             <field name="name">subscription.document.form</field>
             <field name="model">subscription.document</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Document" version="7.0">
                     <group col="4">
@@ -140,7 +134,6 @@
         <record id="document_tree" model="ir.ui.view">
             <field name="name">subscription.document.tree</field>
             <field name="model">subscription.document</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Subscription Document">
                     <field name="name"/>
@@ -153,7 +146,6 @@
         <record id="view_subscription_document_filter" model="ir.ui.view">
             <field name="name">subscription.document.filter</field>
             <field name="model">subscription.document</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Subscription Document">
                     <field name="name" string="Subscription Document"/>
@@ -165,7 +157,6 @@
         <record id="document_fields_form" model="ir.ui.view">
             <field name="name">subscription.document.fields.form</field>
             <field name="model">subscription.document.fields</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Document Fields" version="7.0">
                     <group>
@@ -179,7 +170,6 @@
         <record id="document_fields_tree" model="ir.ui.view">
             <field name="name">subscription.document.fields.tree</field>
             <field name="model">subscription.document.fields</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Subscription Document Fields">
                     <field name="field"/>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 9f29873cfd8..b8c6f97e45b 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -16,7 +16,6 @@
         <record model="ir.ui.view" id="survey_form">
             <field name="name">survey_form</field>
             <field name="model">survey</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
                 <header>
@@ -246,7 +245,6 @@
         <record model ="ir.ui.view" id= "survey_tree">
             <field name="name">survey_tree</field>
             <field name="model">survey</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="gray:state == 'close'" string="Survey">
                     <field name="title"/>
@@ -272,7 +270,6 @@
         <record id="survey_search" model="ir.ui.view">
             <field name="name">survey_search</field>
             <field name="model">survey</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey">
                     <field name="title" string="Survey"/>
@@ -294,7 +291,6 @@
         <record model="ir.ui.view" id="view_survey_kanban">
             <field name="name">event.survey.kanban</field>
             <field name="model">survey</field>
-            <field name="type">kanban</field>
             <field name="arch" type="xml">
                 <kanban>
                     <field name="title"/>
@@ -369,7 +365,6 @@
         <record model="ir.ui.view" id="survey_page_form">
             <field name="name">survey_page_form</field>
             <field name="model">survey.page</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Page" version="7.0">
                     <sheet>
@@ -539,7 +534,6 @@
         <record model="ir.ui.view" id="survey_page_tree">
             <field name="name">survey_page_tree</field>
             <field name="model">survey.page</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Survey Page">
                     <field name="sequence" string="Seq"/>
@@ -553,7 +547,6 @@
         <record id="view_survey_page_filter" model="ir.ui.view">
             <field name="name">survey.page.list.select</field>
             <field name="model">survey.page</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey Page">
                     <field name="title" string="Page"/>
@@ -580,7 +573,6 @@
         <record model="ir.ui.view" id="survey_page_wizard_test1">
             <field name="name">survey_page_wizard_test</field>
             <field name="model">survey.page</field>
-            <field name="type">form</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Survey Pages">
@@ -603,7 +595,6 @@
         <record model="ir.ui.view" id="survey_question_form">
             <field name="name">survey_question_form</field>
             <field name="model">survey.question</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Question">
                     <field name="question" colspan="4"/>
@@ -742,7 +733,6 @@
         <record model="ir.ui.view" id="survey_question_tree">
             <field name="name">survey_question_tree</field>
             <field name="model">survey.question</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Survey Question">
                     <field name="sequence" string="Seq"/>
@@ -757,7 +747,6 @@
         <record id="survey_question_search" model="ir.ui.view">
             <field name="name">survey_question_search</field>
             <field name="model">survey.question</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Question">
                     <field name="question" string="Question"/>
@@ -784,7 +773,6 @@
             <field name="name">survey_question_wizard_test</field>
             <field name="model">survey.question</field>
             <field name="priority">20</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Question">
                     <field name="question" colspan="4"/>
@@ -930,7 +918,6 @@
         <record model ="ir.ui.view" id="survey_answer_form">
             <field name="name">survey_answer_form</field>
             <field name="model">survey.answer</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Answer">
                     <field name="answer" colspan="4"/>
@@ -951,7 +938,6 @@
         <record model="ir.ui.view" id= "survey_answer_tree">
             <field name="name">survey_answer_tree</field>
             <field name="model">survey.answer</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Survey Answer">
                     <field name="sequence" string="Seq"/>
@@ -968,7 +954,6 @@
         <record model ="ir.ui.view" id= "survey_response_line_form">
             <field name="name">survey_response_line_form</field>
             <field name="model">survey.response.line</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Answer">
                     <field name="question_id"/>
@@ -1009,7 +994,6 @@
         <record model="ir.ui.view" id="survey_response_line_tree">
             <field name="name">survey_response_line_tree</field>
             <field name="model">survey.response.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Survey Answer Line">
                     <field name="page_id"/>
@@ -1027,7 +1011,6 @@
         <record model="ir.ui.view" id="survey_response_form">
             <field name="name">survey_response_form</field>
             <field name="model">survey.response</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Answer">
                     <field name="survey_id"/>
@@ -1043,7 +1026,6 @@
         <record model="ir.ui.view" id="survey_response_tree">
             <field name="name">survey_response_tree</field>
             <field name="model">survey.response</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Survey Answer">
                     <field name="survey_id"/>
@@ -1062,7 +1044,6 @@
         <record model="ir.ui.view" id="survey_response_answer_form">
             <field name="name">survey_response_answer_form</field>
             <field name="model">survey.response.answer</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Answer">
                     <group colspan="4">
@@ -1082,7 +1063,6 @@
         <record model="ir.ui.view" id="survey_response_answer_tree">
             <field name="name">survey_response_answer_tree</field>
             <field name="model">survey.response.answer</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="top" string="Survey Answer">
                     <field name="answer_id"/>
@@ -1101,7 +1081,6 @@
         <record model="ir.ui.view" id="survey_question_column_heading_form">
             <field name="name">survey_question_column_heading_form</field>
             <field name="model">survey.question.column.heading</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Column Heading">
                     <field name="title"/>
@@ -1122,7 +1101,6 @@
         <record model="ir.ui.view" id="survey_question_column_heading_tree">
             <field name="name">survey_question_column_heading_tree</field>
             <field name="model">survey.question.column.heading</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Column Heading">
                     <field name="title"/>
@@ -1137,9 +1115,8 @@
         <record model="ir.ui.view" id="survey_request_form">
             <field name="name">survey_request_form</field>
             <field name="model">survey.request</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Request" version="7.0">
                 <header>
                     <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object"/>
                     <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" class="oe_highlight"/>
@@ -1162,7 +1139,6 @@
         <record model="ir.ui.view" id="survey_request_tree">
             <field name="name">survey_request_tree</field>
             <field name="model">survey.request</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Evaluation Plan Phase" colors="red:date_deadline&lt;current_date">
                     <field name="date_deadline"/>
@@ -1177,7 +1153,6 @@
        <record id="survey_request_search" model="ir.ui.view">
             <field name="name">survey_request_search</field>
             <field name="model">survey.request</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey">
                     <field name="email" string="Survey"/>
@@ -1218,7 +1193,6 @@
         <record model="ir.ui.view" id="survey_type_form">
             <field name="name">survey_type_form</field>
             <field name="model">survey.type</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Type">
                     <field name="name"/>
@@ -1230,7 +1204,6 @@
         <record model="ir.ui.view" id="survey_type_tree">
             <field name="name">survey_type_tree</field>
             <field name="model">survey.type</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Survey Type">
                     <field name="name"/>
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index 162e820c059..3460ad41bb3 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -8,7 +8,6 @@
         <record id="view_survey_question_message" model="ir.ui.view">
             <field name="name">Answer Survey</field>
             <field name="model">survey.question.wiz</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Your Messages"  version="7.0">
                     <field name="name" nolabel="1" colspan="4" />
@@ -19,7 +18,6 @@
         <record id="view_survey_question_message1" model="ir.ui.view">
             <field name="name">Survey Search</field>
             <field name="model">survey.question.wiz</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Your Messages">
                     <field name="name"/>
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index 635e4451f4d..cb50eb955bb 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -9,7 +9,6 @@
         <record id="view_survey_answer" model="ir.ui.view">
             <field name="name">Survey</field>
             <field name="model">survey.browse.answer</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
                     <header>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index 2ca251d1bba..40056234fe8 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -7,7 +7,6 @@
         <record id="view_survey_print" model="ir.ui.view">
             <field name="name">Survey Print</field>
             <field name="model">survey.print</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Print" version="7.0">
                     <header>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index ffa271c0087..c2363695292 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -7,7 +7,6 @@
         <record id="view_survey_print_answer" model="ir.ui.view">
             <field name="name">Survey Print Answer</field>
             <field name="model">survey.print.answer</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Print Answer" version="7.0">
                     <header>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index 3cc94d2f606..97d976b98f6 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -7,7 +7,6 @@
         <record id="view_survey_print_statistics" model="ir.ui.view">
             <field name="name">Survey Print Statistics</field>
             <field name="model">survey.print.statistics</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Print Statistics" version="7.0">
                     <header>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index 15b4af6756f..de1231b53fb 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -8,7 +8,6 @@
         <record id="view_survey_name" model="ir.ui.view">
             <field name="name">Survey</field>
             <field name="model">survey.name.wiz</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
                     <header>
diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml
index 5c8a2e93fa7..340cb58b5cf 100644
--- a/addons/survey/wizard/survey_send_invitation.xml
+++ b/addons/survey/wizard/survey_send_invitation.xml
@@ -7,7 +7,6 @@
         <record id="view_survey_send_invitation" model="ir.ui.view">
             <field name="name">Send Invitation</field>
             <field name="model">survey.send.invitation</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Send Invitation" version="7.0">
                     <header>
@@ -53,7 +52,6 @@
         <record id="view_survey_send_invitation_log" model="ir.ui.view">
             <field name="name">survey send invitation log</field>
             <field name="model">survey.send.invitation.log</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="User creation" version="7.0">
                     <group string="Results :">
diff --git a/addons/warning/warning_view.xml b/addons/warning/warning_view.xml
index 55a00b66776..3f3bbefdbab 100644
--- a/addons/warning/warning_view.xml
+++ b/addons/warning/warning_view.xml
@@ -5,7 +5,6 @@
          <record id="view_partner_warning_form" model="ir.ui.view">
             <field name="name">res.partner.warning.form.inherit</field>
             <field name="model">res.partner</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
@@ -42,7 +41,6 @@
         <record id="product_warning_form_view" model="ir.ui.view">
             <field name="name">product.warning.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <notebook position="inside">