FIX gettext and rename code to number

This commit is contained in:
Raimon Esteve 2020-10-29 10:41:25 +01:00
parent a9e5ddf16b
commit 4d1278b039
3 changed files with 12 additions and 12 deletions

View file

@ -3,16 +3,16 @@
this repository contains the full copyright notices and license terms. -->
<tryton>
<data grouped="1">
<record model="ir.message" id="shipment_done_title">
<field name="text">You can not create return sale</field>
<record model="ir.message" id="msg_shipment_done_title">
<field name="text">You can not create return sale from "%(shipment)s"</field>
</record>
<record model="ir.message" id="shipment_done_msg">
<record model="ir.message" id="msg_shipment_done_msg">
<field name="text">The return shipment with code "%(shipment)s" is not yet sent.</field>
</record>
<record model="ir.message" id="shipment_description">
<record model="ir.message" id="msg_shipment_description">
<field name="text">Shipment Out Return "%(shipment)s"</field>
</record>
<record model="ir.message" id="shipment_out_origin">
<record model="ir.message" id="msg_shipment_out_origin">
<field name="text">Shipment Out Return "%(shipment)s" origin does not come from a Shipment Out</field>
</record>
</data>

View file

@ -30,9 +30,8 @@ class CreateSaleReturn(Wizard):
for shipment_out_return in shipment_out_returns:
if shipment_out_return.state != 'done':
raise UserError(gettext(
'sale_shipment_returns.hipment_done_title',
error_description='shipment_done_msg',
error_description_args=shipment_out_return.code))
'sale_shipment_returns.msg_shipment_done_title',
shipment=shipment_out_return.number))
sale_origin = None
if isinstance(shipment_out_return.origin, ShipmentOut):
@ -44,8 +43,8 @@ class CreateSaleReturn(Wizard):
party = sale_origin.party
else:
party = shipment_out_return.customer
description = gettext('sale_shipment_returns.hipment_description',
shipment=shipment_out_return.code)
description = gettext('sale_shipment_returns.msg_shipment_description',
shipment=shipment_out_return.number)
# create sale and lines from moves, and new origin move
sale = Sale.get_sale_data(party, description)
@ -72,8 +71,8 @@ class CreateSaleReturn(Wizard):
move.origin = 'sale.line,%s' % line.id
moves_to_save.append(move)
if not lines:
raise UserError(gettext(
'sale_shipment_returns.shipment_out_origin',
raise UserError(
gettext('sale_shipment_returns.msg_shipment_out_origin',
shipment=shipment_out_return.rec_name))
sale.lines = lines

View file

@ -5,3 +5,4 @@ depends:
stock_origin
xml:
shipment.xml
message.xml