Browse Source

Fix Pylint

pull/355/head
Open Net Sarl 8 years ago
committed by Sébastien Gendre
parent
commit
d69257fff5
  1. 2
      base_location/__manifest__.py
  2. 25
      base_location/models/better_zip.py
  3. 14
      base_location/models/company.py
  4. 14
      base_location/models/partner.py
  5. 2
      base_location/security/ir.model.access.csv

2
base_location/__manifest__.py

@ -22,7 +22,7 @@
############################################################################## ##############################################################################
{ {
'name': 'Location management (aka Better ZIP)', 'name': 'Location management (aka Better ZIP)',
'version': '9.0.1.0.0',
'version': '10.0.0.1',
'depends': ['contacts'], 'depends': ['contacts'],
'author': "Camptocamp," 'author': "Camptocamp,"
"ACYSOS S.L.," "ACYSOS S.L.,"

25
base_location/models/better_zip.py

@ -30,7 +30,7 @@ class BetterZip(models.Model):
_order = "name asc" _order = "name asc"
_rec_name = "display_name" _rec_name = "display_name"
display_name = fields.Char('Name', compute='_get_display_name', store=True)
display_name = fields.Char('Name', compute='_compute_display_name', store=True)
name = fields.Char('ZIP') name = fields.Char('ZIP')
code = fields.Char('City Code', size=64, code = fields.Char('City Code', size=64,
help="The official code for the city") help="The official code for the city")
@ -38,23 +38,24 @@ class BetterZip(models.Model):
state_id = fields.Many2one('res.country.state', 'State') state_id = fields.Many2one('res.country.state', 'State')
country_id = fields.Many2one('res.country', 'Country') country_id = fields.Many2one('res.country', 'Country')
@api.one
@api.multi
@api.depends( @api.depends(
'name', 'name',
'city', 'city',
'state_id', 'state_id',
'country_id', 'country_id',
) )
def _get_display_name(self):
if self.name:
name = [self.name, self.city]
else:
name = [self.city]
if self.state_id:
name.append(self.state_id.name)
if self.country_id:
name.append(self.country_id.name)
self.display_name = ", ".join(name)
def _compute_display_name(self):
for bz in self:
if bz.name:
name = [bz.name, bz.city]
else:
name = [bz.city]
if bz.state_id:
name.append(bz.state_id.name)
if bz.country_id:
name.append(bz.country_id.name)
bz.display_name = ", ".join(name)
@api.onchange('state_id') @api.onchange('state_id')
def onchange_state_id(self): def onchange_state_id(self):

14
base_location/models/company.py

@ -27,14 +27,16 @@ class ResCompany(models.Model):
_inherit = 'res.company' _inherit = 'res.company'
@api.one
@api.multi
@api.onchange('better_zip_id') @api.onchange('better_zip_id')
def on_change_city(self): def on_change_city(self):
if self.better_zip_id:
self.zip = self.better_zip_id.name
self.city = self.better_zip_id.city
self.state_id = self.better_zip_id.state_id
self.country_id = self.better_zip_id.country_id
for company in self:
if company.better_zip_id:
bz = company.better_zip_id
company.zip = bz.name
company.city = bz.city
company.state_id = bz.state_id
company.country_id = bz.country_id
better_zip_id = fields.Many2one( better_zip_id = fields.Many2one(
'res.better.zip', 'res.better.zip',

14
base_location/models/partner.py

@ -27,11 +27,13 @@ class ResPartner(models.Model):
_inherit = 'res.partner' _inherit = 'res.partner'
zip_id = fields.Many2one('res.better.zip', 'City/Location') zip_id = fields.Many2one('res.better.zip', 'City/Location')
@api.one
@api.multi
@api.onchange('zip_id') @api.onchange('zip_id')
def onchange_zip_id(self): def onchange_zip_id(self):
if self.zip_id:
self.zip = self.zip_id.name
self.city = self.zip_id.city
self.state_id = self.zip_id.state_id
self.country_id = self.zip_id.country_id
for partner in self:
if partner.zip_id:
zip_id = partner.zip_id
partner.zip = zip_id.name
partner.city = zip_id.city
partner.state_id = zip_id.state_id
partner.country_id = zip_id.country_id

2
base_location/security/ir.model.access.csv

@ -1,3 +1,3 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"ir_model_access_betterzip0","res_better_zip group_user_all","model_res_better_zip",base.group_user,1,0,0,0 "ir_model_access_betterzip0","res_better_zip group_user_all","model_res_better_zip",base.group_user,1,0,0,0
"ir_model_access_betterzip1","res_better_zip group_user","model_res_better_zip","base.group_partner_manager",1,1,1,1
"ir_model_access_betterzip1","res_better_zip group_user","model_res_better_zip","base.group_partner_manager",1,1,1,1
Loading…
Cancel
Save