diff --git a/rma_sale_mrp/README.rst b/rma_sale_mrp/README.rst index 2356c86e..0ee1b502 100644 --- a/rma_sale_mrp/README.rst +++ b/rma_sale_mrp/README.rst @@ -14,13 +14,13 @@ Return Merchandise Authorization Management - Link with MRP Kits :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/13.0/rma_sale_mrp + :target: https://github.com/OCA/rma/tree/14.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-13-0/rma-13-0-rma_sale_mrp + :target: https://translation.odoo-community.org/projects/rma-14-0/rma-14-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/13.0 + :target: https://runbot.odoo-community.org/runbot/145/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -74,7 +74,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -114,6 +114,6 @@ Current `maintainer `__: |maintainer-chienandalu| -This module is part of the `OCA/rma `_ project on GitHub. +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/__manifest__.py b/rma_sale_mrp/__manifest__.py index d6af18dd..9d22d5ff 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": "13.0.2.0.1", + "version": "14.0.1.0.0", "development_status": "Beta", "category": "RMA", "website": "https://github.com/OCA/rma", @@ -12,6 +12,7 @@ "license": "AGPL-3", "depends": ["rma_sale", "mrp"], "data": [ + "security/ir.model.access.csv", "views/sale_order_portal_template.xml", "views/rma_views.xml", "views/report_rma.xml", diff --git a/rma_sale_mrp/i18n/rma_sale_mrp.pot b/rma_sale_mrp/i18n/rma_sale_mrp.pot index 73d5c9e8..7a29f000 100644 --- a/rma_sale_mrp/i18n/rma_sale_mrp.pot +++ b/rma_sale_mrp/i18n/rma_sale_mrp.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -133,18 +133,30 @@ msgid "Description" msgstr "" #. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_account_move__display_name +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__display_name +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order__display_name +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line__display_name +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__display_name #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__display_name +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_rma_wizard__display_name msgid "Display Name" msgstr "" #. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_account_move__id +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma__id +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order__id +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line__id +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard__id #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component__id +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_rma_wizard__id msgid "ID" msgstr "" #. module: rma_sale_mrp #: model:ir.model,name:rma_sale_mrp.model_account_move -msgid "Journal Entries" +msgid "Journal Entry" msgstr "" #. module: rma_sale_mrp @@ -164,7 +176,13 @@ msgid "Kit quantity" msgstr "" #. module: rma_sale_mrp +#: model:ir.model.fields,field_description:rma_sale_mrp.field_account_move____last_update +#: model:ir.model.fields,field_description:rma_sale_mrp.field_rma____last_update +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order____last_update +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line____last_update +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard____last_update #: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_line_rma_wizard_component____last_update +#: model:ir.model.fields,field_description:rma_sale_mrp.field_sale_order_rma_wizard____last_update msgid "Last Modified on" msgstr "" diff --git a/rma_sale_mrp/security/ir.model.access.csv b/rma_sale_mrp/security/ir.model.access.csv new file mode 100644 index 00000000..cf6cb56c --- /dev/null +++ b/rma_sale_mrp/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_sale_order_line_rma_wizard_component_user_all,sale.order.line.rma.wizard.component.user.all,model_sale_order_line_rma_wizard_component,rma.rma_group_user_all,1,1,1,1 diff --git a/rma_sale_mrp/static/description/index.html b/rma_sale_mrp/static/description/index.html index e87ce535..f49f3644 100644 --- a/rma_sale_mrp/static/description/index.html +++ b/rma_sale_mrp/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/rma Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/rma Translate me on Weblate Try me on Runbot

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.

@@ -423,7 +423,7 @@ version to use the same rules so they fail for the same reasons.

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.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -452,7 +452,7 @@ mission is to support the collaborative development of Odoo features and promote its widespread use.

Current maintainer:

chienandalu

-

This module is part of the OCA/rma project on GitHub.

+

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/tests/test_rma_sale_mrp.py b/rma_sale_mrp/tests/test_rma_sale_mrp.py index e207c69e..8c34cd26 100644 --- a/rma_sale_mrp/tests/test_rma_sale_mrp.py +++ b/rma_sale_mrp/tests/test_rma_sale_mrp.py @@ -61,7 +61,9 @@ class TestRmaSaleMrp(SavepointCase): 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 = Form( + cls.env[wiz_act["res_model"]].with_context(wiz_act["context"]) + ).save() wiz.process() cls.backorder = cls.sale_order.picking_ids - cls.order_out_picking for line in cls.backorder.move_lines: @@ -117,7 +119,7 @@ class TestRmaSaleMrp(SavepointCase): ) order.user_id = user.id rma.reception_move_id.quantity_done = rma.product_uom_qty - rma.reception_move_id.picking_id.action_done() + 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() @@ -126,14 +128,14 @@ class TestRmaSaleMrp(SavepointCase): additional_rma.reception_move_id.quantity_done = ( additional_rma.product_uom_qty ) - additional_rma.reception_move_id.picking_id.action_done() + 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.post() + rma.refund_id.action_post() # We can still return another kit wizard_id = order.action_create_rma()["res_id"] wizard = self.env["sale.order.rma.wizard"].browse(wizard_id) diff --git a/rma_sale_mrp/views/report_rma.xml b/rma_sale_mrp/views/report_rma.xml index c88cb571..8a845487 100644 --- a/rma_sale_mrp/views/report_rma.xml +++ b/rma_sale_mrp/views/report_rma.xml @@ -1,77 +1,75 @@ - -