diff --git a/account_banking/account_banking_view.xml b/account_banking/account_banking_view.xml
index 104f8d1c2..c9fce3dea 100644
--- a/account_banking/account_banking_view.xml
+++ b/account_banking/account_banking_view.xml
@@ -36,7 +36,6 @@
         <record model="ir.ui.view" id="view_banking_account_settings_form">
             <field name="name">account.banking.account.settings.form</field>
             <field name="model">account.banking.account.settings</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Default Import Settings for Bank Account">
                     <field name="company_id"
@@ -70,7 +69,6 @@
         <record model="ir.ui.view" id="view_banking_account_settings_tree">
             <field name="name">account.banking.account.settings.tree</field>
             <field name="model">account.banking.account.settings</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Default Import Settings for Bank Account">
                     <field name="company_id" />
@@ -99,7 +97,6 @@
         <record model="ir.ui.view" id="view_account_banking_imported_file_form">
             <field name="name">account.banking.imported.file.form</field>
             <field name="model">account.banking.imported.file</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Imported Bank Statements">
                     <notebook colspan="4">
@@ -124,7 +121,6 @@
         <record model="ir.ui.view" id="view_account_banking_imported_file_tree">
             <field name="name">account.banking.imported.file.tree</field>
             <field name="model">account.banking.imported.file</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Imported Bank Statements Files" colors="red:state=='error';blue:state=='unfinished'">
                     <field name="company_id" />
@@ -182,7 +178,6 @@
             <field name="name">account.bank.statement.tree.banking</field>
             <field name="inherit_id" ref="account.view_bank_statement_tree" />
             <field name="model">account.bank.statement</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <!-- Remove period from bank statement -->
                 <field name="period_id" position="replace">
@@ -197,7 +192,6 @@
             <field name="inherit_id" ref="account.view_bank_statement_form" />
             <field name="model">account.bank.statement</field>
             <field name="sequence" eval="60"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
                     <page string="Transactions" position="after">
@@ -281,7 +275,6 @@
             <field name="name">res.partner.bank.form.banking-2</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="priority" eval="24"/>
             <field name="arch" type="xml">
                 <data>
@@ -300,7 +293,6 @@
             <field name="name">res.bank.form.banking-1</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="replace">
                     <field name="bic" on_change="onchange_bic(bic, name)"/>
@@ -311,7 +303,6 @@
         <record model="ir.ui.view" id="view_bank_statement_line_tree">
             <field name="name">Bank statement line tree view</field>
             <field name="model">account.bank.statement.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Statement lines" colors="black:state == 'confirmed';darkmagenta:match_multi == True;crimson:duplicate == True;grey:state=='draft';">
                     <field name="sequence" readonly="1" invisible="1"/>
diff --git a/account_banking/wizard/bank_import_view.xml b/account_banking/wizard/bank_import_view.xml
index 2e04e29c6..0aca85c30 100644
--- a/account_banking/wizard/bank_import_view.xml
+++ b/account_banking/wizard/bank_import_view.xml
@@ -4,7 +4,6 @@
         <record id="view_banking_import" model="ir.ui.view">
             <field name="name">account.banking.bank.import</field>
             <field name="model">account.banking.bank.import</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
 		<form string="Import Bank Transactions File">
 		    <group colspan="4" states="init,ready,error">
diff --git a/account_banking/wizard/banking_transaction_wizard.xml b/account_banking/wizard/banking_transaction_wizard.xml
index 47aa7bab0..561feb049 100644
--- a/account_banking/wizard/banking_transaction_wizard.xml
+++ b/account_banking/wizard/banking_transaction_wizard.xml
@@ -3,7 +3,6 @@
     <data>
         <record model="ir.ui.view" id="transaction_wizard_first">
             <field name="name">transaction.wizard.first</field>
-            <field name="type">form</field>
             <field name="model">banking.transaction.wizard</field>
             <field name="arch" type="xml">
                 <form string="Match transaction">
