diff --git a/account_banking/__openerp__.py b/account_banking/__openerp__.py
index 81bc377d5..bce225cd4 100644
--- a/account_banking/__openerp__.py
+++ b/account_banking/__openerp__.py
@@ -41,8 +41,12 @@
         'wizard/bank_import_view.xml',
         'account_banking_view.xml',
         'wizard/banking_transaction_wizard.xml',
+        'wizard/link_partner.xml',
         'workflow/account_invoice.xml',
     ],
+    'js': [
+        'static/src/js/account_banking.js',
+    ],
     'external_dependencies': {
         'python' : ['BeautifulSoup'],
     },
diff --git a/account_banking/account_banking_view.xml b/account_banking/account_banking_view.xml
index c9fce3dea..6200cdfee 100644
--- a/account_banking/account_banking_view.xml
+++ b/account_banking/account_banking_view.xml
@@ -230,6 +230,13 @@
                     -->
                     <xpath expr="//field[@name='line_ids']/tree/field[@name='partner_id']"
                            position="after">
+                        <field name="link_partner_ok" invisible="1" />
+                        <button name="link_partner"
+                                string="Link partner"
+                                icon="terp-partner"
+                                type="object"
+                                attrs="{'invisible': [('link_partner_ok', '=', False)]}"
+                                />
                         <!-- TODO set partner_id when partner_bank_id changes -->
                         <field name="partner_bank_id"/>
                     </xpath>
@@ -242,10 +249,14 @@
                            position="after">
                         <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"
-                                type="object"/>
+                                attrs="{'invisible': ['|', ('parent_id', '!=', False),
+                                                           ('state', '!=', 'draft')]}"
+                                type="object"
+                                />
                         <field name="match_multi" invisible="1"/>
                         <field name="duplicate" invisible="1"/>
                         <field name="state"/>
@@ -310,6 +321,13 @@
                     <field name="name"/>
                     <field name="ref"/>
                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                    <field name="link_partner_ok" invisible="1" />
+                    <button name="link_partner"
+                            string="Link partner"
+                            icon="terp-partner"
+                            type="object"
+                            attrs="{'invisible': [('link_partner_ok', '=', False)]}"
+                            />
                     <!-- TODO set partner_id when partner_bank_id changes -->
                     <field name="partner_bank_id"/>
                     <field name="type" on_change="onchange_type(partner_id, type)"/>
@@ -319,10 +337,14 @@
                     <field name="amount"/>
                     <field name="match_type"/>
                     <field name="residual"/>
+                    <field name="parent_id" invisible="1" />
                     <button name="match_wizard" states="draft"
                             string="Match"
                             icon="terp-gtk-jump-to-ltr"
-                            type="object"/>
+                            attrs="{'invisible': ['|', ('parent_id', '!=', False),
+                                                       ('state', '!=', 'draft')]}"
+                            type="object"
+                            />
                     <field name="match_multi" invisible="1"/>
                     <field name="duplicate" invisible="1"/>
                     <field name="state"/>
