From d60b28db6f8298f95f37721448691ec44554ce94 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 19 Feb 2021 15:09:21 +0100 Subject: [PATCH 01/21] [ADD] rma_sale_mrp: New module to refund kits --- rma_sale_mrp/README.rst | 119 +++++ rma_sale_mrp/__init__.py | 2 + rma_sale_mrp/__manifest__.py | 23 + rma_sale_mrp/i18n/es.po | 249 ++++++++++ rma_sale_mrp/i18n/rma_sale_mrp.pot | 287 +++++++++++ rma_sale_mrp/models/__init__.py | 3 + rma_sale_mrp/models/account_invoice.py | 19 + rma_sale_mrp/models/rma.py | 65 +++ rma_sale_mrp/models/sale_order.py | 110 +++++ rma_sale_mrp/readme/CONTRIBUTORS.rst | 3 + rma_sale_mrp/readme/DESCRIPTION.rst | 3 + rma_sale_mrp/readme/ROADMAP.rst | 14 + rma_sale_mrp/readme/USAGE.rst | 12 + rma_sale_mrp/static/description/icon.png | Bin 0 -> 9455 bytes rma_sale_mrp/static/description/index.html | 461 ++++++++++++++++++ rma_sale_mrp/tests/__init__.py | 1 + rma_sale_mrp/tests/test_rma_sale_mrp.py | 155 ++++++ rma_sale_mrp/views/report_rma.xml | 59 +++ rma_sale_mrp/views/rma_views.xml | 21 + .../views/sale_order_portal_template.xml | 91 ++++ rma_sale_mrp/wizard/__init__.py | 1 + rma_sale_mrp/wizard/sale_order_rma_wizard.py | 119 +++++ .../wizard/sale_order_rma_wizard_views.xml | 17 + 23 files changed, 1834 insertions(+) create mode 100644 rma_sale_mrp/README.rst create mode 100644 rma_sale_mrp/__init__.py create mode 100644 rma_sale_mrp/__manifest__.py create mode 100644 rma_sale_mrp/i18n/es.po create mode 100644 rma_sale_mrp/i18n/rma_sale_mrp.pot create mode 100644 rma_sale_mrp/models/__init__.py create mode 100644 rma_sale_mrp/models/account_invoice.py create mode 100644 rma_sale_mrp/models/rma.py create mode 100644 rma_sale_mrp/models/sale_order.py create mode 100644 rma_sale_mrp/readme/CONTRIBUTORS.rst create mode 100644 rma_sale_mrp/readme/DESCRIPTION.rst create mode 100644 rma_sale_mrp/readme/ROADMAP.rst create mode 100644 rma_sale_mrp/readme/USAGE.rst create mode 100644 rma_sale_mrp/static/description/icon.png create mode 100644 rma_sale_mrp/static/description/index.html create mode 100644 rma_sale_mrp/tests/__init__.py create mode 100644 rma_sale_mrp/tests/test_rma_sale_mrp.py create mode 100644 rma_sale_mrp/views/report_rma.xml create mode 100644 rma_sale_mrp/views/rma_views.xml create mode 100644 rma_sale_mrp/views/sale_order_portal_template.xml create mode 100644 rma_sale_mrp/wizard/__init__.py create mode 100644 rma_sale_mrp/wizard/sale_order_rma_wizard.py create mode 100644 rma_sale_mrp/wizard/sale_order_rma_wizard_views.xml diff --git a/rma_sale_mrp/README.rst b/rma_sale_mrp/README.rst new file mode 100644 index 00000000..1be2d464 --- /dev/null +++ b/rma_sale_mrp/README.rst @@ -0,0 +1,119 @@ +================================================================ +Return Merchandise Authorization Management - Link with MRP Kits +================================================================ + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github + :target: https://github.com/OCA/rma/tree/12.0/rma_sale_mrp + :alt: OCA/rma +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma_sale_mrp + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/145/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module enables RMAs for kits, wich isn't compatible with the base modules. +In the backend side, we can return separate component while in the frontend +side, customers can return the whole kit and the proper RMAs will be generated. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To use this module, you need to: + +#. Make a a sale order with a kit on it and deliver its components. +#. Go to the portal view for the order and launch the RMA wizard. +#. You'll see a line for the kit. +#. There will be a limit of kits to return that should much the number of kits + delivered. +#. Once you validate the wizard with the number of kits to deliver, you'll + have as many RMAs as components those kits have with the proper quantities + for each one. +#. If you refund the components, the kit in the sale line will be used as the + reference. + +Known issues / Roadmap +====================== + +We compute the kits from the original demanded quantity in the sale order. If +this quantity was to change, we could loose the right components per kit +reference. So this should be very present. Also, v12 has a very poor support +for delivered quantities, that is very improved in v13 with the introduction +of the link to the BoM line in the stock moves. That approach could lead to +errors as well, as the BoM line could change in the future loosing again the +original components per kit reference. Anyway, is to be considered in that +version to use the same rules so they fail for the same reasons. + +Some extra features would be nice to have: + +* Add actions constraints to disallow actions on single components. +* Show kit components in the portal wizard. +* Allow to make an RMA directly from a kit product. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* `Tecnativa `__: + + * David Vidal + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +.. |maintainer-chienandalu| image:: https://github.com/chienandalu.png?size=40px + :target: https://github.com/chienandalu + :alt: chienandalu + +Current `maintainer `__: + +|maintainer-chienandalu| + +This module is part of the `OCA/rma `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/rma_sale_mrp/__init__.py b/rma_sale_mrp/__init__.py new file mode 100644 index 00000000..9b429614 --- /dev/null +++ b/rma_sale_mrp/__init__.py @@ -0,0 +1,2 @@ +from . import models +from . import wizard diff --git a/rma_sale_mrp/__manifest__.py b/rma_sale_mrp/__manifest__.py new file mode 100644 index 00000000..acf2ce45 --- /dev/null +++ b/rma_sale_mrp/__manifest__.py @@ -0,0 +1,23 @@ +# Copyright 2020 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +{ + "name": "Return Merchandise Authorization Management - Link with MRP Kits", + "summary": "Allow doing RMAs from MRP kits", + "version": "12.0.1.0.0", + "development_status": "Beta", + "category": "RMA", + "website": "https://github.com/OCA/rma", + "author": "Tecnativa, Odoo Community Association (OCA)", + "maintainers": ["chienandalu"], + "license": "AGPL-3", + "depends": [ + "rma_sale", + "mrp", + ], + "data": [ + "views/sale_order_portal_template.xml", + "views/rma_views.xml", + "views/report_rma.xml", + "wizard/sale_order_rma_wizard_views.xml", + ], +} diff --git a/rma_sale_mrp/i18n/es.po b/rma_sale_mrp/i18n/es.po new file mode 100644 index 00000000..1e280efe --- /dev/null +++ b/rma_sale_mrp/i18n/es.po @@ -0,0 +1,249 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * rma_sale_mrp +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-01-22 12:23+0000\n" +"PO-Revision-Date: 2021-01-22 14:44+0100\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: \n" +"Language: es\n" +"X-Generator: Poedit 2.3\n" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Cancelled" +msgstr "Cancelado" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Draft" +msgstr " Borrador" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Waiting" +msgstr " En espera" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid "Related Kit Components RMAs" +msgstr "RMAs relacionados de los componentes del kit" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Kit Quantity" +msgstr " Ctd. de kits" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Kit" +msgstr " Kit" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__allowed_picking_ids +msgid "Allowed Picking" +msgstr "Albaranes permitidos" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__allowed_product_ids +msgid "Allowed Product" +msgstr "Producto Permitido" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_category_id +msgid "Category" +msgstr "Categoría" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_rma_wizard__component_line_ids +msgid "Component Lines" +msgstr "Líneas de componentes" + +#. module: rma_sale_mrp +#: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_category_id +msgid "Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios." +msgstr "La conversión entre las unidades de medidas sólo pueden ocurrir si pertenecen a la misma categoría. La conversión se basará en los ratios establecidos." + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__create_uid +msgid "Created by" +msgstr "Creado por" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__create_date +msgid "Created on" +msgstr "Creado el" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__picking_id +msgid "Delivery order" +msgstr "Orden de entrega" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__description +msgid "Description" +msgstr "Descripción" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__display_name +msgid "Display Name" +msgstr "Nombre mostrado" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__id +msgid "ID" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_my_rmas +msgid "Kit" +msgstr "Kit" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__kit_qty_done +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__kit_qty_done +msgid "Kit Qty Done" +msgstr "Ctd hecha de kit" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__kit_qty +msgid "Kit quantity" +msgstr "Cantidad de kit" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component____last_update +msgid "Last Modified on" +msgstr "Última modificación en" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__write_uid +msgid "Last Updated by" +msgstr "Última actualización por" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__write_date +msgid "Last Updated on" +msgstr "Última actualización el" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__move_id +msgid "Move" +msgstr "Movimiento" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__order_id +msgid "Order" +msgstr "Pedido" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__per_kit_quantity +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__per_kit_quantity +msgid "Per Kit Quantity" +msgstr "Cantidad por kit" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__phantom_bom_product +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__phantom_bom_product +msgid "Phantom Bom Product" +msgstr "Producto Kit" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__phantom_kit_line +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__phantom_kit_line +msgid "Phantom Kit Line" +msgstr "Línea de kit" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__product_id +msgid "Product" +msgstr "Producto" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__quantity +msgid "Quantity" +msgstr "Cantidad" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_rma +msgid "RMA" +msgstr "RMA" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__phantom_bom_product +msgid "Related kit product" +msgstr "Product kit relacionado" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__operation_id +msgid "Requested operation" +msgstr "Operación solicitada" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__rma_kit_register +msgid "Rma Kit Register" +msgstr "Registro de RMA del kit" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__sale_line_id +msgid "Sale Line" +msgstr "Línea de venta" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order +msgid "Sale Order" +msgstr "Pedido de venta" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_line_rma_wizard +msgid "Sale Order Line Rma Wizard" +msgstr "Asistente de RMA" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_rma_wizard +msgid "Sale Order Rma Wizard" +msgstr "Asistente de Orden de Venta - RMA" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_line +msgid "Sales Order Line" +msgstr "Línea de pedido de venta" + +#. module: rma_sale_mrp +#: model:ir.model.fields,help:rma_sale_mrp.field_rma__kit_qty +msgid "To how many kits this components corresponds to. Used mainly for refunding the right quantity" +msgstr "A cuántos kits corresponde este componente. Utilizado principalmente para reembolsar la cantidad correcta" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_id +msgid "Unit of Measure" +msgstr "Unidad de medida" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_line_rma_wizard_component +msgid "Used to hide kit components in the wizards" +msgstr "Utilizado para ocultar los componentes en los asistentes" + +#. module: rma_sale_mrp +#: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard__kit_qty_done +#: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard_component__kit_qty_done +msgid "Used to inform kit qty used in the rma. Will be useful to refund" +msgstr "Utilizado para informar la cantidad de kits utilizados en el RMA. Resultará útil al reembolsar" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__wizard_id +msgid "Wizard" +msgstr "Asistente" + +#. module: rma_sale_mrp +#: code:addons/rma_sale_mrp/models/rma.py:49 +#, python-format +msgid "You can't refund a kit in wich some RMAs aren't received" +msgstr "No puedes reembolsar un kit cuyos RMAs no están en estado `recibido`" diff --git a/rma_sale_mrp/i18n/rma_sale_mrp.pot b/rma_sale_mrp/i18n/rma_sale_mrp.pot new file mode 100644 index 00000000..13388219 --- /dev/null +++ b/rma_sale_mrp/i18n/rma_sale_mrp.pot @@ -0,0 +1,287 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * rma_sale_mrp +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Cancelled" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Draft" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Waiting" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Product" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "RMA" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "State" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Related Kit Components RMAs" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Kit information" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Kit Quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Kit" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Kit Quantity:" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Kit:" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__allowed_picking_ids +msgid "Allowed Picking" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__allowed_product_ids +msgid "Allowed Product" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_category_id +msgid "Category" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_rma_wizard__component_line_ids +msgid "Component Lines" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_category_id +msgid "Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios." +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__create_uid +msgid "Created by" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__create_date +msgid "Created on" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__picking_id +msgid "Delivery order" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__description +msgid "Description" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__display_name +msgid "Display Name" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__id +msgid "ID" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_my_rmas +msgid "Kit" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__kit_qty_done +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__kit_qty_done +msgid "Kit Qty Done" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__kit_qty +msgid "Kit quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component____last_update +msgid "Last Modified on" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__write_date +msgid "Last Updated on" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__move_id +msgid "Move" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__order_id +msgid "Order" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__per_kit_quantity +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__per_kit_quantity +msgid "Per Kit Quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__phantom_bom_product +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__phantom_bom_product +msgid "Phantom Bom Product" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__phantom_kit_line +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__phantom_kit_line +msgid "Phantom Kit Line" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__product_id +msgid "Product" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__quantity +msgid "Quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_rma +msgid "RMA" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__phantom_bom_product +msgid "Related kit product" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__operation_id +msgid "Requested operation" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__rma_kit_register +msgid "Rma Kit Register" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__sale_line_id +msgid "Sale Line" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order +msgid "Sale Order" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_line_rma_wizard +msgid "Sale Order Line Rma Wizard" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_rma_wizard +msgid "Sale Order Rma Wizard" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,help:rma_sale_mrp.field_rma__kit_qty +msgid "To how many kits this components corresponds to. Used mainly for refunding the right quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_id +msgid "Unit of Measure" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_line_rma_wizard_component +msgid "Used to hide kit components in the wizards" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard__kit_qty_done +#: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard_component__kit_qty_done +msgid "Used to inform kit qty used in the rma. Will be useful to refund" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__wizard_id +msgid "Wizard" +msgstr "" + +#. module: rma_sale_mrp +#: code:addons/rma_sale_mrp/models/rma.py:49 +#, python-format +msgid "You can't refund a kit in wich some RMAs aren't received" +msgstr "" + diff --git a/rma_sale_mrp/models/__init__.py b/rma_sale_mrp/models/__init__.py new file mode 100644 index 00000000..7593ab7f --- /dev/null +++ b/rma_sale_mrp/models/__init__.py @@ -0,0 +1,3 @@ +from . import account_invoice +from . import rma +from . import sale_order diff --git a/rma_sale_mrp/models/account_invoice.py b/rma_sale_mrp/models/account_invoice.py new file mode 100644 index 00000000..bf0d04d8 --- /dev/null +++ b/rma_sale_mrp/models/account_invoice.py @@ -0,0 +1,19 @@ +# Copyright 2021 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import models +from odoo.tools import float_compare + + +class AccountInvoice(models.Model): + _inherit = "account.invoice" + + def _check_rma_invoice_lines_qty(self): + """For those with differences, check if the kit quantity is the same""" + precision = self.env["decimal.precision"].precision_get( + "Product Unit of Measure") + lines = super()._check_rma_invoice_lines_qty() + if lines: + return lines.sudo().filtered( + lambda r: (r.rma_id.phantom_bom_product and float_compare( + r.quantity, r.rma_id.kit_qty, precision) < 0)) + return lines diff --git a/rma_sale_mrp/models/rma.py b/rma_sale_mrp/models/rma.py new file mode 100644 index 00000000..6111b4e2 --- /dev/null +++ b/rma_sale_mrp/models/rma.py @@ -0,0 +1,65 @@ +# Copyright 2020 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import _, fields, models +from odoo.exceptions import UserError +import odoo.addons.decimal_precision as dp + + +class Rma(models.Model): + _inherit = "rma" + + phantom_bom_product = fields.Many2one( + comodel_name="product.product", + string="Related kit product", + readonly=True, + ) + kit_qty = fields.Float( + string="Kit quantity", + digits=dp.get_precision("Product Unit of Measure"), + readonly=True, + help="To how many kits this components corresponds to. Used mainly " + "for refunding the right quantity", + ) + rma_kit_register = fields.Char(readonly=True) + + def _get_refund_line_quantity(self): + """Refund the kit, not the component""" + if self.phantom_bom_product: + uom = ( + self.sale_line_id.product_uom + or self.phantom_bom_product.uom_id + ) + return (self.kit_qty, uom) + return (self.product_uom_qty, self.product_uom) + + def action_refund(self): + """We want to process them altogether""" + phantom_rmas = self.filtered("phantom_bom_product") + phantom_rmas |= self.search([ + ("rma_kit_register", "in", phantom_rmas.mapped("rma_kit_register")), + ("id", "not in", phantom_rmas.ids), + ]) + self -= phantom_rmas + for rma_kit_register in phantom_rmas.mapped( + "rma_kit_register"): + # We want to avoid refunding kits that aren't completely processed + rmas_by_register = phantom_rmas.filtered( + lambda x: x.rma_kit_register == rma_kit_register) + if any(rmas_by_register.filtered(lambda x: x.state != "received")): + raise UserError(_( + "You can't refund a kit in wich some RMAs aren't received" + )) + self |= rmas_by_register[0] + super().action_refund() + # We can just link the line to an RMA but we can link several RMAs + # to one invoice line. + for rma_kit_register in set(phantom_rmas.mapped("rma_kit_register")): + grouped_rmas = phantom_rmas.filtered( + lambda x: x.rma_kit_register == rma_kit_register) + lead_rma = grouped_rmas.filtered("refund_line_id") + grouped_rmas -= lead_rma + grouped_rmas.write({ + "refund_line_id": lead_rma.refund_line_id.id, + "refund_id": lead_rma.refund_id.id, + "state": "refunded", + }) diff --git a/rma_sale_mrp/models/sale_order.py b/rma_sale_mrp/models/sale_order.py new file mode 100644 index 00000000..fb464d0e --- /dev/null +++ b/rma_sale_mrp/models/sale_order.py @@ -0,0 +1,110 @@ +# Copyright 2020 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import models + + +class SaleOrder(models.Model): + _inherit = "sale.order" + + def _prepare_rma_wizard_line_vals(self, data): + """Set the real kit product""" + vals = super()._prepare_rma_wizard_line_vals(data) + if data.get("phantom_bom_product"): + vals["phantom_bom_product"] = data.get("phantom_bom_product").id + vals["per_kit_quantity"] = data.get("per_kit_quantity", 0) + vals["phantom_kit_line"] = data.get("phantom_kit_line", False) + return vals + + def get_delivery_rma_data(self): + """Get the phantom lines we'll be showing in the wizard""" + data_list = super().get_delivery_rma_data() + kit_products = set( + [ + ( + x.get("phantom_bom_product"), + x.get("sale_line_id") + ) for x in data_list + if x.get("phantom_bom_product") + ] + ) + # For every unique phantom product we'll create a phantom line wich + # will be using as the control in frontend and for display purposes + # in backend + for product, sale_line_id in kit_products: + order_line_obj = self.env["sale.order.line"] + product_obj = self.env["product.product"] + first_component_dict = next( + x for x in data_list if x.get( + "phantom_bom_product", product_obj + ) == product and x.get( + "sale_line_id", order_line_obj + ) == sale_line_id) + component_index = data_list.index(first_component_dict) + # Prevent miscalculation if there partial deliveries + quantity = sum([ + x.get("quantity", 0) for x in data_list + if x.get("sale_line_id") + and x.get("product") == first_component_dict.get("product") + and x.get("sale_line_id") == first_component_dict.get( + "sale_line_id")]) + data_list.insert( + component_index, { + "product": product, + "quantity": ( + first_component_dict.get("per_kit_quantity") and ( + quantity + / first_component_dict.get("per_kit_quantity") + ) + ), + "uom": first_component_dict.get( + "sale_line_id", order_line_obj).product_uom, + "phantom_kit_line": True, + "picking": False, + "sale_line_id": first_component_dict.get( + "sale_line_id", order_line_obj), + } + ) + return data_list + + +class SaleOrderLine(models.Model): + _inherit = "sale.order.line" + + def get_delivery_move(self): + self.ensure_one() + if self.product_id and not self.product_id._is_phantom_bom(): + return super().get_delivery_move() + return self.move_ids.filtered(lambda m: ( + m.state == "done" and not m.scrapped + and m.location_dest_id.usage == "customer" + and ( + not m.origin_returned_move_id + or (m.origin_returned_move_id and m.to_refund)))) + + def prepare_sale_rma_data(self): + """We'll take both the sale order product and the phantom one so we + can play with them when filtering or showing to the customer""" + self.ensure_one() + data = super().prepare_sale_rma_data() + if self.product_id and self.product_id._is_phantom_bom(): + for d in data: + d.update( + { + "phantom_bom_product": self.product_id, + "per_kit_quantity": self._get_kit_qty(d.get("product")) + } + ) + return data + + def _get_kit_qty(self, product_id): + """Compute how many kit components were demanded from this line. We + rely on the matching of sale order and pickings demands, but if those + were manually changed, it could lead to inconsistencies""" + self.ensure_one() + if self.product_id and not self.product_id._is_phantom_bom(): + return 0 + component_demand = sum( + self.move_ids.filtered( + lambda x: x.product_id == product_id + and not x.origin_returned_move_id).mapped("product_uom_qty")) + return component_demand / self.product_uom_qty diff --git a/rma_sale_mrp/readme/CONTRIBUTORS.rst b/rma_sale_mrp/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..e5276b37 --- /dev/null +++ b/rma_sale_mrp/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Tecnativa `__: + + * David Vidal diff --git a/rma_sale_mrp/readme/DESCRIPTION.rst b/rma_sale_mrp/readme/DESCRIPTION.rst new file mode 100644 index 00000000..ddd47c93 --- /dev/null +++ b/rma_sale_mrp/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module enables RMAs for kits, wich isn't compatible with the base modules. +In the backend side, we can return separate component while in the frontend +side, customers can return the whole kit and the proper RMAs will be generated. diff --git a/rma_sale_mrp/readme/ROADMAP.rst b/rma_sale_mrp/readme/ROADMAP.rst new file mode 100644 index 00000000..0f199f02 --- /dev/null +++ b/rma_sale_mrp/readme/ROADMAP.rst @@ -0,0 +1,14 @@ +We compute the kits from the original demanded quantity in the sale order. If +this quantity was to change, we could loose the right components per kit +reference. So this should be very present. Also, v12 has a very poor support +for delivered quantities, that is very improved in v13 with the introduction +of the link to the BoM line in the stock moves. That approach could lead to +errors as well, as the BoM line could change in the future loosing again the +original components per kit reference. Anyway, is to be considered in that +version to use the same rules so they fail for the same reasons. + +Some extra features would be nice to have: + +* Add actions constraints to disallow actions on single components. +* Show kit components in the portal wizard. +* Allow to make an RMA directly from a kit product. diff --git a/rma_sale_mrp/readme/USAGE.rst b/rma_sale_mrp/readme/USAGE.rst new file mode 100644 index 00000000..0ba426e9 --- /dev/null +++ b/rma_sale_mrp/readme/USAGE.rst @@ -0,0 +1,12 @@ +To use this module, you need to: + +#. Make a a sale order with a kit on it and deliver its components. +#. Go to the portal view for the order and launch the RMA wizard. +#. You'll see a line for the kit. +#. There will be a limit of kits to return that should much the number of kits + delivered. +#. Once you validate the wizard with the number of kits to deliver, you'll + have as many RMAs as components those kits have with the proper quantities + for each one. +#. If you refund the components, the kit in the sale line will be used as the + reference. diff --git a/rma_sale_mrp/static/description/icon.png b/rma_sale_mrp/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/rma_sale_mrp/static/description/index.html b/rma_sale_mrp/static/description/index.html new file mode 100644 index 00000000..606e3a07 --- /dev/null +++ b/rma_sale_mrp/static/description/index.html @@ -0,0 +1,461 @@ + + + + + + +Return Merchandise Authorization Management - Link with MRP Kits + + + + + + diff --git a/rma_sale_mrp/tests/__init__.py b/rma_sale_mrp/tests/__init__.py new file mode 100644 index 00000000..6506fae1 --- /dev/null +++ b/rma_sale_mrp/tests/__init__.py @@ -0,0 +1 @@ +from . import test_rma_sale_mrp diff --git a/rma_sale_mrp/tests/test_rma_sale_mrp.py b/rma_sale_mrp/tests/test_rma_sale_mrp.py new file mode 100644 index 00000000..a08772c0 --- /dev/null +++ b/rma_sale_mrp/tests/test_rma_sale_mrp.py @@ -0,0 +1,155 @@ +# Copyright 2020 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo.tests import Form, SavepointCase +from odoo.exceptions import UserError + + +class TestRmaSaleMrp(SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.res_partner = cls.env["res.partner"] + cls.product_product = cls.env["product.product"] + cls.sale_order = cls.env["sale.order"] + cls.product_kit = cls.product_product.create({ + "name": "Product test 1", + "type": "consu", + }) + cls.product_kit_comp_1 = cls.product_product.create({ + "name": "Product Component 1", + "type": "product", + }) + cls.product_kit_comp_2 = cls.product_product.create({ + "name": "Product Component 2", + "type": "product", + }) + cls.bom = cls.env["mrp.bom"].create({ + "product_id": cls.product_kit.id, + "product_tmpl_id": cls.product_kit.product_tmpl_id.id, + "type": "phantom", + "bom_line_ids": [ + (0, 0, { + "product_id": cls.product_kit_comp_1.id, + "product_qty": 2, + }), + (0, 0, { + "product_id": cls.product_kit_comp_2.id, + "product_qty": 4, + }) + ]}) + cls.product_2 = cls.product_product.create({ + "name": "Product test 2", + "type": "product", + }) + cls.partner = cls.res_partner.create({ + "name": "Partner test", + }) + order_form = Form(cls.sale_order) + order_form.partner_id = cls.partner + with order_form.order_line.new() as line_form: + line_form.product_id = cls.product_kit + 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_kit) + cls.order_out_picking = cls.sale_order.picking_ids + # Confirm but leave a backorder to split moves so we can test that + # the wizard correctly creates the RMAs with the proper quantities + for line in cls.order_out_picking.move_lines: + line.quantity_done = line.product_uom_qty - 7 + wiz_act = cls.order_out_picking.button_validate() + wiz = cls.env["stock.backorder.confirmation"].browse(wiz_act["res_id"]) + wiz.process() + cls.backorder = cls.sale_order.picking_ids - cls.order_out_picking + for line in cls.backorder.move_lines: + line.quantity_done = line.product_uom_qty + cls.backorder.button_validate() + + def test_create_rma_from_so(self): + order = self.sale_order + out_pickings = self.order_out_picking + self.backorder + wizard_id = order.action_create_rma()["res_id"] + wizard = self.env["sale.order.rma.wizard"].browse(wizard_id) + wizard.line_ids.quantity = 4 + res = wizard.create_and_open_rma() + rmas = self.env["rma"].search(res["domain"]) + for rma in rmas: + self.assertEqual(rma.partner_id, order.partner_id) + self.assertEqual(rma.order_id, order) + self.assertTrue(rma.picking_id in out_pickings) + self.assertEqual(rmas.mapped("phantom_bom_product"), self.product_kit) + self.assertEqual( + rmas.mapped("product_id"), + self.product_kit_comp_1 + self.product_kit_comp_2 + ) + rma_1 = rmas.filtered(lambda x: x.product_id == self.product_kit_comp_1) + rma_2 = rmas.filtered(lambda x: x.product_id == self.product_kit_comp_2) + move_1 = out_pickings.mapped("move_lines").filtered( + lambda x: x.product_id == self.product_kit_comp_1 + ) + move_2 = out_pickings.mapped("move_lines").filtered( + lambda x: x.product_id == self.product_kit_comp_2 + ) + self.assertEqual( + sum(rma_1.mapped("product_uom_qty")), + 8 + ) + self.assertEqual( + rma_1.mapped("product_uom"), + move_1.mapped("product_uom") + ) + self.assertEqual( + sum(rma_2.mapped("product_uom_qty")), + 16 + ) + self.assertEqual( + rma_2.mapped("product_uom"), + move_2.mapped("product_uom") + ) + self.assertEqual(rma.state, "confirmed") + self.assertEqual( + rma_1.mapped("reception_move_id.origin_returned_move_id"), + move_1, + ) + self.assertEqual( + rma_2.mapped("reception_move_id.origin_returned_move_id"), + move_2, + ) + self.assertEqual( + rmas.mapped("reception_move_id.picking_id") + + self.order_out_picking + self.backorder, + order.picking_ids, + ) + # Refund the RMA + user = self.env["res.users"].create( + { + "login": "test_refund_with_so", + "name": "Test", + } + ) + order.user_id = user.id + rma.reception_move_id.quantity_done = rma.product_uom_qty + rma.reception_move_id.picking_id.action_done() + # All the component RMAs must be received if we want to make a refund + with self.assertRaises(UserError): + rma.action_refund() + rmas_left = rmas - rma + for additional_rma in rmas_left: + additional_rma.reception_move_id.quantity_done = ( + additional_rma.product_uom_qty) + additional_rma.reception_move_id.picking_id.action_done() + rma.action_refund() + self.assertEqual(rma.refund_id.user_id, user) + # The component RMAs get automatically refunded + self.assertEqual(rma.refund_id, rmas_left.mapped("refund_id")) + # The refund product is the kit, not the components + self.assertEqual( + rma.refund_id.invoice_line_ids.product_id, self.product_kit) + rma.refund_id.action_invoice_open() + # We can still return another kit + wizard_id = order.action_create_rma()["res_id"] + wizard = self.env["sale.order.rma.wizard"].browse(wizard_id) + self.assertEqual(wizard.line_ids.quantity, 1) diff --git a/rma_sale_mrp/views/report_rma.xml b/rma_sale_mrp/views/report_rma.xml new file mode 100644 index 00000000..55b3b715 --- /dev/null +++ b/rma_sale_mrp/views/report_rma.xml @@ -0,0 +1,59 @@ + + + + + + diff --git a/rma_sale_mrp/views/rma_views.xml b/rma_sale_mrp/views/rma_views.xml new file mode 100644 index 00000000..d3325c27 --- /dev/null +++ b/rma_sale_mrp/views/rma_views.xml @@ -0,0 +1,21 @@ + + + + + rma + + + + + + + + + rma + + + + + + + diff --git a/rma_sale_mrp/views/sale_order_portal_template.xml b/rma_sale_mrp/views/sale_order_portal_template.xml new file mode 100644 index 00000000..191ee317 --- /dev/null +++ b/rma_sale_mrp/views/sale_order_portal_template.xml @@ -0,0 +1,91 @@ + + + + + + diff --git a/rma_sale_mrp/wizard/__init__.py b/rma_sale_mrp/wizard/__init__.py new file mode 100644 index 00000000..77189e50 --- /dev/null +++ b/rma_sale_mrp/wizard/__init__.py @@ -0,0 +1 @@ +from . import sale_order_rma_wizard diff --git a/rma_sale_mrp/wizard/sale_order_rma_wizard.py b/rma_sale_mrp/wizard/sale_order_rma_wizard.py new file mode 100644 index 00000000..d1c8c61b --- /dev/null +++ b/rma_sale_mrp/wizard/sale_order_rma_wizard.py @@ -0,0 +1,119 @@ +# Copyright 2020 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import api, fields, models + + +class SaleOrderRmaWizard(models.TransientModel): + _inherit = "sale.order.rma.wizard" + + # We wan't to separate components from the main line so we can separate + # them and hide them in the wizard + component_line_ids = fields.One2many( + comodel_name="sale.order.line.rma.wizard.component", + inverse_name="wizard_id", + string="Component Lines", + ) + + @api.model + def create(self, vals): + """Split component lines""" + if "line_ids" in vals and vals.get("line_ids"): + line_ids = [ + (x[0], x[1], x[2]) for x in vals.get("line_ids") + if not x[2].get("phantom_bom_product") + ] + component_line_ids = [ + (x[0], x[1], x[2]) for x in vals.get("line_ids") + if x[2].get("phantom_bom_product") + ] + vals.update({ + "line_ids": line_ids, + "component_line_ids": component_line_ids, + }) + return super().create(vals) + + def create_rma(self, from_portal=None): + """We'll decompose the RMAs and remove the phantom lines""" + phantom_lines = self.line_ids.filtered("phantom_kit_line") + # Coming from the portal, we'll compute how many per kit to receive. + # From backend we'll be returning them from each individual component + # import pdb; pdb.set_trace() + for line in phantom_lines: + kit_lines = self.component_line_ids.filtered( + lambda x: x.phantom_bom_product == line.product_id + and x.sale_line_id == line.sale_line_id + ) + component_products = kit_lines.mapped("product_id") + for product in component_products: + product_kit_lines = kit_lines.filtered( + lambda x: x.product_id == product) + qty_to_return = product_kit_lines[0].per_kit_quantity * line.quantity + while qty_to_return: + for kit_line in product_kit_lines: + kit_line.quantity = min(qty_to_return, kit_line.quantity) + kit_line.operation_id = line.operation_id + kit_line.kit_qty_done = ( + kit_line.quantity / kit_line.per_kit_quantity) + qty_to_return -= kit_line.quantity + # Finally we add them the main line_ids + kit_line_vals = [ + (0, 0, x._convert_to_write(x._cache)) for x in kit_lines] + self.update({"line_ids": kit_line_vals}) + # We don't need them anymore + phantom_lines.unlink() + return super().create_rma(from_portal=from_portal) + + +class SaleOrderLineRmaWizard(models.TransientModel): + _inherit = "sale.order.line.rma.wizard" + + phantom_bom_product = fields.Many2one( + comodel_name="product.product", + ) + kit_qty_done = fields.Float( + readonly=True, + help="Used to inform kit qty used in the rma. Will be useful to refund", + ) + per_kit_quantity = fields.Float( + readonly=True, + ) + phantom_kit_line = fields.Boolean(readonly=True) + + @api.depends("picking_id") + def _compute_move_id(self): + """We need to process kit components separately so we can match them + against their phantom product""" + not_kit = self.filtered( + lambda x: not x.phantom_bom_product and + not x.product_id._is_phantom_bom()) + super(SaleOrderLineRmaWizard, not_kit)._compute_move_id() + for line in self.filtered( + lambda x: x.phantom_bom_product and x.picking_id): + line.move_id = line.picking_id.move_lines.filtered( + lambda ml: ( + ml.product_id == line.product_id + and ml.sale_line_id == line.sale_line_id + and ml.sale_line_id.product_id == line.phantom_bom_product + and ml.sale_line_id.order_id == line.order_id)) + + def _prepare_rma_values(self): + """It will be used as a reference for the components""" + res = super()._prepare_rma_values() + if self.phantom_bom_product: + unique_register = "{}-{}-{}".format( + self.wizard_id.id, + self.phantom_bom_product.id, + self.sale_line_id.id + ) + res.update({ + "phantom_bom_product": self.phantom_bom_product.id, + "kit_qty": self.kit_qty_done, + "rma_kit_register": unique_register, + }) + return res + + +class SaleOrderLineRmaWizardComponent(models.TransientModel): + _name = "sale.order.line.rma.wizard.component" + _inherit = "sale.order.line.rma.wizard" + _description = "Used to hide kit components in the wizards" diff --git a/rma_sale_mrp/wizard/sale_order_rma_wizard_views.xml b/rma_sale_mrp/wizard/sale_order_rma_wizard_views.xml new file mode 100644 index 00000000..bac324da --- /dev/null +++ b/rma_sale_mrp/wizard/sale_order_rma_wizard_views.xml @@ -0,0 +1,17 @@ + + + + + + sale.order.rma.wizard + + + + + + {'readonly': [('phantom_kit_line', '=', True)]} + 1 + + + + From 2ef0ed6f5df69cf34e0332be80dc57c62cf69ac7 Mon Sep 17 00:00:00 2001 From: Pedro Castro Silva Date: Thu, 11 Mar 2021 18:29:50 +0000 Subject: [PATCH 02/21] Added translation using Weblate (Portuguese) --- rma_sale_mrp/i18n/pt.po | 287 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 287 insertions(+) create mode 100644 rma_sale_mrp/i18n/pt.po diff --git a/rma_sale_mrp/i18n/pt.po b/rma_sale_mrp/i18n/pt.po new file mode 100644 index 00000000..8b2591d4 --- /dev/null +++ b/rma_sale_mrp/i18n/pt.po @@ -0,0 +1,287 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * rma_sale_mrp +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: pt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Cancelled" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Draft" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Waiting" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Product" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "RMA" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "State" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Related Kit Components RMAs" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Kit information" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Kit Quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Kit" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Kit Quantity:" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Kit:" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__allowed_picking_ids +msgid "Allowed Picking" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__allowed_product_ids +msgid "Allowed Product" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_category_id +msgid "Category" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_rma_wizard__component_line_ids +msgid "Component Lines" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_category_id +msgid "Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios." +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__create_uid +msgid "Created by" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__create_date +msgid "Created on" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__picking_id +msgid "Delivery order" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__description +msgid "Description" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__display_name +msgid "Display Name" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__id +msgid "ID" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_my_rmas +msgid "Kit" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__kit_qty_done +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__kit_qty_done +msgid "Kit Qty Done" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__kit_qty +msgid "Kit quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component____last_update +msgid "Last Modified on" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__write_date +msgid "Last Updated on" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__move_id +msgid "Move" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__order_id +msgid "Order" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__per_kit_quantity +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__per_kit_quantity +msgid "Per Kit Quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__phantom_bom_product +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__phantom_bom_product +msgid "Phantom Bom Product" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__phantom_kit_line +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__phantom_kit_line +msgid "Phantom Kit Line" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__product_id +msgid "Product" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__quantity +msgid "Quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_rma +msgid "RMA" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__phantom_bom_product +msgid "Related kit product" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__operation_id +msgid "Requested operation" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__rma_kit_register +msgid "Rma Kit Register" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__sale_line_id +msgid "Sale Line" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order +msgid "Sale Order" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_line_rma_wizard +msgid "Sale Order Line Rma Wizard" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_rma_wizard +msgid "Sale Order Rma Wizard" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,help:rma_sale_mrp.field_rma__kit_qty +msgid "To how many kits this components corresponds to. Used mainly for refunding the right quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_id +msgid "Unit of Measure" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_line_rma_wizard_component +msgid "Used to hide kit components in the wizards" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard__kit_qty_done +#: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard_component__kit_qty_done +msgid "Used to inform kit qty used in the rma. Will be useful to refund" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__wizard_id +msgid "Wizard" +msgstr "" + +#. module: rma_sale_mrp +#: code:addons/rma_sale_mrp/models/rma.py:49 +#, python-format +msgid "You can't refund a kit in wich some RMAs aren't received" +msgstr "" From 3ad8491a3e3148f5f333cc085449e639a6fb96a6 Mon Sep 17 00:00:00 2001 From: Pedro Castro Silva Date: Thu, 11 Mar 2021 23:34:49 +0000 Subject: [PATCH 03/21] Translated using Weblate (Portuguese) Currently translated at 43.3% (23 of 53 strings) Translation: rma-12.0/rma-12.0-rma_sale_mrp Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma_sale_mrp/pt/ --- rma_sale_mrp/i18n/pt.po | 50 ++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/rma_sale_mrp/i18n/pt.po b/rma_sale_mrp/i18n/pt.po index 8b2591d4..d723f76b 100644 --- a/rma_sale_mrp/i18n/pt.po +++ b/rma_sale_mrp/i18n/pt.po @@ -6,33 +6,41 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2021-03-12 01:45+0000\n" +"Last-Translator: Pedro Castro Silva \n" "Language-Team: none\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.3.2\n" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page msgid " Cancelled" msgstr "" +" Cancelado" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page msgid " Draft" msgstr "" +" Rascunho" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page msgid " Waiting" msgstr "" +" Em Espera" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document msgid "Product" -msgstr "" +msgstr "Produto" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document @@ -93,7 +101,7 @@ msgstr "" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_category_id msgid "Category" -msgstr "" +msgstr "Categoria" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_rma_wizard__component_line_ids @@ -108,37 +116,37 @@ msgstr "" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__create_uid msgid "Created by" -msgstr "" +msgstr "Criado por" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__create_date msgid "Created on" -msgstr "" +msgstr "Criado em" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__picking_id msgid "Delivery order" -msgstr "" +msgstr "Ordem de Entrega" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__description msgid "Description" -msgstr "" +msgstr "Descrição" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__display_name msgid "Display Name" -msgstr "" +msgstr "Nome a Exibir" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__id msgid "ID" -msgstr "" +msgstr "ID" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_account_invoice msgid "Invoice" -msgstr "" +msgstr "Fatura" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_my_rmas @@ -179,7 +187,7 @@ msgstr "" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__order_id msgid "Order" -msgstr "" +msgstr "Encomenda" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__per_kit_quantity @@ -202,17 +210,17 @@ msgstr "" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__product_id msgid "Product" -msgstr "" +msgstr "Produto" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__quantity msgid "Quantity" -msgstr "" +msgstr "Quantidade" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_rma msgid "RMA" -msgstr "" +msgstr "RMA" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__phantom_bom_product @@ -232,27 +240,27 @@ msgstr "" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__sale_line_id msgid "Sale Line" -msgstr "" +msgstr "Linha de Venda" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_sale_order msgid "Sale Order" -msgstr "" +msgstr "Encomenda de Venda" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_sale_order_line_rma_wizard msgid "Sale Order Line Rma Wizard" -msgstr "" +msgstr "Assistente da Linha de RMA da Encomenda de Venda" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_sale_order_rma_wizard msgid "Sale Order Rma Wizard" -msgstr "" +msgstr "Assistente da RMA da Encomenda de Venda" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_sale_order_line msgid "Sales Order Line" -msgstr "" +msgstr "Linha de Encomenda de Venda" #. module: rma_sale_mrp #: model:ir.model.fields,help:rma_sale_mrp.field_rma__kit_qty @@ -262,7 +270,7 @@ msgstr "" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_id msgid "Unit of Measure" -msgstr "" +msgstr "Unidade de Medida" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_sale_order_line_rma_wizard_component @@ -278,7 +286,7 @@ msgstr "" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__wizard_id msgid "Wizard" -msgstr "" +msgstr "Assistente" #. module: rma_sale_mrp #: code:addons/rma_sale_mrp/models/rma.py:49 From 2415fcb914a2caf97769f40743123ab66c516b73 Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Mon, 15 Mar 2021 06:19:19 +0000 Subject: [PATCH 04/21] Added translation using Weblate (Portuguese (Brazil)) --- rma_sale_mrp/i18n/pt_BR.po | 287 +++++++++++++++++++++++++++++++++++++ 1 file changed, 287 insertions(+) create mode 100644 rma_sale_mrp/i18n/pt_BR.po diff --git a/rma_sale_mrp/i18n/pt_BR.po b/rma_sale_mrp/i18n/pt_BR.po new file mode 100644 index 00000000..db5245db --- /dev/null +++ b/rma_sale_mrp/i18n/pt_BR.po @@ -0,0 +1,287 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * rma_sale_mrp +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Cancelled" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Draft" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Waiting" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Product" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "RMA" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "State" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Related Kit Components RMAs" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Kit information" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Kit Quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +msgid " Kit" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Kit Quantity:" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Kit:" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__allowed_picking_ids +msgid "Allowed Picking" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__allowed_product_ids +msgid "Allowed Product" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_category_id +msgid "Category" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_rma_wizard__component_line_ids +msgid "Component Lines" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_category_id +msgid "Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios." +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__create_uid +msgid "Created by" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__create_date +msgid "Created on" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__picking_id +msgid "Delivery order" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__description +msgid "Description" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__display_name +msgid "Display Name" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__id +msgid "ID" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_my_rmas +msgid "Kit" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__kit_qty_done +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__kit_qty_done +msgid "Kit Qty Done" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__kit_qty +msgid "Kit quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component____last_update +msgid "Last Modified on" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__write_date +msgid "Last Updated on" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__move_id +msgid "Move" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__order_id +msgid "Order" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__per_kit_quantity +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__per_kit_quantity +msgid "Per Kit Quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__phantom_bom_product +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__phantom_bom_product +msgid "Phantom Bom Product" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__phantom_kit_line +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__phantom_kit_line +msgid "Phantom Kit Line" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__product_id +msgid "Product" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__quantity +msgid "Quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_rma +msgid "RMA" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__phantom_bom_product +msgid "Related kit product" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__operation_id +msgid "Requested operation" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__rma_kit_register +msgid "Rma Kit Register" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__sale_line_id +msgid "Sale Line" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order +msgid "Sale Order" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_line_rma_wizard +msgid "Sale Order Line Rma Wizard" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_rma_wizard +msgid "Sale Order Rma Wizard" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,help:rma_sale_mrp.field_rma__kit_qty +msgid "To how many kits this components corresponds to. Used mainly for refunding the right quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_id +msgid "Unit of Measure" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_sale_order_line_rma_wizard_component +msgid "Used to hide kit components in the wizards" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard__kit_qty_done +#: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard_component__kit_qty_done +msgid "Used to inform kit qty used in the rma. Will be useful to refund" +msgstr "" + +#. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__wizard_id +msgid "Wizard" +msgstr "" + +#. module: rma_sale_mrp +#: code:addons/rma_sale_mrp/models/rma.py:49 +#, python-format +msgid "You can't refund a kit in wich some RMAs aren't received" +msgstr "" From 313e8a03221b9c366eba0e9388d89fa90b3c23e2 Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Mon, 15 Mar 2021 06:32:17 +0000 Subject: [PATCH 05/21] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (53 of 53 strings) Translation: rma-12.0/rma-12.0-rma_sale_mrp Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma_sale_mrp/pt_BR/ --- rma_sale_mrp/i18n/pt_BR.po | 109 +++++++++++++++++++++---------------- 1 file changed, 63 insertions(+), 46 deletions(-) diff --git a/rma_sale_mrp/i18n/pt_BR.po b/rma_sale_mrp/i18n/pt_BR.po index db5245db..fc4f1142 100644 --- a/rma_sale_mrp/i18n/pt_BR.po +++ b/rma_sale_mrp/i18n/pt_BR.po @@ -6,282 +6,299 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2021-03-15 08:45+0000\n" +"Last-Translator: Marcel Savegnago \n" "Language-Team: none\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.3.2\n" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page msgid " Cancelled" msgstr "" +" Cancelado" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page msgid " Draft" msgstr "" +" Rascunho" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page msgid " Waiting" msgstr "" +" Esperando" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document msgid "Product" -msgstr "" +msgstr "Produto" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document msgid "Quantity" -msgstr "" +msgstr "Quantidade" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document msgid "RMA" -msgstr "" +msgstr "RMA" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document msgid "State" -msgstr "" +msgstr "Estado" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document msgid "Related Kit Components RMAs" msgstr "" +"RMAs de componentes de kit " +"relacionados" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document msgid "Kit information" -msgstr "" +msgstr "Informações do Kit" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page msgid " Kit Quantity" msgstr "" +" Quantidade de Kit" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page msgid " Kit" -msgstr "" +msgstr " Kit" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document msgid "Kit Quantity:" -msgstr "" +msgstr "Quantidade do Kit:" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document msgid "Kit:" -msgstr "" +msgstr "Kit:" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__allowed_picking_ids msgid "Allowed Picking" -msgstr "" +msgstr "Coleta Autorizada" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__allowed_product_ids msgid "Allowed Product" -msgstr "" +msgstr "Produto Autorizado" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_category_id msgid "Category" -msgstr "" +msgstr "Categoria" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_rma_wizard__component_line_ids msgid "Component Lines" -msgstr "" +msgstr "Linhas Componentes" #. module: rma_sale_mrp #: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_category_id msgid "Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios." msgstr "" +"Uma conversão entre unidades de medida só poderá ocorrer se pertencer à " +"mesma categoria. A conversão será feita com base nas proporções." #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__create_uid msgid "Created by" -msgstr "" +msgstr "Criado por" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__create_date msgid "Created on" -msgstr "" +msgstr "Criado em" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__picking_id msgid "Delivery order" -msgstr "" +msgstr "Ordem de Entrega" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__description msgid "Description" -msgstr "" +msgstr "Descrição" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__display_name msgid "Display Name" -msgstr "" +msgstr "Exibir Nome" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__id msgid "ID" -msgstr "" +msgstr "ID" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_account_invoice msgid "Invoice" -msgstr "" +msgstr "Fatura" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_my_rmas msgid "Kit" -msgstr "" +msgstr "Kit" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__kit_qty_done #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__kit_qty_done msgid "Kit Qty Done" -msgstr "" +msgstr "Qtd de Kit Feito" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__kit_qty msgid "Kit quantity" -msgstr "" +msgstr "Quantidade do kit" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component____last_update msgid "Last Modified on" -msgstr "" +msgstr "Última modificação Feita em" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__write_uid msgid "Last Updated by" -msgstr "" +msgstr "Última Atualização por" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__write_date msgid "Last Updated on" -msgstr "" +msgstr "Última Atualização em" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__move_id msgid "Move" -msgstr "" +msgstr "Movimentação" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__order_id msgid "Order" -msgstr "" +msgstr "Pedido" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__per_kit_quantity #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__per_kit_quantity msgid "Per Kit Quantity" -msgstr "" +msgstr "Por Quantidade de Kit" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__phantom_bom_product #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__phantom_bom_product msgid "Phantom Bom Product" -msgstr "" +msgstr "LdM do Produto Fantasma" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__phantom_kit_line #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__phantom_kit_line msgid "Phantom Kit Line" -msgstr "" +msgstr "Linha de Kit Fantasma" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__product_id msgid "Product" -msgstr "" +msgstr "Produto" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__quantity msgid "Quantity" -msgstr "" +msgstr "Quantidade" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_rma msgid "RMA" -msgstr "" +msgstr "RMA" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__phantom_bom_product msgid "Related kit product" -msgstr "" +msgstr "Produto do kit relacionado" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__operation_id msgid "Requested operation" -msgstr "" +msgstr "Operação Requisitada" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__rma_kit_register msgid "Rma Kit Register" -msgstr "" +msgstr "Registro de Kit RMA" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__sale_line_id msgid "Sale Line" -msgstr "" +msgstr "Linha de Venda" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_sale_order msgid "Sale Order" -msgstr "" +msgstr "Pedido de Venda" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_sale_order_line_rma_wizard msgid "Sale Order Line Rma Wizard" -msgstr "" +msgstr "Assistente da Linha do Pedido de Venda RMA" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_sale_order_rma_wizard msgid "Sale Order Rma Wizard" -msgstr "" +msgstr "Assistente do Pedido de Venda RMA" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_sale_order_line msgid "Sales Order Line" -msgstr "" +msgstr "Linha do Pedido de Venda" #. module: rma_sale_mrp #: model:ir.model.fields,help:rma_sale_mrp.field_rma__kit_qty msgid "To how many kits this components corresponds to. Used mainly for refunding the right quantity" msgstr "" +"A quantos kits este componente corresponde. Usado principalmente para " +"reembolsar a quantidade certa" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_id msgid "Unit of Measure" -msgstr "" +msgstr "Unidade de Medida" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_sale_order_line_rma_wizard_component msgid "Used to hide kit components in the wizards" -msgstr "" +msgstr "Usado para ocultar os componentes do kit nos assistentes" #. module: rma_sale_mrp #: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard__kit_qty_done #: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard_component__kit_qty_done msgid "Used to inform kit qty used in the rma. Will be useful to refund" msgstr "" +"Usado para informar a quantidade de kit usada na rma. Será útil para " +"reembolsar" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__wizard_id msgid "Wizard" -msgstr "" +msgstr "Assistente" #. module: rma_sale_mrp #: code:addons/rma_sale_mrp/models/rma.py:49 #, python-format msgid "You can't refund a kit in wich some RMAs aren't received" -msgstr "" +msgstr "Você não pode reembolsar um kit em que alguns RMAs não foram recebidos" From 07a1f95274dd1fd44647122e585ed7dc4271e215 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 15 Apr 2021 15:02:32 +0200 Subject: [PATCH 06/21] [FIX] rma_sale_mrp: infinite loop In the wizard, if a component line didn't have any quantity, we could end in an infinite loop when creating the RMA. --- rma_sale_mrp/__manifest__.py | 2 +- rma_sale_mrp/wizard/sale_order_rma_wizard.py | 40 +++++++++++--------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/rma_sale_mrp/__manifest__.py b/rma_sale_mrp/__manifest__.py index acf2ce45..2c38d08f 100644 --- a/rma_sale_mrp/__manifest__.py +++ b/rma_sale_mrp/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Return Merchandise Authorization Management - Link with MRP Kits", "summary": "Allow doing RMAs from MRP kits", - "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_mrp/wizard/sale_order_rma_wizard.py b/rma_sale_mrp/wizard/sale_order_rma_wizard.py index d1c8c61b..d372b264 100644 --- a/rma_sale_mrp/wizard/sale_order_rma_wizard.py +++ b/rma_sale_mrp/wizard/sale_order_rma_wizard.py @@ -33,33 +33,39 @@ class SaleOrderRmaWizard(models.TransientModel): return super().create(vals) def create_rma(self, from_portal=None): - """We'll decompose the RMAs and remove the phantom lines""" + """We kept the component lines in the shade and now we need to take + the ones linked to the phatom lines (kits) to create the proper RMA + for each component according to the proper component quantities""" phantom_lines = self.line_ids.filtered("phantom_kit_line") - # Coming from the portal, we'll compute how many per kit to receive. - # From backend we'll be returning them from each individual component - # import pdb; pdb.set_trace() + kit_line_vals = [] for line in phantom_lines: - kit_lines = self.component_line_ids.filtered( + # There could be two lines for the same product, so we need to + # split them to get the right quantities and operations for each + # one and then group them by product to process them altogether + kit_component_lines = self.component_line_ids.filtered( lambda x: x.phantom_bom_product == line.product_id and x.sale_line_id == line.sale_line_id ) - component_products = kit_lines.mapped("product_id") - for product in component_products: - product_kit_lines = kit_lines.filtered( - lambda x: x.product_id == product) - qty_to_return = product_kit_lines[0].per_kit_quantity * line.quantity - while qty_to_return: - for kit_line in product_kit_lines: + for product in kit_component_lines.mapped("product_id"): + product_kit_component_lines = kit_component_lines.filtered( + lambda x: x.product_id == product and x.quantity + ) + qty_to_return = ( + product_kit_component_lines[0].per_kit_quantity + * line.quantity + ) + while qty_to_return > 0: + for kit_line in product_kit_component_lines: kit_line.quantity = min(qty_to_return, kit_line.quantity) kit_line.operation_id = line.operation_id kit_line.kit_qty_done = ( kit_line.quantity / kit_line.per_kit_quantity) qty_to_return -= kit_line.quantity - # Finally we add them the main line_ids - kit_line_vals = [ - (0, 0, x._convert_to_write(x._cache)) for x in kit_lines] - self.update({"line_ids": kit_line_vals}) - # We don't need them anymore + kit_line_vals += [ + (0, 0, x._convert_to_write(x._cache)) for x in kit_component_lines] + self.update({"line_ids": kit_line_vals}) + # We don't need the phantom lines anymore as we already have the + # kit component ones. phantom_lines.unlink() return super().create_rma(from_portal=from_portal) From 6f0a240edf579e6ad439d5d8458f88bf631202ff Mon Sep 17 00:00:00 2001 From: david Date: Thu, 22 Apr 2021 11:19:25 +0200 Subject: [PATCH 07/21] [FIX] rma_sale_mrp: handle exceptions when qty is forced --- rma_sale_mrp/__manifest__.py | 2 +- rma_sale_mrp/i18n/es.po | 100 ++++++++++++++++--- rma_sale_mrp/i18n/pt.po | 30 ++++-- rma_sale_mrp/i18n/pt_BR.po | 34 +++++-- rma_sale_mrp/i18n/rma_sale_mrp.pot | 6 ++ rma_sale_mrp/tests/test_rma_sale_mrp.py | 11 +- rma_sale_mrp/wizard/sale_order_rma_wizard.py | 9 +- 7 files changed, 162 insertions(+), 30 deletions(-) diff --git a/rma_sale_mrp/__manifest__.py b/rma_sale_mrp/__manifest__.py index 2c38d08f..6bfa5b76 100644 --- a/rma_sale_mrp/__manifest__.py +++ b/rma_sale_mrp/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Return Merchandise Authorization Management - Link with MRP Kits", "summary": "Allow doing RMAs from MRP kits", - "version": "12.0.1.0.1", + "version": "12.0.1.0.2", "development_status": "Beta", "category": "RMA", "website": "https://github.com/OCA/rma", diff --git a/rma_sale_mrp/i18n/es.po b/rma_sale_mrp/i18n/es.po index 1e280efe..dcd707d6 100644 --- a/rma_sale_mrp/i18n/es.po +++ b/rma_sale_mrp/i18n/es.po @@ -10,32 +10,72 @@ msgstr "" "PO-Revision-Date: 2021-01-22 14:44+0100\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: \n" -"Language: es\n" "X-Generator: Poedit 2.3\n" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page -msgid " Cancelled" -msgstr "Cancelado" +msgid "" +" Cancelled" +msgstr "" +"Cancelado" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page -msgid " Draft" -msgstr " Borrador" +msgid "" +" Draft" +msgstr "" +" Borrador" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page -msgid " Waiting" -msgstr " En espera" +msgid "" +" Waiting" +msgstr "" +" En espera" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Product" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Quantity" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "RMA" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "State" +msgstr "" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document msgid "Related Kit Components RMAs" -msgstr "RMAs relacionados de los componentes del kit" +msgstr "" +"RMAs relacionados de los componentes del kit" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Kit information" +msgstr "" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page @@ -47,6 +87,16 @@ msgstr " Ctd. de kits" msgid " Kit" msgstr " Kit" +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Kit Quantity:" +msgstr "" + +#. module: rma_sale_mrp +#: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document +msgid "Kit:" +msgstr "" + #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__allowed_picking_ids msgid "Allowed Picking" @@ -69,8 +119,13 @@ msgstr "Líneas de componentes" #. module: rma_sale_mrp #: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_category_id -msgid "Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios." -msgstr "La conversión entre las unidades de medidas sólo pueden ocurrir si pertenecen a la misma categoría. La conversión se basará en los ratios establecidos." +msgid "" +"Conversion between Units of Measure can only occur if they belong to the " +"same category. The conversion will be made based on the ratios." +msgstr "" +"La conversión entre las unidades de medidas sólo pueden ocurrir si " +"pertenecen a la misma categoría. La conversión se basará en los ratios " +"establecidos." #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__create_uid @@ -102,6 +157,11 @@ msgstr "Nombre mostrado" msgid "ID" msgstr "" +#. module: rma_sale_mrp +#: model:ir.model,name:rma_sale_mrp.model_account_invoice +msgid "Invoice" +msgstr "" + #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_my_rmas msgid "Kit" @@ -216,10 +276,22 @@ msgstr "Asistente de Orden de Venta - RMA" msgid "Sales Order Line" msgstr "Línea de pedido de venta" +#. module: rma_sale_mrp +#: code:addons/rma_sale_mrp/wizard/sale_order_rma_wizard.py:55 +#, python-format +msgid "" +"The kit corresponding to the product %s can't be put in the RMA. Either all " +"or some of the components where already put in another RMA" +msgstr "" + #. module: rma_sale_mrp #: model:ir.model.fields,help:rma_sale_mrp.field_rma__kit_qty -msgid "To how many kits this components corresponds to. Used mainly for refunding the right quantity" -msgstr "A cuántos kits corresponde este componente. Utilizado principalmente para reembolsar la cantidad correcta" +msgid "" +"To how many kits this components corresponds to. Used mainly for refunding " +"the right quantity" +msgstr "" +"A cuántos kits corresponde este componente. Utilizado principalmente para " +"reembolsar la cantidad correcta" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_id @@ -235,7 +307,9 @@ msgstr "Utilizado para ocultar los componentes en los asistentes" #: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard__kit_qty_done #: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard_component__kit_qty_done msgid "Used to inform kit qty used in the rma. Will be useful to refund" -msgstr "Utilizado para informar la cantidad de kits utilizados en el RMA. Resultará útil al reembolsar" +msgstr "" +"Utilizado para informar la cantidad de kits utilizados en el RMA. Resultará " +"útil al reembolsar" #. module: rma_sale_mrp #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__wizard_id diff --git a/rma_sale_mrp/i18n/pt.po b/rma_sale_mrp/i18n/pt.po index d723f76b..0b0a1c92 100644 --- a/rma_sale_mrp/i18n/pt.po +++ b/rma_sale_mrp/i18n/pt.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * rma_sale_mrp +# * rma_sale_mrp # msgid "" msgstr "" @@ -18,21 +18,27 @@ msgstr "" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page -msgid " Cancelled" +msgid "" +" Cancelled" msgstr "" " Cancelado" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page -msgid " Draft" +msgid "" +" Draft" msgstr "" " Rascunho" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page -msgid " Waiting" +msgid "" +" Waiting" msgstr "" " Em Espera" @@ -110,7 +116,9 @@ msgstr "" #. module: rma_sale_mrp #: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_category_id -msgid "Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios." +msgid "" +"Conversion between Units of Measure can only occur if they belong to the " +"same category. The conversion will be made based on the ratios." msgstr "" #. module: rma_sale_mrp @@ -262,9 +270,19 @@ msgstr "Assistente da RMA da Encomenda de Venda" msgid "Sales Order Line" msgstr "Linha de Encomenda de Venda" +#. module: rma_sale_mrp +#: code:addons/rma_sale_mrp/wizard/sale_order_rma_wizard.py:55 +#, python-format +msgid "" +"The kit corresponding to the product %s can't be put in the RMA. Either all " +"or some of the components where already put in another RMA" +msgstr "" + #. module: rma_sale_mrp #: model:ir.model.fields,help:rma_sale_mrp.field_rma__kit_qty -msgid "To how many kits this components corresponds to. Used mainly for refunding the right quantity" +msgid "" +"To how many kits this components corresponds to. Used mainly for refunding " +"the right quantity" msgstr "" #. module: rma_sale_mrp diff --git a/rma_sale_mrp/i18n/pt_BR.po b/rma_sale_mrp/i18n/pt_BR.po index fc4f1142..743a6e0b 100644 --- a/rma_sale_mrp/i18n/pt_BR.po +++ b/rma_sale_mrp/i18n/pt_BR.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * rma_sale_mrp +# * rma_sale_mrp # msgid "" msgstr "" @@ -18,21 +18,27 @@ msgstr "" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page -msgid " Cancelled" +msgid "" +" Cancelled" msgstr "" " Cancelado" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page -msgid " Draft" +msgid "" +" Draft" msgstr "" " Rascunho" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.portal_rma_page -msgid " Waiting" +msgid "" +" Waiting" msgstr "" " Esperando" @@ -62,8 +68,8 @@ msgstr "Estado" #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document msgid "Related Kit Components RMAs" msgstr "" -"RMAs de componentes de kit " -"relacionados" +"RMAs de componentes de kit relacionados" #. module: rma_sale_mrp #: model_terms:ir.ui.view,arch_db:rma_sale_mrp.report_rma_document @@ -113,7 +119,9 @@ msgstr "Linhas Componentes" #. module: rma_sale_mrp #: model:ir.model.fields,help:rma_sale_mrp.field_sale_order_line_rma_wizard_component__uom_category_id -msgid "Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios." +msgid "" +"Conversion between Units of Measure can only occur if they belong to the " +"same category. The conversion will be made based on the ratios." msgstr "" "Uma conversão entre unidades de medida só poderá ocorrer se pertencer à " "mesma categoria. A conversão será feita com base nas proporções." @@ -267,9 +275,19 @@ msgstr "Assistente do Pedido de Venda RMA" msgid "Sales Order Line" msgstr "Linha do Pedido de Venda" +#. module: rma_sale_mrp +#: code:addons/rma_sale_mrp/wizard/sale_order_rma_wizard.py:55 +#, python-format +msgid "" +"The kit corresponding to the product %s can't be put in the RMA. Either all " +"or some of the components where already put in another RMA" +msgstr "" + #. module: rma_sale_mrp #: model:ir.model.fields,help:rma_sale_mrp.field_rma__kit_qty -msgid "To how many kits this components corresponds to. Used mainly for refunding the right quantity" +msgid "" +"To how many kits this components corresponds to. Used mainly for refunding " +"the right quantity" msgstr "" "A quantos kits este componente corresponde. Usado principalmente para " "reembolsar a quantidade certa" diff --git a/rma_sale_mrp/i18n/rma_sale_mrp.pot b/rma_sale_mrp/i18n/rma_sale_mrp.pot index 13388219..bff578f5 100644 --- a/rma_sale_mrp/i18n/rma_sale_mrp.pot +++ b/rma_sale_mrp/i18n/rma_sale_mrp.pot @@ -253,6 +253,12 @@ msgstr "" msgid "Sales Order Line" msgstr "" +#. module: rma_sale_mrp +#: code:addons/rma_sale_mrp/wizard/sale_order_rma_wizard.py:55 +#, python-format +msgid "The kit corresponding to the product %s can't be put in the RMA. Either all or some of the components where already put in another RMA" +msgstr "" + #. module: rma_sale_mrp #: model:ir.model.fields,help:rma_sale_mrp.field_rma__kit_qty msgid "To how many kits this components corresponds to. Used mainly for refunding the right quantity" diff --git a/rma_sale_mrp/tests/test_rma_sale_mrp.py b/rma_sale_mrp/tests/test_rma_sale_mrp.py index a08772c0..b64b3c49 100644 --- a/rma_sale_mrp/tests/test_rma_sale_mrp.py +++ b/rma_sale_mrp/tests/test_rma_sale_mrp.py @@ -1,7 +1,7 @@ # Copyright 2020 Tecnativa - David Vidal # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo.tests import Form, SavepointCase -from odoo.exceptions import UserError +from odoo.exceptions import UserError, ValidationError class TestRmaSaleMrp(SavepointCase): @@ -153,3 +153,12 @@ class TestRmaSaleMrp(SavepointCase): wizard_id = order.action_create_rma()["res_id"] wizard = self.env["sale.order.rma.wizard"].browse(wizard_id) self.assertEqual(wizard.line_ids.quantity, 1) + wizard.create_and_open_rma() + # Now we open the wizard again and try to force the RMA qty wich should + # be 0 at this time + wizard_id = order.action_create_rma()["res_id"] + wizard = self.env["sale.order.rma.wizard"].browse(wizard_id) + self.assertEqual(wizard.line_ids.quantity, 0) + wizard.line_ids.quantity = 1 + with self.assertRaises(ValidationError): + wizard.create_and_open_rma() diff --git a/rma_sale_mrp/wizard/sale_order_rma_wizard.py b/rma_sale_mrp/wizard/sale_order_rma_wizard.py index d372b264..d8e89772 100644 --- a/rma_sale_mrp/wizard/sale_order_rma_wizard.py +++ b/rma_sale_mrp/wizard/sale_order_rma_wizard.py @@ -1,6 +1,7 @@ # Copyright 2020 Tecnativa - David Vidal # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import api, fields, models +from odoo import _, api, fields, models +from odoo.exceptions import ValidationError class SaleOrderRmaWizard(models.TransientModel): @@ -50,6 +51,12 @@ class SaleOrderRmaWizard(models.TransientModel): product_kit_component_lines = kit_component_lines.filtered( lambda x: x.product_id == product and x.quantity ) + if not product_kit_component_lines: + raise ValidationError(_( + "The kit corresponding to the product %s can't be " + "put in the RMA. Either all or some of the components " + "where already put in another RMA" + ) % line.product_id.name) qty_to_return = ( product_kit_component_lines[0].per_kit_quantity * line.quantity From 7c8e17779d9fe0342cdca9ad7bd8a8f25eb76c51 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 30 Apr 2021 18:29:34 +0200 Subject: [PATCH 08/21] [IMP] rma_sale_mrp: black, isort, prettier --- rma_sale_mrp/__manifest__.py | 5 +- rma_sale_mrp/models/account_invoice.py | 10 +- rma_sale_mrp/models/rma.py | 49 +++---- rma_sale_mrp/models/sale_order.py | 81 ++++++----- rma_sale_mrp/tests/test_rma_sale_mrp.py | 113 +++++++-------- rma_sale_mrp/views/report_rma.xml | 40 ++++-- .../views/sale_order_portal_template.xml | 129 +++++++++++++----- rma_sale_mrp/wizard/sale_order_rma_wizard.py | 70 +++++----- .../wizard/sale_order_rma_wizard_views.xml | 6 +- 9 files changed, 287 insertions(+), 216 deletions(-) diff --git a/rma_sale_mrp/__manifest__.py b/rma_sale_mrp/__manifest__.py index 6bfa5b76..bfd5aef0 100644 --- a/rma_sale_mrp/__manifest__.py +++ b/rma_sale_mrp/__manifest__.py @@ -10,10 +10,7 @@ "author": "Tecnativa, Odoo Community Association (OCA)", "maintainers": ["chienandalu"], "license": "AGPL-3", - "depends": [ - "rma_sale", - "mrp", - ], + "depends": ["rma_sale", "mrp"], "data": [ "views/sale_order_portal_template.xml", "views/rma_views.xml", diff --git a/rma_sale_mrp/models/account_invoice.py b/rma_sale_mrp/models/account_invoice.py index bf0d04d8..91150fc0 100644 --- a/rma_sale_mrp/models/account_invoice.py +++ b/rma_sale_mrp/models/account_invoice.py @@ -10,10 +10,14 @@ class AccountInvoice(models.Model): def _check_rma_invoice_lines_qty(self): """For those with differences, check if the kit quantity is the same""" precision = self.env["decimal.precision"].precision_get( - "Product Unit of Measure") + "Product Unit of Measure" + ) lines = super()._check_rma_invoice_lines_qty() if lines: return lines.sudo().filtered( - lambda r: (r.rma_id.phantom_bom_product and float_compare( - r.quantity, r.rma_id.kit_qty, precision) < 0)) + lambda r: ( + r.rma_id.phantom_bom_product + and float_compare(r.quantity, r.rma_id.kit_qty, precision) < 0 + ) + ) return lines diff --git a/rma_sale_mrp/models/rma.py b/rma_sale_mrp/models/rma.py index 6111b4e2..45dad61c 100644 --- a/rma_sale_mrp/models/rma.py +++ b/rma_sale_mrp/models/rma.py @@ -2,6 +2,7 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo import _, fields, models from odoo.exceptions import UserError + import odoo.addons.decimal_precision as dp @@ -9,57 +10,57 @@ class Rma(models.Model): _inherit = "rma" phantom_bom_product = fields.Many2one( - comodel_name="product.product", - string="Related kit product", - readonly=True, + comodel_name="product.product", string="Related kit product", readonly=True, ) kit_qty = fields.Float( string="Kit quantity", digits=dp.get_precision("Product Unit of Measure"), readonly=True, help="To how many kits this components corresponds to. Used mainly " - "for refunding the right quantity", + "for refunding the right quantity", ) rma_kit_register = fields.Char(readonly=True) def _get_refund_line_quantity(self): """Refund the kit, not the component""" if self.phantom_bom_product: - uom = ( - self.sale_line_id.product_uom - or self.phantom_bom_product.uom_id - ) + uom = self.sale_line_id.product_uom or self.phantom_bom_product.uom_id return (self.kit_qty, uom) return (self.product_uom_qty, self.product_uom) def action_refund(self): """We want to process them altogether""" phantom_rmas = self.filtered("phantom_bom_product") - phantom_rmas |= self.search([ - ("rma_kit_register", "in", phantom_rmas.mapped("rma_kit_register")), - ("id", "not in", phantom_rmas.ids), - ]) + phantom_rmas |= self.search( + [ + ("rma_kit_register", "in", phantom_rmas.mapped("rma_kit_register")), + ("id", "not in", phantom_rmas.ids), + ] + ) self -= phantom_rmas - for rma_kit_register in phantom_rmas.mapped( - "rma_kit_register"): + for rma_kit_register in phantom_rmas.mapped("rma_kit_register"): # We want to avoid refunding kits that aren't completely processed rmas_by_register = phantom_rmas.filtered( - lambda x: x.rma_kit_register == rma_kit_register) + lambda x: x.rma_kit_register == rma_kit_register + ) if any(rmas_by_register.filtered(lambda x: x.state != "received")): - raise UserError(_( - "You can't refund a kit in wich some RMAs aren't received" - )) + raise UserError( + _("You can't refund a kit in wich some RMAs aren't received") + ) self |= rmas_by_register[0] super().action_refund() # We can just link the line to an RMA but we can link several RMAs # to one invoice line. for rma_kit_register in set(phantom_rmas.mapped("rma_kit_register")): grouped_rmas = phantom_rmas.filtered( - lambda x: x.rma_kit_register == rma_kit_register) + lambda x: x.rma_kit_register == rma_kit_register + ) lead_rma = grouped_rmas.filtered("refund_line_id") grouped_rmas -= lead_rma - grouped_rmas.write({ - "refund_line_id": lead_rma.refund_line_id.id, - "refund_id": lead_rma.refund_id.id, - "state": "refunded", - }) + grouped_rmas.write( + { + "refund_line_id": lead_rma.refund_line_id.id, + "refund_id": lead_rma.refund_id.id, + "state": "refunded", + } + ) diff --git a/rma_sale_mrp/models/sale_order.py b/rma_sale_mrp/models/sale_order.py index fb464d0e..62bc51a0 100644 --- a/rma_sale_mrp/models/sale_order.py +++ b/rma_sale_mrp/models/sale_order.py @@ -18,15 +18,11 @@ class SaleOrder(models.Model): def get_delivery_rma_data(self): """Get the phantom lines we'll be showing in the wizard""" data_list = super().get_delivery_rma_data() - kit_products = set( - [ - ( - x.get("phantom_bom_product"), - x.get("sale_line_id") - ) for x in data_list - if x.get("phantom_bom_product") - ] - ) + kit_products = { + (x.get("phantom_bom_product"), x.get("sale_line_id")) + for x in data_list + if x.get("phantom_bom_product") + } # For every unique phantom product we'll create a phantom line wich # will be using as the control in frontend and for display purposes # in backend @@ -34,35 +30,40 @@ class SaleOrder(models.Model): order_line_obj = self.env["sale.order.line"] product_obj = self.env["product.product"] first_component_dict = next( - x for x in data_list if x.get( - "phantom_bom_product", product_obj - ) == product and x.get( - "sale_line_id", order_line_obj - ) == sale_line_id) + x + for x in data_list + if x.get("phantom_bom_product", product_obj) == product + and x.get("sale_line_id", order_line_obj) == sale_line_id + ) component_index = data_list.index(first_component_dict) # Prevent miscalculation if there partial deliveries - quantity = sum([ - x.get("quantity", 0) for x in data_list - if x.get("sale_line_id") - and x.get("product") == first_component_dict.get("product") - and x.get("sale_line_id") == first_component_dict.get( - "sale_line_id")]) + quantity = sum( + [ + x.get("quantity", 0) + for x in data_list + if x.get("sale_line_id") + and x.get("product") == first_component_dict.get("product") + and x.get("sale_line_id") + == first_component_dict.get("sale_line_id") + ] + ) data_list.insert( - component_index, { + component_index, + { "product": product, "quantity": ( - first_component_dict.get("per_kit_quantity") and ( - quantity - / first_component_dict.get("per_kit_quantity") - ) + first_component_dict.get("per_kit_quantity") + and (quantity / first_component_dict.get("per_kit_quantity")) ), "uom": first_component_dict.get( - "sale_line_id", order_line_obj).product_uom, + "sale_line_id", order_line_obj + ).product_uom, "phantom_kit_line": True, "picking": False, "sale_line_id": first_component_dict.get( - "sale_line_id", order_line_obj), - } + "sale_line_id", order_line_obj + ), + }, ) return data_list @@ -74,12 +75,17 @@ class SaleOrderLine(models.Model): self.ensure_one() if self.product_id and not self.product_id._is_phantom_bom(): return super().get_delivery_move() - return self.move_ids.filtered(lambda m: ( - m.state == "done" and not m.scrapped - and m.location_dest_id.usage == "customer" - and ( - not m.origin_returned_move_id - or (m.origin_returned_move_id and m.to_refund)))) + return self.move_ids.filtered( + lambda m: ( + m.state == "done" + and not m.scrapped + and m.location_dest_id.usage == "customer" + and ( + not m.origin_returned_move_id + or (m.origin_returned_move_id and m.to_refund) + ) + ) + ) def prepare_sale_rma_data(self): """We'll take both the sale order product and the phantom one so we @@ -91,7 +97,7 @@ class SaleOrderLine(models.Model): d.update( { "phantom_bom_product": self.product_id, - "per_kit_quantity": self._get_kit_qty(d.get("product")) + "per_kit_quantity": self._get_kit_qty(d.get("product")), } ) return data @@ -105,6 +111,7 @@ class SaleOrderLine(models.Model): return 0 component_demand = sum( self.move_ids.filtered( - lambda x: x.product_id == product_id - and not x.origin_returned_move_id).mapped("product_uom_qty")) + lambda x: x.product_id == product_id and not x.origin_returned_move_id + ).mapped("product_uom_qty") + ) return component_demand / self.product_uom_qty diff --git a/rma_sale_mrp/tests/test_rma_sale_mrp.py b/rma_sale_mrp/tests/test_rma_sale_mrp.py index b64b3c49..2b00d5e1 100644 --- a/rma_sale_mrp/tests/test_rma_sale_mrp.py +++ b/rma_sale_mrp/tests/test_rma_sale_mrp.py @@ -1,7 +1,7 @@ # Copyright 2020 Tecnativa - David Vidal # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo.tests import Form, SavepointCase from odoo.exceptions import UserError, ValidationError +from odoo.tests import Form, SavepointCase class TestRmaSaleMrp(SavepointCase): @@ -11,39 +11,38 @@ class TestRmaSaleMrp(SavepointCase): cls.res_partner = cls.env["res.partner"] cls.product_product = cls.env["product.product"] cls.sale_order = cls.env["sale.order"] - cls.product_kit = cls.product_product.create({ - "name": "Product test 1", - "type": "consu", - }) - cls.product_kit_comp_1 = cls.product_product.create({ - "name": "Product Component 1", - "type": "product", - }) - cls.product_kit_comp_2 = cls.product_product.create({ - "name": "Product Component 2", - "type": "product", - }) - cls.bom = cls.env["mrp.bom"].create({ - "product_id": cls.product_kit.id, - "product_tmpl_id": cls.product_kit.product_tmpl_id.id, - "type": "phantom", - "bom_line_ids": [ - (0, 0, { - "product_id": cls.product_kit_comp_1.id, - "product_qty": 2, - }), - (0, 0, { - "product_id": cls.product_kit_comp_2.id, - "product_qty": 4, - }) - ]}) - cls.product_2 = cls.product_product.create({ - "name": "Product test 2", - "type": "product", - }) - cls.partner = cls.res_partner.create({ - "name": "Partner test", - }) + cls.product_kit = cls.product_product.create( + {"name": "Product test 1", "type": "consu"} + ) + cls.product_kit_comp_1 = cls.product_product.create( + {"name": "Product Component 1", "type": "product"} + ) + cls.product_kit_comp_2 = cls.product_product.create( + {"name": "Product Component 2", "type": "product"} + ) + cls.bom = cls.env["mrp.bom"].create( + { + "product_id": cls.product_kit.id, + "product_tmpl_id": cls.product_kit.product_tmpl_id.id, + "type": "phantom", + "bom_line_ids": [ + ( + 0, + 0, + {"product_id": cls.product_kit_comp_1.id, "product_qty": 2}, + ), + ( + 0, + 0, + {"product_id": cls.product_kit_comp_2.id, "product_qty": 4}, + ), + ], + } + ) + cls.product_2 = cls.product_product.create( + {"name": "Product test 2", "type": "product"} + ) + cls.partner = cls.res_partner.create({"name": "Partner test"}) order_form = Form(cls.sale_order) order_form.partner_id = cls.partner with order_form.order_line.new() as line_form: @@ -54,7 +53,8 @@ class TestRmaSaleMrp(SavepointCase): # 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_kit) + lambda r: r.product_id == cls.product_kit + ) cls.order_out_picking = cls.sale_order.picking_ids # Confirm but leave a backorder to split moves so we can test that # the wizard correctly creates the RMAs with the proper quantities @@ -82,8 +82,7 @@ class TestRmaSaleMrp(SavepointCase): self.assertTrue(rma.picking_id in out_pickings) self.assertEqual(rmas.mapped("phantom_bom_product"), self.product_kit) self.assertEqual( - rmas.mapped("product_id"), - self.product_kit_comp_1 + self.product_kit_comp_2 + rmas.mapped("product_id"), self.product_kit_comp_1 + self.product_kit_comp_2 ) rma_1 = rmas.filtered(lambda x: x.product_id == self.product_kit_comp_1) rma_2 = rmas.filtered(lambda x: x.product_id == self.product_kit_comp_2) @@ -93,42 +92,26 @@ class TestRmaSaleMrp(SavepointCase): move_2 = out_pickings.mapped("move_lines").filtered( lambda x: x.product_id == self.product_kit_comp_2 ) - self.assertEqual( - sum(rma_1.mapped("product_uom_qty")), - 8 - ) - self.assertEqual( - rma_1.mapped("product_uom"), - move_1.mapped("product_uom") - ) - self.assertEqual( - sum(rma_2.mapped("product_uom_qty")), - 16 - ) - self.assertEqual( - rma_2.mapped("product_uom"), - move_2.mapped("product_uom") - ) + self.assertEqual(sum(rma_1.mapped("product_uom_qty")), 8) + self.assertEqual(rma_1.mapped("product_uom"), move_1.mapped("product_uom")) + self.assertEqual(sum(rma_2.mapped("product_uom_qty")), 16) + self.assertEqual(rma_2.mapped("product_uom"), move_2.mapped("product_uom")) self.assertEqual(rma.state, "confirmed") self.assertEqual( - rma_1.mapped("reception_move_id.origin_returned_move_id"), - move_1, + rma_1.mapped("reception_move_id.origin_returned_move_id"), move_1, ) self.assertEqual( - rma_2.mapped("reception_move_id.origin_returned_move_id"), - move_2, + rma_2.mapped("reception_move_id.origin_returned_move_id"), move_2, ) self.assertEqual( rmas.mapped("reception_move_id.picking_id") - + self.order_out_picking + self.backorder, + + self.order_out_picking + + self.backorder, order.picking_ids, ) # Refund the RMA user = self.env["res.users"].create( - { - "login": "test_refund_with_so", - "name": "Test", - } + {"login": "test_refund_with_so", "name": "Test"} ) order.user_id = user.id rma.reception_move_id.quantity_done = rma.product_uom_qty @@ -139,15 +122,15 @@ class TestRmaSaleMrp(SavepointCase): rmas_left = rmas - rma for additional_rma in rmas_left: additional_rma.reception_move_id.quantity_done = ( - additional_rma.product_uom_qty) + additional_rma.product_uom_qty + ) additional_rma.reception_move_id.picking_id.action_done() rma.action_refund() self.assertEqual(rma.refund_id.user_id, user) # The component RMAs get automatically refunded self.assertEqual(rma.refund_id, rmas_left.mapped("refund_id")) # The refund product is the kit, not the components - self.assertEqual( - rma.refund_id.invoice_line_ids.product_id, self.product_kit) + self.assertEqual(rma.refund_id.invoice_line_ids.product_id, self.product_kit) rma.refund_id.action_invoice_open() # We can still return another kit wizard_id = order.action_create_rma()["res_id"] diff --git a/rma_sale_mrp/views/report_rma.xml b/rma_sale_mrp/views/report_rma.xml index 55b3b715..c88cb571 100644 --- a/rma_sale_mrp/views/report_rma.xml +++ b/rma_sale_mrp/views/report_rma.xml @@ -1,4 +1,4 @@ - +