changeset 240c671c6be7 in modules/web_shop_shopify:default
details:
https://hg.tryton.org/modules/web_shop_shopify?cmd=changeset&node=240c671c6be7
description:
Ignore subdivision with non valid type
issue11201
review381901002
diffstat:
party.py | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diffs (30 lines):
diff -r d1c9880969da -r 240c671c6be7 party.py
--- a/party.py Thu Feb 03 22:45:21 2022 +0100
+++ b/party.py Mon Feb 07 22:41:11 2022 +0100
@@ -59,6 +59,7 @@
pool = Pool()
Country = pool.get('country.country')
Subdivision = pool.get('country.subdivision')
+ SubdivisionType = pool.get('party.address.subdivision_type')
values = {}
values['party_name'] = remove_forbidden_chars(address.name or '')
@@ -75,10 +76,14 @@
if address.province_code:
subdivision_code = '-'.join(
[address.country_code, address.province_code])
- subdivisions = Subdivision.search([
- ('country', '=', country.id),
- ('code', 'like', subdivision_code + '%'),
- ], limit=1)
+ subdivision_domain = [
+ ('country', '=', country.id),
+ ('code', 'like', subdivision_code + '%'),
+ ]
+ types = SubdivisionType.get_types(country)
+ if types:
+ subdivision_domain.append(('type', 'in', types))
+ subdivisions = Subdivision.search(subdivision_domain, limit=1)
if subdivisions:
subdivision, = subdivisions
values['subdivision'] = subdivision.id