diff --git a/account_banking_nl_clieop/__openerp__.py b/account_banking_nl_clieop/__openerp__.py
index 6401de474..9e7aac5b9 100644
--- a/account_banking_nl_clieop/__openerp__.py
+++ b/account_banking_nl_clieop/__openerp__.py
@@ -37,5 +37,5 @@
     ClieOp format is used by Dutch banks to batch national bank transfers.
     This module uses the account_banking logic.
     ''',
-    'installable': False,
+    'installable': True,
 }
diff --git a/account_banking_nl_clieop/account_banking_nl_clieop.xml b/account_banking_nl_clieop/account_banking_nl_clieop.xml
index f40861f8a..8b4658b7f 100644
--- a/account_banking_nl_clieop/account_banking_nl_clieop.xml
+++ b/account_banking_nl_clieop/account_banking_nl_clieop.xml
@@ -11,7 +11,6 @@
         <record id="view_banking_export_clieop_form" model="ir.ui.view">
             <field name="name">account.banking.export.clieop.form</field>
             <field name="model">banking.export.clieop</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Client Opdrachten Export">
                     <notebook>
@@ -48,7 +47,6 @@
         <record id="view_banking_export_clieop_tree" model="ir.ui.view">
             <field name="name">account.banking.export.clieop.tree</field>
             <field name="model">banking.export.clieop</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Client Opdrachten Export">
                     <field name="filetype" />
diff --git a/account_banking_nl_clieop/wizard/export_clieop_view.xml b/account_banking_nl_clieop/wizard/export_clieop_view.xml
index 3c6754e51..34b3e4cfe 100644
--- a/account_banking_nl_clieop/wizard/export_clieop_view.xml
+++ b/account_banking_nl_clieop/wizard/export_clieop_view.xml
@@ -4,7 +4,6 @@
         <record id="banking_export_clieop_wizard_view" model="ir.ui.view">
             <field name="name">banking.export.clieop.wizard.view</field>
             <field name="model">banking.export.clieop.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Client Opdrachten Export">
                     <field name="state" invisible="True"/>
diff --git a/account_banking_payment/__openerp__.py b/account_banking_payment/__openerp__.py
index 98507a061..af1ecab2e 100644
--- a/account_banking_payment/__openerp__.py
+++ b/account_banking_payment/__openerp__.py
@@ -37,6 +37,7 @@
     'data': [
         'view/account_payment.xml',
         'view/banking_transaction_wizard.xml',
+        'view/payment_mode.xml',
         'view/payment_mode_type.xml',
         'view/bank_payment_manual.xml',
         'data/payment_mode_type.xml',
@@ -53,5 +54,5 @@
         account_banking_nl_clieop
     ''',
     'auto_install': True,
-    'installable': False,
+    'installable': True,
 }
diff --git a/account_banking_payment/model/payment_line.py b/account_banking_payment/model/payment_line.py
index f46010a1e..3d5bdf247 100644
--- a/account_banking_payment/model/payment_line.py
+++ b/account_banking_payment/model/payment_line.py
@@ -47,10 +47,10 @@ class payment_line(orm.Model):
             ], 'State', select=True
         ),
         'msg': fields.char('Message', size=255, required=False, readonly=True),
+        'date_done': fields.date(
+            'Date Confirmed', select=True, readonly=True),
 
         # Redefined fields: added states
-        'date_done': fields.datetime('Date Confirmed', select=True,
-                                     readonly=True),
         'name': fields.char(
             'Your Reference', size=64, required=True,
             states={
@@ -159,12 +159,19 @@ class payment_line(orm.Model):
                 'done': [('readonly', True)]
             },
         ),
-    }
+        'transit_move_line_id': fields.many2one(
+            # this line is part of the credit side of move 2a 
+            # from the documentation
+            'account.move.line', 'Debit move line',
+            readonly=True,
+            help="Move line through which the debit order pays the invoice",
+            ),
+        }
+
     _defaults = {
         'export_state': 'draft',
-        'date_done': False,
         'msg': '',
-    }
+        }
 
     def fields_get(self, cr, uid, fields=None, context=None):
         res = super(payment_line, self).fields_get(cr, uid, fields, context)
@@ -290,13 +297,3 @@ class payment_line(orm.Model):
             netsvc.LocalService("workflow").trg_validate(
                 uid, 'account.invoice', torec_move_line.invoice.id,
                 'undo_debit_denied', cr)
-
-
-    _columns = {
-        'transit_move_line_id': fields.many2one(
-            # this line is part of the credit side of move 2a 
-            # from the documentation
-            'account.move.line', 'Debit move line',
-            readonly=True,
-            help="Move line through which the debit order pays the invoice"),
-        }
diff --git a/account_banking_payment/view/account_payment.xml b/account_banking_payment/view/account_payment.xml
index b2233c225..5afca51c1 100644
--- a/account_banking_payment/view/account_payment.xml
+++ b/account_banking_payment/view/account_payment.xml
@@ -9,7 +9,6 @@
             <field name="name">account.payment.order.form.banking-1</field>
             <field name="inherit_id" ref="account_payment.view_payment_order_form" />
             <field name="model">payment.order</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/group/button[@string='Select Invoices to Pay']"
