Browse Source

[REF] Fix new checks of latest version of flake8

pull/248/head
Moisés López 9 years ago
parent
commit
65096b4cef
  1. 2
      base_location/models/better_zip.py
  2. 4
      base_location_geonames_import/__openerp__.py
  3. 6
      base_location_geonames_import/wizard/geonames_import.py
  4. 2
      base_partner_sequence/models/partner.py
  5. 5
      firstname_display_name_trigger/res_partner.py
  6. 6
      partner_external_maps/partner_external_maps.py
  7. 2
      partner_relations/tests/test_partner_relations.py
  8. 2
      partner_street_number/__init__.py
  9. 4
      partner_street_number/__openerp__.py

2
base_location/models/better_zip.py

@ -44,7 +44,7 @@ class BetterZip(models.Model):
'city', 'city',
'state_id', 'state_id',
'country_id', 'country_id',
)
)
def _get_display_name(self): def _get_display_name(self):
if self.name: if self.name:
name = [self.name, self.city] name = [self.name, self.city]

4
base_location_geonames_import/__openerp__.py

@ -39,9 +39,9 @@
'external_dependencies': {'python': ['requests', 'unicodecsv']}, 'external_dependencies': {'python': ['requests', 'unicodecsv']},
'data': [ 'data': [
'wizard/geonames_import_view.xml', 'wizard/geonames_import_view.xml',
],
],
'test': [ 'test': [
'test/import.yml' 'test/import.yml'
],
],
'installable': True 'installable': True
} }

6
base_location_geonames_import/wizard/geonames_import.py

@ -73,7 +73,7 @@ class BetterZipGeonamesImport(models.TransientModel):
'city': self.transform_city_name(row[2], country), 'city': self.transform_city_name(row[2], country),
'state_id': state.id, 'state_id': state.id,
'country_id': country.id, 'country_id': country.id,
}
}
return vals return vals
@api.model @api.model
@ -106,7 +106,7 @@ class BetterZipGeonamesImport(models.TransientModel):
states = self.env['res.country.state'].search([ states = self.env['res.country.state'].search([
('country_id', '=', country.id), ('country_id', '=', country.id),
('code', '=', row[code_row_index]), ('code', '=', row[code_row_index]),
])
])
if len(states) > 1: if len(states) > 1:
raise Warning( raise Warning(
_("Too many states with code %s for country %s") _("Too many states with code %s for country %s")
@ -118,7 +118,7 @@ class BetterZipGeonamesImport(models.TransientModel):
'name': row[name_row_index], 'name': row[name_row_index],
'code': row[code_row_index], 'code': row[code_row_index],
'country_id': country.id 'country_id': country.id
})
})
@api.one @api.one
def run_import(self): def run_import(self):

2
base_partner_sequence/models/partner.py

@ -27,7 +27,7 @@ class ResPartner(models.Model):
# only assign a 'ref' to commercial partners # only assign a 'ref' to commercial partners
if partner_id: if partner_id:
partner = self.browse(partner_id) partner = self.browse(partner_id)
vals.setdefault('is_company', partner.is_company)
vals.setdefault('is_company', partner.is_company)
vals.setdefault('parent_id', partner.parent_id.id) vals.setdefault('parent_id', partner.parent_id.id)
return vals.get('is_company') or not vals.get('parent_id') return vals.get('is_company') or not vals.get('parent_id')

5
firstname_display_name_trigger/res_partner.py

@ -57,7 +57,7 @@ class ResPartner(orm.Model):
lambda self, cr, uid, ids, context=None: lambda self, cr, uid, ids, context=None:
self.search(cr, uid, [ self.search(cr, uid, [
('id', 'child_of', ids) ('id', 'child_of', ids)
]),
]),
['parent_id', 'is_company', 'name', 'firstname', 'lastname'], ['parent_id', 'is_company', 'name', 'firstname', 'lastname'],
10 10
) )
@ -65,7 +65,8 @@ class ResPartner(orm.Model):
# indirection to avoid passing a copy of the overridable method when # indirection to avoid passing a copy of the overridable method when
# declaring the function field # declaring the function field
_display_name = lambda self, *a, **kw: self._display_name_compute(*a, **kw)
def _display_name(self, *a, **kw):
return self._display_name_compute(*a, **kw)
_columns = { _columns = {
# extra field to allow ORDER BY to match visible names # extra field to allow ORDER BY to match visible names

6
partner_external_maps/partner_external_maps.py

@ -104,7 +104,7 @@ class ResUsers(models.Model):
'context_map_website_id': map_website.id or False, 'context_map_website_id': map_website.id or False,
'context_route_map_website_id': map_route_website.id or False, 'context_route_map_website_id': map_route_website.id or False,
'context_route_start_partner_id': user.partner_id.id or False, 'context_route_start_partner_id': user.partner_id.id or False,
})
})
class ResPartner(models.Model): class ResPartner(models.Model):
@ -167,7 +167,7 @@ class ResPartner(models.Model):
'type': 'ir.actions.act_url', 'type': 'ir.actions.act_url',
'url': url, 'url': url,
'target': 'new', 'target': 'new',
}
}
@api.multi @api.multi
def open_route_map(self): def open_route_map(self):
@ -207,4 +207,4 @@ class ResPartner(models.Model):
'type': 'ir.actions.act_url', 'type': 'ir.actions.act_url',
'url': url, 'url': url,
'target': 'new', 'target': 'new',
}
}

2
partner_relations/tests/test_partner_relations.py

@ -30,7 +30,7 @@ class TestPartnerRelation(common.TransactionCase):
self.relation_model = self.env['res.partner.relation'] self.relation_model = self.env['res.partner.relation']
self.partner_1 = self.partner_model.create({ self.partner_1 = self.partner_model.create({
'name': 'Test User 1',
'name': 'Test User 1',
'is_company': False 'is_company': False
}) })

2
partner_street_number/__init__.py

@ -36,7 +36,7 @@ def post_init_hook(cr, registry):
cr.execute( cr.execute(
'SELECT id, street FROM res_partner ' 'SELECT id, street FROM res_partner '
'WHERE street IS NOT NULL and street_name IS NULL' 'WHERE street IS NOT NULL and street_name IS NULL'
)
)
partner_obj = registry['res.partner'] partner_obj = registry['res.partner']
for partner in cr.fetchall(): for partner in cr.fetchall():
partner_obj.write( partner_obj.write(

4
partner_street_number/__openerp__.py

@ -27,10 +27,10 @@
"category": 'Tools', "category": 'Tools',
"depends": [ "depends": [
'base' 'base'
],
],
"data": [ "data": [
'views/res_partner.xml', 'views/res_partner.xml',
],
],
'installable': True, 'installable': True,
'license': 'AGPL-3', 'license': 'AGPL-3',
'post_init_hook': 'post_init_hook', 'post_init_hook': 'post_init_hook',

Loading…
Cancel
Save