diff --git a/account_banking/banking_import_transaction.py b/account_banking/banking_import_transaction.py
index 5dadb1747..082fa4e24 100644
--- a/account_banking/banking_import_transaction.py
+++ b/account_banking/banking_import_transaction.py
@@ -181,7 +181,7 @@ class banking_import_transaction(orm.Model):
             Match on ID of invoice (reference, name or number, whatever
             available and sensible)
             '''
-            if invoice.reference:
+            if invoice.reference and len(invoice.reference) > 2:
                 # Reference always comes first, as it is manually set for a
                 # reason.
                 iref = invoice.reference.upper()
@@ -189,7 +189,7 @@ class banking_import_transaction(orm.Model):
                     return True
             if invoice.type.startswith('in_'):
                 # Internal numbering, no likely match on number
-                if invoice.name:
+                if invoice.name and len(invoice.name) > 2:
                     iname = invoice.name.upper()
                     if iname in ref or iname in msg:
                         return True
@@ -334,7 +334,7 @@ class banking_import_transaction(orm.Model):
                 move_line = False
                 partial = False
 
-            elif len(candidates) == 1:
+            elif len(candidates) == 1 and candidates[0].invoice:
                 # Mismatch in amounts
                 move_line = candidates[0]
                 invoice = move_line.invoice
@@ -382,10 +382,10 @@ class banking_import_transaction(orm.Model):
                     if x.partner_id.id == move_line.partner_id.id
                     ]
                 
-            return (trans, self._get_move_info(
-                    cr, uid, [move_line.id],
-                    account_ids and account_ids[0] or False),
-                    trans2)
+                return (trans, self._get_move_info(
+                        cr, uid, [move_line.id],
+                        account_ids and account_ids[0] or False),
+                        trans2)
 
         return trans, False, False
 
@@ -791,7 +791,7 @@ class banking_import_transaction(orm.Model):
         if move_lines and len(move_lines) == 1:
             retval['reference'] = move_lines[0].ref
         if retval['match_type'] == 'invoice':
-            retval['invoice_ids'] = [x.invoice.id for x in move_lines]
+            retval['invoice_ids'] = list(set([x.invoice.id for x in move_lines]))
             retval['type'] = type_map[move_lines[0].invoice.type]
         return retval
 
@@ -826,7 +826,8 @@ class banking_import_transaction(orm.Model):
         journal_obj = self.pool.get('account.journal')
         move_line_obj = self.pool.get('account.move.line')
         payment_line_obj = self.pool.get('payment.line')
-        has_payment = bool(payment_line_obj)
+        has_payment = bool(
+            payment_line_obj and 'date_done' in payment_line_obj._columns)
         statement_line_obj = self.pool.get('account.bank.statement.line')
         statement_obj = self.pool.get('account.bank.statement')
         imported_statement_ids = []
@@ -862,8 +863,6 @@ class banking_import_transaction(orm.Model):
                 ('date_done', '=', False)], context=context)
             payment_lines = payment_line_obj.browse(
                 cr, uid, payment_line_ids)
-        else:
-            payment_lines = False
 
         # Start the loop over the transactions requested to match
         transactions = self.browse(cr, uid, ids, context)
@@ -891,6 +890,9 @@ class banking_import_transaction(orm.Model):
                     i += 1
                 continue
             
+            partner_banks = []
+            partner_ids = []
+
             # TODO: optimize by ordering transactions per company, 
             # and perform the stanza below only once per company.
             # In that case, take newest transaction date into account
@@ -1044,7 +1046,6 @@ class banking_import_transaction(orm.Model):
                     if not [x for x in move_lines if x.id == line.id]:
                         move_lines.append(line)
                 partner_ids = [account_info.bank_partner_id.id]
-                partner_banks = []
             else:
                 # Link remote partner, import account when needed
                 partner_banks = banktools.get_bank_accounts(
@@ -1054,47 +1055,28 @@ class banking_import_transaction(orm.Model):
                 if partner_banks:
                     partner_ids = [x.partner_id.id for x in partner_banks]
                 elif transaction.remote_owner:
-                    iban = sepa.IBAN(transaction.remote_account)
-                    if iban.valid:
-                        country_code = iban.countrycode
-                    elif transaction.remote_owner_country_code:
-                        country_code = transaction.remote_owner_country_code
-                    # fallback on the import parsers country code
-                    elif transaction.bank_country_code:
-                        country_code = transaction.bank_country_code
-                    elif company.partner_id and company.partner_id.country:
-                        country_code = company.partner_id.country.code
-                    else:
-                        country_code = None
-                    partner_id = banktools.get_or_create_partner(
+                    country_id = banktools.get_country_id(
+                        self.pool, cr, uid, transaction, context=context)
+                    partner_id = banktools.get_partner(
                         self.pool, cr, uid, transaction.remote_owner,
                         transaction.remote_owner_address,
                         transaction.remote_owner_postalcode,
                         transaction.remote_owner_city,
-                        country_code, results['log'],
-                        customer=transaction.transferred_amount > 0,
-                        supplier=transaction.transferred_amount < 0,
+                        country_id, results['log'],
                         context=context)
-                    if transaction.remote_account:
-                        partner_bank_id = banktools.create_bank_account(
-                            self.pool, cr, uid, partner_id,
-                            transaction.remote_account,
-                            transaction.remote_owner, 
-                            transaction.remote_owner_address,
-                            transaction.remote_owner_city,
-                            country_code, results['log'],
-                            bic=transaction.remote_bank_bic
-                            )
-                        partner_banks = partner_bank_obj.browse(
-                            cr, uid, [partner_bank_id]
-                            )
-                    else:
-                        partner_bank_id = None
-                        partner_banks = []
-                    partner_ids = [partner_id]
-                else:
-                    partner_ids = []
-                    partner_banks = []
+                    if partner_id:
+                        partner_ids = [partner_id]
+                        if transaction.remote_account:
+                            partner_bank_id = banktools.create_bank_account(
+                                self.pool, cr, uid, partner_id,
+                                transaction.remote_account,
+                                transaction.remote_owner, 
+                                transaction.remote_owner_address,
+                                transaction.remote_owner_city,
+                                country_id, bic=transaction.remote_bank_bic,
+                                context=context)
+                            partner_banks = partner_bank_obj.browse(
+                                cr, uid, [partner_bank_id], context=context)
 
             # Credit means payment... isn't it?
             if (not move_info
@@ -1300,6 +1282,21 @@ class banking_import_transaction(orm.Model):
 
         return res
 
+    def unlink(self, cr, uid, ids, context=None):
+        """
+        Unsplit if this if a split transaction
+        """
+        for this in self.browse(cr, uid, ids, context):
+            if this.parent_id:
+                this.parent_id.write(
+                        {'transferred_amount':
+                            this.parent_id.transferred_amount + \
+                                    this.transferred_amount,
+                        })
+                this.parent_id.refresh()
+        return super(banking_import_transaction, self).unlink(
+                cr, uid, ids, context=context)
+
     column_map = {
         # used in bank_import.py, converting non-osv transactions
         'statement_id': 'statement',
@@ -1351,7 +1348,7 @@ class banking_import_transaction(orm.Model):
         'duplicate': fields.boolean('duplicate'),
         'statement_line_id': fields.many2one(
             'account.bank.statement.line', 'Statement line',
-            ondelete='CASCADE'),
+            ondelete='cascade'),
         'statement_id': fields.many2one(
             'account.bank.statement', 'Statement',
             ondelete='CASCADE'),
@@ -1420,10 +1417,28 @@ banking_import_transaction()
 
 class account_bank_statement_line(orm.Model):
     _inherit = 'account.bank.statement.line'
+
+    def _get_link_partner_ok(
+            self, cr, uid, ids, name, args, context=None):
+        """
+        Deliver the values of the function field that
+        determines if the 'link partner' wizard is show on the 
+        bank statement line
+        """
+        res = {}
+        for line in self.browse(cr, uid, ids, context):
+            res[line.id] = bool(
+                line.state == 'draft'
+                and not line.partner_id
+                and line.import_transaction_id
+                and line.import_transaction_id.remote_owner
+                and line.import_transaction_id.remote_account)
+        return res
+
     _columns = {
         'import_transaction_id': fields.many2one(
             'banking.import.transaction', 
-            'Import transaction', readonly=True, delete='cascade'),
+            'Import transaction', readonly=True, ondelete='cascade'),
         'match_multi': fields.related(
             'import_transaction_id', 'match_multi', type='boolean',
             string='Multi match', readonly=True),
@@ -1450,6 +1465,11 @@ class account_bank_statement_line(orm.Model):
         'state': fields.selection(
             [('draft', 'Draft'), ('confirmed', 'Confirmed')], 'State',
             readonly=True, required=True),
+        'parent_id': fields.many2one('account.bank.statement.line',
+            'Parent'),
+        'link_partner_ok': fields.function(
+            _get_link_partner_ok, type='boolean',
+            string='Can link partner'),
         }
 
     _defaults = {
@@ -1470,6 +1490,66 @@ class account_bank_statement_line(orm.Model):
             res = wizard_obj.create_act_window(cr, uid, res_id, context=context)
         return res
 
+    def link_partner(self, cr, uid, ids, context=None):
+        """
+        Get the appropriate partner or fire a wizard to create
+        or link one
+        """
+        if not ids:
+            return False
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+                
+        # Check if the partner is already known but not shown
+        # because the screen was not refreshed yet
+        statement_line = self.browse(
+            cr, uid, ids[0], context=context)
+        if statement_line.partner_id:
+            return True
+
+        # Reuse the bank's partner if any
+        if (statement_line.partner_bank_id and
+                statement_line.partner_bank_id.partner_id):
+            statement_line.write(
+                {'partner_id': statement_line.partner_bank_id.partner_id.id})
+            return True
+
+        if (not statement_line.import_transaction_id or
+            not statement_line.import_transaction_id.remote_account):
+            raise osv.except_osv(
+                _("Error"),
+                _("No bank account available to link partner to"))
+            
+        # Check if the bank account was already been linked
+        # manually to another transaction
+        remote_account = statement_line.import_transaction_id.remote_account
+        source_line_ids = self.search(
+            cr, uid,
+            [('import_transaction_id.remote_account', '=', remote_account),
+             ('partner_bank_id.partner_id', '!=', False),
+             ], limit=1, context=context)
+        if source_line_ids:
+            source_line = self.browse(
+                cr, uid, source_line_ids[0], context=context)
+            target_line_ids = self.search(
+                cr, uid,
+                [('import_transaction_id.remote_account', '=', remote_account),
+                 ('partner_bank_id', '=', False),
+                 ('state', '=', 'draft')], context=context)
+            self.write(
+                cr, uid, target_line_ids,
+                {'partner_bank_id': source_line.partner_bank_id.id,
+                 'partner_id': source_line.partner_bank_id.partner_id.id,
+                 }, context=context)
+            return True
+                
+        # Or fire the wizard to link partner and account
+        wizard_obj = self.pool.get('banking.link_partner')
+        res_id = wizard_obj.create(
+            cr, uid, {'statement_line_id': ids[0]}, context=context)
+        return wizard_obj.create_act_window(cr, uid, res_id, context=context)
+
     def _convert_currency(
         self, cr, uid, from_curr_id, to_curr_id, from_amount,
         round=False, date=None, context=None):
@@ -1590,6 +1670,8 @@ class account_bank_statement_line(orm.Model):
     def unlink(self, cr, uid, ids, context=None):
         """
         Don't allow deletion of a confirmed statement line
+        If this statement line comes from a split transaction, give the
+        amount back
         """
         if type(ids) is int:
             ids = [ids]
@@ -1599,6 +1681,12 @@ class account_bank_statement_line(orm.Model):
                     _('Confirmed Statement Line'),
                     _("You cannot delete a confirmed Statement Line"
                       ": '%s'") % line.name)
+            if line.parent_id:
+                line.parent_id.write(
+                        {
+                            'amount': line.parent_id.amount + line.amount,
+                        })
+                line.parent_id.refresh()
         return super(account_bank_statement_line, self).unlink(
             cr, uid, ids, context=context)
 
@@ -1638,7 +1726,45 @@ class account_bank_statement_line(orm.Model):
                         'import_transaction_id': res},
                     context=context)
 
-account_bank_statement_line()
+    def split_off(self, cr, uid, ids, amount, context=None):
+        """
+        Create a child statement line with amount, deduce that from this line,
+        change transactions accordingly
+        """
+        if context is None:
+            context = {}
+
+        transaction_pool = self.pool.get('banking.import.transaction')
+    
+        child_statement_ids = []
+        for this in self.browse(cr, uid, ids, context):
+            transaction_data = transaction_pool.copy_data(
+                    cr, uid, this.import_transaction_id.id)
+            transaction_data['transferred_amount'] = amount
+            transaction_data['message'] = (
+                    (transaction_data['message'] or '') + _(' (split)'))
+            transaction_data['parent_id'] = this.import_transaction_id.id
+            transaction_id = transaction_pool.create(
+                    cr,
+                    uid,
+                    transaction_data,
+                    context=dict(
+                        context, transaction_no_duplicate_search=True))
+
+            statement_line_data = self.copy_data(
+                    cr, uid, this.id)
+            statement_line_data['amount'] = amount
+            statement_line_data['name'] = (
+                    (statement_line_data['name'] or '') + _(' (split)'))
+            statement_line_data['import_transaction_id'] = transaction_id
+            statement_line_data['parent_id'] = this.id
+
+            child_statement_ids.append(
+                    self.create(cr, uid, statement_line_data,
+                        context=context))
+            this.write({'amount': this.amount - amount})
+
+        return child_statement_ids
 
 
 class account_bank_statement(orm.Model):
diff --git a/account_banking/static/src/js/account_banking.js b/account_banking/static/src/js/account_banking.js
new file mode 100644
index 000000000..93ef30a41
--- /dev/null
+++ b/account_banking/static/src/js/account_banking.js
@@ -0,0 +1,61 @@
+/*############################################################################
+#
+#    Copyright (C) 2013 Therp BV (<http://therp.nl>).
+#            
+#    All other contributions are (C) by their respective contributors
+#
+#    All Rights Reserved
+#
+#    WARNING: This program as such is intended to be used by professional
+#    programmers who take the whole responsability of assessing all potential
+#    consequences resulting from its eventual inadequacies and bugs
+#    End users who are looking for a ready-to-use solution with commercial
+#    garantees and support are strongly adviced to contract EduSense BV
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################*/
+
+openerp.account_banking = function(instance)
+{
+    var _t = instance.web._t;
+    instance.web.Dialog.include(
+    {
+        close: function()
+        {
+            this._super.apply(this, arguments);
+            if (this.dialog_title == _t("Match transaction"))
+            {   
+                // The match wizard can create or unlink a statement line
+                // Force a reload of the view so that the correct lines
+                // are shown.
+                var parent = this.getParent()
+                if (parent)
+                {
+                    var child = this.getParent().getChildren()[0];
+                    if (child.views) {
+                        _.each(child.views, function(view)
+                               {
+                                   if (view && view.controller)
+                                   {
+                                       view.controller.reload();
+                                   }
+                               }
+                              );
+                    }
+                }
+            }
+        },
+    });
+}
diff --git a/account_banking/wizard/__init__.py b/account_banking/wizard/__init__.py
index 7c98ca7b2..169e55e51 100644
--- a/account_banking/wizard/__init__.py
+++ b/account_banking/wizard/__init__.py
@@ -20,5 +20,6 @@
 ##############################################################################
 import bank_import
 import banking_transaction_wizard
+import link_partner
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/account_banking/wizard/banking_transaction_wizard.py b/account_banking/wizard/banking_transaction_wizard.py
index 4bc9a1954..bdd5ed471 100644
--- a/account_banking/wizard/banking_transaction_wizard.py
+++ b/account_banking/wizard/banking_transaction_wizard.py
@@ -73,7 +73,7 @@ class banking_transaction_wizard(orm.TransientModel):
         Call the automatic matching routine for one or
         more bank transactions
         """
-        if isinstance(ids, (int, float)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
         import_transaction_obj = self.pool.get('banking.import.transaction')
         trans_id = self.read(
@@ -98,6 +98,8 @@ class banking_transaction_wizard(orm.TransientModel):
         # which populates regular fields on the transaction
         manual_invoice_id = vals.pop('manual_invoice_id', False)
         manual_move_line_id = vals.pop('manual_move_line_id', False)
+        manual_invoice_ids = vals.pop('manual_invoice_ids', [])
+        manual_move_line_ids = vals.pop('manual_move_line_ids', [])
 
         res = super(banking_transaction_wizard, self).write(
             cr, uid, ids, vals, context=context)
@@ -143,55 +145,96 @@ class banking_transaction_wizard(orm.TransientModel):
                             _("No entry found for the selected invoice. " +
                               "Try manual reconciliation."))
 
-        if manual_move_line_id or manual_invoice_id:
+        if manual_move_line_id or manual_invoice_id \
+                or manual_move_line_ids or manual_invoice_ids:
             move_line_obj = self.pool.get('account.move.line')
             invoice_obj = self.pool.get('account.invoice')
             statement_line_obj = self.pool.get('account.bank.statement.line')
-            for wiz in self.browse(
-                cr, uid, ids, context=context):
-                move_line_id = False
-                invoice_id = manual_invoice_id
-                if invoice_id:
-                    invoice = invoice_obj.browse(
-                        cr, uid, manual_invoice_id, context=context)
+            manual_invoice_ids = (
+                    ([manual_invoice_id] if manual_invoice_id else []) +
+                    [i[1] for i in manual_invoice_ids if i[0]==4] +
+                    [j for i in manual_invoice_ids if i[0]==6 for j in i[2]])
+            manual_move_line_ids = (
+                    ([manual_move_line_id] if manual_move_line_id else []) +
+                    [i[1] for i in manual_move_line_ids if i[0]==4] +
+                    [j for i in manual_move_line_ids if i[0]==6 for j in i[2]])
+            for wiz in self.browse(cr, uid, ids, context=context):
+                #write can be called multiple times for the same values
+                #that doesn't hurt above, but it does here
+                if wiz.match_type and (
+                        len(manual_move_line_ids) > 1 or
+                        len(manual_invoice_ids) > 1):
+                    continue
+
+                todo = []
+
+                for invoice in invoice_obj.browse(
+                        cr, uid, manual_invoice_ids, context=context):
+                    found_move_line = False
                     if invoice.move_id:
                         for line in invoice.move_id.line_id:
                             if line.account_id.type in ('receivable', 'payable'):
-                                move_line_id = line.id
+                                todo.append((invoice.id, line.id))
+                                found_move_line = True
                                 break
-                    if not move_line_id:
-                        orm.except_orm(
+                    if not found_move_line:
+                        raise orm.except_orm(
                             _("Cannot select for reconcilion"),
                             _("No entry found for the selected invoice. "))
-                else:
-                    move_line_id = manual_move_line_id
-                    move_line = move_line_obj.read(
-                        cr, uid, move_line_id, ['invoice'], context=context)
-                    invoice_id = (move_line['invoice'] and
-                                  move_line['invoice'][0])
-                vals = {
-                    'move_line_id': move_line_id,
-                    'move_line_ids': [(6, 0, [move_line_id])],
-                    'invoice_id': invoice_id,
-                    'invoice_ids': [(6, 0, invoice_id and
-                                     [invoice_id] or [])],
-                    'match_type': 'manual',
-                    }
-                transaction_obj.clear_and_write(
-                    cr, uid, wiz.import_transaction_id.id,
-                    vals, context=context)
-                st_line_vals = {
-                    'account_id': move_line_obj.read(
-                        cr, uid, move_line_id, 
-                        ['account_id'], context=context)['account_id'][0],
-                    }
-                if invoice_id:
-                    st_line_vals['partner_id'] = invoice_obj.read(
-                        cr, uid, invoice_id, 
-                        ['partner_id'], context=context)['partner_id'][0]
-                statement_line_obj.write(
-                    cr, uid, wiz.import_transaction_id.statement_line_id.id,
-                    st_line_vals, context=context)
+                for move_line_id in manual_move_line_ids:
+                    todo_entry = [False, move_line_id]
+                    move_line=move_line_obj.read(
+                            cr,
+                            uid,
+                            move_line_id,
+                            ['invoice'],
+                            context=context)
+                    if move_line['invoice']:
+                        todo_entry[0] = move_line['invoice'][0]
+                    todo.append(todo_entry)
+
+                while todo:
+                    todo_entry = todo.pop()
+                    move_line = move_line_obj.browse(
+                            cr, uid, todo_entry[1], context)
+                    transaction_id = wiz.import_transaction_id.id
+                    statement_line_id = wiz.statement_line_id.id
+
+                    if len(todo) > 0:
+                        statement_line_id = wiz.statement_line_id.split_off(
+                                move_line.credit or move_line.debit)[0]
+                        transaction_id = statement_line_obj.browse(
+                                cr,
+                                uid,
+                                statement_line_id,
+                                context=context).import_transaction_id.id
+
+                    vals = {
+                        'move_line_id': todo_entry[1],
+                        'move_line_ids': [(6, 0, [todo_entry[1]])],
+                        'invoice_id': todo_entry[0],
+                        'invoice_ids': [(6, 0,
+                            [todo_entry[0]] if todo_entry[0] else [])],
+                        'match_type': 'manual',
+                        }
+
+                    transaction_obj.clear_and_write(
+                        cr, uid, transaction_id, vals, context=context)
+
+                    st_line_vals = {
+                        'account_id': move_line_obj.read(
+                            cr, uid, todo_entry[1], 
+                            ['account_id'], context=context)['account_id'][0],
+                        }
+
+                    if todo_entry[0]:
+                        st_line_vals['partner_id'] = invoice_obj.read(
+                            cr, uid, todo_entry[0], 
+                            ['partner_id'], context=context)['partner_id'][0]
+
+                    statement_line_obj.write(
+                        cr, uid, statement_line_id, 
+                        st_line_vals, context=context)
         return res
 
     def trigger_write(self, cr, uid, ids, context=None):
@@ -207,7 +250,7 @@ class banking_transaction_wizard(orm.TransientModel):
         settings_pool = self.pool.get('account.banking.account.settings')
         statement_pool = self.pool.get('account.bank.statement.line')
 
-        if isinstance(ids, (int, float)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
 
         for wiz in self.browse(cr, uid, ids, context=context):
@@ -223,18 +266,24 @@ class banking_transaction_wizard(orm.TransientModel):
                     account_id = setting.default_debit_account_id and setting.default_debit_account_id.id
                 statement_pool.write(cr, uid, wiz.statement_line_id.id, {'account_id':account_id})
             
-            self.write(cr, uid, wiz.id, {'partner_id': False}, context=context)
-            
-            wizs = self.read(
-                cr, uid, ids, ['import_transaction_id'], context=context)
-            trans_ids = [x['import_transaction_id'][0] for x in wizs
-                         if x['import_transaction_id']]
-            self.pool.get('banking.import.transaction').clear_and_write(
-                cr, uid, trans_ids, context=context)
+            wiz.write({'partner_id': False})
+
+            if wiz.statement_line_id:
+                #delete splits causing an unsplit if this is a split
+                #transaction
+                statement_pool.unlink(cr, uid,
+                        statement_pool.search(cr, uid,
+                            [('parent_id', '=', wiz.statement_line_id.id)],
+                            context=context),
+                        context=context)
+
+            if wiz.import_transaction_id:
+                wiz.import_transaction_id.clear_and_write()
+
         return self.create_act_window(cr, uid, ids, context=None)
 
     def reverse_duplicate(self, cr, uid, ids, context=None):
-        if isinstance(ids, (int, float)):
+        if isinstance(ids, (int, long)):
             ids = [ids]
         transaction_obj = self.pool.get('banking.import.transaction')
         for wiz in self.read(
@@ -246,7 +295,7 @@ class banking_transaction_wizard(orm.TransientModel):
         return self.create_act_window(cr, uid, ids, context=None)
 
     def button_done(self, cr, uid, ids, context=None):
-        return {'nodestroy': False, 'type': 'ir.actions.act_window_close'}        
+        return {'type': 'ir.actions.act_window_close'}        
 
     _columns = {
         'name': fields.char('Name', size=64),
@@ -266,6 +315,9 @@ class banking_transaction_wizard(orm.TransientModel):
             'statement_line_id', 'partner_id',
             type='many2one', relation='res.partner',
             string="Partner", readonly=True),
+        'statement_line_parent_id': fields.related(
+            'statement_line_id', 'parent_id', type='many2one',
+            relation='account.bank.statement.line', readonly=True),
         'import_transaction_id': fields.related(
             'statement_line_id', 'import_transaction_id', 
             string="Import transaction",
@@ -277,10 +329,6 @@ class banking_transaction_wizard(orm.TransientModel):
             'import_transaction_id', 'writeoff_account_id',
             type='many2one', relation='account.account',
             string='Write-off account'),
-        'writeoff_journal_id': fields.related(
-            'import_transaction_id', 'writeoff_journal_id',
-            type='many2one', relation='account.journal',
-            string='Write-off journal'),
         'invoice_ids': fields.related(
             'import_transaction_id', 'invoice_ids', string="Matching invoices", 
             type='many2many', relation='account.invoice'),
@@ -318,8 +366,18 @@ class banking_transaction_wizard(orm.TransientModel):
         'manual_move_line_id': fields.many2one(
             'account.move.line', 'Or match this entry',
             domain=[('account_id.reconcile', '=', True),
-                    ('reconcile_id', '=', False)],
-            ),
+                    ('reconcile_id', '=', False)]),
+        'manual_invoice_ids': fields.many2many(
+            'account.invoice',
+            'banking_transaction_wizard_account_invoice_rel',
+            'wizard_id', 'invoice_id', string='Match following invoices',
+            domain=[('reconciled', '=', False)]),
+        'manual_move_line_ids': fields.many2many(
+            'account.move.line',
+            'banking_transaction_wizard_account_move_line_rel',
+            'wizard_id', 'move_line_id',   string='Or match this entries',
+            domain=[('account_id.reconcile', '=', True),
+                    ('reconcile_id', '=', False)]),
         'payment_option': fields.related('import_transaction_id','payment_option', string='Payment Difference', type='selection', required=True,
                                          selection=[('without_writeoff', 'Keep Open'),('with_writeoff', 'Reconcile Payment Balance')]),
         'writeoff_analytic_id': fields.related(
diff --git a/account_banking/wizard/banking_transaction_wizard.xml b/account_banking/wizard/banking_transaction_wizard.xml
index 561feb049..e65d3ac4c 100644
--- a/account_banking/wizard/banking_transaction_wizard.xml
+++ b/account_banking/wizard/banking_transaction_wizard.xml
@@ -7,6 +7,7 @@
             <field name="arch" type="xml">
                 <form string="Match transaction">
                     <!-- fields used for form logic -->
+                    <field name="statement_line_parent_id" invisible="True"/>
                     <field name="invoice_ids" invisible="True"/>
                     <field name="move_line_ids" invisible="True"/>
                     <field name="match_multi" invisible="True"/>
@@ -83,7 +84,9 @@
                                 <!-- Manual selection -->
                             </page>
                             <page string="Manual match">
-                                <field name="manual_invoice_id"/>
+                                <field name="manual_invoice_id"
+                                       context="{'search_default_partner_id': partner_id}"
+                                       />
                                 <!-- 
                                      Specify alternative tree_view_ref as a
                                      workaround for lp:1073521 in OpenERP 6.1
@@ -95,8 +98,9 @@
                                 -->
                                 <field name="manual_move_line_id"
                                        context="{
-                                                'tree_view_ref': 'account.view_move_line_tax_tree',
-                                                'view_mode': 'yes'
+                                                    'search_default_partner_id': partner_id,
+                                                    'tree_view_ref': 'account.view_move_line_tax_tree',
+                                                    'view_mode': 'yes'
                                                 }"
                                        />
                                 <newline/>
@@ -105,6 +109,17 @@
                                         type="object"
                                         string="Match"/>
                             </page>
+                            <page string="Multiple manual matches" attrs="{'invisible': ['|', ('match_type', '!=', False), ('statement_line_parent_id', '!=', False)]}">
+                                <field name="manual_invoice_ids" colspan="4"
+                                       context="{'search_default_partner_id': partner_id}"
+                                       />
+                                <field name="manual_move_line_ids" colspan="4"
+                                       context="{'search_default_partner_id': partner_id}"
+                                       />
+                                <button name="trigger_write"
+                                        type="object"
+                                        string="Match" />
+                            </page>
                             <page string="Write-Off" attrs="{'invisible': [('match_type', '=', False)]}">
                                 <group colspan="2" col="2">
                                     <label string="Choose what you want to do with the eventual difference between the paid amount and the sum of allocated amounts. You can either choose to keep open this difference on the partner's account, or reconcile it with the payment."  colspan="2"/>
diff --git a/account_banking/wizard/banktools.py b/account_banking/wizard/banktools.py
index aad9ddf10..94f0cd70c 100644
--- a/account_banking/wizard/banktools.py
+++ b/account_banking/wizard/banktools.py
@@ -26,7 +26,8 @@ from openerp.addons.account_banking.struct import struct
 __all__ = [
     'get_period', 
     'get_bank_accounts',
-    'get_or_create_partner',
+    'get_partner',
+    'get_country_id',
     'get_company_bank_account',
     'create_bank_account',
 ]
@@ -56,7 +57,7 @@ def get_bank_accounts(pool, cr, uid, account_number, log, fail=False):
     '''
     # No need to search for nothing
     if not account_number:
