adapt to 5.1

This commit is contained in:
?ngel ?lvarez 2019-09-16 11:01:01 +02:00
parent cb8775a4e2
commit 66dfd225f3
3 changed files with 17 additions and 27 deletions

View file

@ -4,6 +4,8 @@
from trytond.pool import Pool
from trytond.wizard import Wizard, StateAction
from trytond.transaction import Transaction
from trytond.i18n import gettext
from trytond.exceptions import UserError
__all__ = ['CreateSaleReturn']
@ -13,18 +15,6 @@ class CreateSaleReturn(Wizard):
__name__ = 'stock.sale.return.create'
start = StateAction('sale.act_sale_form')
@classmethod
def __setup__(cls):
super(CreateSaleReturn, cls).__setup__()
cls._error_messages.update({
'shipment_done_title': 'You can not create return sale',
'shipment_done_msg': ('The return shipment with code "%s" is '
'not yet sent.'),
'shipment_description': ('Shipment Out Return "%s"'),
'shipment_out_origin': ('Shipment Out Return "%s" origin does '
'not come from a Shipment Out'),
})
def do_start(self, action):
pool = Pool()
ShipmentOut = pool.get('stock.shipment.out')
@ -39,9 +29,10 @@ class CreateSaleReturn(Wizard):
sales = []
for shipment_out_return in shipment_out_returns:
if shipment_out_return.state != 'done':
self.raise_user_error('shipment_done_title',
raise UserError(gettext(
'sale_shipment_returns.hipment_done_title',
error_description='shipment_done_msg',
error_description_args=shipment_out_return.code)
error_description_args=shipment_out_return.code))
sale_origin = None
if isinstance(shipment_out_return.origin, ShipmentOut):
@ -53,8 +44,8 @@ class CreateSaleReturn(Wizard):
party = sale_origin.party
else:
party = shipment_out_return.customer
description = self.raise_user_error('shipment_description',
(shipment_out_return.code), raise_exception=False)
description = gettext('sale_shipment_returns.hipment_description',
shipment=shipment_out_return.code)
# create sale and lines from moves, and new origin move
sale = Sale.get_sale_data(party, description)
@ -81,8 +72,10 @@ class CreateSaleReturn(Wizard):
move.origin = 'sale.line,%s' % line.id
moves_to_save.append(move)
if not lines:
self.raise_user_error('shipment_out_origin', (
shipment_out_return.rec_name,))
raise UserError(gettext(
'sale_shipment_returns.shipment_out_origin',
shipment=shipment_out_return.rec_name))
sale.lines = lines
sales.append(sale)

13
tox.ini
View file

@ -1,18 +1,15 @@
[tox]
envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
envlist = {py35,py36,py37}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
[testenv]
commands = {envpython} setup.py test
deps =
{py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
pypy-postgresql: psycopg2cffi >= 2.5
mysql: MySQL-python
sqlite: sqlitebck
{py35,py36,py37}-postgresql: psycopg2 >= 2.5
pypy3-postgresql: psycopg2cffi >= 2.5
{py35,py36}-sqlite: sqlitebck
setenv =
sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://}
sqlite: DB_NAME={env:SQLITE_NAME::memory:}
postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
mysql: DB_NAME={env:MYSQL_NAME:test}
install_command = pip install --pre --find-links https://trydevpi.tryton.org/ --process-dependency-links {opts} {packages}
install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}

View file

@ -1,5 +1,5 @@
[tryton]
version=4.8.0
version=5.2.0
depends:
sale_data
stock_origin