diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 77a76723cdc..927fda19182 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -60,9 +60,6 @@ This module manages:
         'security/account_voucher_security.xml',
         'account_voucher_data.xml',
     ],
-    'js': [
-        'static/src/js/account_voucher.js',
-    ],
     'test' : [
         'test/case5_suppl_usd_usd.yml',
         'test/account_voucher.yml',
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index bfe6434613b..b0c53b72835 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -267,7 +267,7 @@ class account_voucher(osv.osv):
     _order = "date desc, id desc"
 #    _rec_name = 'number'
     _columns = {
-        'active':fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the payment term without removing it."),
+        'active': fields.boolean('Active', help="By default, reconciliation vouchers made on draft bank statements are set as inactive, which allow to hide the customer/supplier payment while the bank statement isn't confirmed."),
         'type':fields.selection([
             ('sale','Sale'),
             ('purchase','Purchase'),
@@ -329,7 +329,7 @@ class account_voucher(osv.osv):
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
     }
     _defaults = {
-        'active': lambda *a: True,
+        'active': True,
         'period_id': _get_period,
         'partner_id': _get_partner,
         'journal_id':_get_journal,
@@ -1510,12 +1510,12 @@ class account_bank_statement(osv.osv):
     _inherit = 'account.bank.statement'
 
     def button_confirm_bank(self, cr, uid, ids, context=None):
-        statementLine = self.pool.get('account.bank.statement.line')
-        voucher = self.pool.get('account.voucher')
+        voucher_obj = self.pool.get('account.voucher')
+        voucher_ids = []
         for statement in self.browse(cr, uid, ids, context=context):
-            for line in statement.line_ids:
-                if line.voucher_id:
-                    voucher.write(cr, uid, line.voucher_id.id, {'active':True}, context=context)
+            voucher_ids += [line.voucher_id.id for line in statement.line_ids if line.voucher_id]
+        if voucher_ids:
+            voucher_obj.write(cr, uid, voucher_ids, {'active': True}, context=context)
         return super(account_bank_statement, self).button_confirm_bank(cr, uid, ids, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
@@ -1548,13 +1548,6 @@ class account_bank_statement(osv.osv):
             return move_line_obj.write(cr, uid, [x.id for x in v.move_ids], {'statement_id': st_line.statement_id.id}, context=context)
         return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line.id, company_currency_id, next_number, context=context)
 
-    def unlink(self, cr, uid, ids, context=None):
-        statementLine = self.pool.get('account.bank.statement.line')
-        for statement in self.read(cr, uid, ids, ['line_ids'], context=context):
-            statementLine.unlink(cr, uid, statement['line_ids'], context=context)
-        return super(account_bank_statement, self).unlink(cr, uid, ids, context=context)
-
-
 account_bank_statement()
 
 class account_bank_statement_line(osv.osv):
@@ -1562,6 +1555,8 @@ class account_bank_statement_line(osv.osv):
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
         res = super(account_bank_statement_line, self).onchange_partner_id(cr, uid, ids, partner_id, context=context)
+        if 'value' not in res:
+            res['value'] = {}
         res['value'].update({'voucher_id' : False})
         return res
 
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 7460feada15..2cb393f4008 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -206,24 +206,16 @@
             </field>
         </record>
 
-        <record id="view_bank_statement_tree_voucher" model="ir.ui.view">
+        <record id="view_bank_statement_form_voucher" model="ir.ui.view">
             <field name="name">account.bank.statement.voucher.tree.inherit</field>
             <field name="model">account.bank.statement</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">
-                    <field name="voucher_id" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Reconciled'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
+                    <field name="voucher_id" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False}"/>
                 </xpath>
-            </field>
-        </record>
-
-        <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="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">
-                    <field name="voucher_id" widget="many2onebutton" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
+                    <field name="voucher_id" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False}"/>
                 </xpath>
                 <field name="amount" position="attributes">
                     <attribute name="on_change">onchange_amount(amount)</attribute>
diff --git a/addons/account_voucher/static/src/js/account_voucher.js b/addons/account_voucher/static/src/js/account_voucher.js
deleted file mode 100644
index f70ca275d49..00000000000
--- a/addons/account_voucher/static/src/js/account_voucher.js
+++ /dev/null
@@ -1,12 +0,0 @@
-openerp.account_voucher = function(instance) {
-
-    instance.web.form.Many2OneButton = instance.web.form.Many2OneButton.extend({
-        on_click: function() {
-            this._super.apply(this, arguments);
-            this.popup.on('create_completed', self, function(r) {
-                var voucher = new instance.web.Model('account.voucher');
-                voucher.call('write', [[r], {'active':false}]);
-            });
-        },
-    });
-}
\ No newline at end of file