From 1b7efc9fe597aaf117b210fb76d16e556e285d2b Mon Sep 17 00:00:00 2001
From: Holger Brunn <hbrunn@therp.nl>
Date: Thu, 25 Apr 2013 15:27:09 +0200
Subject: [PATCH] [IMP] backport srijnhart@therp.nl's fixes concerning
 unsplitting mutations for a unified user experience

---
 account_banking/account_banking_view.xml      | 14 +++++++-------
 account_banking/banking_import_transaction.py |  4 ----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/account_banking/account_banking_view.xml b/account_banking/account_banking_view.xml
index 26d093d3e..cce3b3719 100644
--- a/account_banking/account_banking_view.xml
+++ b/account_banking/account_banking_view.xml
@@ -293,14 +293,11 @@
                         <field name="match_type"/>
                         <field name="residual"/>
                         <field name="parent_id" invisible="1" />
-                        <button name="action_unlink"
-                            string="Remove split transaction"
-                            type="object"
-                            icon="STOCK_REMOVE"
-                            attrs="{'invisible': ['|', ('parent_id', '=', False), ('state', '!=', 'draft')]}" />
-                        <button name="match_wizard" states="draft"
+                        <button name="match_wizard"
                                 string="Match"
                                 icon="terp-gtk-jump-to-ltr"
+                                attrs="{'invisible': ['|', ('parent_id', '!=', False),
+                                                           ('state', '!=', 'draft')]}"
                                 type="object"/>
                         <field name="match_multi" invisible="1"/>
                         <field name="duplicate" invisible="1"/>
@@ -533,9 +530,12 @@
                     <field name="amount"/>
                         <field name="match_type"/>
                         <field name="residual"/>
-                        <button name="match_wizard" states="draft"
+                        <field name="parent_id" invisible="1" />
+                        <button name="match_wizard"
                                 string="Match"
                                 icon="terp-gtk-jump-to-ltr"
+                                attrs="{'invisible': ['|', ('parent_id', '!=', False),
+                                                           ('state', '!=', 'draft')]}"
                                 type="object"/>
                         <field name="match_multi" invisible="1"/>
                         <field name="duplicate" invisible="1"/>
diff --git a/account_banking/banking_import_transaction.py b/account_banking/banking_import_transaction.py
index e57d6a3e9..99a616310 100644
--- a/account_banking/banking_import_transaction.py
+++ b/account_banking/banking_import_transaction.py
@@ -1986,10 +1986,6 @@ class account_bank_statement_line(osv.osv):
 
         return child_statement_ids
 
-    def action_unlink(self, cr, uid, ids, context=None):
-        self.unlink(cr, uid, ids, context=context)
-        return True
-
 account_bank_statement_line()
 
 class account_bank_statement(osv.osv):