Lorenzo Battistini - Agile BG has proposed merging lp:~agilebg/openobject-italia/7.0-bug-1239610-elbati into lp:openobject-italia/7.0.
Requested reviews: OpenERP Italia core devs (openobject-italia-core-devs) Related bugs: Bug #1239610 in OpenERP Italia: "l10n_it_base: alcune città non vengono trovate" https://bugs.launchpad.net/openobject-italia/+bug/1239610 For more details, see: https://code.launchpad.net/~agilebg/openobject-italia/7.0-bug-1239610-elbati/+merge/191239 -- https://code.launchpad.net/~agilebg/openobject-italia/7.0-bug-1239610-elbati/+merge/191239 Your team OpenERP Italia core devs is requested to review the proposed merge of lp:~agilebg/openobject-italia/7.0-bug-1239610-elbati into lp:openobject-italia/7.0.
=== modified file 'l10n_it_base/partner/partner.py' --- l10n_it_base/partner/partner.py 2013-03-01 09:25:20 +0000 +++ l10n_it_base/partner/partner.py 2013-10-15 16:02:01 +0000 @@ -1,19 +1,19 @@ # -*- encoding: utf-8 -*- ############################################################################## -# -# Copyright (C) 2010 OpenERP Italian Community (<http://www.openerp-italia.org>). -# All Rights Reserved -# $Id$ +# +# Copyright (C) 2010 OpenERP Italian Community +# (<http://www.openerp-italia.org>). +# Copyright (C) 2010 Associazione OpenERP Italia. # # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# GNU Affero General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. @@ -24,40 +24,52 @@ from osv import fields from tools.translate import _ + class res_region(osv.osv): _name = 'res.region' _description = 'Region' _columns = { - 'name': fields.char('Region Name', size=64, help='The full name of the region.', required=True), + 'name': fields.char( + 'Region Name', size=64, help='The full name of the region.', + required=True), 'country_id': fields.many2one('res.country', 'Country'), } res_region() + class res_province(osv.osv): _name = 'res.province' _description = 'Province' _columns = { - 'name': fields.char('Province Name', size=64, help='The full name of the province.', required=True), - 'code': fields.char('Province Code', size=2, help='The province code in two chars.',required=True), - 'region': fields.many2one('res.region','Region'), + 'name': fields.char( + 'Province Name', size=64, help='The full name of the province.', + required=True), + 'code': fields.char( + 'Province Code', size=2, help='The province code in two chars.', + required=True), + 'region': fields.many2one('res.region', 'Region'), } res_province() + class res_city(osv.osv): _name = 'res.city' _description = 'City' _columns = { 'name': fields.char('City', size=64, required=True), - 'province_id': fields.many2one('res.province','Province'), + 'province_id': fields.many2one('res.province', 'Province'), 'zip': fields.char('ZIP', size=5), - 'phone_prefix': fields.char('Telephone Prefix' , size=16), + 'phone_prefix': fields.char('Telephone Prefix', size=16), 'istat_code': fields.char('ISTAT code', size=16), 'cadaster_code': fields.char('Cadaster Code', size=16), 'web_site': fields.char('Web Site', size=64), - 'region': fields.related('province_id','region',type='many2one', relation='res.region', string='Region', readonly=True), + 'region': fields.related( + 'province_id', 'region', type='many2one', relation='res.region', + string='Region', readonly=True), } + class res_partner(osv.osv): _inherit = 'res.partner' @@ -67,28 +79,39 @@ } def on_change_city(self, cr, uid, ids, city): - res = {'value':{}} + res = {'value': {}} if(city): - city_id = self.pool.get('res.city').search(cr, uid, [('name', '=', city.title())]) + city_id = self.pool.get('res.city').search( + cr, uid, [('name', '=ilike', city)]) if city_id: - city_obj = self.pool.get('res.city').browse(cr, uid, city_id[0]) + city_obj = self.pool.get('res.city').browse( + cr, uid, city_id[0]) res = {'value': { - 'province': city_obj.province_id and city_obj.province_id.id or False, + 'province': ( + city_obj.province_id and city_obj.province_id.id + or False + ), 'region': city_obj.region and city_obj.region.id or False, 'zip': city_obj.zip, - 'country_id': city_obj.region and city_obj.region.country_id and city_obj.region.country_id.id or False, + 'country_id': ( + city_obj.region and + city_obj.region.country_id and + city_obj.region.country_id.id or False + ), 'city': city.title(), - }} + } + } return res def _set_vals_city_data(self, cr, uid, vals): - if vals.has_key('city') and not vals.has_key('province') and not vals.has_key('region'): + if 'city' in vals and 'province' not in vals and 'region' not in vals: if vals['city']: - city_obj= self.pool.get('res.city') - city_ids = city_obj.search(cr, uid, [('name', '=', vals['city'].title())]) + city_obj = self.pool.get('res.city') + city_ids = city_obj.search( + cr, uid, [('name', '=ilike', vals['city'])]) if city_ids: city = city_obj.browse(cr, uid, city_ids[0]) - if not vals.has_key('zip'): + if 'zip' not in vals: vals['zip'] = city.zip if city.province_id: vals['province'] = city.province_id.id @@ -105,5 +128,5 @@ def write(self, cr, uid, ids, vals, context=None): vals = self._set_vals_city_data(cr, uid, vals) return super(res_partner, self).write(cr, uid, ids, vals, context) - + res_partner()
_______________________________________________ Mailing list: https://launchpad.net/~openobject-italia-core-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~openobject-italia-core-devs More help : https://help.launchpad.net/ListHelp