-        return False
+        return []
 
     partner_bank_obj = pool.get('res.partner.bank')
     bank_account_ids = partner_bank_obj.search(cr, uid, [
@@ -74,7 +75,7 @@ def get_bank_accounts(pool, cr, uid, account_number, log, fail=False):
                 _('Bank account %(account_no)s was not found in the database')
                 % dict(account_no=account_number)
             )
-        return False
+        return []
     return partner_bank_obj.browse(cr, uid, bank_account_ids)
 
 def _has_attr(obj, attr):
@@ -85,11 +86,10 @@ def _has_attr(obj, attr):
     except KeyError:
         return False
 
-def get_or_create_partner(pool, cr, uid, name, address, postal_code, city,
-                          country_code, log, supplier=False, customer=False,
-                          context=None):
+def get_partner(pool, cr, uid, name, address, postal_code, city,
+                country_id, log, context=None):
     '''
-    Get or create the partner belonging to the account holders name <name>
+    Get the partner belonging to the account holders name <name>
 
     If multiple partners are found with the same name, select the first and
     add a warning to the import log.
@@ -99,16 +99,10 @@ def get_or_create_partner(pool, cr, uid, name, address, postal_code, city,
     partner_obj = pool.get('res.partner')
     partner_ids = partner_obj.search(cr, uid, [('name', 'ilike', name)],
                                      context=context)
-    country_id = False
     if not partner_ids:
         # Try brute search on address and then match reverse
         criteria = []
-        if country_code:
-            country_obj = pool.get('res.country')
-            country_ids = country_obj.search(
-                cr, uid, [('code', '=', country_code.upper())],
-                context=context)
-            country_id = country_ids and country_ids[0] or False
+        if country_id:
             criteria.append(('country_id', '=', country_id))
         if city:
             criteria.append(('city', 'ilike', city))
@@ -116,6 +110,11 @@ def get_or_create_partner(pool, cr, uid, name, address, postal_code, city,
             criteria.append(('zip', 'ilike', postal_code))
         partner_search_ids = partner_obj.search(
             cr, uid, criteria, context=context)
+        if (not partner_search_ids and country_id):
+            # Try again with country_id = False
+            criteria[0] = ('country_id', '=', False)
+            partner_search_ids = partner_obj.search(
+                cr, uid, criteria, context=context)
         key = name.lower()
         partners = []
         for partner in partner_obj.read(
@@ -124,35 +123,11 @@ def get_or_create_partner(pool, cr, uid, name, address, postal_code, city,
                 partners.append(partner)
         partners.sort(key=lambda x: len(x['name']), reverse=True)
         partner_ids = [x['id'] for x in partners]
-    if not partner_ids:
-        if not country_id:
-            user = pool.get('res.user').browse(cr, uid, uid, context=context)
-            country_id = (
-                user.company_id.partner_id.country and 
-                user.company_id.partner_id.country.id or
-                False
-            )
-        partner_id = partner_obj.create(
-            cr, uid, {
-                'name': name,
-                'active': True,
-                'comment': 'Generated from Bank Statements Import',
-                'street': address and address[0] or '',
-                'street2': len(address) > 1 and address[1] or '',
-                'city': city,
-                'zip': postal_code or '',
-                'country_id': country_id,
-                'is_company': True,
-                'supplier': supplier,
-                'customer': customer,
-                }, context=context)
-    else:
-        if len(partner_ids) > 1:
-            log.append(
-                _('More than one possible match found for partner with '
-                  'name %(name)s') % {'name': name})
-        partner_id = partner_ids[0]
-    return partner_id
+    if len(partner_ids) > 1:
+        log.append(
+            _('More than one possible match found for partner with '
+              'name %(name)s') % {'name': name})
+    return partner_ids and partner_ids[0] or False
 
 def get_company_bank_account(pool, cr, uid, account_number, currency,
                              company, log):
@@ -283,19 +258,47 @@ def get_or_create_bank(pool, cr, uid, bic, online=False, code=None,
         ))
     return bank_id, country_id
 
+def get_country_id(pool, cr, uid, transaction, context=None):
+    """
+    Derive a country id from the info on the transaction.
+    
+    :param transaction: browse record of a transaction
+    :returns: res.country id or False 
+    """
+    
+    country_code = False
+    iban = sepa.IBAN(transaction.remote_account)
+    if iban.valid:
+        country_code = iban.countrycode
+    elif transaction.remote_owner_country_code:
+        country_code = transaction.remote_owner_country_code
+    # fallback on the import parsers country code
+    elif transaction.bank_country_code:
+        country_code = transaction.bank_country_code
+    if country_code:
+        country_ids = pool.get('res.country').search(
+            cr, uid, [('code', '=', country_code.upper())],
+            context=context)
+        country_id = country_ids and country_ids[0] or False
+    if not country_id:
+        company = transaction.statement_line_id.company_id
+        if company.partner_id.country:
+            country_id = company.partner_id.country.id
+    return country_id
+
 def create_bank_account(pool, cr, uid, partner_id,
                         account_number, holder_name, address, city,
-                        country_code, log, bic=False,
-                        ):
+                        country_id, bic=False,
+                        context=None):
     '''
     Create a matching bank account with this holder for this partner.
     '''
     values = struct(
         partner_id = partner_id,
         owner_name = holder_name,
+        country_id = country_id,
     )
     bankcode = None
-    country_obj = pool.get('res.country')
 
     # Are we dealing with IBAN?
     iban = sepa.IBAN(account_number)
@@ -305,44 +308,29 @@ def create_bank_account(pool, cr, uid, partner_id,
         values.acc_number = str(iban)
         values.acc_number_domestic = iban.BBAN
         bankcode = iban.bankcode + iban.countrycode
-        country_code = iban.countrycode
-
-    if not country_code:
-        country = pool.get('res.partner').browse(
-            cr, uid, partner_id).country
-        country_code = country.code
-        country_id = country.id
     else:
-        if iban.valid:
-            country_ids = country_obj.search(cr, uid,
-                                             [('code', '=', iban.countrycode)]
-                                             )
-        else:
-            country_ids = country_obj.search(cr, uid,
-                                             [('code', '=', country_code)]
-                                             )
-        country_id = country_ids[0]
-    
-    account_info = False
-    if not iban.valid:
         # No, try to convert to IBAN
         values.state = 'bank'
         values.acc_number = values.acc_number_domestic = account_number
-        if country_code in sepa.IBAN.countries:
-            account_info = sepa.online.account_info(country_code,
-                                                    values.acc_number
-                                                   )
-            if account_info:
-                values.acc_number = iban = account_info.iban
-                values.state = 'iban'
-                bankcode = account_info.code
-                bic = account_info.bic
+
+        if country_id:
+            country_code = pool.get('res.country').read(
+                cr, uid, country_id, ['code'], context=context)['code']
+            if country_code in sepa.IBAN.countries:
+                account_info = sepa.online.account_info(
+                    country_code, values.acc_number)
+                if account_info:
+                    values.acc_number = iban = account_info.iban
+                    values.state = 'iban'
+                    bankcode = account_info.code
+                    bic = account_info.bic
 
     if bic:
         values.bank = get_or_create_bank(pool, cr, uid, bic)[0]
         values.bank_bic = bic
 
     # Create bank account and return
-    return pool.get('res.partner.bank').create(cr, uid, values)
+    return pool.get('res.partner.bank').create(
+        cr, uid, values, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/account_banking/wizard/link_partner.py b/account_banking/wizard/link_partner.py
new file mode 100644
index 000000000..c4d9108f6
--- /dev/null
+++ b/account_banking/wizard/link_partner.py
@@ -0,0 +1,179 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Therp BV (<http://therp.nl>).
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+from openerp.tools.translate import _
+from openerp.addons.account_banking.wizard import banktools
+
+class link_partner(orm.TransientModel):
+    _name = 'banking.link_partner'
+    _description = 'Link partner'
+
+    _columns = {
+        'name': fields.char(
+            'Create partner with name', size=128, required=True),
+        'supplier': fields.boolean('Supplier'),
+        'customer': fields.boolean('Customer'),
+        'partner_id': fields.many2one(
+            'res.partner', 'or link existing partner'),
+        'statement_line_id': fields.many2one(
+            'account.bank.statement.line',
+            'Statement line', required=True),
+        'remote_account': fields.char(
+            'Account number', size=24, readonly=True),
+        # Partner values
+        'street': fields.char('Street', size=128),
+        'street2': fields.char('Street2', size=128),
+        'zip': fields.char('Zip', change_default=True, size=24),
+        'city': fields.char('City', size=128),
+        'state_id': fields.many2one("res.country.state", 'State'),
+        'country_id': fields.many2one('res.country', 'Country'),
+        'email': fields.char('Email', size=240),
+        'phone': fields.char('Phone', size=64),
+        'fax': fields.char('Fax', size=64),
+        'mobile': fields.char('Mobile', size=64),
+        }
+    
+    def create(self, cr, uid, vals, context=None):
+        """
+        Get default values from the transaction data 
+        on the statement line
+        """
+        if vals and vals.get('statement_line_id'):
+            statement_line_obj = self.pool.get('account.bank.statement.line')
+            statement_line = statement_line_obj.browse(
+                cr, uid, vals['statement_line_id'], context=context)
+            transaction = statement_line.import_transaction_id
+
+            if statement_line.partner_bank_id:
+                raise orm.except_orm(
+                    _('Error'),
+                    _('Statement line is already linked to a bank account '))
+            
+            if not(transaction and transaction.remote_owner
+                   and transaction.remote_account):
+                raise orm.except_orm(
+                    _('Error'),
+                    _('No transaction data on statement line'))
+
+            if 'supplier' not in vals and statement_line.amount < 0:
+                vals['supplier'] = True
+            if 'customer' not in vals and statement_line.amount > 0:
+                vals['customer'] = True
+
+            if not vals.get('street'):
+                vals['street'] = transaction.remote_owner_address
+            if not vals.get('street'):
+                vals['city'] = transaction.remote_owner_city
+            if not vals.get('country_id'):
+                vals['country_id'] = banktools.get_country_id(
+                    self.pool, cr, uid, transaction, context=context)
+            if not vals.get('name'):
+                vals['name'] = transaction.remote_owner
+            if not vals.get('remote_account'):
+                vals['remote_account'] = transaction.remote_account
+
+        return super(link_partner, self).create(
+            cr, uid, vals, context=context)
+            
+    def update_partner_values(self, cr, uid, wizard, values, context=None):
+        """
+        Updates the new partner values with the values from the wizard
+        
+        :param wizard: read record of wizard (with load='_classic_write')
+        :param values: the dictionary of partner values that will be updated
+        """
+        for field in ['name',
+                      'street', 
+                      'street2',
+                      'zip',
+                      'country_id',
+                      'state_id',
+                      'phone',
+                      'fax',
+                      'mobile',
+                      'email'
+                      ]:
+            if wizard[field]:
+                values[field] = wizard[field]
+        return True
+    
+    def link_partner(self, cr, uid, ids, context=None):
+        statement_line_obj = self.pool.get(
+            'account.bank.statement.line')
+        wiz = self.browse(cr, uid, ids[0], context=context)
+
+        if wiz.partner_id:
+            partner_id = wiz.partner_id.id
+        else:
+            wiz_read = self.read(
+                cr, uid, ids[0], context=context, load='_classic_write')
+            partner_fields = self.pool.get(
+                'res.partner')._columns.keys()
+            partner_vals = {
+                    'is_company': True,
+                    'type': 'default',
+                    }
+            self.update_partner_values(
+                cr, uid, wiz_read, partner_vals, context=context)
+            partner_id = self.pool.get('res.partner').create(
+                cr, uid, partner_vals, context=context)
+            
+        partner_bank_id = banktools.create_bank_account(
+            self.pool, cr, uid, partner_id,
+            wiz.remote_account, wiz.name,
+            wiz.street, wiz.city,
+            wiz.country_id and wiz.country_id.id or False,
+            bic=wiz.statement_line_id.import_transaction_id.remote_bank_bic,
+            context=context)
+
+        statement_line_ids = statement_line_obj.search(
+            cr, uid,
+            [('import_transaction_id.remote_account', '=', wiz.remote_account),
+             ('partner_bank_id', '=', False),
+             ('state', '=', 'draft')], context=context)
+        statement_line_obj.write(
+            cr, uid, statement_line_ids,
+            {'partner_bank_id': partner_bank_id,
+             'partner_id': partner_id}, context=context)
+
+        return {'type': 'ir.actions.act_window_close'}        
+
+    def create_act_window(self, cr, uid, ids, nodestroy=True, context=None):
+        """ 
+        Return a popup window for this model
+        """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        return {
+            'name': self._description,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': self._name,
+            'domain': [],
+            'context': context,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'res_id': ids[0],
+            'nodestroy': nodestroy,
+            }
+
+
diff --git a/account_banking/wizard/link_partner.xml b/account_banking/wizard/link_partner.xml
new file mode 100644
index 000000000..c9c2d21c9
--- /dev/null
+++ b/account_banking/wizard/link_partner.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="link_partner_view">
+            <field name="name">Link partner wizard view</field>
+            <field name="type">form</field>
+            <field name="model">banking.link_partner</field>
+            <field name="arch" type="xml">
+                <form string="Link partner">
+                    <group colspan="4" col="6">
+                        <field name="name"
+                               attrs="{'readonly': [('partner_id', '!=', False)]}" />
+                        <field name="partner_id"/>
+                        <field name="remote_account" />
+                    </group>
+                    <group colspan="4"
+                           string="Address"
+                           attrs="{'invisible': [('partner_id', '!=', False)]}">
+                        <group colspan="2" col="2">
+                            <field name="street"/>
+                            <field name="street2"/>
+                            <field name="zip"/>
+                            <field name="city"/>
+                            <field name="country_id"/>
+                            <field name="state_id"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <field name="phone"/>
+                            <field name="fax"/>
+                            <field name="mobile"/>
+                            <field name="email" widget="email"/>
+                        </group>
+                    </group>
+                    <button icon="gtk-cancel" string="Cancel" special="cancel" />
+                    <button icon="gtk-ok" string="Create partner"
+                            name="link_partner" type="object"
+                            attrs="{'invisible': [('partner_id', '!=', False)]}"
+                            />
+                    <button icon="gtk-ok" string="Link existing partner"
+                            name="link_partner" type="object"
+                            attrs="{'invisible': [('partner_id', '==', False)]}"
+                            />
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/account_banking_nl_abnamro/abnamro.py b/account_banking_nl_abnamro/abnamro.py
index 3a6c1e3f7..5028bdd32 100644
--- a/account_banking_nl_abnamro/abnamro.py
+++ b/account_banking_nl_abnamro/abnamro.py
@@ -295,7 +295,7 @@ class transaction(models.mem_bank_transaction):
                 if fields[2].startswith('/'):
                     self.remote_account = fields[2][1:].strip()
                 else:
-                    self.message += ' ' + fields[2].strip()
+                    self.remote_account = fields[2].strip()
                 # fourth column contains remote owner
                 self.remote_owner = (len(fields) > 3 and fields[3].strip() or
                                      False)
diff --git a/account_banking_nl_clieop/wizard/clieop.py b/account_banking_nl_clieop/wizard/clieop.py
index 64e005b19..678301ff5 100644
--- a/account_banking_nl_clieop/wizard/clieop.py
+++ b/account_banking_nl_clieop/wizard/clieop.py
@@ -43,6 +43,11 @@ class SWIFTField(record.Field):
     #def format(self, value):
     #    return convert.to_swift(super(SWIFTField, self).format(value))
 
+class SWIFTFieldNoLeadingWhitespace(SWIFTField):
+    def format(self, value):
+        return super(SWIFTFieldNoLeadingWhitespace, self).format(
+            self.cast(value).lstrip())
+
 def eleven_test(s):
     '''
     Dutch eleven-test for validating 9-long local bank account numbers.
@@ -161,7 +166,7 @@ class PaymentReferenceRecord(record.Record):
     _fields = [
         record.Filler('recordcode', 4, '0150'),
         record.Filler('variantcode', 1, 'A'),
-        SWIFTField('paymentreference', 16),
+        SWIFTFieldNoLeadingWhitespace('paymentreference', 16),
         record.Filler('filler', 29),
     ]
 
diff --git a/account_banking_payment/model/banking_import_transaction.py b/account_banking_payment/model/banking_import_transaction.py
index 4d5a225be..1282442e5 100644
--- a/account_banking_payment/model/banking_import_transaction.py
+++ b/account_banking_payment/model/banking_import_transaction.py
@@ -55,7 +55,8 @@ class banking_import_transaction(orm.Model):
             limit=0, context=context)
         orders = payment_order_obj.browse(cr, uid, order_ids, context)
         candidates = [x for x in orders if
-                      equals_order_amount(x.total - trans.transferred_amount)]
+                      equals_order_amount(x.total - trans.transferred_amount) and
+                      x.line_ids and x.line_ids[0].transit_move_line_id]
         if len(candidates) > 0:
             # retrieve the common account_id, if any
             account_id = False
