diff --git a/rma/README.rst b/rma/README.rst index 95c36299..8caae01d 100644 --- a/rma/README.rst +++ b/rma/README.rst @@ -17,7 +17,7 @@ RMA (Return Merchandise Authorization) :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html :alt: License: LGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-ForgeFlow%2Fstock--rma-lightgray.png?logo=github - :target: https://github.com/ForgeFlow/stock-rma/tree/17.0/rma + :target: https://github.com/ForgeFlow/stock-rma/tree/18.0/rma :alt: ForgeFlow/stock-rma |badge1| |badge2| |badge3| @@ -128,7 +128,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 to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -155,6 +155,6 @@ Contributors Maintainers ----------- -This module is part of the `ForgeFlow/stock-rma `_ project on GitHub. +This module is part of the `ForgeFlow/stock-rma `_ project on GitHub. You are welcome to contribute. diff --git a/rma/__manifest__.py b/rma/__manifest__.py index 79635d2b..d8a68264 100644 --- a/rma/__manifest__.py +++ b/rma/__manifest__.py @@ -3,7 +3,7 @@ { "name": "RMA (Return Merchandise Authorization)", - "version": "17.0.1.0.0", + "version": "18.0.1.0.0", "license": "LGPL-3", "category": "RMA", "summary": "Introduces the return merchandise authorization (RMA) process in odoo", diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py index f3077f0b..5da8d710 100644 --- a/rma/models/stock_move.py +++ b/rma/models/stock_move.py @@ -78,7 +78,6 @@ class StockMove(models.Model): self, need, location_id, - quant_ids=None, lot_id=None, package_id=None, owner_id=None, @@ -94,7 +93,6 @@ class StockMove(models.Model): return super()._update_reserved_quantity( need, location_id, - quant_ids=quant_ids, lot_id=lot_id, package_id=package_id, owner_id=owner_id, diff --git a/rma/models/stock_warehouse.py b/rma/models/stock_warehouse.py index 9feebe72..fec18c89 100644 --- a/rma/models/stock_warehouse.py +++ b/rma/models/stock_warehouse.py @@ -69,7 +69,6 @@ class StockWarehouse(models.Model): "usage": "internal", "location_id": wh.view_location_id.id, "company_id": wh.company_id.id, - "return_location": True, } ) # RMA types diff --git a/rma/report/rma_report.xml b/rma/report/rma_report.xml index c5b9a811..455f1880 100644 --- a/rma/report/rma_report.xml +++ b/rma/report/rma_report.xml @@ -1,24 +1,23 @@ - - - RMA - rma.order.line - qweb-pdf - rma.report_rma_order_line - rma.report_rma_order_line - ('RMA - %s' % (object.name)) - - report - - - RMA Group - rma.order - qweb-pdf - rma.report_rma_order - rma.report_rma_order - ('RMA Group - %s' % (object.name)) - - report - + + RMA + rma.order.line + qweb-pdf + rma.report_rma_order_line + rma.report_rma_order_line + ('RMA - %s' % (object.name)) + + report + + + RMA Group + rma.order + qweb-pdf + rma.report_rma_order + rma.report_rma_order + ('RMA Group - %s' % (object.name)) + + report + diff --git a/rma/report/rma_report_templates.xml b/rma/report/rma_report_templates.xml index a700b4d7..cf881749 100644 --- a/rma/report/rma_report_templates.xml +++ b/rma/report/rma_report_templates.xml @@ -4,7 +4,6 @@
-
Shipping address: -
-

VAT: VAT:

@@ -89,13 +88,15 @@ Quantity Unit Price - - + + - - + + + + + + @@ -110,11 +111,15 @@
-

Description

 + +

Description

+
-

Term and conditions

 + +

Term and conditions

+
@@ -138,7 +143,6 @@
-
Shipping address: -
-

VAT: VAT:

