From f90bfc59eff47d10582e503d513cd4d84fee2876 Mon Sep 17 00:00:00 2001 From: DavidJForgeFlow Date: Mon, 8 Jul 2024 11:24:39 +0200 Subject: [PATCH 1/3] [ADD] rma_reason_code --- rma_reason_code/README.rst | 47 ++ rma_reason_code/__init__.py | 4 + rma_reason_code/__manifest__.py | 20 + rma_reason_code/models/__init__.py | 4 + rma_reason_code/models/reason_code.py | 26 + rma_reason_code/models/rma_order_line.py | 44 ++ rma_reason_code/readme/CONTRIBUTORS.rst | 1 + rma_reason_code/readme/DESCRIPTION.rst | 1 + rma_reason_code/reports/__init__.py | 1 + .../reports/rma_reason_code_report.py | 55 +++ .../reports/rma_reason_code_report_views.xml | 122 +++++ rma_reason_code/security/ir.model.access.csv | 4 + rma_reason_code/security/security.xml | 14 + rma_reason_code/static/description/icon.png | Bin 0 -> 9455 bytes rma_reason_code/static/description/index.html | 451 ++++++++++++++++++ rma_reason_code/tests/__init__.py | 3 + .../tests/test_scrap_reason_code.py | 160 +++++++ rma_reason_code/views/reason_code_view.xml | 55 +++ .../views/rma_order_line_views.xml | 74 +++ 19 files changed, 1086 insertions(+) create mode 100644 rma_reason_code/README.rst create mode 100644 rma_reason_code/__init__.py create mode 100644 rma_reason_code/__manifest__.py create mode 100644 rma_reason_code/models/__init__.py create mode 100644 rma_reason_code/models/reason_code.py create mode 100644 rma_reason_code/models/rma_order_line.py create mode 100644 rma_reason_code/readme/CONTRIBUTORS.rst create mode 100644 rma_reason_code/readme/DESCRIPTION.rst create mode 100644 rma_reason_code/reports/__init__.py create mode 100644 rma_reason_code/reports/rma_reason_code_report.py create mode 100644 rma_reason_code/reports/rma_reason_code_report_views.xml create mode 100644 rma_reason_code/security/ir.model.access.csv create mode 100644 rma_reason_code/security/security.xml create mode 100644 rma_reason_code/static/description/icon.png create mode 100644 rma_reason_code/static/description/index.html create mode 100644 rma_reason_code/tests/__init__.py create mode 100644 rma_reason_code/tests/test_scrap_reason_code.py create mode 100644 rma_reason_code/views/reason_code_view.xml create mode 100644 rma_reason_code/views/rma_order_line_views.xml diff --git a/rma_reason_code/README.rst b/rma_reason_code/README.rst new file mode 100644 index 00000000..7b1d0aba --- /dev/null +++ b/rma_reason_code/README.rst @@ -0,0 +1,47 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :alt: License LGPL-3 + +============ +RMA Put Away +============ + +This module allows you to put away the products after you have received them. + +Configuration +============= + +Go to *RMA / Configuration / Customer Operations* and define there: + +#. The Put Away Policy +#. The route that you wish to use to put away the products. +#. The default destination location (optional). + +Usage +===== + +#. Go to a Customer RMA. +#. Click on *Put Away*. +#. Indicate the quantity that you want to put away and destination location. + +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. + +Credits +======= + +Contributors +------------ + +* Jordi Ballester Alomar +* David Jimenez + + +Maintainer +---------- + +This module is maintained by ForgeFlow diff --git a/rma_reason_code/__init__.py b/rma_reason_code/__init__.py new file mode 100644 index 00000000..c88b5c5a --- /dev/null +++ b/rma_reason_code/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from . import models +from . import reports diff --git a/rma_reason_code/__manifest__.py b/rma_reason_code/__manifest__.py new file mode 100644 index 00000000..b12431e0 --- /dev/null +++ b/rma_reason_code/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +{ + "name": "RMA Reason Code", + "version": "14.0.1.1.0", + "license": "AGPL-3", + "summary": "Reason code for RMA", + "author": "ForgeFlow", + "website": "https://github.com/ForgeFlow/stock-rma", + "category": "Warehouse Management", + "depends": ["rma"], + "data": [ + "security/ir.model.access.csv", + "security/security.xml", + "views/reason_code_view.xml", + "views/rma_order_line_views.xml", + "reports/rma_reason_code_report_views.xml", + ], + "installable": True, +} diff --git a/rma_reason_code/models/__init__.py b/rma_reason_code/models/__init__.py new file mode 100644 index 00000000..915e24af --- /dev/null +++ b/rma_reason_code/models/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from . import reason_code +from . import rma_order_line diff --git a/rma_reason_code/models/reason_code.py b/rma_reason_code/models/reason_code.py new file mode 100644 index 00000000..b52ef0a7 --- /dev/null +++ b/rma_reason_code/models/reason_code.py @@ -0,0 +1,26 @@ +# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from random import randint + +from odoo import fields, models + + +class RMAReasonCode(models.Model): + _name = "rma.reason.code" + _description = "RMA Reason Code" + + def _get_default_color(self): + return randint(1, 11) + + name = fields.Char("Code", required=True) + description = fields.Text("Description") + type = fields.Selection( + [ + ("customer", "Customer RMA"), + ("supplier", "Supplier RTV"), + ("both", "Both Customer and Supplier"), + ], + default="both", + required=True, + ) + color = fields.Integer("Color", default=_get_default_color) diff --git a/rma_reason_code/models/rma_order_line.py b/rma_reason_code/models/rma_order_line.py new file mode 100644 index 00000000..5233085f --- /dev/null +++ b/rma_reason_code/models/rma_order_line.py @@ -0,0 +1,44 @@ +# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import _, api, fields, models +from odoo.exceptions import ValidationError + + +class RMAOrderLine(models.Model): + _inherit = "rma.order.line" + + reason_code_ids = fields.Many2many( + "rma.reason.code", + "rma_order_line_reason_code_rel", + string="Reason Code", + domain="[('id', 'in', allowed_reason_code_ids)]", + ) + allowed_reason_code_ids = fields.Many2many( + comodel_name="rma.reason.code", + compute="_compute_allowed_reason_code_ids", + ) + + @api.depends("type") + def _compute_allowed_reason_code_ids(self): + for rec in self: + codes = self.env["rma.reason.code"] + if rec.type == "customer": + codes = codes.search([("type", "in", ["customer", "both"])]) + else: + codes = codes.search([("type", "in", ["supplier", "both"])]) + rec.allowed_reason_code_ids = codes + + @api.constrains("reason_code_ids", "product_id") + def _check_reason_code_ids(self): + for rec in self: + if rec.reason_code_ids and not any( + rc in rec.allowed_reason_code_ids for rc in rec.reason_code_ids + ): + raise ValidationError( + _( + "Any of the reason code selected is not allowed for " + "this type of RMA (%s)." + ) + % rec.type + ) diff --git a/rma_reason_code/readme/CONTRIBUTORS.rst b/rma_reason_code/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..fcd08101 --- /dev/null +++ b/rma_reason_code/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* David Jiménez diff --git a/rma_reason_code/readme/DESCRIPTION.rst b/rma_reason_code/readme/DESCRIPTION.rst new file mode 100644 index 00000000..041c4317 --- /dev/null +++ b/rma_reason_code/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +Adds a reason code for RMA operations and an interface for the user to create RMA codes diff --git a/rma_reason_code/reports/__init__.py b/rma_reason_code/reports/__init__.py new file mode 100644 index 00000000..ac4253fc --- /dev/null +++ b/rma_reason_code/reports/__init__.py @@ -0,0 +1 @@ +from . import rma_reason_code_report diff --git a/rma_reason_code/reports/rma_reason_code_report.py b/rma_reason_code/reports/rma_reason_code_report.py new file mode 100644 index 00000000..b0f87364 --- /dev/null +++ b/rma_reason_code/reports/rma_reason_code_report.py @@ -0,0 +1,55 @@ +# Copyright 2022 ForgeFlow S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class RmaReasonCodeReport(models.Model): + _name = "rma.reason.code.report" + _auto = False + _description = "Rma Reason Code Report" + + rma_order_line_id = fields.Many2one(comodel_name="rma.order.line") + reason_code_id = fields.Many2one(comodel_name="rma.reason.code") + date_rma = fields.Datetime(string="Order Date") + type = fields.Selection([("customer", "Customer"), ("supplier", "Supplier")]) + company_id = fields.Many2one(comodel_name="res.company") + + def _select(self): + return """ + SELECT + row_number() OVER () AS id, + rma.id as rma_order_line_id, + rma.type, + rrc.id as reason_code_id, + rma.date_rma, + rma.company_id + + """ + + def _from(self): + return """ + FROM + rma_order_line rma + INNER JOIN + rma_order_line_reason_code_rel rolr ON rma.id = rolr.rma_order_line_id + INNER JOIN + rma_reason_code rrc ON rolr.rma_reason_code_id = rrc.id + + """ + + def _order_by(self): + return """ + ORDER BY + rma.id, rrc.id + """ + + @property + def _table_query(self): + return """ + {_select} + {_from} + {_order_by} + """.format( + _select=self._select(), _from=self._from(), _order_by=self._order_by() + ) diff --git a/rma_reason_code/reports/rma_reason_code_report_views.xml b/rma_reason_code/reports/rma_reason_code_report_views.xml new file mode 100644 index 00000000..dd72fb65 --- /dev/null +++ b/rma_reason_code/reports/rma_reason_code_report_views.xml @@ -0,0 +1,122 @@ + + + + rma.reason.code.report.tree + rma.reason.code.report + + + + + + + + + + + + + rma.reason.code.report.graph + rma.reason.code.report + + + + + + + + + rma.reason.code.report.search + rma.reason.code.report + + + + + + + + + + + + + + + + + + + + RMA Reason Code Analysis + rma.reason.code.report + graph,pivot,tree + + { + 'search_default_group_rma_date': 1, + 'search_default_group_reason_code_id': 2, + 'search_default_is_customer': 1, + } + +

