Merge lp:~elbati/openobject-italia/fix_l10n_it_base_on_change_city into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-6.1

Proposed by Lorenzo Battistini
Status: Merged
Merged at revision: 234
Proposed branch: lp:~elbati/openobject-italia/fix_l10n_it_base_on_change_city
Merge into: lp:~openobject-italia-core-devs/openobject-italia/italian-addons-6.1
Diff against target: 17 lines (+3/-3)
1 file modified
l10n_it_base/partner/partner.py (+3/-3)
To merge this branch: bzr merge lp:~elbati/openobject-italia/fix_l10n_it_base_on_change_city
Reviewer Review Type Date Requested Status
Sergio Corato (community) Approve
Review via email: mp+151163@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sergio Corato (icsergio) wrote :

Backport da 7.0
(a dir la verità non trovo più come creare l'errore :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_it_base/partner/partner.py'
2--- l10n_it_base/partner/partner.py 2013-01-19 17:36:47 +0000
3+++ l10n_it_base/partner/partner.py 2013-03-01 09:26:26 +0000
4@@ -72,10 +72,10 @@
5 if city_id:
6 city_obj = self.pool.get('res.city').browse(cr, uid, city_id[0])
7 res = {'value': {
8- 'province':city_obj.province_id.id,
9- 'region':city_obj.region.id,
10+ 'province': city_obj.province_id and city_obj.province_id.id or False,
11+ 'region': city_obj.region and city_obj.region.id or False,
12 'zip': city_obj.zip,
13- 'country_id': city_obj.region.country_id.id,
14+ 'country_id': city_obj.region and city_obj.region.country_id and city_obj.region.country_id.id or False,
15 'city': city.title(),
16 }}
17 return res

Subscribers

People subscribed via source and target branches