Widget: Fix data-invoice-address-country being overridden by GeoIP (#4168)

This commit is contained in:
Raphael Michel
2024-05-23 11:17:54 +02:00
committed by GitHub
parent d882da0adb
commit 9f297fbd25

View File

@@ -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)