+ No data yet! +

+ Assign a Reason Code to a RMA +

+ + + + + RTV Reason Code Analysis + rma.reason.code.report + graph,pivot,tree + + { + 'search_default_group_rma_date': 1, + 'search_default_group_reason_code_id': 2, + 'search_default_is_supplier': 1, + } + +

+ No data yet! +

+ Assign a Reason Code to a RTV +

+ + + + + + + + diff --git a/rma_reason_code/security/ir.model.access.csv b/rma_reason_code/security/ir.model.access.csv new file mode 100644 index 00000000..11b0aac1 --- /dev/null +++ b/rma_reason_code/security/ir.model.access.csv @@ -0,0 +1,4 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_rma_reason_code_user,rma.reason.code,model_rma_reason_code,rma.group_rma_customer_user,1,0,0,0 +access_rma_reason_code_manager,rma.reason.code,model_rma_reason_code,rma.group_rma_manager,1,1,1,1 +access_rma_reason_code_report_user,rma.reason.code.report,model_rma_reason_code_report,rma.group_rma_customer_user,1,0,0,0 diff --git a/rma_reason_code/security/security.xml b/rma_reason_code/security/security.xml new file mode 100644 index 00000000..ad97b8b0 --- /dev/null +++ b/rma_reason_code/security/security.xml @@ -0,0 +1,14 @@ + + + + + RMA Reason Code Report + + ['|',('company_id','=',False),('company_id', 'in', company_ids)] + + diff --git a/rma_reason_code/static/description/icon.png b/rma_reason_code/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/rma_reason_code/static/description/index.html b/rma_reason_code/static/description/index.html new file mode 100644 index 00000000..12dd1e4c --- /dev/null +++ b/rma_reason_code/static/description/index.html @@ -0,0 +1,451 @@ + + + + + + +Scrap Reason Code + + + +
+

