Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syncing from upstream OCA/partner-contact (14.0) #579

Merged
merged 4 commits into from
Jun 10, 2021
Merged

Syncing from upstream OCA/partner-contact (14.0) #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd6e03e
[FIX] old_zip id may be removed more than once
ivantodorovich Jun 9, 2021
c69e963
Merge PR #1115 into 14.0
OCA-git-bot Jun 9, 2021
b9db4d4
base_location_geonames_import 14.0.1.0.1
OCA-git-bot Jun 9, 2021
42d6a17
[UPD] addons table in README.md
OCA-git-bot Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ addon | version | summary
[animal](animal/) | 14.0.1.0.1 | Manage animals information
[base_country_state_translatable](base_country_state_translatable/) | 14.0.1.0.0 | Translate Country States
[base_location](base_location/) | 14.0.1.0.1 | Enhanced zip/npa management system
[base_location_geonames_import](base_location_geonames_import/) | 14.0.1.0.0 | Import zip entries from Geonames
[base_location_geonames_import](base_location_geonames_import/) | 14.0.1.0.1 | Import zip entries from Geonames
[base_location_nuts](base_location_nuts/) | 14.0.1.0.1 | NUTS Regions
[base_partner_sequence](base_partner_sequence/) | 14.0.1.0.1 | Sets customer's code from a sequence
[partner_address_street3](partner_address_street3/) | 14.0.1.0.0 | Add a third address line on partners
Expand Down
2 changes: 1 addition & 1 deletion base_location_geonames_import/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

{
"name": "Base Location Geonames Import",
"version": "14.0.1.0.0",
"version": "14.0.1.0.1",
"category": "Partner Management",
"license": "AGPL-3",
"summary": "Import zip entries from Geonames",
Expand Down
2 changes: 1 addition & 1 deletion base_location_geonames_import/wizard/geonames_import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def _process_csv(self, parsed_csv, country):
if zip_vals not in zip_vals_list:
zip_vals_list.append(zip_vals)
else:
old_zips.remove(zip_code.id)
old_zips.discard(zip_code.id)
self.env["res.city.zip"].create(zip_vals_list)
if not max_import:
if old_zips:
Expand Down