@@ -365,29 +366,22 @@ class banking_import_transaction(orm.Model):
     def __init__(self, pool, cr):
         """
         Updating the function maps to handle the match types that this
-        module adds. While creating the map in the super object was
-        straightforward, the fact that these are now functions rather than
-        method requires the awkward way of updating it with the methods'
-        function objects.
-
-        As noted above, another implication is that any addon that inherits
-        one of these methods needs to overwrite the entry in the function
-        maps in the same way as is done below.
+        module adds.
         """
         super(banking_import_transaction, self).__init__(pool, cr)
 
-        self.confirm_map.update({
-                'storno': self._confirm_storno.__func__,
-                'payment_order': self._confirm_payment_order.__func__,
-                'payment': self._confirm_payment.__func__,
-                'payment_order_manual': self._confirm_payment_order.__func__,
-                'payment_manual': self._confirm_payment.__func__,
+        banking_import_transaction.confirm_map.update({
+                'storno': banking_import_transaction._confirm_storno,
+                'payment_order': banking_import_transaction._confirm_payment_order,
+                'payment': banking_import_transaction._confirm_payment,
+                'payment_order_manual': banking_import_transaction._confirm_payment_order,
+                'payment_manual': banking_import_transaction._confirm_payment,
                 })
 
-        self.cancel_map.update({
-                'storno': self._cancel_storno.__func__,
-                'payment_order': self._cancel_payment_order.__func__,
-                'payment': self._cancel_payment.__func__,
-                'payment_order_manual': self._cancel_payment_order.__func__,
-                'payment_manual': self._cancel_payment.__func__,
+        banking_import_transaction.cancel_map.update({
+                'storno': banking_import_transaction._cancel_storno,
+                'payment_order': banking_import_transaction._cancel_payment_order,
+                'payment': banking_import_transaction._cancel_payment,
+                'payment_order_manual': banking_import_transaction._cancel_payment_order,
+                'payment_manual': banking_import_transaction._cancel_payment,
                 })
diff --git a/account_direct_debit/model/account_move_line.py b/account_direct_debit/model/account_move_line.py
index 943268912..b60a58669 100644
--- a/account_direct_debit/model/account_move_line.py
+++ b/account_direct_debit/model/account_move_line.py
@@ -59,7 +59,7 @@ class account_move_line(orm.Model):
         if not args:
             return []
         line_obj = self.pool.get('account.move.line')
-        query = line_obj._query_get(cr, uid, context={})
+        query = line_obj._query_get(cr, uid, context=context)
         where = ' and '.join(map(lambda x: '''(SELECT
         CASE WHEN l.amount_currency > 0
             THEN l.amount_currency