Scrap Reason Code

+ + +

Beta License: AGPL-3 OCA/stock-logistics-warehouse Translate me on Weblate Try me on Runbot

+

Adds a reason code for scrapping operations and an interface for the user +to create scrap codes

+

Table of contents

+ +
+

Configuration

+

Go to Inventory > Configuration > Scrap Reason Codes

+

Create a required scrap reason code and provide scrap location.

+
+
+

Usage

+
    +
  • Go to Inventory > Operations > Scrap
    • +
  • Create a scarp order and select reason code.
    • +
  • A scrap location will be readonly and auto fill based on selected reason +code.
    • +
+
+
+

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

+
    +
  • Open Source Integrators
    • +
+
+
+

Contributors

+ +
+
+

Other credits

+

The development of this module has been financially supported by:

+
    +
  • Open Source Integrators
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

Current maintainer:

+

bodedra

+

This module is part of the OCA/stock-logistics-warehouse project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/rma_reason_code/tests/__init__.py b/rma_reason_code/tests/__init__.py new file mode 100644 index 00000000..a493ff1f --- /dev/null +++ b/rma_reason_code/tests/__init__.py @@ -0,0 +1,3 @@ +# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from . import test_scrap_reason_code diff --git a/rma_reason_code/tests/test_scrap_reason_code.py b/rma_reason_code/tests/test_scrap_reason_code.py new file mode 100644 index 00000000..1c896ab3 --- /dev/null +++ b/rma_reason_code/tests/test_scrap_reason_code.py @@ -0,0 +1,160 @@ +# Copyright 2024 ForgeFlow S.L. (https://www.forgeflow.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api +from odoo.exceptions import ValidationError +from odoo.tests import common + + +class RMAOrderLine(common.SavepointCase): + @classmethod + def setUpClass(cls): + super(RMAOrderLine, cls).setUpClass() + cls.user_admin = cls.env.ref("base.user_admin") + cls.env = api.Environment(cls.cr, cls.user_admin.id, {}) + cls.user_admin.tz = False # Make sure there's no timezone in user + cls.warehouse = cls.env.ref("stock.warehouse0") + cls.location = cls.env.ref("rma.location_rma") + cls.cust_location = cls.env.ref("stock.stock_location_customers") + cls.vend_location = cls.env.ref("stock.stock_location_suppliers") + cls.product = cls.env["product.product"].create( + { + "name": "TEST Product", + "type": "product", + } + ) + cls.partner = cls.env["res.partner"].create({"name": "Test partner"}) + + cls.route = cls.env.ref("rma.route_rma_customer") + + cls.operation1 = cls.env["rma.operation"].create( + { + "code": "TEST1", + "name": "Replace after receive", + "type": "customer", + "receipt_policy": "ordered", + "delivery_policy": "received", + "in_route_id": cls.route.id, + "out_route_id": cls.route.id, + "location_id": cls.location.id, + "in_warehouse_id": cls.warehouse.id, + "out_warehouse_id": cls.warehouse.id, + } + ) + + cls.operation2 = cls.env["rma.operation"].create( + { + "code": "TEST2", + "name": "Refund after receive", + "type": "supplier", + "receipt_policy": "ordered", + "delivery_policy": "no", + "in_route_id": cls.route.id, + "out_route_id": cls.route.id, + "location_id": cls.location.id, + "in_warehouse_id": cls.warehouse.id, + "out_warehouse_id": cls.warehouse.id, + } + ) + + cls.rma_line_1 = cls.env["rma.order.line"].create( + { + "partner_id": cls.partner.id, + "requested_by": False, + "assigned_to": False, + "type": "customer", + "product_id": cls.product.id, + "uom_id": cls.product.uom_id.id, + "product_qty": 1, + "price_unit": 10, + "operation_id": cls.operation1.id, + "delivery_address_id": cls.partner.id, + "receipt_policy": cls.operation1.receipt_policy, + "delivery_policy": cls.operation1.delivery_policy, + "in_warehouse_id": cls.operation1.in_warehouse_id.id, + "out_warehouse_id": cls.operation1.out_warehouse_id.id, + "in_route_id": cls.operation1.in_route_id.id, + "out_route_id": cls.operation1.out_route_id.id, + "location_id": cls.operation1.location_id.id, + } + ) + + cls.rma_line_2 = cls.env["rma.order.line"].create( + { + "partner_id": cls.partner.id, + "requested_by": False, + "assigned_to": False, + "type": "supplier", + "product_id": cls.product.id, + "uom_id": cls.product.uom_id.id, + "product_qty": 1, + "price_unit": 10, + "operation_id": cls.operation2.id, + "delivery_address_id": cls.partner.id, + "receipt_policy": cls.operation2.receipt_policy, + "delivery_policy": cls.operation2.delivery_policy, + "in_warehouse_id": cls.operation2.in_warehouse_id.id, + "out_warehouse_id": cls.operation2.out_warehouse_id.id, + "in_route_id": cls.operation2.in_route_id.id, + "out_route_id": cls.operation2.out_route_id.id, + "location_id": cls.operation2.location_id.id, + } + ) + cls.env["rma.reason.code"].search([]).unlink() + cls.reason_code_both = cls.env["rma.reason.code"].create( + { + "name": "Test Code 1", + "description": "Test description", + "type": "both", + } + ) + cls.reason_code_customer = cls.env["rma.reason.code"].create( + { + "name": "Test Code 2", + "description": "Test description", + "type": "customer", + } + ) + cls.reason_code_supplier = cls.env["rma.reason.code"].create( + { + "name": "Test Code 3", + "description": "Test description", + "type": "supplier", + } + ) + + def test_01_reason_code_customer(self): + self.rma_line_1.action_rma_to_approve() + self.assertEqual( + self.rma_line_1.allowed_reason_code_ids.ids, + [self.reason_code_both.id, self.reason_code_customer.id], + ) + with self.assertRaises(ValidationError): + self.rma_line_1.write( + { + "reason_code_ids": [self.reason_code_supplier.id], + } + ) + self.rma_line_1.write( + { + "reason_code_ids": [self.reason_code_customer.id], + } + ) + + def test_02_reason_code_supplier(self): + self.rma_line_2.action_rma_to_approve() + self.assertEqual( + self.rma_line_2.allowed_reason_code_ids.ids, + [self.reason_code_both.id, self.reason_code_supplier.id], + ) + with self.assertRaises(ValidationError): + self.rma_line_2.write( + { + "reason_code_ids": [self.reason_code_customer.id], + } + ) + self.rma_line_2.write( + { + "reason_code_ids": [self.reason_code_supplier.id], + } + ) diff --git a/rma_reason_code/views/reason_code_view.xml b/rma_reason_code/views/reason_code_view.xml new file mode 100644 index 00000000..60bc433c --- /dev/null +++ b/rma_reason_code/views/reason_code_view.xml @@ -0,0 +1,55 @@ + + + + + + rma.reason.code.form + rma.reason.code + +
+ +
+

