From 2dc9f8197c5c7038f88608614e426afed496e4ab Mon Sep 17 00:00:00 2001
From: vrenaville <vincent.renaville@camptocamp.com>
Date: Fri, 17 Jul 2015 12:04:42 +0200
Subject: [PATCH 1/2] [ADD] Add field to test is account cancel is installed to
 prevent to have 2 cancel button on statement

---
 account_constraints/model/account_bank_statement.py | 11 +++++++++++
 account_constraints/view/account_bank_statement.xml |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/account_constraints/model/account_bank_statement.py b/account_constraints/model/account_bank_statement.py
index e1a3b35de..2aa438e90 100644
--- a/account_constraints/model/account_bank_statement.py
+++ b/account_constraints/model/account_bank_statement.py
@@ -62,3 +62,14 @@ class AccountBankStatementLine(models.Model):
         self = self.with_context(from_parent_object=True)
         return super(AccountBankStatementLine, self)\
             .process_reconciliation(mv_line_dicts)
+
+    @api.multi
+    def _is_account_cancel_installed(self):
+        ir_module = self.env['ir.module.module']
+        account_cancel = ir_module.search([('name', '=', 'account_cancel'),
+                                           ('state', '=', 'installed')])
+        return bool(account_cancel)
+
+    account_cancel_installed = fields.Boolean(
+        compute='_is_account_cancel_installed',
+        string='Allow Cancelling Entries')
diff --git a/account_constraints/view/account_bank_statement.xml b/account_constraints/view/account_bank_statement.xml
index b1c7f3e48..f9ca7f3c8 100644
--- a/account_constraints/view/account_bank_statement.xml
+++ b/account_constraints/view/account_bank_statement.xml
@@ -13,7 +13,8 @@
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='bank_account_id']" position="after">
                     <field name="state" invisible="1"/>
-                    <button name="cancel" attrs="{'invisible': ['|', ('journal_entry_id', '=', False), ('state', '=', 'confirm')]}" string="Cancel" type="object" icon="gtk-undo"/>
+                    <field name='account_cancel_installed' invisible="1"/>
+                    <button name="cancel" attrs="{'invisible': ['|', ('journal_entry_id', '=', False),('account_cancel_installed','=',True) ,('state', '=', 'confirm')]}" string="Cancel" type="object" icon="gtk-undo"/>
                 </xpath>
             </field>
         </record>

From 3f58f7e3e13aae6d936fe8029804f79a10b9004c Mon Sep 17 00:00:00 2001
From: vrenaville <vincent.renaville@camptocamp.com>
Date: Mon, 20 Jul 2015 14:33:24 +0200
Subject: [PATCH 2/2] [FIX] change for multiple statement line + change domain
 to fit the account cancel

---
 account_constraints/model/account_bank_statement.py | 9 ++++++---
 account_constraints/view/account_bank_statement.xml | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/account_constraints/model/account_bank_statement.py b/account_constraints/model/account_bank_statement.py
index 2aa438e90..68fe0c8b1 100644
--- a/account_constraints/model/account_bank_statement.py
+++ b/account_constraints/model/account_bank_statement.py
@@ -66,9 +66,12 @@ class AccountBankStatementLine(models.Model):
     @api.multi
     def _is_account_cancel_installed(self):
         ir_module = self.env['ir.module.module']
-        account_cancel = ir_module.search([('name', '=', 'account_cancel'),
-                                           ('state', '=', 'installed')])
-        return bool(account_cancel)
+        res_found_module = ir_module.search_count([
+            ('name', '=', 'account_cancel'),
+            ('state', '=', 'installed')])
+        if res_found_module:
+            for line in self:
+                line.account_cancel_installed = True
 
     account_cancel_installed = fields.Boolean(
         compute='_is_account_cancel_installed',
diff --git a/account_constraints/view/account_bank_statement.xml b/account_constraints/view/account_bank_statement.xml
index f9ca7f3c8..cf1b4c3e8 100644
--- a/account_constraints/view/account_bank_statement.xml
+++ b/account_constraints/view/account_bank_statement.xml
@@ -14,7 +14,7 @@
                 <xpath expr="//field[@name='bank_account_id']" position="after">
                     <field name="state" invisible="1"/>
                     <field name='account_cancel_installed' invisible="1"/>
-                    <button name="cancel" attrs="{'invisible': ['|', ('journal_entry_id', '=', False),('account_cancel_installed','=',True) ,('state', '=', 'confirm')]}" string="Cancel" type="object" icon="gtk-undo"/>
+                    <button name="cancel" attrs="{'invisible': ['|', ('journal_entry_id', '=', False),('account_cancel_installed','=', True)]}" string="Cancel" type="object" icon="gtk-undo"/>
                 </xpath>
             </field>
         </record>