diff --git a/account_banking_payment_transfer/model/account_payment.py b/account_banking_payment_transfer/model/account_payment.py
index b34f70ad6..a0e1b07ad 100644
--- a/account_banking_payment_transfer/model/account_payment.py
+++ b/account_banking_payment_transfer/model/account_payment.py
@@ -83,18 +83,23 @@ class PaymentOrder(models.Model):
         """
         Get the transfer move lines (on the transfer account).
         """
-        res = []
-        for order in self:
-            for bank_line in order.bank_line_ids:
-                move_line = bank_line.transfer_move_line_id
-                if move_line:
-                    res.append(move_line)
-        return res
+        if not self:
+            return self.env['account.move.line']
+        self.env.cr.execute(
+            '''select ml.id from
+            account_move_line ml join bank_payment_line pl
+            on pl.transfer_move_line_id=ml.id
+            where pl.order_id in %s''',
+            (tuple(self.ids),),
+        )
+        return self.env['account.move.line'].browse(
+            i for i, in self.env.cr.fetchall()
+        )
 
     @api.multi
     def get_transfer_move_line_ids(self, *args):
         '''Used in the workflow for trigger_expr_id'''
-        return [move_line.id for move_line in self._get_transfer_move_lines()]
+        return self._get_transfer_move_lines().ids
 
     @api.multi
     def test_done(self):
@@ -104,8 +109,12 @@ class PaymentOrder(models.Model):
         Called from the workflow to move to the done state when
         all transfer move have been reconciled through bank statements.
         """
-        return all([move_line.reconcile_id for move_line in
-                    self._get_transfer_move_lines()])
+        self.env.cr.execute(
+            '''select id from account_move_line
+            where id in %s and reconcile_id is null''',
+            (tuple(self.get_transfer_move_line_ids()),)
+        )
+        return self.env.cr.rowcount == 0
 
     @api.multi
     def test_undo_done(self):
diff --git a/account_banking_payment_transfer/model/bank_payment_line.py b/account_banking_payment_transfer/model/bank_payment_line.py
index f0494dbe2..64e1263fe 100644
--- a/account_banking_payment_transfer/model/bank_payment_line.py
+++ b/account_banking_payment_transfer/model/bank_payment_line.py
@@ -18,7 +18,8 @@ class BankPaymentLine(models.Model):
     transfer_move_line_id = fields.Many2one(
         'account.move.line', compute='_get_transfer_move_line',
         string='Transfer move line counterpart',
-        help="Counterpart move line on the transfer account")
+        help="Counterpart move line on the transfer account",
+        store=True)
 
     @api.multi
     def move_line_transfer_account_hashcode(self):
@@ -34,6 +35,11 @@ class BankPaymentLine(models.Model):
         return hashcode
 
     @api.multi
+    @api.depends(
+        'transit_move_line_id.move_id.line_id.debit',
+        'transit_move_line_id.move_id.line_id.credit',
+        'order_id.payment_order_type',
+    )
     def _get_transfer_move_line(self):
         for bank_line in self:
             if bank_line.transit_move_line_id: