Upgrade to 5.6

This commit is contained in:
raimonesteve 2020-07-05 11:05:00 +02:00
parent 140877fa08
commit 92ce6a6cd6
4 changed files with 44 additions and 23 deletions

6
api.py
View File

@ -4,6 +4,8 @@
import logging
from trytond.pool import PoolMeta
from trytond.pyson import Eval, Not, Equal
from trytond.i18n import gettext
from trytond.exceptions import UserError
from seurvalencia.picking import *
__all__ = ['CarrierApi']
@ -33,4 +35,6 @@ class CarrierApi(metaclass=PoolMeta):
with API(api.username, api.password, api.debug) as seurvalencia_api:
message = seurvalencia_api.test_connection()
cls.raise_user_error(message)
raise UserError(gettext(
'carrier_send_shipments_seurvalencia.msg_test_connection',
message=message))

25
message.xml Normal file
View File

@ -0,0 +1,25 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<tryton>
<data grouped="1">
<record model="ir.message" id="msg_test_connection">
<field name="text">%(message)s</field>
</record>
<record model="ir.message" id="msg_add_services">
<field name="text">Select a service or default service in Seur API</field>
</record>
<record model="ir.message" id="msg_not_country">
<field name="text">Add country in shipment "%(name)s" delivery address</field>
</record>
<record model="ir.message" id="msg_not_send">
<field name="text">Not send shipment %(name)s</field>
</record>
<record model="ir.message" id="msg_not_send_error">
<field name="text">Not send shipment %(name)s. %(error)s</field>
</record>
<record model="ir.message" id="msg_not_label">
<field name="text">Not available "%(name)s" label from Seur</field>
</record>
</data>
</tryton>

View File

@ -3,6 +3,8 @@
# the full copyright notices and license terms.
from trytond.pool import Pool, PoolMeta
from trytond.transaction import Transaction
from trytond.i18n import gettext
from trytond.exceptions import UserError
from seurvalencia.picking import Picking
from trytond.modules.carrier_send_shipments.tools import unaccent, unspaces
import logging
@ -16,17 +18,6 @@ logger = logging.getLogger(__name__)
class ShipmentOut(metaclass=PoolMeta):
__name__ = 'stock.shipment.out'
@classmethod
def __setup__(cls):
super(ShipmentOut, cls).__setup__()
cls._error_messages.update({
'seurval_add_services': 'Select a service or default service in Seur API',
'seurval_not_country': 'Add country in shipment "%(name)s" delivery address',
'seurval_not_send': 'Not send shipment %(name)s',
'seurval_not_send_error': 'Not send shipment %(name)s. %(error)s',
'seurval_not_label': 'Not available "%(name)s" label from Seur',
})
@classmethod
def send_seurvalencia(self, api, shipments):
'''
@ -52,14 +43,16 @@ class ShipmentOut(metaclass=PoolMeta):
for shipment in shipments:
service = shipment.carrier_service or shipment.carrier.service or default_service
if not service:
message = self.raise_user_error('seurval_add_services', {},
raise_exception=False)
message = gettext(
'carrier_send_shipments_seurvalencia.msg_add_services',
message=message)
errors.append(message)
continue
if not shipment.delivery_address.country:
message = self.raise_user_error('seurval_not_country', {},
raise_exception=False)
message = gettext(
'carrier_send_shipments_seurvalencia.msg_not_country',
message=message)
errors.append(message)
continue
@ -201,17 +194,15 @@ class ShipmentOut(metaclass=PoolMeta):
temp.close()
labels.append(temp.name)
else:
message = self.raise_user_error('seurval_not_label', {
'name': shipment.rec_name,
}, raise_exception=False)
message = gettext('carrier_send_shipments_mrw.msg_not_label',
name=shipment.rec_name)
errors.append(message)
logger.error(message)
if error:
message = self.raise_user_error('seurval_not_send_error', {
'name': shipment.rec_name,
'error': error,
}, raise_exception=False)
message = gettext('carrier_send_shipments_mrw.msg_not_send_error',
name=shipment.rec_name,
error=error)
logger.error(message)
errors.append(message)

View File

@ -8,3 +8,4 @@ extras_depend:
stock_shipment_weight
xml:
api.xml
message.xml