diff --git a/modules/account_credit_limit/party.py b/modules/account_credit_limit/party.py
index a94f5dd85a..64bc6f5454 100644
--- a/modules/account_credit_limit/party.py
+++ b/modules/account_credit_limit/party.py
@@ -85,7 +85,7 @@ class Party(metaclass=PoolMeta):
                         '.msg_party_credit_limit_amount',
                         party=self.rec_name,
                         limit=limit))
-            warning_name = 'credit_limit_amount_%s' % origin
+            warning_name = Warning.format('credit_limit_amount', [origin])
             if Warning.check(warning_name):
                 raise CreditLimitWarning(warning_name,
                     gettext('account_credit_limit'
@@ -107,7 +107,7 @@ class Party(metaclass=PoolMeta):
                             '.msg_party_credit_limit_dunning',
                             party=self.rec_name,
                             dunning=dunning.rec_name))
-                warning_name = 'credit_limit_dunning_%s' % origin
+                warning_name = Warning.format('credit_limit_dunning', [origin])
                 if Warning.check(warning_name):
                     raise CreditLimitWarning(warning_name,
                         gettext('account_credit_limit'
diff --git a/modules/sale_credit_limit/sale.py b/modules/sale_credit_limit/sale.py
index 0e4ebff75f..bd9bd389a0 100644
--- a/modules/sale_credit_limit/sale.py
+++ b/modules/sale_credit_limit/sale.py
@@ -26,7 +26,7 @@ class Sale(metaclass=PoolMeta):
             if sale.must_check_credit_limit():
                 party = sale.invoice_party or sale.party
                 party.check_credit_limit(
-                    sale.credit_limit_amount, sale.company, origin=str(sale))
+                    sale.credit_limit_amount, sale.company, origin=sale)
         super(Sale, cls).confirm(sales)