From 61e27881e1ced84a2dd9b70bba05a1bf759f4744 Mon Sep 17 00:00:00 2001 From: Ernesto Tejeda Date: Thu, 30 Jul 2020 09:23:09 -0400 Subject: [PATCH] [FIX] rma_sale: fix expected single record error in tests. rma_sale 12.0.1.0.1 Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: rma-12.0/rma-12.0-rma_sale Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma_sale/ --- rma_sale/__manifest__.py | 2 +- rma_sale/i18n/es.po | 70 ++++++++++++++++++--------------- rma_sale/tests/test_rma_sale.py | 8 +++- 3 files changed, 45 insertions(+), 35 deletions(-) diff --git a/rma_sale/__manifest__.py b/rma_sale/__manifest__.py index 0c0efb2a..ab2f78d6 100644 --- a/rma_sale/__manifest__.py +++ b/rma_sale/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Return Merchandise Authorization Management - Link with Sales", "summary": "Sale Order - Return Merchandise Authorization (RMA)", - "version": "12.0.1.0.0", + "version": "12.0.1.0.1", "development_status": "Beta", "category": "RMA", "website": "https://github.com/OCA/rma", diff --git a/rma_sale/i18n/es.po b/rma_sale/i18n/es.po index 0d3e1091..bdc9fbbb 100644 --- a/rma_sale/i18n/es.po +++ b/rma_sale/i18n/es.po @@ -107,6 +107,27 @@ msgstr "Orden de venta" msgid "Accept" msgstr "Aceptar" +#. module: rma_sale +#: model:ir.model.fields,field_description:rma_sale.field_rma__allowed_move_ids +msgid "Allowed Move" +msgstr "" + +#. module: rma_sale +#: model:ir.model.fields,field_description:rma_sale.field_rma__allowed_picking_ids +#: model:ir.model.fields,field_description:rma_sale.field_sale_order_line_rma_wizard__allowed_picking_ids +#, fuzzy +#| msgid "Picking" +msgid "Allowed Picking" +msgstr "Dominio de órdenes de entrega" + +#. module: rma_sale +#: model:ir.model.fields,field_description:rma_sale.field_rma__allowed_product_ids +#: model:ir.model.fields,field_description:rma_sale.field_sale_order_line_rma_wizard__allowed_product_ids +#, fuzzy +#| msgid "Product" +msgid "Allowed Product" +msgstr "Producto" + #. module: rma_sale #: model_terms:ir.ui.view,arch_db:rma_sale.=sale_order_rma_wizard_form_view msgid "Cancel" @@ -172,34 +193,12 @@ msgstr "Orden de entrega" msgid "Display Name" msgstr "Nombre mostrado" -#. module: rma_sale -#: model:ir.model.fields,field_description:rma_sale.field_rma__domain_move_ids -msgid "Domain Move" -msgstr "Dominio de movimientos" - -#. module: rma_sale -#: model:ir.model.fields,field_description:rma_sale.field_rma__domain_picking_ids -msgid "Domain Picking" -msgstr "Dominio de entregas" - -#. module: rma_sale -#: model:ir.model.fields,field_description:rma_sale.field_rma__domain_product_ids -msgid "Domain Product" -msgstr "Dominio de productos" - #. module: rma_sale #: model:ir.model.fields,field_description:rma_sale.field_sale_order_line_rma_wizard__id #: model:ir.model.fields,field_description:rma_sale.field_sale_order_rma_wizard__id msgid "ID" msgstr "" -#. module: rma_sale -#: model:ir.model.fields,field_description:rma_sale.field_stock_move__is_sale_delivery -#, fuzzy -#| msgid "Delivery" -msgid "Is Sale Delivery" -msgstr "Es entrega de orden de venta" - #. module: rma_sale #: model:ir.model.fields,field_description:rma_sale.field_sale_order_line_rma_wizard____last_update #: model:ir.model.fields,field_description:rma_sale.field_sale_order_rma_wizard____last_update @@ -244,11 +243,6 @@ msgstr "Orden de Entrega" msgid "Origin move" msgstr "Movimiento" -#. module: rma_sale -#: model:ir.model.fields,field_description:rma_sale.field_sale_order_line_rma_wizard__picking_ids -msgid "Picking" -msgstr "Dominio de órdenes de entrega" - #. module: rma_sale #: model:ir.model.fields,field_description:rma_sale.field_rma__product_id #: model:ir.model.fields,field_description:rma_sale.field_sale_order_line_rma_wizard__product_id @@ -315,11 +309,6 @@ msgstr "Asistente de Orden de Venta - RMA" msgid "Sales Order Line" msgstr "Línea de pedido de venta" -#. module: rma_sale -#: model:ir.model,name:rma_sale.model_stock_move -msgid "Stock Move" -msgstr "Movimiento" - #. module: rma_sale #: model:ir.model.fields,field_description:rma_sale.field_sale_order_line_rma_wizard__uom_id msgid "Unit of Measure" @@ -335,3 +324,20 @@ msgstr "Asistente" #, python-format msgid "You may only create RMAs from a confirmed or done sale order." msgstr "Solo puedes crear RMAs desde una orden de venta confirmada o hecha." + +#~ msgid "Domain Move" +#~ msgstr "Dominio de movimientos" + +#~ msgid "Domain Picking" +#~ msgstr "Dominio de entregas" + +#~ msgid "Domain Product" +#~ msgstr "Dominio de productos" + +#, fuzzy +#~| msgid "Delivery" +#~ msgid "Is Sale Delivery" +#~ msgstr "Es entrega de orden de venta" + +#~ msgid "Stock Move" +#~ msgstr "Movimiento" diff --git a/rma_sale/tests/test_rma_sale.py b/rma_sale/tests/test_rma_sale.py index 8150a4ff..ddac44b1 100644 --- a/rma_sale/tests/test_rma_sale.py +++ b/rma_sale/tests/test_rma_sale.py @@ -30,6 +30,10 @@ class TestRmaSale(SavepointCase): line_form.product_uom_qty = 5 cls.sale_order = order_form.save() cls.sale_order.action_confirm() + # Maybe other modules create additional lines in the create + # method in sale.order model, so let's find the correct line. + cls.order_line = cls.sale_order.order_line.filtered( + lambda r: r.product_id == cls.product_1) cls.order_out_picking = cls.sale_order.picking_ids cls.order_out_picking.move_lines.quantity_done = 5 cls.order_out_picking.button_validate() @@ -55,8 +59,8 @@ class TestRmaSale(SavepointCase): self.assertEqual(rma.picking_id, self.order_out_picking) self.assertEqual(rma.move_id, self.order_out_picking.move_lines) self.assertEqual(rma.product_id, self.product_1) - self.assertEqual(rma.product_uom_qty, order.order_line.product_uom_qty) - self.assertEqual(rma.product_uom, order.order_line.product_uom) + self.assertEqual(rma.product_uom_qty, self.order_line.product_uom_qty) + self.assertEqual(rma.product_uom, self.order_line.product_uom) self.assertEqual(rma.state, 'confirmed') self.assertEqual( rma.reception_move_id.origin_returned_move_id,