From 8bc292afcd255d7a13ffadc045ab251c994981e0 Mon Sep 17 00:00:00 2001
From: chv-odoo <chv@odoo.com>
Date: Fri, 25 Aug 2017 14:29:05 +0530
Subject: [PATCH] [IMP] account: remove 'cancel' button in bank statements

that button was not useful: the only way to cancel a bank statement is to unreconcile the entries. And to unreconcile the entries you have to set your bank statement back to draft.  Was PR #16632
---
 addons/account/models/account_bank_statement.py    |  7 -------
 addons/account/views/account_view.xml              |  1 -
 .../models/account_bank_statement.py               | 14 --------------
 addons/account_cancel/views/account_views.xml      |  2 +-
 4 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/addons/account/models/account_bank_statement.py b/addons/account/models/account_bank_statement.py
index b90f563c354..377a39222d6 100644
--- a/addons/account/models/account_bank_statement.py
+++ b/addons/account/models/account_bank_statement.py
@@ -218,13 +218,6 @@ class AccountBankStatement(models.Model):
                 'target': 'new'
             }
 
-    @api.multi
-    def button_cancel(self):
-        for statement in self:
-            if any(line.journal_entry_ids.ids for line in statement.line_ids):
-                raise UserError(_('A statement cannot be canceled when its lines are reconciled.'))
-        self.state = 'open'
-
     @api.multi
     def check_confirm_bank(self):
         if self.journal_type == 'cash' and not self.currency_id.is_zero(self.difference):
diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index f08c0c016fc..29870e634a8 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -561,7 +561,6 @@
                     <field name="all_lines_reconciled" invisible="1" />
                     <button name="%(action_bank_reconcile_bank_statements)d" string="Reconcile" type="action" class="oe_highlight" attrs="{'invisible':['|','|',('all_lines_reconciled','=',True),('line_ids','=',[]),('state', '!=', 'open')]}"/>
                     <button name="check_confirm_bank" string="Validate" type="object" class="oe_highlight" attrs="{'invisible':['|','|',('all_lines_reconciled','=',False),('line_ids','=',[]),('state', '!=', 'open')]}"/>
-                    <button name="button_cancel" states="confirm" string="Cancel Statement" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,confirm"/>
                 </header>
                 <sheet>
diff --git a/addons/account_cancel/models/account_bank_statement.py b/addons/account_cancel/models/account_bank_statement.py
index c671d1ee566..f5e23e0b479 100644
--- a/addons/account_cancel/models/account_bank_statement.py
+++ b/addons/account_cancel/models/account_bank_statement.py
@@ -12,18 +12,4 @@ class BankStatement(models.Model):
     def button_draft(self):
         self.state = 'open'
 
-    @api.multi
-    def button_cancel(self):
-        return super(BankStatement, self.with_context(bank_statement_cancel=True)).button_cancel()
 
-
-class BankStatementLine(models.Model):
-    _inherit = 'account.bank.statement.line'
-
-    @api.multi
-    def cancel(self):
-        if not self.env.context.get('bank_statement_cancel'):
-            for line in self:
-                if line.statement_id.state == 'confirm':
-                    raise UserError(_("Please set the bank statement to New before canceling."))
-        return super(BankStatementLine, self).cancel()
diff --git a/addons/account_cancel/views/account_views.xml b/addons/account_cancel/views/account_views.xml
index 0d3875c41b2..3ee651f271d 100644
--- a/addons/account_cancel/views/account_views.xml
+++ b/addons/account_cancel/views/account_views.xml
@@ -38,7 +38,7 @@
             <field name="model">account.bank.statement</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//button[@name='button_cancel']" position="after">
+                <xpath expr="//button[@name='check_confirm_bank']" position="after">
                     <button name="button_draft" states="confirm" string="Reset to New" type="object"/>
                 </xpath>
             </field>