diff --git a/account_credit_control/account_view.xml b/account_credit_control/account_view.xml
index 0bc381a67..d70ebcf7e 100644
--- a/account_credit_control/account_view.xml
+++ b/account_credit_control/account_view.xml
@@ -13,7 +13,6 @@
       <field name="name">invoice.followup.form.view</field>
       <field name="model">account.invoice</field>
       <field name="inherit_id" ref="account.invoice_form" />
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <notebook position="inside">
         <page string="Credit Control"
diff --git a/account_credit_control/company_view.xml b/account_credit_control/company_view.xml
index 75139b9be..feb50c0d5 100644
--- a/account_credit_control/company_view.xml
+++ b/account_credit_control/company_view.xml
@@ -3,7 +3,6 @@
     <record id="credit_control_company_form" model="ir.ui.view">
       <field name="name">credit.control.company.form</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">
         <field name="currency_id" position="after">
diff --git a/account_credit_control/line_view.xml b/account_credit_control/line_view.xml
index 767f44921..ef5512897 100644
--- a/account_credit_control/line_view.xml
+++ b/account_credit_control/line_view.xml
@@ -3,7 +3,6 @@
     <record id="credit_control_line_form" model="ir.ui.view">
       <field name="name">credit.control.line.form</field>
       <field name="model">credit.control.line</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Control Credit Lines">
           <header>
@@ -48,7 +47,6 @@
     <record id="credit_control_line_search" model="ir.ui.view">
       <field name="name">Credit Control Lines</field>
       <field name="model">credit.control.line</field>
-      <field name="type">search</field>
       <field name="arch" type="xml">
         <search string="Control Credit Lines">
           <group string="Filters">
@@ -121,7 +119,6 @@
     <record id="credit_control_line_tree" model="ir.ui.view">
       <field name="name">credit.control.line.tree</field>
       <field name="model">credit.control.line</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree editable="bottom" string="Control Credit Lines" colors="green:state == 'sent';red:state in ('error', 'email_error');">
           <field name="date"/>
diff --git a/account_credit_control/partner_view.xml b/account_credit_control/partner_view.xml
index 71030aa2d..c6c4c89fd 100644
--- a/account_credit_control/partner_view.xml
+++ b/account_credit_control/partner_view.xml
@@ -4,7 +4,6 @@
       <field name="name">partner.credit_control.form.view</field>
       <field name="model">res.partner</field>
       <field name="inherit_id" ref="base.view_partner_form" />
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <field name="credit_limit" position="after">
           <field name="credit_policy_id" widget="selection"
diff --git a/account_credit_control/policy_view.xml b/account_credit_control/policy_view.xml
index cdab56d34..7158389f1 100644
--- a/account_credit_control/policy_view.xml
+++ b/account_credit_control/policy_view.xml
@@ -4,7 +4,6 @@
     <record id="credit_control_policy_form" model="ir.ui.view">
       <field name="name">credit.control.policy.form</field>
       <field name="model">credit.control.policy</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Credit control policy">
           <group>
@@ -28,17 +27,21 @@
                   <field name="name"/>
                   <notebook colspan="4">
                     <page string="Delay Setting">
-                      <field name="level"/>
-                      <field name="channel"/>
-                      <field name="delay_days"/>
-                      <field name="computation_mode"/>
+                      <group>
+                        <field name="level"/>
+                        <field name="channel"/>
+                        <field name="delay_days"/>
+                        <field name="computation_mode"/>
+                      </group>
                     </page>
                     <page string="Mail and reporting">
-                      <field name="email_template_id"/>
-                      <newline/>
-                      <field name="custom_text" colspan="4"/>
-                      <newline/>
-                      <field name="custom_mail_text" colspan="4"/>
+                      <group>
+                        <field name="email_template_id"/>
+                        <newline/>
+                        <field name="custom_text" colspan="4"/>
+                        <newline/>
+                        <field name="custom_mail_text" colspan="4"/>
+                      </group>
                     </page>
                   </notebook>
                 </form>
@@ -55,7 +58,6 @@
     <record id="credit_control_policy_tree" model="ir.ui.view">
       <field name="name">credit.control.policy.tree</field>
       <field name="model">credit.control.policy</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="Credit control policy">
           <field name="name"/>
@@ -88,20 +90,23 @@
     <record id="credit_mangement_policy_level_form" model="ir.ui.view">
       <field name="name">credit.mangement.policy.level.form</field>
       <field name="model">credit.control.policy.level</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Policy level">
           <field name="name"/>
           <notebook colspan="4">
             <page string="Delay Setting">
-              <field name="level"/>
-              <field name="channel"/>
-              <field name="delay_days"/>
-              <field name="computation_mode"/>
+              <group>
+                <field name="level"/>
+                <field name="channel"/>
+                <field name="delay_days"/>
+                <field name="computation_mode"/>
+              </group>
             </page>
             <page string="Mail and reporting">
-              <field name="email_template_id"/>
-              <field name="custom_text"/>
+              <group>
+                <field name="email_template_id"/>
+                <field name="custom_text"/>
+              </group>
             </page>
           </notebook>
         </form>
@@ -111,7 +116,6 @@
     <record id="credit_control_policy_level_tree" model="ir.ui.view">
       <field name="name">credit.control.policy.level.tree</field>
       <field name="model">credit.control.policy.level</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="Credit control policy level">
           <field name="name"/>
diff --git a/account_credit_control/run_view.xml b/account_credit_control/run_view.xml
index 949eeb0a4..e10e8c389 100644
--- a/account_credit_control/run_view.xml
+++ b/account_credit_control/run_view.xml
@@ -4,7 +4,6 @@
     <record id="credit_control_run_tree" model="ir.ui.view">
       <field name="name">credit.control.run.tree</field>
       <field name="model">credit.control.run</field>
-      <field name="type">tree</field>
       <field name="arch" type="xml">
         <tree string="Credit control run">
           <field name="date"/>
@@ -16,7 +15,6 @@
     <record id="credit_control_run_form" model="ir.ui.view">
       <field name="name">credit.control.run.form</field>
       <field name="model">credit.control.run</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Credit control run">
           <header>
diff --git a/account_credit_control/wizard/credit_control_printer_view.xml b/account_credit_control/wizard/credit_control_printer_view.xml
index 224e5fc8e..e49a26510 100644
--- a/account_credit_control/wizard/credit_control_printer_view.xml
+++ b/account_credit_control/wizard/credit_control_printer_view.xml
@@ -4,7 +4,6 @@
     <record id="credit_line_printer_form" model="ir.ui.view">
       <field name="name">credit.line.printer.form</field>
       <field name="model">credit.control.printer</field>
-      <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="Lines report" version="7.0">
           <separator string="Print the selected lines" colspan="4"/>