+
+ + + + + + +
+ + + + rma.reason.code.list + rma.reason.code + + + + + + + + + + + RMA Reason Codes + rma.reason.code + tree,form + + + diff --git a/rma_reason_code/views/rma_order_line_views.xml b/rma_reason_code/views/rma_order_line_views.xml new file mode 100644 index 00000000..9e010d0a --- /dev/null +++ b/rma_reason_code/views/rma_order_line_views.xml @@ -0,0 +1,74 @@ + + + + + + rma.order.line.tree - rma_reason_code + rma.order.line + + + + + + + + + + + rma.order.line.supplier.tree - rma_reason_code + rma.order.line + + + + + + + + + + + rma.order.line.form - rma_reason_code + rma.order.line + + + + + + + + + + + rma.order.line.search - rma_reason_code + rma.order.line + + + + + + + + + + + + From d1d42fb6d83a2390b5c0077e5145e16bc2a3a3d7 Mon Sep 17 00:00:00 2001 From: Meritxell Abellan Date: Thu, 12 Dec 2024 09:12:46 +0100 Subject: [PATCH 2/3] [IMP] rma_reason_code: pre-commit auto fixes --- rma_reason_code/README.rst | 68 ++++++++------ rma_reason_code/__manifest__.py | 2 +- rma_reason_code/pyproject.toml | 3 + rma_reason_code/readme/CONTRIBUTORS.md | 1 + rma_reason_code/readme/CONTRIBUTORS.rst | 1 - .../{DESCRIPTION.rst => DESCRIPTION.md} | 3 +- .../reports/rma_reason_code_report.py | 15 ++- rma_reason_code/static/description/index.html | 91 ++++++------------- .../tests/test_scrap_reason_code.py | 2 +- 9 files changed, 84 insertions(+), 102 deletions(-) create mode 100644 rma_reason_code/pyproject.toml create mode 100644 rma_reason_code/readme/CONTRIBUTORS.md delete mode 100644 rma_reason_code/readme/CONTRIBUTORS.rst rename rma_reason_code/readme/{DESCRIPTION.rst => DESCRIPTION.md} (72%) diff --git a/rma_reason_code/README.rst b/rma_reason_code/README.rst index 7b1d0aba..cd5604c5 100644 --- a/rma_reason_code/README.rst +++ b/rma_reason_code/README.rst @@ -1,47 +1,61 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :alt: License LGPL-3 +=============== +RMA Reason Code +=============== -============ -RMA Put Away -============ +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:7fe458ca9d7af3377506c22b519e03a0a8175169e7939409a36821718e03392a + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -This module allows you to put away the products after you have received them. +.. |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-ForgeFlow%2Fstock--rma-lightgray.png?logo=github + :target: https://github.com/ForgeFlow/stock-rma/tree/17.0/rma_reason_code + :alt: ForgeFlow/stock-rma -Configuration -============= +|badge1| |badge2| |badge3| -Go to *RMA / Configuration / Customer Operations* and define there: +Adds a reason code for RMA operations and an interface for the user to +create RMA codes -#. The Put Away Policy -#. The route that you wish to use to put away the products. -#. The default destination location (optional). +**Table of contents** -Usage -===== - -#. Go to a Customer RMA. -#. Click on *Put Away*. -#. Indicate the quantity that you want to put away and destination location. +.. contents:: + :local: 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. +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 `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= +Authors +------- + +* ForgeFlow + Contributors ------------ -* Jordi Ballester Alomar -* David Jimenez +- David Jiménez +Maintainers +----------- -Maintainer ----------- +This module is part of the `ForgeFlow/stock-rma `_ project on GitHub. -This module is maintained by ForgeFlow +You are welcome to contribute. diff --git a/rma_reason_code/__manifest__.py b/rma_reason_code/__manifest__.py index b12431e0..01b7ab7c 100644 --- a/rma_reason_code/__manifest__.py +++ b/rma_reason_code/__manifest__.py @@ -6,7 +6,7 @@ "license": "AGPL-3", "summary": "Reason code for RMA", "author": "ForgeFlow", - "website": "https://github.com/ForgeFlow/stock-rma", + "website": "https://github.com/ForgeFlow", "category": "Warehouse Management", "depends": ["rma"], "data": [ diff --git a/rma_reason_code/pyproject.toml b/rma_reason_code/pyproject.toml new file mode 100644 index 00000000..4231d0cc --- /dev/null +++ b/rma_reason_code/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/rma_reason_code/readme/CONTRIBUTORS.md b/rma_reason_code/readme/CONTRIBUTORS.md new file mode 100644 index 00000000..ac18283b --- /dev/null +++ b/rma_reason_code/readme/CONTRIBUTORS.md @@ -0,0 +1 @@ +- David Jiménez \<\> diff --git a/rma_reason_code/readme/CONTRIBUTORS.rst b/rma_reason_code/readme/CONTRIBUTORS.rst deleted file mode 100644 index fcd08101..00000000 --- a/rma_reason_code/readme/CONTRIBUTORS.rst +++ /dev/null @@ -1 +0,0 @@ -* David Jiménez diff --git a/rma_reason_code/readme/DESCRIPTION.rst b/rma_reason_code/readme/DESCRIPTION.md similarity index 72% rename from rma_reason_code/readme/DESCRIPTION.rst rename to rma_reason_code/readme/DESCRIPTION.md index 041c4317..be1008fa 100644 --- a/rma_reason_code/readme/DESCRIPTION.rst +++ b/rma_reason_code/readme/DESCRIPTION.md @@ -1 +1,2 @@ -Adds a reason code for RMA operations and an interface for the user to create RMA codes +Adds a reason code for RMA operations and an interface for the user to +create RMA codes diff --git a/rma_reason_code/reports/rma_reason_code_report.py b/rma_reason_code/reports/rma_reason_code_report.py index b0f87364..cb6d1b27 100644 --- a/rma_reason_code/reports/rma_reason_code_report.py +++ b/rma_reason_code/reports/rma_reason_code_report.py @@ -32,7 +32,8 @@ class RmaReasonCodeReport(models.Model): FROM rma_order_line rma INNER JOIN - rma_order_line_reason_code_rel rolr ON rma.id = rolr.rma_order_line_id + rma_order_line_reason_code_rel rolr + ON rma.id = rolr.rma_order_line_id INNER JOIN rma_reason_code rrc ON rolr.rma_reason_code_id = rrc.id @@ -46,10 +47,8 @@ class RmaReasonCodeReport(models.Model): @property def _table_query(self): - return """ - {_select} - {_from} - {_order_by} - """.format( - _select=self._select(), _from=self._from(), _order_by=self._order_by() - ) + return f""" + {self._select()} + {self._from()} + {self._order_by()} + """ diff --git a/rma_reason_code/static/description/index.html b/rma_reason_code/static/description/index.html index 12dd1e4c..d4b9528a 100644 --- a/rma_reason_code/static/description/index.html +++ b/rma_reason_code/static/description/index.html @@ -1,20 +1,19 @@ - - -Scrap Reason Code + +RMA Reason Code -
-

