diff --git a/addons/account_payment/models/account_payment.py b/addons/account_payment/models/account_payment.py
index 7df7492dad0..cc84b61f5ff 100644
--- a/addons/account_payment/models/account_payment.py
+++ b/addons/account_payment/models/account_payment.py
@@ -197,13 +197,18 @@ class AccountPayment(models.Model):
         return {
             'provider_id': self.payment_token_id.provider_id.id,
             'payment_method_id': self.payment_token_id.payment_method_id.id,
-            'reference': self.ref,
+            'reference': self.env['payment.transaction']._compute_reference(
+                self.payment_token_id.provider_id.code, prefix=self.ref
+            ),
             'amount': self.amount,
             'currency_id': self.currency_id.id,
             'partner_id': self.partner_id.id,
             'token_id': self.payment_token_id.id,
             'operation': 'offline',
             'payment_id': self.id,
+            **({'invoice_ids': [Command.set(self._context.get('active_ids', []))]}
+                if self._context.get('active_model') == 'account.move'
+                else {}),
             **extra_create_values,
         }