From 8f294520278d2fc55cd31e63b83e5a693a32eb29 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 31 Oct 2012 15:03:34 +0100
Subject: [PATCH 01/16] [IMP] Improved voucher_id field in bank statement
 lines.

bzr revid: vta@openerp.com-20121031140334-mqi6hcofjuk4zps0
---
 addons/account/account_view.xml               |  4 +-
 addons/account_voucher/__openerp__.py         |  9 +++
 addons/account_voucher/account_voucher.py     |  2 +-
 .../account_voucher/account_voucher_view.xml  |  4 +-
 .../src/js/account_voucher_reconciliation.js  | 74 +++++++++++++++++++
 5 files changed, 88 insertions(+), 5 deletions(-)
 create mode 100644 addons/account_voucher/static/src/js/account_voucher_reconciliation.js

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d9e95f15079..bf3fe6aaafb 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -650,7 +650,7 @@
                                     <field name="ref"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
+                                    <field name="account_id" domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                     <field name="amount"/>
                                 </tree>
@@ -661,7 +661,7 @@
                                         <field name="ref"/>
                                         <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                         <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                        <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
+                                        <field name="account_id" domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]"/>
                                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                         <field name="amount"/>
                                         <field name="sequence" readonly="0"/>
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index c0011c8b3c5..ac80a7f32b0 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -60,6 +60,15 @@ This module manages:
         'security/account_voucher_security.xml',
         'account_voucher_data.xml',
     ],
+    'js': [
+        'static/src/js/account_voucher_reconciliation.js',
+    ],
+    'qweb' : [
+        'static/src/xml/account_voucher_reconciliation.xml',
+    ],
+    'css': [
+        #'static/src/css/account_voucher_reconciliation.css',
+    ],
     'test' : [
         'test/account_voucher.yml',
         'test/sales_receipt.yml',
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index e1caf190316..8774b717477 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1565,7 +1565,7 @@ class account_bank_statement_line(osv.osv):
     _columns = {
         'amount_reconciled': fields.function(_amount_reconciled,
             string='Amount reconciled', type='float'),
-        'voucher_id': fields.many2one('account.voucher', 'Payment'),
+        'voucher_id': fields.many2one('account.voucher', 'Reconciliation'),
     }
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 4b02d697982..55a07c5fd99 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -212,7 +212,7 @@
             <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" 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="account_voucher_field" 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}"/>
                 </xpath>
             </field>
         </record>
@@ -223,7 +223,7 @@
             <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" 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="account_voucher_field" 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}"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/account_voucher/static/src/js/account_voucher_reconciliation.js b/addons/account_voucher/static/src/js/account_voucher_reconciliation.js
new file mode 100644
index 00000000000..7a4d47403f6
--- /dev/null
+++ b/addons/account_voucher/static/src/js/account_voucher_reconciliation.js
@@ -0,0 +1,74 @@
+openerp.account_voucher = function (instance) {
+    var _t = instance.web._t,
+        _lt = instance.web._lt;
+    var QWeb = instance.web.qweb;
+    
+    instance.web.account_voucher = {};
+
+    instance.web.form.widgets.add('account_voucher_field', 'instance.web.account_voucher.AccountVoucherField');
+    instance.web.account_voucher.AccountVoucherField = instance.web.form.AbstractField.extend({
+        template: 'FieldAccountVoucher',
+        init: function(field_manager, node) {            
+            this._super.apply(this, arguments);
+            var self = this;
+            this.set('value', false);
+            this.is_started = false;           
+        },
+        start: function() {
+            this._super.apply(this, arguments);
+            var self = this;
+            this.string = this.get('value') ? _t('Edit') : _t('Create');
+            this.node.attrs.icon = this.get('value') ? '/web/static/src/img/icons/gtk-yes.png' : '/web/static/src/img/icons/gtk-no.png';
+            this.$button = $(QWeb.render('WidgetButton', {'widget': this}));
+            this.$el.append(this.$button);
+            this.$button.on('click', self.on_click);
+            this.is_started = true;
+        },
+        on_click: function(ev) {
+            var self = this;
+            ev.stopPropagation();
+            var popup =  new instance.web.form.FormOpenPopup(this);
+            popup.show_element(
+                this.field.relation,
+                this.get('value'),
+                this.build_context(),
+                {title: _t("Voucher: ") + this.string}
+            );
+            popup.on('create_completed write_completed', self, function(r){
+                self.set_value(r);
+            });
+        },
+        // render_value: function() {},
+        set_value: function(value_) {
+            var self = this;
+            if (value_ instanceof Array) {
+                value_ = value_[0];
+            }
+            value_ = value_ || false;
+            this.set('value', value_);
+            if (this.is_started) {
+                this.render_value();
+            }
+         },
+        // get_value: function() {},
+        // set_input_id: function(id) {},
+        // is_valid: function() {},
+        // is_syntax_valid: function() {},
+        // focus: function() {},
+        // on_translate: function() {},
+
+    });
+
+    instance.web.list.columns.add('field.account_voucher_field', 'instance.web.list.AccountVoucherField');
+    instance.web.list.AccountVoucherField = instance.web.list.Column.extend({
+        format: function (row_data, options) {
+            if (row_data.voucher_id.value) {
+                this.icon = '/web/static/src/img/icons/gtk-yes.png';
+            } else {
+                this.icon = '/web/static/src/img/icons/gtk-no.png';
+            }
+            return QWeb.render('FieldAccountVoucher.cell', {'widget': this});
+        },
+    });
+
+};
\ No newline at end of file

From af6f626a2c642320da491966b5f42c3fd4221c3e Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 31 Oct 2012 16:06:16 +0100
Subject: [PATCH 02/16] [ADD] Added new files.

bzr revid: vta@openerp.com-20121031150616-m4i6dp2xa6edkgxr
---
 .../src/css/account_voucher_reconciliation.css    |  0
 .../src/js/account_voucher_reconciliation.js      |  2 +-
 .../src/xml/account_voucher_reconciliation.xml    | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 addons/account_voucher/static/src/css/account_voucher_reconciliation.css
 create mode 100644 addons/account_voucher/static/src/xml/account_voucher_reconciliation.xml

diff --git a/addons/account_voucher/static/src/css/account_voucher_reconciliation.css b/addons/account_voucher/static/src/css/account_voucher_reconciliation.css
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/account_voucher/static/src/js/account_voucher_reconciliation.js b/addons/account_voucher/static/src/js/account_voucher_reconciliation.js
index 7a4d47403f6..8c96d7441be 100644
--- a/addons/account_voucher/static/src/js/account_voucher_reconciliation.js
+++ b/addons/account_voucher/static/src/js/account_voucher_reconciliation.js
@@ -61,7 +61,7 @@ openerp.account_voucher = function (instance) {
 
     instance.web.list.columns.add('field.account_voucher_field', 'instance.web.list.AccountVoucherField');
     instance.web.list.AccountVoucherField = instance.web.list.Column.extend({
-        format: function (row_data, options) {
+        _format: function (row_data, options) {
             if (row_data.voucher_id.value) {
                 this.icon = '/web/static/src/img/icons/gtk-yes.png';
             } else {
diff --git a/addons/account_voucher/static/src/xml/account_voucher_reconciliation.xml b/addons/account_voucher/static/src/xml/account_voucher_reconciliation.xml
new file mode 100644
index 00000000000..8ac808920b1
--- /dev/null
+++ b/addons/account_voucher/static/src/xml/account_voucher_reconciliation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+
+    <t t-name="FieldAccountVoucher">
+        <span class="oe_form_field">
+        </span>
+    </t>
+
+    <t t-name="FieldAccountVoucher.cell"
+        ><img t-if="widget.icon" t-att-src="_s + widget.icon" width="16" height="16"/>
+    </t>
+
+</templates>
\ No newline at end of file

From e60907fa8da7d9cd9c2eb34e38b2beca9090b8b2 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 31 Oct 2012 16:21:10 +0100
Subject: [PATCH 03/16] [REM] Removed unused code.

bzr revid: vta@openerp.com-20121031152110-1v8qeocy6dd5kntb
---
 .../static/src/js/account_voucher_reconciliation.js   | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/addons/account_voucher/static/src/js/account_voucher_reconciliation.js b/addons/account_voucher/static/src/js/account_voucher_reconciliation.js
index 8c96d7441be..c500125510f 100644
--- a/addons/account_voucher/static/src/js/account_voucher_reconciliation.js
+++ b/addons/account_voucher/static/src/js/account_voucher_reconciliation.js
@@ -11,8 +11,7 @@ openerp.account_voucher = function (instance) {
         init: function(field_manager, node) {            
             this._super.apply(this, arguments);
             var self = this;
-            this.set('value', false);
-            this.is_started = false;           
+            this.set('value', false);          
         },
         start: function() {
             this._super.apply(this, arguments);
@@ -22,7 +21,6 @@ openerp.account_voucher = function (instance) {
             this.$button = $(QWeb.render('WidgetButton', {'widget': this}));
             this.$el.append(this.$button);
             this.$button.on('click', self.on_click);
-            this.is_started = true;
         },
         on_click: function(ev) {
             var self = this;
@@ -38,7 +36,6 @@ openerp.account_voucher = function (instance) {
                 self.set_value(r);
             });
         },
-        // render_value: function() {},
         set_value: function(value_) {
             var self = this;
             if (value_ instanceof Array) {
@@ -50,12 +47,6 @@ openerp.account_voucher = function (instance) {
                 this.render_value();
             }
          },
-        // get_value: function() {},
-        // set_input_id: function(id) {},
-        // is_valid: function() {},
-        // is_syntax_valid: function() {},
-        // focus: function() {},
-        // on_translate: function() {},
 
     });
 

From c75d2605059afe5c939147df00bf92c10f04770b Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Fri, 2 Nov 2012 10:38:57 +0100
Subject: [PATCH 04/16] [FIX] Refactoring of view_vendor_receipt_form.

bzr revid: vta@openerp.com-20121102093857-es04l1spvh1h63z8
---
 addons/account/account_view.xml               |  4 +--
 .../account_analytic_plans_view.xml           |  2 +-
 .../src/js/account_voucher_reconciliation.js  |  2 +-
 .../voucher_payment_receipt_view.xml          | 26 +++++++++----------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index bf3fe6aaafb..159f2f704a0 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -302,7 +302,7 @@
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
 
-         <record id="view_account_gain_loss_tree" model="ir.ui.view">
+        <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="arch" type="xml">
@@ -322,7 +322,7 @@
             </field>
         </record>
 
-          <record id="action_account_gain_loss" model="ir.actions.act_window">
+        <record id="action_account_gain_loss" model="ir.actions.act_window">
             <field name="name">Unrealized Gain or Loss</field>
             <field name="res_model">account.account</field>
             <field name="view_type">form</field>
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 76d6aeed7b8..a4b8f0756f5 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -276,7 +276,7 @@
                 </field>
             </field>
         </record>
-         <record model="ir.ui.view" id="view_default_inherit_tree">
+        <record model="ir.ui.view" id="view_default_inherit_tree">
             <field name="name">account.analytic.default.tree.plans</field>
             <field name="model">account.analytic.default</field>
             <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_tree"/>
diff --git a/addons/account_voucher/static/src/js/account_voucher_reconciliation.js b/addons/account_voucher/static/src/js/account_voucher_reconciliation.js
index c500125510f..09616a139fb 100644
--- a/addons/account_voucher/static/src/js/account_voucher_reconciliation.js
+++ b/addons/account_voucher/static/src/js/account_voucher_reconciliation.js
@@ -8,7 +8,7 @@ openerp.account_voucher = function (instance) {
     instance.web.form.widgets.add('account_voucher_field', 'instance.web.account_voucher.AccountVoucherField');
     instance.web.account_voucher.AccountVoucherField = instance.web.form.AbstractField.extend({
         template: 'FieldAccountVoucher',
-        init: function(field_manager, node) {            
+        init: function(field_manager, node) {
             this._super.apply(this, arguments);
             var self = this;
             this.set('value', false);          
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index e1a48c6c535..a671fe2c358 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -390,35 +390,33 @@
             <field name="model">account.voucher</field>
             <field name="arch" type="xml">
                 <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)"/>
-                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
+                <header invisible="context.get('line_type', False)">
+                    <button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet>
                     <h1 attrs="{'invisible': [('number','=',False)]}"><field name="number"/></h1>
-                    <group>
+                    <group invisible="context.get('line_type', False)">
                         <group>
-                            <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+                            <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
                             <field name="currency_id" invisible="1"/>
                             <field name="amount" class="oe_inline"
                                 string="Paid Amount"
                                 widget="monetary" options="{'currency_field': 'currency_id'}"
-                                invisible="context.get('line_type', False)"
                                 on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                             <field name="journal_id"
                                 domain="[('type','in',['bank', 'cash'])]"
-                                invisible="context.get('line_type', False)"
                                 widget="selection"
                                 on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                                 string="Payment Method"/>
                         </group>
                         <group>
-                            <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
-                            <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="e.g. 003/10"/>
-                            <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="e.g. Invoice SAJ/0042"/>
+                            <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                            <field name="reference" string="Payment Ref" placeholder="e.g. 003/10"/>
+                            <field name="name" colspan="2" placeholder="e.g. Invoice SAJ/0042"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
 
                             <field name="account_id"
@@ -430,7 +428,7 @@
                     </group>
                     <notebook>
                         <page string="Payment Information" groups="base.group_user">
-                            <label for="line_cr_ids"/>
+                            <label for="line_cr_ids" invisible="context.get('line_type', False)"/>
                             <field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -511,7 +509,7 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <div class="oe_chatter">
+                    <div class="oe_chatter" invisible="context.get('line_type', False)">
                         <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
                     </div>

From c4fe6c2f58f43a1434f13a538ba8df034e5d8348 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Mon, 5 Nov 2012 13:53:46 +0100
Subject: [PATCH 05/16] [REM] Removed many2onebutton widget from
 account_voucher, now in view_form.js and view_list.js, as standard widget.

bzr revid: vta@openerp.com-20121105125346-v8hgfn157ef0j8fl
---
 addons/account/account_view.xml               |  4 +-
 addons/account_voucher/__openerp__.py         |  9 ---
 .../account_voucher/account_voucher_view.xml  |  4 +-
 .../css/account_voucher_reconciliation.css    |  0
 .../src/js/account_voucher_reconciliation.js  | 65 -------------------
 .../xml/account_voucher_reconciliation.xml    | 15 -----
 6 files changed, 4 insertions(+), 93 deletions(-)
 delete mode 100644 addons/account_voucher/static/src/css/account_voucher_reconciliation.css
 delete mode 100644 addons/account_voucher/static/src/js/account_voucher_reconciliation.js
 delete mode 100644 addons/account_voucher/static/src/xml/account_voucher_reconciliation.xml

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 159f2f704a0..e050daec2b1 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1055,7 +1055,7 @@
             </field>
         </record>
 
-         <record id="view_move_line_tree" model="ir.ui.view">
+        <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 eval="4" name="priority"/>
@@ -1850,7 +1850,7 @@
             </field>
         </record>
 
-         <record id="view_subscription_search" model="ir.ui.view">
+        <record id="view_subscription_search" model="ir.ui.view">
             <field name="name">account.subscription.search</field>
             <field name="model">account.subscription</field>
             <field name="arch" type="xml">
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index ac80a7f32b0..c0011c8b3c5 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -60,15 +60,6 @@ This module manages:
         'security/account_voucher_security.xml',
         'account_voucher_data.xml',
     ],
-    'js': [
-        'static/src/js/account_voucher_reconciliation.js',
-    ],
-    'qweb' : [
-        'static/src/xml/account_voucher_reconciliation.xml',
-    ],
-    'css': [
-        #'static/src/css/account_voucher_reconciliation.css',
-    ],
     'test' : [
         'test/account_voucher.yml',
         'test/sales_receipt.yml',
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 55a07c5fd99..333cde7638f 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -212,7 +212,7 @@
             <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="account_voucher_field" 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" 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}"/>
                 </xpath>
             </field>
         </record>
@@ -223,7 +223,7 @@
             <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="account_voucher_field" 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" 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}"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/account_voucher/static/src/css/account_voucher_reconciliation.css b/addons/account_voucher/static/src/css/account_voucher_reconciliation.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/addons/account_voucher/static/src/js/account_voucher_reconciliation.js b/addons/account_voucher/static/src/js/account_voucher_reconciliation.js
deleted file mode 100644
index 09616a139fb..00000000000
--- a/addons/account_voucher/static/src/js/account_voucher_reconciliation.js
+++ /dev/null
@@ -1,65 +0,0 @@
-openerp.account_voucher = function (instance) {
-    var _t = instance.web._t,
-        _lt = instance.web._lt;
-    var QWeb = instance.web.qweb;
-    
-    instance.web.account_voucher = {};
-
-    instance.web.form.widgets.add('account_voucher_field', 'instance.web.account_voucher.AccountVoucherField');
-    instance.web.account_voucher.AccountVoucherField = instance.web.form.AbstractField.extend({
-        template: 'FieldAccountVoucher',
-        init: function(field_manager, node) {
-            this._super.apply(this, arguments);
-            var self = this;
-            this.set('value', false);          
-        },
-        start: function() {
-            this._super.apply(this, arguments);
-            var self = this;
-            this.string = this.get('value') ? _t('Edit') : _t('Create');
-            this.node.attrs.icon = this.get('value') ? '/web/static/src/img/icons/gtk-yes.png' : '/web/static/src/img/icons/gtk-no.png';
-            this.$button = $(QWeb.render('WidgetButton', {'widget': this}));
-            this.$el.append(this.$button);
-            this.$button.on('click', self.on_click);
-        },
-        on_click: function(ev) {
-            var self = this;
-            ev.stopPropagation();
-            var popup =  new instance.web.form.FormOpenPopup(this);
-            popup.show_element(
-                this.field.relation,
-                this.get('value'),
-                this.build_context(),
-                {title: _t("Voucher: ") + this.string}
-            );
-            popup.on('create_completed write_completed', self, function(r){
-                self.set_value(r);
-            });
-        },
-        set_value: function(value_) {
-            var self = this;
-            if (value_ instanceof Array) {
-                value_ = value_[0];
-            }
-            value_ = value_ || false;
-            this.set('value', value_);
-            if (this.is_started) {
-                this.render_value();
-            }
-         },
-
-    });
-
-    instance.web.list.columns.add('field.account_voucher_field', 'instance.web.list.AccountVoucherField');
-    instance.web.list.AccountVoucherField = instance.web.list.Column.extend({
-        _format: function (row_data, options) {
-            if (row_data.voucher_id.value) {
-                this.icon = '/web/static/src/img/icons/gtk-yes.png';
-            } else {
-                this.icon = '/web/static/src/img/icons/gtk-no.png';
-            }
-            return QWeb.render('FieldAccountVoucher.cell', {'widget': this});
-        },
-    });
-
-};
\ No newline at end of file
diff --git a/addons/account_voucher/static/src/xml/account_voucher_reconciliation.xml b/addons/account_voucher/static/src/xml/account_voucher_reconciliation.xml
deleted file mode 100644
index 8ac808920b1..00000000000
--- a/addons/account_voucher/static/src/xml/account_voucher_reconciliation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
-<templates id="template" xml:space="preserve">
-
-    <t t-name="FieldAccountVoucher">
-        <span class="oe_form_field">
-        </span>
-    </t>
-
-    <t t-name="FieldAccountVoucher.cell"
-        ><img t-if="widget.icon" t-att-src="_s + widget.icon" width="16" height="16"/>
-    </t>
-
-</templates>
\ No newline at end of file

From 01d33d5d063078002a289b045bda483cd2e140f1 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Tue, 6 Nov 2012 16:36:02 +0100
Subject: [PATCH 06/16] [IMP] Make account.voucher inactive by default, and
 only change its state when confirming the corresponding bank statement.
 Improved bank statement unlink method, also removing its corresponding
 vouchers.

bzr revid: vta@openerp.com-20121106153602-jmtaqkn55o5hxwyv
---
 addons/account_voucher/account_voucher.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 8774b717477..8f34fd8a1fc 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -267,6 +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."),
         'type':fields.selection([
             ('sale','Sale'),
             ('purchase','Purchase'),
@@ -328,6 +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: False,
         'period_id': _get_period,
         'partner_id': _get_partner,
         'journal_id':_get_journal,
@@ -1504,6 +1506,15 @@ account_voucher_line()
 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')
+        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)
+        return super(account_bank_statement, self).button_confirm_bank(cr, uid, ids, context=context)
+
     def button_cancel(self, cr, uid, ids, context=None):
         voucher_obj = self.pool.get('account.voucher')
         for st in self.browse(cr, uid, ids, context=context):
@@ -1534,6 +1545,13 @@ 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):

From bee0f20b667ec99041aee43a1d8f91a607c035cc Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 7 Nov 2012 09:18:27 +0100
Subject: [PATCH 07/16] [IMP] Set the new voucher as inactive.

bzr revid: vta@openerp.com-20121107081827-ncls1h2c5pbjvis3
---
 addons/account_voucher/__openerp__.py                |  3 +++
 addons/account_voucher/account_voucher.py            |  2 +-
 .../account_voucher/static/src/js/account_voucher.js | 12 ++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 addons/account_voucher/static/src/js/account_voucher.js

diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index c0011c8b3c5..85090cd617d 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -60,6 +60,9 @@ This module manages:
         'security/account_voucher_security.xml',
         'account_voucher_data.xml',
     ],
+    'js': [
+        'static/src/js/account_voucher.js',
+    ],
     'test' : [
         'test/account_voucher.yml',
         'test/sales_receipt.yml',
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 8f34fd8a1fc..85ab06714e7 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -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: False,
+        'active': lambda *a: True,
         'period_id': _get_period,
         'partner_id': _get_partner,
         'journal_id':_get_journal,
diff --git a/addons/account_voucher/static/src/js/account_voucher.js b/addons/account_voucher/static/src/js/account_voucher.js
new file mode 100644
index 00000000000..9d38ad252cf
--- /dev/null
+++ b/addons/account_voucher/static/src/js/account_voucher.js
@@ -0,0 +1,12 @@
+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 write_completed', self, function(r) {
+                var voucher = new instance.web.Model('account.voucher');
+                voucher.call('write', [[r], {'active':false}]);
+            });
+        },
+    });
+}
\ No newline at end of file

From 0ad71eb405a2ec089904ec3a13db2b02d3e0fe05 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 7 Nov 2012 09:45:40 +0100
Subject: [PATCH 08/16] [FIX] Hide open m2o icon.

bzr revid: vta@openerp.com-20121107084540-iahqvnuh4q9tcejo
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e050daec2b1..8441c8dbfc9 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -650,7 +650,7 @@
                                     <field name="ref"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field name="account_id" domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]"/>
+                                    <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                     <field name="amount"/>
                                 </tree>

From 4d56a3c591f3aa4659d498ef9daae042d288a1ff Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 7 Nov 2012 16:22:20 +0100
Subject: [PATCH 09/16] [FIX] Remove icon in Import Invoice button, added
 Journal Entries button.

bzr revid: vta@openerp.com-20121107152220-20k5s5i37bem6gug
---
 addons/account/account_view.xml                 | 12 ++++++++++++
 addons/account_voucher/account_voucher_view.xml |  5 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8441c8dbfc9..7931668d6ef 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -680,6 +680,18 @@
             </field>
         </record>
 
+        <record id="view_bank_statement_form_journal_items" model="ir.ui.view">
+            <field name="name">account.bank.statement.journal.items.form.inherit</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="view_bank_statement_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='import_buttons']" position="inside">
+                    <button name=""
+                            string="Journal Items" type="action"
+                            attrs="{'invisible':[('state','!=','confirm')]}"/>
+                </xpath>
+            </field>
+        </record>
 
         <record id="action_bank_statement_tree" model="ir.actions.act_window">
             <field name="name">Bank Statements</field>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 333cde7638f..192c48944d0 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -200,7 +200,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='import_buttons']" position="inside">
                     <button name="%(action_view_account_statement_from_invoice_lines)d"
-                            string="Import Invoices" type="action" icon="gtk-execute"
+                            string="Import Invoices" type="action"
                             attrs="{'invisible':[('state','=','confirm')]}"/>
                 </xpath>
             </field>
@@ -212,7 +212,7 @@
             <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" 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':'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}"/>
                 </xpath>
             </field>
         </record>
@@ -227,6 +227,7 @@
                 </xpath>
             </field>
         </record>
+
         <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>

From d9acaadba7948a7b2a210d4fec1dd0279ad87022 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Thu, 8 Nov 2012 09:59:04 +0100
Subject: [PATCH 10/16] [FIX] Added action to the button.

bzr revid: vta@openerp.com-20121108085904-ktoqdx5eok044g53
---
 addons/account/account_view.xml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7931668d6ef..a946d04d2ff 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -680,15 +680,25 @@
             </field>
         </record>
 
+        <record id="action_view_bank_statement_journal_entries" model="ir.actions.act_window">
+            <field name="name">Journal Items</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">tree</field>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_move_line_tree"/>
+            <field name="domain">[('statement_id', '=', context.get('active_ids'))]</field>
+        </record>
+
         <record id="view_bank_statement_form_journal_items" model="ir.ui.view">
             <field name="name">account.bank.statement.journal.items.form.inherit</field>
             <field name="model">account.bank.statement</field>
             <field name="inherit_id" ref="view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='import_buttons']" position="inside">
-                    <button name=""
+                    <button name="%(action_view_bank_statement_journal_entries)d"
                             string="Journal Items" type="action"
-                            attrs="{'invisible':[('state','!=','confirm')]}"/>
+                            attrs="{'invisible':[('state','!=','confirm')]}"
+                            context="{'journal_id':'journal_id'}"/>
                 </xpath>
             </field>
         </record>

From cb7cb1420be0ffbc06fd0ebbbdbfa2a0786b6964 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Thu, 8 Nov 2012 11:36:34 +0100
Subject: [PATCH 11/16] [FIX] Now the action is type object, method return the
 same action in order to have the right context.

bzr revid: vta@openerp.com-20121108103634-acxd3tyzd13b09ck
---
 addons/account/account_bank_statement.py | 19 +++++++++++++++++++
 addons/account/account_view.xml          | 16 +++-------------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 48082451f35..93d9dec21b3 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -486,6 +486,25 @@ class account_bank_statement(osv.osv):
         default['move_line_ids'] = []
         return super(account_bank_statement, self).copy(cr, uid, id, default, context=context)
 
+    def button_journal_entries(self, cr, uid, ids, context=None):      
+      mod_obj = self.pool.get('ir.model.data')
+      res = mod_obj.get_object_reference(cr, uid, 'account', 'view_move_line_tree')
+      res_id = res and res[1] or False
+      ctx = dict(context)
+      ctx.update({
+        'active_model': 'account.bank.statement',
+        'active_id': ids[0],
+      })
+      return {
+        'view_type':'tree',
+        'view_mode':'tree',
+        'res_model':'account.move.line',
+        'view_id':res_id,
+        'type':'ir.actions.act_window',
+        'domain':[('statement_id','=',ctx.get('active_id'))],
+        'context':ctx,
+      }
+
 account_bank_statement()
 
 class account_bank_statement_line(osv.osv):
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a946d04d2ff..059c96da4a4 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -680,25 +680,15 @@
             </field>
         </record>
 
-        <record id="action_view_bank_statement_journal_entries" model="ir.actions.act_window">
-            <field name="name">Journal Items</field>
-            <field name="res_model">account.move.line</field>
-            <field name="view_type">tree</field>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_move_line_tree"/>
-            <field name="domain">[('statement_id', '=', context.get('active_ids'))]</field>
-        </record>
-
         <record id="view_bank_statement_form_journal_items" model="ir.ui.view">
             <field name="name">account.bank.statement.journal.items.form.inherit</field>
             <field name="model">account.bank.statement</field>
             <field name="inherit_id" ref="view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='import_buttons']" position="inside">
-                    <button name="%(action_view_bank_statement_journal_entries)d"
-                            string="Journal Items" type="action"
-                            attrs="{'invisible':[('state','!=','confirm')]}"
-                            context="{'journal_id':'journal_id'}"/>
+                    <button name="button_journal_entries"
+                            string="Journal Items" type="object"
+                            attrs="{'invisible':[('state','!=','confirm')]}"/>
                 </xpath>
             </field>
         </record>

From 156ba2f21c3793f0357989a9e75bed8f5fd1c382 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Thu, 8 Nov 2012 12:48:54 +0100
Subject: [PATCH 12/16] [FIX] Fixed method.

bzr revid: vta@openerp.com-20121108114854-36dm65swirji13oq
---
 addons/account/account_bank_statement.py | 18 ++++++------------
 addons/account/account_view.xml          |  3 ---
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 93d9dec21b3..c7b6626c8f2 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -486,22 +486,16 @@ class account_bank_statement(osv.osv):
         default['move_line_ids'] = []
         return super(account_bank_statement, self).copy(cr, uid, id, default, context=context)
 
-    def button_journal_entries(self, cr, uid, ids, context=None):      
-      mod_obj = self.pool.get('ir.model.data')
-      res = mod_obj.get_object_reference(cr, uid, 'account', 'view_move_line_tree')
-      res_id = res and res[1] or False
-      ctx = dict(context)
-      ctx.update({
-        'active_model': 'account.bank.statement',
-        'active_id': ids[0],
-      })
+    def button_journal_entries(self, cr, uid, ids, context=None):
+      ctx = (context or {}).copy()
+      ctx['journal_id'] = self.browse(cr, uid, ids[0], context=context).journal_id.id
       return {
-        'view_type':'tree',
+        'view_type':'form',
         'view_mode':'tree',
         'res_model':'account.move.line',
-        'view_id':res_id,
+        'view_id':False,
         'type':'ir.actions.act_window',
-        'domain':[('statement_id','=',ctx.get('active_id'))],
+        'domain':[('statement_id','in',ids)],
         'context':ctx,
       }
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 059c96da4a4..98df5ddee04 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -671,9 +671,6 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Journal Entries" name="move_live_ids">
-                            <field name="move_line_ids"/>
-                        </page>
                     </notebook>
                 </sheet>
                 </form>

From 781c63db9f2ff6e218c72626b8aed3e78609810a Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Thu, 8 Nov 2012 14:16:05 +0100
Subject: [PATCH 13/16] [FIX] Typo.

bzr revid: vta@openerp.com-20121108131605-dmo1rysu4iipki1o
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 100c657c901..8b6dc693347 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -510,7 +510,6 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter" invisible="context.get('line_type', False)">
-                    <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
                         <field name="message_ids" widget="mail_thread"/>
                     </div>

From e93727ab0135a2de14ac4251bfb8490af3685360 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Thu, 8 Nov 2012 16:43:39 +0100
Subject: [PATCH 14/16] [FIX] Many2OneButton, don't subscribe to write_complete
 event.

bzr revid: vta@openerp.com-20121108154339-o5r1wzr08x53g6c4
---
 addons/account_voucher/static/src/js/account_voucher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/static/src/js/account_voucher.js b/addons/account_voucher/static/src/js/account_voucher.js
index 9d38ad252cf..f70ca275d49 100644
--- a/addons/account_voucher/static/src/js/account_voucher.js
+++ b/addons/account_voucher/static/src/js/account_voucher.js
@@ -3,7 +3,7 @@ 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 write_completed', self, function(r) {
+            this.popup.on('create_completed', self, function(r) {
                 var voucher = new instance.web.Model('account.voucher');
                 voucher.call('write', [[r], {'active':false}]);
             });

From 87a3464329fa55562d765c79cc006ff1f360f4c6 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Sat, 10 Nov 2012 19:01:29 +0100
Subject: [PATCH 15/16] [IMP] Added onchange methods in
 account_voucher.account_bank_statement_line for parent_id and amount in order
 to set the voucher_id to False.

bzr revid: vta@openerp.com-20121110180129-ww29a3ciuo90iop5
---
 addons/account_voucher/account_voucher.py       | 8 ++++++++
 addons/account_voucher/account_voucher_view.xml | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 061a213d8d0..cf2c25e3e5f 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1557,6 +1557,14 @@ account_bank_statement()
 class account_bank_statement_line(osv.osv):
     _inherit = 'account.bank.statement.line'
 
+    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)
+        res['value'].update({'voucher_id' : False})
+        return res
+
+    def onchange_amount(self, cr, uid, ids, amount, context=None):
+        return {'value' :  {'voucher_id' : False}}
+
     def _amount_reconciled(self, cursor, user, ids, name, args, context=None):
         if not ids:
             return {}
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 0bed5793587..7460feada15 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -225,6 +225,9 @@
                 <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}"/>
                 </xpath>
+                <field name="amount" position="attributes">
+                    <attribute name="on_change">onchange_amount(amount)</attribute>
+                </field>
             </field>
         </record>
 

From ab297a3dadc0d5c47389baa6673e5f9f9e6cb596 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 13 Nov 2012 13:30:13 +0100
Subject: [PATCH 16/16] [REF] account_voucher: refactoring of new featured
 button to create/edit the reconciliations on bank statement line

bzr revid: qdp-launchpad@openerp.com-20121113123013-htxy2ods9rkynt75
---
 addons/account_voucher/__openerp__.py         |  3 ---
 addons/account_voucher/account_voucher.py     | 23 ++++++++-----------
 .../account_voucher/account_voucher_view.xml  | 14 +++--------
 .../static/src/js/account_voucher.js          | 12 ----------
 4 files changed, 12 insertions(+), 40 deletions(-)
 delete mode 100644 addons/account_voucher/static/src/js/account_voucher.js

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