From 9f297fbd252a8ec891c05bb52a6b64c9026d75f9 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 23 May 2024 11:17:54 +0200 Subject: [PATCH] Widget: Fix data-invoice-address-country being overridden by GeoIP (#4168) --- src/pretix/base/forms/questions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pretix/base/forms/questions.py b/src/pretix/base/forms/questions.py index a11bb1f0ea..f8e8436d96 100644 --- a/src/pretix/base/forms/questions.py +++ b/src/pretix/base/forms/questions.py @@ -1035,7 +1035,7 @@ class BaseInvoiceAddressForm(forms.ModelForm): self.all_optional = kwargs.pop('all_optional', False) kwargs.setdefault('initial', {}) - if not kwargs.get('instance') or not kwargs['instance'].country: + if (not kwargs.get('instance') or not kwargs['instance'].country) and not kwargs["initial"].get("country"): kwargs['initial']['country'] = guess_country_from_request(self.request, self.event) super().__init__(*args, **kwargs)