@@ -22,7 +21,8 @@
                     </xpath>
                     <xpath expr="/form/group/button[@string='Make Payments']"
                            position="replace">
-                        <button name="launch_wizard" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
+                        <button name="launch_wizard" states="open"
+                                string="Make Payments" type="object" icon="gtk-execute"/>
                         <newline/>
                     </xpath>
                 </data>
@@ -33,34 +33,13 @@
             <field name="name">account.payment.order.tree.banking-1</field>
             <field name="inherit_id" ref="account_payment.view_payment_order_tree" />
             <field name="model">payment.order</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
 		<button string="Make Payments" position="replace">
-                    <button name="launch_wizard" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
+                    <button name="launch_wizard" states="open"
+                            string="Make Payments" type="object" icon="gtk-execute"/>
                 </button>
             </field>
         </record>
 
-	<!-- Add transfer settings -->
-	<record model="ir.ui.view" id="view_payment_mode_form">
-	  <field name="name">payment.mode.form add transfer account</field>
-	  <field name="model">payment.mode</field>
-	  <field name="inherit_id" ref="account_banking.view_payment_mode_form_inherit"/>
-	  <field name="type">form</field>
-	  <field name="arch" type="xml">
-	    <field name="type" position="after">
-	      <field name="transfer_account_id"
-                     domain="[('type', '=', 'other'),
-                              ('reconcile', '=', True),
-                              ('company_id', '=', company_id)]"
-                     />
-	      <field name="transfer_journal_id"
-                     domain="[('company_id', '=', company_id)]"
-                     />
-              <field name="payment_term_ids"/>
-	    </field>
-	  </field>
-	</record>
-
     </data>
 </openerp>
diff --git a/account_banking_payment/view/bank_payment_manual.xml b/account_banking_payment/view/bank_payment_manual.xml
index 64e8bd08a..538862ca3 100644
--- a/account_banking_payment/view/bank_payment_manual.xml
+++ b/account_banking_payment/view/bank_payment_manual.xml
@@ -4,9 +4,8 @@
         <record id="view_payment_manual_form" model="ir.ui.view">
             <field name="name">Form for manual payment wizard</field>
             <field name="model">payment.manual</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form string="Manual payment">
                     <label string="Payment order(s) have been set to 'sent'"/>
                     <button special="cancel" icon="gtk-ok" string="OK"/>
                 </form>
diff --git a/account_banking_payment/view/banking_transaction_wizard.xml b/account_banking_payment/view/banking_transaction_wizard.xml
index aaa80fc64..fa9118107 100644
--- a/account_banking_payment/view/banking_transaction_wizard.xml
+++ b/account_banking_payment/view/banking_transaction_wizard.xml
@@ -6,7 +6,6 @@
             <field name="model">banking.transaction.wizard</field>
             <field name="inherit_id"
                    ref="account_banking.transaction_wizard_first" />
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="invoice_ids" position="before">
                     <field name="payment_order_ids" invisible="True"/>
diff --git a/account_banking_payment/view/payment_mode.xml b/account_banking_payment/view/payment_mode.xml
new file mode 100644
index 000000000..1f54cda12
--- /dev/null
+++ b/account_banking_payment/view/payment_mode.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- 
+             Add the payment mode type and transfer settings
+        -->
+        <record id="view_payment_mode_form_inherit" model="ir.ui.view">
+            <field name="name">payment.mode.form.inherit</field>
+            <field name="model">payment.mode</field>
+            <field name="inherit_id" ref="account_payment.view_payment_mode_form"/>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="type"/>
+                    <field name="transfer_account_id"
+                           domain="[('type', '=', 'other'),
+                                   ('reconcile', '=', True),
+                                   ('company_id', '=', company_id)]"
+                           />
+                    <field name="transfer_journal_id"
+                           domain="[('company_id', '=', company_id)]"
+                           />
+                    <field name="payment_term_ids"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/account_banking_payment/view/payment_mode_type.xml b/account_banking_payment/view/payment_mode_type.xml
index c8a3b1c49..47a5121c9 100644
--- a/account_banking_payment/view/payment_mode_type.xml
+++ b/account_banking_payment/view/payment_mode_type.xml
@@ -2,24 +2,10 @@
 <openerp>
     <data>
 
-        <!-- Add the payment mode type to the payment mode views -->
-        <record id="view_payment_mode_form_inherit" model="ir.ui.view">
-            <field name="name">payment.mode.form.inherit</field>
-            <field name="model">payment.mode</field>
-            <field name="inherit_id" ref="account_payment.view_payment_mode_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="company_id" position="after">
-                    <field name="type"/>
-                </field>
-            </field>
-        </record>
-
         <record id="view_payment_mode_tree_inherit" model="ir.ui.view">
             <field name="name">payment.mode.tree.inherit</field>
             <field name="model">payment.mode</field>
             <field name="inherit_id" ref="account_payment.view_payment_mode_tree"/>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <field name="company_id" position="after">
                     <field name="type"/>
@@ -31,9 +17,8 @@
         <record model="ir.ui.view" id="view_payment_mode_type_form">
             <field name="name">view.payment.mode.type.form</field>
             <field name="model">payment.mode.type</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form string="Payment mode">
 		    <field name="name" />
 		    <field name="code" />
 		    <field name="suitable_bank_types"/>
diff --git a/account_direct_debit/__openerp__.py b/account_direct_debit/__openerp__.py
index da3d223c7..f5791122b 100644
--- a/account_direct_debit/__openerp__.py
+++ b/account_direct_debit/__openerp__.py
@@ -22,7 +22,7 @@
     'name': 'Direct Debit',
     'version': '7.0.2.134',
     'license': 'AGPL-3',
-    'author': '['Therp BV', 'Smile']',
+    'author': ['Therp BV', 'Smile'],
     'website': 'https://launchpad.net/banking-addons',
     'category': 'Banking addons',
     'depends': ['account_banking'],
@@ -48,5 +48,5 @@ of modules helps you to provide support for communications with your local
 banking institutions. The banking addons are a continuation of Account Banking
 Framework by Edusense BV. See https://launchpad.net/banking-addons.
     ''',
-    'installable': False,
+    'installable': True,
 }
diff --git a/account_direct_debit/view/account_invoice.xml b/account_direct_debit/view/account_invoice.xml
index c43ee8bcb..ece0e8d6e 100644
--- a/account_direct_debit/view/account_invoice.xml
+++ b/account_direct_debit/view/account_invoice.xml
@@ -4,7 +4,6 @@
         <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="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
                 <data>
diff --git a/account_direct_debit/view/account_payment.xml b/account_direct_debit/view/account_payment.xml
index 8ebb27b35..05797f0b1 100644
--- a/account_direct_debit/view/account_payment.xml
+++ b/account_direct_debit/view/account_payment.xml
@@ -25,7 +25,6 @@
         <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="inherit_id" ref="account_payment.view_payment_order_form"/>
             <field name="priority" eval="60"/>
             <field name="arch" type="xml">
@@ -54,7 +53,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 name="inherit_id" ref="account_payment.view_payment_line_tree"/>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
diff --git a/bank_statement_instant_voucher/view/account_bank_statement_line.xml b/bank_statement_instant_voucher/view/account_bank_statement_line.xml
index 1ca7ea52b..15660e9aa 100644
--- a/bank_statement_instant_voucher/view/account_bank_statement_line.xml
+++ b/bank_statement_instant_voucher/view/account_bank_statement_line.xml
@@ -5,7 +5,6 @@
             <field name="name">Add instant voucher button to bank statement line on statement form</field>
             <field name="inherit_id" ref="account.view_bank_statement_form" />
             <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
             <field name="priority" eval="30"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='voucher_id']"
diff --git a/bank_statement_instant_voucher/view/account_voucher_instant.xml b/bank_statement_instant_voucher/view/account_voucher_instant.xml
index cccf06fb8..559dc14bf 100644
--- a/bank_statement_instant_voucher/view/account_voucher_instant.xml
+++ b/bank_statement_instant_voucher/view/account_voucher_instant.xml
@@ -4,7 +4,6 @@
         <record id="instant_voucher_form" model="ir.ui.view">
             <field name="name">Instant voucher form view</field>
             <field name="model">account.voucher.instant</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form>
                     <field name="state" invisible="1" readonly="1"/>