@@ -228,15 +232,21 @@ Quantity Unit Price - - + + - - - - + + + + + + + + + + + + @@ -248,7 +258,9 @@
-

Additional Information

 + +

Additional Information

+
diff --git a/rma/static/description/index.html b/rma/static/description/index.html index a349b732..701559b0 100644 --- a/rma/static/description/index.html +++ b/rma/static/description/index.html @@ -8,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -274,7 +275,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code { margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -300,7 +301,7 @@ span.option { span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -368,7 +369,7 @@ ul.auto-toc { !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:310ce4e3f5919e5be643c54f11481d09bb8fc79cab65f08ac969ef3bf9d799fe !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: LGPL-3 ForgeFlow/stock-rma

+

Beta License: LGPL-3 ForgeFlow/stock-rma

A Return Merchandise Authorization (RMA), is a part of the process of returning a product in order to receive a refund, replacement, or repair during the product’s warranty period.

@@ -485,7 +486,7 @@ showing “Vendor Address” while it should be “Customer Address”.

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 to smash it by providing a detailed and welcomed -feedback.

+feedback.

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

@@ -511,7 +512,7 @@ If you spotted it first, help us to smash it by providing a detailed and welcome

Maintainers

-

This module is part of the ForgeFlow/stock-rma project on GitHub.

+

This module is part of the ForgeFlow/stock-rma project on GitHub.

You are welcome to contribute.

diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py index 6e5900a6..718ee3a5 100644 --- a/rma/tests/test_rma.py +++ b/rma/tests/test_rma.py @@ -150,7 +150,7 @@ class TestRma(common.TransactionCase): @classmethod def _create_product(cls, name): return cls.product_product_model.create( - {"name": name, "categ_id": cls.category.id, "type": "product"} + {"name": name, "categ_id": cls.category.id, "is_storable": True} ) @classmethod diff --git a/rma/views/res_config_settings_views.xml b/rma/views/res_config_settings_views.xml index 82982e2f..2851fb88 100644 --- a/rma/views/res_config_settings_views.xml +++ b/rma/views/res_config_settings_views.xml @@ -8,67 +8,40 @@ -
-

Return Merchandise Authorization

-
-
+ -
- -
-
-
-
-
+ + -
- -
-
-
-
-
-
- -
-
-
-
-
-
+ + + + + + + Settings - ir.actions.act_window res.config.settings form inline - {'module' : 'rma'} + {'module' : 'rma', 'bin_size': False} diff --git a/rma/views/rma_operation_view.xml b/rma/views/rma_operation_view.xml index 3629a3bb..c682f007 100644 --- a/rma/views/rma_operation_view.xml +++ b/rma/views/rma_operation_view.xml @@ -1,16 +1,16 @@ - rma.operation.tree + rma.operation.list rma.operation - + - + @@ -71,7 +71,7 @@ Customer Operations rma.operation - tree,form + list,form {'default_type': "customer"} [('type','=', 'customer')] @@ -80,7 +80,7 @@ Supplier Operations rma.operation - tree,form + list,form {'default_type': "supplier"} [('type','=', 'supplier')] diff --git a/rma/views/rma_order_line_view.xml b/rma/views/rma_order_line_view.xml index 887f541d..673aff8c 100644 --- a/rma/views/rma_order_line_view.xml +++ b/rma/views/rma_order_line_view.xml @@ -1,63 +1,63 @@ - - rma.order.line.tree - rma.order.line - - - - - - + rma.order.line.list + rma.order.line + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - rma.order.line.supplier.tree - rma.order.line - - - - - - + rma.order.line.supplier.list + rma.order.line + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - rma.order.line.form - rma.order.line - -
-
-
- -
- - - - + - -
-
+ +
+

-
- - - + + + - - - - - - - - - - - - + + + + + + + + + + - - - + + - - - - + + - - - - - + + - - - - + + + - - - - - - + + - - - - + + + + + + + - - - - - + + + + - - - - - + + + + - - - + + - - - - + + + + - - - - - - - + + - - - - - - + + - - - - - - - - - + + + + + + + + - - - - - -
- - -
-
- - + + + + + + + + + - - rma.order.line.supplier.form - rma.order.line - - primary - - + rma.order.line.supplier.form + rma.order.line + + primary + + - Customer RMA - - - Supplier - Customer RMA + + + Supplier + {'res_partner_search_mode': 'supplier'} - - - 1 - - - [('picking_id.partner_id', '=', partner_id), - ('location_id.usage', '=', 'supplier'), - ('state', '=', 'done')] - - - [('type','=','supplier')] - - + + 1 + + + [('picking_id.partner_id', '=', partner_id), + ('location_id.usage', '=', 'supplier'), + ('state', '=', 'done')] + + + [('type','=','supplier')] + + + - - rma.order.line.select - rma.order.line - - - - - - - - - - - - + rma.order.line.select + rma.order.line + + + + + + + + + + + + - - - + + - - - - + + - - - + + - - - - - - - - - + + + + - - Customer RMA - rma.order.line - [('type','=', 'customer')] - {"search_default_assigned_to_filter":1} - tree,form - - + + Customer RMA + rma.order.line + [('type','=', 'customer')] + {"search_default_assigned_to_filter":1} + list,form + + - - Supplier RMA - rma.order.line - [('type','=', 'supplier')] - + Supplier RMA + rma.order.line + [('type','=', 'supplier')] + {"search_default_assigned_to_filter":1, "supplier":1} - tree,form - - + list,form + + - - - tree - - + + + list + + - - - form - - - + + + form + + + - - Request Approval - - - code - -if records.filtered(lambda x: x.state == "draft"): - records.filtered(lambda x: x.state == "draft").action_rma_to_approve() - - + + Request Approval + + + code + + if records.filtered(lambda x: x.state == "draft"): + records.filtered(lambda x: x.state == "draft").action_rma_to_approve() + + - - Cancel - - - code - - records.action_rma_cancel() - - + + Cancel + + + code + + records.action_rma_cancel() + + diff --git a/rma/views/rma_order_view.xml b/rma/views/rma_order_view.xml index d91a7a09..49c65416 100644 --- a/rma/views/rma_order_view.xml +++ b/rma/views/rma_order_view.xml @@ -1,30 +1,30 @@ - rma.order.tree + rma.order.list rma.order - + - + - rma.order.supplier.tree + rma.order.supplier.list rma.order - + - + @@ -33,8 +33,8 @@ rma.order
-
-
- -
- - - - + -
-
-

- -

-
- - - - +
+
+

+ +

+
+ + + + - - + + + + + + + + - - - - - - - - - + + - - - + + - - + - - - + + - - - - + + - + - - - - + + - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - -
- - -
+ + + + + + + + + + + + + + + + + + + + + + + + @@ -342,7 +355,7 @@ context="{'group_by':'date_rma'}" /> - + @@ -351,7 +364,7 @@ rma.order [('type','=', 'customer')] {'customer':1} - tree,form + list,form @@ -360,13 +373,13 @@ rma.order [('type','=', 'supplier')] {'supplier':1} - tree,form + list,form - tree + list diff --git a/rma/views/stock_view.xml b/rma/views/stock_view.xml index a6f8c12f..45541164 100644 --- a/rma/views/stock_view.xml +++ b/rma/views/stock_view.xml @@ -30,7 +30,7 @@ diff --git a/rma/wizards/rma_add_stock_move_view.xml b/rma/wizards/rma_add_stock_move_view.xml index 7d070ba4..5d591e85 100644 --- a/rma/wizards/rma_add_stock_move_view.xml +++ b/rma/wizards/rma_add_stock_move_view.xml @@ -9,8 +9,11 @@ - - + + - +
- The creation of the RMA Lines will be separated according to the lots or serials selected + The creation of the RMA Lines will be separated according to the lots or serials + selected