Scrap Reason Code

+
+

RMA Reason Code

-

Beta License: AGPL-3 OCA/stock-logistics-warehouse Translate me on Weblate Try me on Runbot

-

Adds a reason code for scrapping operations and an interface for the user -to create scrap codes

+

Beta License: AGPL-3 ForgeFlow/stock-rma

+

Adds a reason code for RMA operations and an interface for the user to +create RMA codes

Table of contents

-
-

Configuration

-

Go to Inventory > Configuration > Scrap Reason Codes

-

Create a required scrap reason code and provide scrap location.

-
-
-

Usage

-
    -
  • Go to Inventory > Operations > Scrap
    • -
  • Create a scarp order and select reason code.
    • -
  • A scrap location will be readonly and auto fill based on selected reason -code.
    • -
-
-

Bug Tracker

-

Bugs are tracked on GitHub Issues. +

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.

+If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

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

-

Credits

+

Credits

-

Authors

+

Authors

    -
  • Open Source Integrators
    • +
  • ForgeFlow
-

Contributors

+

Contributors

-
-
-

Other credits

-

The development of this module has been financially supported by:

-
-

Maintainers

-

This module is maintained by the OCA.

-Odoo Community Association -

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.

-

Current maintainer:

-

bodedra

-

This module is part of the OCA/stock-logistics-warehouse project on GitHub.

-

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+

Maintainers

+

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

+

You are welcome to contribute.

diff --git a/rma_reason_code/tests/test_scrap_reason_code.py b/rma_reason_code/tests/test_scrap_reason_code.py index 1c896ab3..71f00693 100644 --- a/rma_reason_code/tests/test_scrap_reason_code.py +++ b/rma_reason_code/tests/test_scrap_reason_code.py @@ -9,7 +9,7 @@ from odoo.tests import common class RMAOrderLine(common.SavepointCase): @classmethod def setUpClass(cls): - super(RMAOrderLine, cls).setUpClass() + super().setUpClass() cls.user_admin = cls.env.ref("base.user_admin") cls.env = api.Environment(cls.cr, cls.user_admin.id, {}) cls.user_admin.tz = False # Make sure there's no timezone in user From 1802c71d8aef45c064348a3e4a2f66061932a93f Mon Sep 17 00:00:00 2001 From: Meritxell Abellan Date: Mon, 16 Dec 2024 15:59:38 +0100 Subject: [PATCH 3/3] [MIG] rma_reason_code: Migration to 17.0 --- rma_reason_code/__manifest__.py | 2 +- .../migrations/17.0.1.0.0/pre-migration.py | 17 +++++++++++++++++ rma_reason_code/models/reason_code.py | 7 ++++--- rma_reason_code/models/rma_order_line.py | 4 ++-- .../reports/rma_reason_code_report.py | 4 ++-- .../reports/rma_reason_code_report_views.xml | 6 +++--- rma_reason_code/tests/test_scrap_reason_code.py | 8 ++++---- rma_reason_code/views/reason_code_view.xml | 6 +++--- rma_reason_code/views/rma_order_line_views.xml | 8 ++++---- 9 files changed, 40 insertions(+), 22 deletions(-) create mode 100644 rma_reason_code/migrations/17.0.1.0.0/pre-migration.py diff --git a/rma_reason_code/__manifest__.py b/rma_reason_code/__manifest__.py index 01b7ab7c..bd9dd6d4 100644 --- a/rma_reason_code/__manifest__.py +++ b/rma_reason_code/__manifest__.py @@ -2,7 +2,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "RMA Reason Code", - "version": "14.0.1.1.0", + "version": "17.0.1.0.0", "license": "AGPL-3", "summary": "Reason code for RMA", "author": "ForgeFlow", diff --git a/rma_reason_code/migrations/17.0.1.0.0/pre-migration.py b/rma_reason_code/migrations/17.0.1.0.0/pre-migration.py new file mode 100644 index 00000000..2acbcdfb --- /dev/null +++ b/rma_reason_code/migrations/17.0.1.0.0/pre-migration.py @@ -0,0 +1,17 @@ +from openupgradelib import openupgrade + + +@openupgrade.migrate() +def migrate(env, version): + if openupgrade.column_exists(env.cr, "rma_reason_code", "type"): + openupgrade.rename_fields( + env, + [ + ( + "rma.reason.code", + "rma_reason_code", + "type", + "rma_type", + ) + ], + ) diff --git a/rma_reason_code/models/reason_code.py b/rma_reason_code/models/reason_code.py index b52ef0a7..b098241a 100644 --- a/rma_reason_code/models/reason_code.py +++ b/rma_reason_code/models/reason_code.py @@ -13,14 +13,15 @@ class RMAReasonCode(models.Model): return randint(1, 11) name = fields.Char("Code", required=True) - description = fields.Text("Description") - type = fields.Selection( + description = fields.Text() + rma_type = fields.Selection( [ ("customer", "Customer RMA"), ("supplier", "Supplier RTV"), ("both", "Both Customer and Supplier"), ], default="both", + string="RMA Type", required=True, ) - color = fields.Integer("Color", default=_get_default_color) + color = fields.Integer(default=_get_default_color) diff --git a/rma_reason_code/models/rma_order_line.py b/rma_reason_code/models/rma_order_line.py index 5233085f..9167f331 100644 --- a/rma_reason_code/models/rma_order_line.py +++ b/rma_reason_code/models/rma_order_line.py @@ -24,9 +24,9 @@ class RMAOrderLine(models.Model): for rec in self: codes = self.env["rma.reason.code"] if rec.type == "customer": - codes = codes.search([("type", "in", ["customer", "both"])]) + codes = codes.search([("rma_type", "in", ["customer", "both"])]) else: - codes = codes.search([("type", "in", ["supplier", "both"])]) + codes = codes.search([("rma_type", "in", ["supplier", "both"])]) rec.allowed_reason_code_ids = codes @api.constrains("reason_code_ids", "product_id") diff --git a/rma_reason_code/reports/rma_reason_code_report.py b/rma_reason_code/reports/rma_reason_code_report.py index cb6d1b27..b00fd1c2 100644 --- a/rma_reason_code/reports/rma_reason_code_report.py +++ b/rma_reason_code/reports/rma_reason_code_report.py @@ -12,7 +12,7 @@ class RmaReasonCodeReport(models.Model): rma_order_line_id = fields.Many2one(comodel_name="rma.order.line") reason_code_id = fields.Many2one(comodel_name="rma.reason.code") date_rma = fields.Datetime(string="Order Date") - type = fields.Selection([("customer", "Customer"), ("supplier", "Supplier")]) + rma_type = fields.Selection([("customer", "Customer"), ("supplier", "Supplier")]) company_id = fields.Many2one(comodel_name="res.company") def _select(self): @@ -20,7 +20,7 @@ class RmaReasonCodeReport(models.Model): SELECT row_number() OVER () AS id, rma.id as rma_order_line_id, - rma.type, + rma.type AS rma_type, rrc.id as reason_code_id, rma.date_rma, rma.company_id diff --git a/rma_reason_code/reports/rma_reason_code_report_views.xml b/rma_reason_code/reports/rma_reason_code_report_views.xml index dd72fb65..b7f58fe4 100644 --- a/rma_reason_code/reports/rma_reason_code_report_views.xml +++ b/rma_reason_code/reports/rma_reason_code_report_views.xml @@ -8,7 +8,7 @@ - + @@ -35,12 +35,12 @@ diff --git a/rma_reason_code/tests/test_scrap_reason_code.py b/rma_reason_code/tests/test_scrap_reason_code.py index 71f00693..904214ba 100644 --- a/rma_reason_code/tests/test_scrap_reason_code.py +++ b/rma_reason_code/tests/test_scrap_reason_code.py @@ -6,7 +6,7 @@ from odoo.exceptions import ValidationError from odoo.tests import common -class RMAOrderLine(common.SavepointCase): +class RMAOrderLine(common.TransactionCase): @classmethod def setUpClass(cls): super().setUpClass() @@ -105,21 +105,21 @@ class RMAOrderLine(common.SavepointCase): { "name": "Test Code 1", "description": "Test description", - "type": "both", + "rma_type": "both", } ) cls.reason_code_customer = cls.env["rma.reason.code"].create( { "name": "Test Code 2", "description": "Test description", - "type": "customer", + "rma_type": "customer", } ) cls.reason_code_supplier = cls.env["rma.reason.code"].create( { "name": "Test Code 3", "description": "Test description", - "type": "supplier", + "rma_type": "supplier", } ) diff --git a/rma_reason_code/views/reason_code_view.xml b/rma_reason_code/views/reason_code_view.xml index 60bc433c..242f8123 100644 --- a/rma_reason_code/views/reason_code_view.xml +++ b/rma_reason_code/views/reason_code_view.xml @@ -21,7 +21,7 @@ nolabel="1" colspan="2" /> - + @@ -32,10 +32,10 @@ rma.reason.code.list rma.reason.code - + - + diff --git a/rma_reason_code/views/rma_order_line_views.xml b/rma_reason_code/views/rma_order_line_views.xml index 9e010d0a..e931d23d 100644 --- a/rma_reason_code/views/rma_order_line_views.xml +++ b/rma_reason_code/views/rma_order_line_views.xml @@ -16,7 +16,7 @@ widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" /> - + @@ -32,7 +32,7 @@ widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" /> - + @@ -66,8 +66,8 @@ string="Reason Code" context="{'group_by':'reason_code_ids'}" /> - - + +