From 4656a4de4b36b61d346eff031949f0761fec035a Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Thu, 30 May 2013 12:03:41 +0200
Subject: [PATCH] [FIX] Don't overwrite match_type field's selection again

---
 account_banking_payment/model/__init__.py     |  1 -
 .../model/account_bank_statement_line.py      | 40 -------------------
 .../model/banking_import_transaction.py       |  1 +
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 account_banking_payment/model/account_bank_statement_line.py

diff --git a/account_banking_payment/model/__init__.py b/account_banking_payment/model/__init__.py
index 02640f10d..9908c8e01 100644
--- a/account_banking_payment/model/__init__.py
+++ b/account_banking_payment/model/__init__.py
@@ -4,7 +4,6 @@ import payment_mode
 import payment_mode_type
 import payment_order_create
 import banking_import_transaction
-import account_bank_statement_line
 import banking_transaction_wizard
 import bank_payment_manual
 import banking_import_line
diff --git a/account_banking_payment/model/account_bank_statement_line.py b/account_banking_payment/model/account_bank_statement_line.py
deleted file mode 100644
index 4cf2ead46..000000000
--- a/account_banking_payment/model/account_bank_statement_line.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
-#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
-#            
-#    All other contributions are (C) by their respective contributors
-#
-#    All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import orm, fields
-
-
-class account_bank_statement_line(orm.Model):
-    _inherit = 'account.bank.statement.line'
-    _columns = {
-        'match_type': fields.related(
-            # Add payment and storno types
-            'import_transaction_id', 'match_type', type='selection',
-            selection=[('manual', 'Manual'), ('move','Move'),
-                       ('invoice', 'Invoice'), ('payment', 'Payment'),
-                       ('payment_order', 'Payment order'),
-                       ('storno', 'Storno')], 
-            string='Match type', readonly=True,),
-        }
diff --git a/account_banking_payment/model/banking_import_transaction.py b/account_banking_payment/model/banking_import_transaction.py
index 91b489ed2..4d5a225be 100644
--- a/account_banking_payment/model/banking_import_transaction.py
+++ b/account_banking_payment/model/banking_import_transaction.py
@@ -324,6 +324,7 @@ class banking_import_transaction(orm.Model):
         return self.write(
             cr, uid, ids, {
                 'payment_line_id': False,
+                'payment_order_id': False,
                 'payment_order_ids': [(6, 0, [])],
                 },
             context=context)