openerp-community-reviewer team mailing list archive
-
openerp-community-reviewer team
-
Mailing list archive
-
Message #03693
[Merge] lp:~camptocamp/carriers-deliveries/7.0-delivery_carrier_label_postlogistics-pep8 into lp:carriers-deliveries
Yannick Vaucher @ Camptocamp has proposed merging lp:~camptocamp/carriers-deliveries/7.0-delivery_carrier_label_postlogistics-pep8 into lp:carriers-deliveries.
Requested reviews:
Stock and Logistic Core Editors (stock-logistic-core-editors)
For more details, see:
https://code.launchpad.net/~camptocamp/carriers-deliveries/7.0-delivery_carrier_label_postlogistics-pep8/+merge/205631
--
https://code.launchpad.net/~camptocamp/carriers-deliveries/7.0-delivery_carrier_label_postlogistics-pep8/+merge/205631
Your team Stock and Logistic Core Editors is requested to review the proposed merge of lp:~camptocamp/carriers-deliveries/7.0-delivery_carrier_label_postlogistics-pep8 into lp:carriers-deliveries.
=== modified file 'delivery_carrier_label_postlogistics/__openerp__.py'
--- delivery_carrier_label_postlogistics/__openerp__.py 2013-12-23 10:54:36 +0000
+++ delivery_carrier_label_postlogistics/__openerp__.py 2014-02-10 17:18:47 +0000
@@ -106,6 +106,6 @@
'license': 'AGPL-3',
'application': True,
'external_dependencies': {
- 'python': ['suds'],
+ 'python': ['suds'],
}
}
=== modified file 'delivery_carrier_label_postlogistics/delivery.py'
--- delivery_carrier_label_postlogistics/delivery.py 2014-01-13 11:23:21 +0000
+++ delivery_carrier_label_postlogistics/delivery.py 2014-02-10 17:18:47 +0000
@@ -108,12 +108,14 @@
def _get_carrier_type_selection(self, cr, uid, context=None):
""" Add postlogistics carrier type """
- res = super(DeliveryCarrier, self)._get_carrier_type_selection(cr, uid, context=context)
+ res = super(DeliveryCarrier, self
+ )._get_carrier_type_selection(cr, uid, context=context)
res.append(('postlogistics', 'Postlogistics'))
return res
- def _get_basic_service_ids(self, cr, uid, ids, field_names, arg, context=None):
- """ Search in all options for the PostLogistics basic services if set """
+ def _get_basic_service_ids(self, cr, uid, ids, field_names, arg,
+ context=None):
+ """ Search in all options for PostLogistics basic services if set """
res = {}
for carrier_id in ids:
res[carrier_id] = []
@@ -135,7 +137,8 @@
res[carrier.id] = option_ids
return res
- def _get_allowed_option_ids(self, cr, uid, ids, field_names, arg, context=None):
+ def _get_allowed_option_ids(self, cr, uid, ids, field_names, arg,
+ context=None):
""" Return a list of possible options
A domain would be too complicated.
@@ -160,31 +163,41 @@
continue
service_group_id = carrier.postlogistics_service_group_id.id
if service_group_id:
- basic_service_ids = [s.id for s in carrier.postlogistics_basic_service_ids]
+ basic_service_ids = [
+ s.id for s in carrier.postlogistics_basic_service_ids]
service_ids = option_template_obj.search(
cr, uid,
- [('postlogistics_service_group_id' ,'=', service_group_id)],
+ [('postlogistics_service_group_id',
+ '=',
+ service_group_id)],
context=context)
allowed_ids.extend(service_ids)
if basic_service_ids:
related_service_ids = option_template_obj.search(
cr, uid,
- [('postlogistics_basic_service_ids' ,'in', basic_service_ids)],
+ [('postlogistics_basic_service_ids',
+ 'in',
+ basic_service_ids)],
context=context)
allowed_ids.extend(related_service_ids)
# Allows to set multiple optional single option in order to
# let the user select them
- single_option_types = ['label_layout', 'output_format', 'resolution']
- selected_single_options = [opt.tmpl_option_id.postlogistics_type
- for opt in carrier.available_option_ids
- if opt.postlogistics_type in single_option_types
- and opt.state in ['mandatory']]
+ single_option_types = [
+ 'label_layout',
+ 'output_format',
+ 'resolution']
+ selected_single_options = [
+ opt.tmpl_option_id.postlogistics_type
+ for opt in carrier.available_option_ids
+ if opt.postlogistics_type in single_option_types
+ and opt.state in ['mandatory']]
if selected_single_options != single_option_types:
service_ids = option_template_obj.search(
cr, uid,
[('postlogistics_type', 'in', single_option_types),
- ('postlogistics_type', 'not in', selected_single_options)],
+ ('postlogistics_type',
+ 'not in', selected_single_options)],
context=context)
allowed_ids.extend(service_ids)
res[carrier.id] = allowed_ids
=== modified file 'delivery_carrier_label_postlogistics/postlogistics/web_service.py'
--- delivery_carrier_label_postlogistics/postlogistics/web_service.py 2013-12-17 07:45:50 +0000
+++ delivery_carrier_label_postlogistics/postlogistics/web_service.py 2014-02-10 17:18:47 +0000
@@ -70,8 +70,8 @@
raise orm.except_orm(
_('Error 401'),
_('Authorization Required\n\n'
- 'Please verify postlogistics username and password in:\n'
- 'Configuration -> Postlogistics'))
+ 'Please verify postlogistics username and password in:\n'
+ 'Configuration -> Postlogistics'))
raise
return res
@@ -91,7 +91,8 @@
return lang_code
return 'en'
- def read_allowed_services_by_franking_license(self, license, company, lang=None):
+ def read_allowed_services_by_franking_license(self, license, company,
+ lang=None):
""" Get a list of allowed service for a postlogistics licence """
if not lang:
lang = company.partner_id.lang
@@ -113,7 +114,8 @@
lang = company.partner_id.lang
lang = self._get_language(lang)
request = self.client.service.ReadBasicServices
- return self._send_request(request, Language=lang, ServiceGroupID=service_group_id)
+ return self._send_request(request, Language=lang,
+ ServiceGroupID=service_group_id)
def read_additional_services(self, company, service_code, lang):
""" Get additional services compatible with a basic services """
@@ -343,7 +345,8 @@
res = {'value': []}
request = self.client.service.GenerateLabel
- response = self._send_request(request, Language=lang, Envelope=envelope)
+ response = self._send_request(request, Language=lang,
+ Envelope=envelope)
if not response['success']:
return response
=== modified file 'delivery_carrier_label_postlogistics/res_config.py'
--- delivery_carrier_label_postlogistics/res_config.py 2013-12-13 13:44:03 +0000
+++ delivery_carrier_label_postlogistics/res_config.py 2014-02-10 17:18:47 +0000
@@ -62,9 +62,10 @@
"– File size: max. 30 kb\n"
"– File format: GIF or PNG\n"
"– Colour table: indexed colours, max. 200 colours\n"
- "– The logo will be printed rotated counter-clockwise by 90°\n"
- "We recommend using a black and white logo for printing in the\n"
- "ZPL2 format."
+ "– The logo will be printed rotated counter-clockwise by 90°"
+ "\n"
+ "We recommend using a black and white logo for printing in "
+ " the ZPL2 format."
),
'office': fields.related(
'company_id', 'postlogistics_office',
@@ -141,7 +142,8 @@
lang = context.get('lang', 'en')
service_code_list = service_code.split(',')
- res = web_service.read_delivery_instructions(company, service_code_list, lang)
+ res = web_service.read_delivery_instructions(
+ company, service_code_list, lang)
if 'errors' in res:
errors = '\n'.join(res['errors'])
error_message = (_('Could not retrieve Postlogistics delivery'
@@ -184,14 +186,15 @@
context=context)
if option_ids:
- carrier_option_obj.write(cr, uid, option_ids, data, context=context)
+ carrier_option_obj.write(cr, uid, option_ids, data,
+ context=context)
else:
data.update(code=service_code,
postlogistics_type='delivery',
partner_id=postlogistics_partner.id)
carrier_option_obj.create(cr, uid, data, context=context)
lang = context.get('lang', 'en')
- _logger.info("Updated delivery instrutions. [%s]" %(lang))
+ _logger.info("Updated delivery instrutions. [%s]" % (lang))
def _get_additional_services(self, cr, uid, ids, web_service,
company, service_code, context=None):
@@ -200,7 +203,8 @@
lang = context.get('lang', 'en')
service_code_list = service_code.split(',')
- res = web_service.read_additional_services(company, service_code_list, lang)
+ res = web_service.read_additional_services(company, service_code_list,
+ lang)
if 'errors' in res:
errors = '\n'.join(res['errors'])
error_message = (_('Could not retrieve Postlogistics base '
@@ -230,7 +234,8 @@
carrier_option_obj = self.pool.get('delivery.carrier.template.option')
postlogistics_partner = ir_model_data_obj.get_object(
- cr, uid, 'delivery_carrier_label_postlogistics', 'postlogistics', context=context)
+ cr, uid, 'delivery_carrier_label_postlogistics', 'postlogistics',
+ context=context)
for service_code, data in additional_services.iteritems():
@@ -240,7 +245,8 @@
], context=context)
if option_ids:
- carrier_option_obj.write(cr, uid, option_ids, data, context=context)
+ carrier_option_obj.write(cr, uid, option_ids, data,
+ context=context)
else:
data.update(code=service_code,
postlogistics_type='additional',
@@ -249,7 +255,8 @@
lang = context.get('lang', 'en')
_logger.info("Updated additional services [%s]" % (lang))
- def _update_basic_services(self, cr, uid, ids, web_service, company, group_id, context=None):
+ def _update_basic_services(self, cr, uid, ids, web_service, company,
+ group_id, context=None):
""" Update of basic services
A basic service can be part only of one service group
@@ -291,41 +298,54 @@
], context=context)
data = {'name': service.Description}
if option_ids:
- carrier_option_obj.write(cr, uid, option_ids, data, context=context)
+ carrier_option_obj.write(cr, uid, option_ids, data,
+ context=context)
option_id = option_ids[0]
else:
data.update(code=service_code,
postlogistics_service_group_id=group_id,
partner_id=postlogistics_partner.id,
postlogistics_type='basic')
- option_id = carrier_option_obj.create(cr, uid, data, context=context)
+ option_id = carrier_option_obj.create(cr, uid, data,
+ context=context)
# Get related services
allowed_services = self._get_additional_services(
- cr, uid, ids, web_service, company, service_code, context=context)
+ cr, uid, ids, web_service, company, service_code,
+ context=context)
for key, value in additional_services.iteritems():
if key in allowed_services:
- additional_services[key]['postlogistics_basic_service_ids'][0][2].append(option_id)
+ (additional_services[key]
+ ['postlogistics_basic_service_ids']
+ [0]
+ [2]).append(option_id)
del allowed_services[key]
for key, value in allowed_services.iteritems():
+ value['postlogistics_basic_service_ids'] = [
+ (6, 0, [option_id])]
additional_services[key] = value
- additional_services[key]['postlogistics_basic_service_ids'] = [(6, 0, [option_id])]
allowed_services = self._get_delivery_instructions(
- cr, uid, ids, web_service, company, service_code, context=context)
+ cr, uid, ids, web_service, company, service_code,
+ context=context)
for key, value in delivery_instructions.iteritems():
if key in allowed_services:
- delivery_instructions[key]['postlogistics_basic_service_ids'][0][2].append(option_id)
+ (delivery_instructions[key]
+ ['postlogistics_basic_service_ids']
+ [0]
+ [2]).append(option_id)
del allowed_services[key]
for key, value in allowed_services.iteritems():
+ value['postlogistics_basic_service_ids'] = [
+ (6, 0, [option_id])]
delivery_instructions[key] = value
- delivery_instructions[key]['postlogistics_basic_service_ids'] = [(6, 0, [option_id])]
_logger.info("Updated '%s' basic service [%s]." % (group.name, lang))
return {'additional_services': additional_services,
'delivery_instructions': delivery_instructions}
- def _update_service_groups(self, cr, uid, ids, web_service, company, context=None):
+ def _update_service_groups(self, cr, uid, ids, web_service, company,
+ context=None):
""" Also updates additional services and delivery instructions
as they are shared between groups
@@ -353,29 +373,40 @@
cr, uid, [('group_extid', '=', group_extid)], context=context)
data = {'name': group.Description}
if group_ids:
- service_group_obj.write(cr, uid, group_ids, data, context=context)
+ service_group_obj.write(cr, uid, group_ids, data,
+ context=context)
group_id = group_ids[0]
else:
data['group_extid'] = group_extid
- group_id = service_group_obj.create(cr, uid, data, context=context)
+ group_id = service_group_obj.create(cr, uid, data,
+ context=context)
# Get related services for all basic services of this group
res = self._update_basic_services(cr, uid, ids, web_service,
- company, group_id, context=context)
+ company, group_id,
+ context=context)
allowed_services = res.get('additional_services', {})
for key, value in additional_services.iteritems():
if key in allowed_services:
- option_ids = allowed_services[key]['postlogistics_basic_service_ids'][0][2]
- additional_services[key]['postlogistics_basic_service_ids'][0][2].extend(option_ids)
+ a = allowed_services[key]
+ option_ids = a['postlogistics_basic_service_ids'][0][2]
+ (additional_services[key]
+ ['postlogistics_basic_service_ids']
+ [0]
+ [2]).extend(option_ids)
del allowed_services[key]
additional_services.update(allowed_services)
allowed_services = res.get('delivery_instructions', {})
for key, value in delivery_instructions.iteritems():
if key in allowed_services:
- option_ids = allowed_services[key]['postlogistics_basic_service_ids'][0][2]
- delivery_instructions[key]['postlogistics_basic_service_ids'][0][2].extend(option_ids)
+ a = allowed_services[key]
+ option_ids = a['postlogistics_basic_service_ids'][0][2]
+ (delivery_instructions[key]
+ ['postlogistics_basic_service_ids']
+ [0]
+ [2]).extend(option_ids)
del allowed_services[key]
delivery_instructions.update(allowed_services)
@@ -383,7 +414,8 @@
self._update_additional_services(cr, uid, ids, web_service,
additional_services, context=context)
self._update_delivery_instructions(cr, uid, ids, web_service,
- delivery_instructions, context=context)
+ delivery_instructions,
+ context=context)
def update_postlogistics_options(self, cr, uid, ids, context=None):
""" This action will update all postlogistics option by
@@ -394,7 +426,6 @@
"""
if context is None:
context = {}
- user_obj = self.pool.get('res.users')
for config in self.browse(cr, uid, ids, context=context):
company = config.company_id
web_service = PostlogisticsWebService(company)
@@ -402,12 +433,14 @@
# make sure we create source text in en_US
ctx = context.copy()
ctx['lang'] = 'en_US'
- self._update_service_groups(cr, uid, ids, web_service, company, context=ctx)
+ self._update_service_groups(cr, uid, ids, web_service, company,
+ context=ctx)
language_obj = self.pool.get('res.lang')
language_ids = language_obj.search(cr, uid, [], context=context)
- languages = language_obj.browse(cr, uid, language_ids, context=context)
+ languages = language_obj.browse(cr, uid, language_ids,
+ context=context)
# handle translations
# we call the same methode with a different language context
@@ -416,9 +449,10 @@
ctx = context.copy()
ctx['lang'] = lang_br.code
postlogistics_lang = web_service._get_language(lang)
- # add translations only for languages that exists on postlogistics
- # english source will be kept for other languages
+ # add translations only for languages that exists on
+ # postlogistics english source will be kept for other languages
if postlogistics_lang == 'en':
continue
- self._update_service_groups(cr, uid, ids, web_service, company, context=ctx)
+ self._update_service_groups(cr, uid, ids, web_service, company,
+ context=ctx)
return True
Follow ups
