diff --git a/l10n_ch_base_bank/models/invoice.py b/l10n_ch_base_bank/models/invoice.py
index 55bd4ba..5ade774 100644
--- a/l10n_ch_base_bank/models/invoice.py
+++ b/l10n_ch_base_bank/models/invoice.py
@@ -87,14 +87,13 @@ class AccountMove(models.Model):
                     )
                 if (
                     bank_acc.acc_type not in ["qr-iban", 'iban']
-                    and (
-                        move.currency_id.name == "CHF"
-                        and not bank_acc.l10n_ch_isr_subscription_chf
-                    )
-                    or (
-                        move.currency_id.name == "EUR"
-                        and not bank_acc.l10n_ch_isr_subscription_eur
-                    )
+                    and ((
+                             move.currency_id.name == "CHF"
+                             and not bank_acc.l10n_ch_isr_subscription_chf
+                         ) or (
+                             move.currency_id.name == "EUR"
+                             and not bank_acc.l10n_ch_isr_subscription_eur
+                         ))
                 ):
                     raise exceptions.ValidationError(
                         _(
diff --git a/l10n_ch_pain_base/models/account_move_line.py b/l10n_ch_pain_base/models/account_move_line.py
index 4d62b05..d83d3ae 100644
--- a/l10n_ch_pain_base/models/account_move_line.py
+++ b/l10n_ch_pain_base/models/account_move_line.py
@@ -10,7 +10,7 @@ class AccountMoveLine(models.Model):
     def _prepare_payment_line_vals(self, payment_order):
         vals = super(AccountMoveLine, self)._prepare_payment_line_vals(
             payment_order)
-        if self.move_id and self.move_id.reference_type in ['isr', 'QRR', 'SCOR']:
+        if self.move_id and self.move_id.partner_bank_id._is_qr_iban():
             if self.move_id.reference_type == 'isr':
                 vals['local_instrument'] = 'CH01'
             if vals['communication']: