odoo-addon-rma 16.0.1.2.0.1__py3-none-any.whl → 17.0.1.0.0.2__py3-none-any.whl

odoo/addons/rma/models/rma.py

@@ -35,60 +35,37 @@ class Rma(models.Model):
     sent = fields.Boolean()
     name = fields.Char(
         index=True,
-        readonly=True,
-        states={"draft": [("readonly", False)]},
         copy=False,
         default=lambda self: _("New"),
     )
     origin = fields.Char(
         string="Source Document",
-        states={
-            "locked": [("readonly", True)],
-            "cancelled": [("readonly", True)],
-        },
         help="Reference of the document that generated this RMA.",
     )
     date = fields.Datetime(
         default=fields.Datetime.now,
         index=True,
         required=True,
-        readonly=True,
-        states={"draft": [("readonly", False)]},
-    )
-    deadline = fields.Date(
-        states={
-            "locked": [("readonly", True)],
-            "cancelled": [("readonly", True)],
-        },
     )
+    deadline = fields.Date()
     user_id = fields.Many2one(
         comodel_name="res.users",
         string="Responsible",
         index=True,
         tracking=True,
-        states={
-            "locked": [("readonly", True)],
-            "cancelled": [("readonly", True)],
-        },
     )
     team_id = fields.Many2one(
         comodel_name="rma.team",
         string="RMA team",
         index=True,
-        states={
-            "locked": [("readonly", True)],
-            "cancelled": [("readonly", True)],
-        },
         compute="_compute_team_id",
         store=True,
-        readonly=False,
     )
     tag_ids = fields.Many2many(comodel_name="rma.tag", string="Tags")
     finalization_id = fields.Many2one(
         string="Finalization Reason",
         comodel_name="rma.finalization",
         copy=False,
-        readonly=True,
         domain=(
             "['|', ('company_id', '=', False), ('company_id', '='," " company_id)]"
         ),
@@ -97,16 +74,10 @@ class Rma(models.Model):
     company_id = fields.Many2one(
         comodel_name="res.company",
         default=lambda self: self.env.company,
-        states={
-            "locked": [("readonly", True)],
-            "cancelled": [("readonly", True)],
-        },
     )
     partner_id = fields.Many2one(
         string="Customer",
         comodel_name="res.partner",
-        readonly=True,
-        states={"draft": [("readonly", False)]},
         index=True,
         tracking=True,
     )
@@ -143,8 +114,6 @@ class Rma(models.Model):
             "    ('partner_id', 'child_of', commercial_partner_id),"
             "]"
         ),
-        readonly=True,
-        states={"draft": [("readonly", False)]},
     )
     move_id = fields.Many2one(
         comodel_name="stock.move",
@@ -187,18 +156,10 @@ class Rma(models.Model):
     procurement_group_id = fields.Many2one(
         comodel_name="procurement.group",
         string="Procurement group",
-        readonly=True,
-        states={
-            "draft": [("readonly", False)],
-            "confirmed": [("readonly", False)],
-            "received": [("readonly", False)],
-        },
     )
     priority = fields.Selection(
         selection=PROCUREMENT_PRIORITIES,
         default="1",
-        readonly=True,
-        states={"draft": [("readonly", False)]},
     )
     operation_id = fields.Many2one(
         comodel_name="rma.operation",
@@ -222,12 +183,7 @@ class Rma(models.Model):
         copy=False,
         tracking=True,
     )
-    description = fields.Html(
-        states={
-            "locked": [("readonly", True)],
-            "cancelled": [("readonly", True)],
-        },
-    )
+    description = fields.Html()
     # Reception fields
     location_id = fields.Many2one(
         comodel_name="stock.location",
@@ -249,12 +205,10 @@ class Rma(models.Model):
     # Refund fields
     refund_id = fields.Many2one(
         comodel_name="account.move",
-        readonly=True,
         copy=False,
     )
     refund_line_id = fields.Many2one(
         comodel_name="account.move.line",
-        readonly=True,
         copy=False,
     )
     can_be_refunded = fields.Boolean(compute="_compute_can_be_refunded")
@@ -263,7 +217,6 @@ class Rma(models.Model):
         comodel_name="stock.move",
         inverse_name="rma_id",
         string="Delivery reservation",
-        readonly=True,
         copy=False,
     )
     delivery_picking_count = fields.Integer(
@@ -275,11 +228,6 @@ class Rma(models.Model):
         compute="_compute_delivered_qty",
         store=True,
     )
-    delivered_qty_done = fields.Float(
-        digits="Product Unit of Measure",
-        compute="_compute_delivered_qty",
-        compute_sudo=True,
-    )
     can_be_returned = fields.Boolean(
         compute="_compute_can_be_returned",
     )
@@ -297,11 +245,6 @@ class Rma(models.Model):
         digits="Product Unit of Measure",
         compute="_compute_remaining_qty",
     )
-    remaining_qty_to_done = fields.Float(
-        string="Remaining delivered qty to done",
-        digits="Product Unit of Measure",
-        compute="_compute_remaining_qty",
-    )
     uom_category_id = fields.Many2one(
         related="product_id.uom_id.category_id", string="Category UoM"
     )
@@ -312,7 +255,6 @@ class Rma(models.Model):
     origin_split_rma_id = fields.Many2one(
         comodel_name="rma",
         string="Extracted from",
-        readonly=True,
         copy=False,
     )
 
@@ -335,8 +277,7 @@ class Rma(models.Model):
         "delivery_move_ids.state",
         "delivery_move_ids.scrapped",
         "delivery_move_ids.product_uom_qty",
-        "delivery_move_ids.reserved_availability",
-        "delivery_move_ids.quantity_done",
+        "delivery_move_ids.quantity",
         "delivery_move_ids.product_uom",
         "product_uom",
     )
@@ -355,29 +296,21 @@ class Rma(models.Model):
         """
         for record in self:
             delivered_qty = 0.0
-            delivered_qty_done = 0.0
             for move in record.delivery_move_ids.filtered(
                 lambda r: r.state != "cancel" and not r.scrapped
             ):
-                if move.quantity_done:
-                    quantity_done = move.product_uom._compute_quantity(
-                        move.quantity_done, record.product_uom
-                    )
-                    if move.state == "done":
-                        delivered_qty_done += quantity_done
-                    delivered_qty += quantity_done
-                elif move.reserved_availability:
-                    delivered_qty += move.product_uom._compute_quantity(
-                        move.reserved_availability, record.product_uom
+                if move.quantity:
+                    quantity = move.product_uom._compute_quantity(
+                        move.quantity, record.product_uom
                     )
+                    delivered_qty += quantity
                 elif move.product_uom_qty:
                     delivered_qty += move.product_uom._compute_quantity(
                         move.product_uom_qty, record.product_uom
                     )
             record.delivered_qty = delivered_qty
-            record.delivered_qty_done = delivered_qty_done
 
-    @api.depends("product_uom_qty", "delivered_qty", "delivered_qty_done")
+    @api.depends("product_uom_qty", "delivered_qty")
     def _compute_remaining_qty(self):
         """Compute 'remaining_qty' and 'remaining_qty_to_done' fields.
 
@@ -392,7 +325,6 @@ class Rma(models.Model):
         """
         for r in self:
             r.remaining_qty = r.product_uom_qty - r.delivered_qty
-            r.remaining_qty_to_done = r.product_uom_qty - r.delivered_qty_done
 
     @api.depends(
         "state",
@@ -443,7 +375,7 @@ class Rma(models.Model):
                 and rma.remaining_qty > 0
             )
 
-    @api.depends("product_uom_qty", "state", "remaining_qty", "remaining_qty_to_done")
+    @api.depends("product_uom_qty", "state", "remaining_qty")
     def _compute_can_be_split(self):
         """Compute 'can_be_split'. This field controls the
         visibility of 'Split' button in the rma form view and
@@ -460,10 +392,10 @@ class Rma(models.Model):
             else:
                 r.can_be_split = False
 
-    @api.depends("remaining_qty_to_done", "state")
+    @api.depends("state")
     def _compute_can_be_locked(self):
         for r in self:
-            r.can_be_locked = r.remaining_qty_to_done > 0 and r.state in [
+            r.can_be_locked = r.remaining_qty > 0 and r.state in [
                 "received",
                 "waiting_return",
                 "waiting_replacement",
@@ -555,7 +487,7 @@ class Rma(models.Model):
 
     def _compute_access_url(self):
         for record in self:
-            record.access_url = "/my/rmas/{}".format(record.id)
+            record.access_url = f"/my/rmas/{record.id}"
 
     # Constrains methods (@api.constrains)
     @api.constrains(
@@ -612,34 +544,41 @@ class Rma(models.Model):
     def _send_draft_email(self):
         """Send customer notifications they place the RMA from the portal"""
         for rma in self.filtered("company_id.send_rma_draft_confirmation"):
-            rma_template_id = rma.company_id.rma_mail_draft_confirmation_template_id.id
             rma.with_context(
                 force_send=True,
                 mark_rma_as_sent=True,
-                default_subtype_id=self.env.ref("rma.mt_rma_notification").id,
-            ).message_post_with_template(rma_template_id)
+            ).message_post_with_source(
+                rma.company_id.rma_mail_draft_confirmation_template_id.get_external_id()[
+                    rma.company_id.rma_mail_draft_confirmation_template_id.id
+                ],
+                subtype_xmlid="rma.mt_rma_notification",
+            )
 
     def _send_confirmation_email(self):
         """Auto send notifications"""
         for rma in self.filtered(lambda p: p.company_id.send_rma_confirmation):
-            rma_template_id = rma.company_id.rma_mail_confirmation_template_id.id
             rma.with_context(
                 force_send=True,
                 mark_rma_as_sent=True,
-                default_subtype_id=self.env.ref("rma.mt_rma_notification").id,
-            ).message_post_with_template(rma_template_id)
+            ).message_post_with_source(
+                rma.company_id.rma_mail_confirmation_template_id.get_external_id()[
+                    rma.company_id.rma_mail_confirmation_template_id.id
+                ],
+                subtype_xmlid="rma.mt_rma_notification",
+            )
 
     def _send_receipt_confirmation_email(self):
         """Send customer notifications when the products are received"""
         for rma in self.filtered("company_id.send_rma_receipt_confirmation"):
-            rma_template_id = (
-                rma.company_id.rma_mail_receipt_confirmation_template_id.id
-            )
             rma.with_context(
                 force_send=True,
                 mark_rma_as_sent=True,
-                default_subtype_id=self.env.ref("rma.mt_rma_notification").id,
-            ).message_post_with_template(rma_template_id)
+            ).message_post_with_source(
+                rma.company_id.rma_mail_receipt_confirmation_template_id.get_external_id()[
+                    rma.company_id.rma_mail_receipt_confirmation_template_id.id
+                ],
+                subtype_xmlid="rma.mt_rma_notification",
+            )
 
     # Action methods
     def action_rma_send(self):
@@ -682,6 +621,7 @@ class Rma(models.Model):
                 reception_move = self._create_receptions_from_picking()
             else:
                 reception_move = self._create_receptions_from_product()
+            reception_move.picked = True
             self.write({"reception_move_id": reception_move.id, "state": "confirmed"})
             self._add_message_subscribe_partner()
             self._send_confirmation_email()
@@ -703,10 +643,10 @@ class Rma(models.Model):
                     (0, 0, rma._prepare_refund_line_vals())
                 )
             refund = self.env["account.move"].sudo().create(refund_vals)
-            refund.with_user(self.env.uid).message_post_with_view(
+            refund.with_user(self.env.uid).message_post_with_source(
                 "mail.message_origin_link",
-                values={"self": refund, "origin": rmas},
-                subtype_id=self.env.ref("mail.mt_note").id,
+                render_values={"self": refund, "origin": rmas},
+                subtype_id=self.env["ir.model.data"]._xmlid_to_res_id("mail.mt_note"),
             )
             for line in refund.invoice_line_ids:
                 line.rma_id.write(
@@ -1017,7 +957,7 @@ class Rma(models.Model):
         ).create_returns()
         picking_id = picking_action["res_id"]
         picking = self.env["stock.picking"].browse(picking_id)
-        picking.origin = "{} ({})".format(self.name, picking.origin)
+        picking.origin = f"{self.name} ({picking.origin})"
         move = picking.move_ids
         move.priority = self.priority
         return move
@@ -1027,10 +967,10 @@ class Rma(models.Model):
         picking = self.env["stock.picking"].create(self._prepare_picking_vals())
         picking.action_confirm()
         picking.action_assign()
-        picking.message_post_with_view(
+        picking.message_post_with_source(
             "mail.message_origin_link",
-            values={"self": picking, "origin": self},
-            subtype_id=self.env.ref("mail.mt_note").id,
+            render_values={"self": picking, "origin": self},
+            subtype_id=self.env["ir.model.data"]._xmlid_to_res_id("mail.mt_note"),
         )
         return picking.move_ids
 
@@ -1052,7 +992,9 @@ class Rma(models.Model):
                         or self.product_id.with_context(
                             lang=self.partner_id.lang or "en_US"
                         ).display_name,
-                        "location_id": self.partner_shipping_id.property_stock_customer.id,
+                        "location_id": (
+                            self.partner_shipping_id.property_stock_customer.id
+                        ),
                         "location_dest_id": self.location_id.id,
                         "product_uom_qty": self.product_uom_qty,
                     },
@@ -1066,7 +1008,7 @@ class Rma(models.Model):
         self._ensure_can_be_split()
         self._ensure_qty_to_extract(qty, uom)
         self.product_uom_qty -= uom._compute_quantity(qty, self.product_uom)
-        if self.remaining_qty_to_done <= 0:
+        if self.remaining_qty <= 0:
             if self.state == "waiting_return":
                 self.state = "returned"
             elif self.state == "waiting_replacement":
@@ -1081,10 +1023,10 @@ class Rma(models.Model):
                 "origin_split_rma_id": self.id,
             }
         )
-        extracted_rma.message_post_with_view(
+        extracted_rma.message_post_with_source(
             "mail.message_origin_link",
-            values={"self": extracted_rma, "origin": self},
-            subtype_id=self.env.ref("mail.mt_note").id,
+            render_values={"self": extracted_rma, "origin": self},
+            subtype_id=self.env["ir.model.data"]._xmlid_to_res_id("mail.mt_note"),
         )
         self.message_post(
             body=_(
@@ -1173,10 +1115,10 @@ class Rma(models.Model):
                 )
             picking.action_confirm()
             picking.action_assign()
-            picking.message_post_with_view(
+            picking.message_post_with_source(
                 "mail.message_origin_link",
-                values={"self": picking, "origin": rmas},
-                subtype_id=self.env.ref("mail.mt_note").id,
+                render_values={"self": picking, "origin": rmas},
+                subtype_id=self.env["ir.model.data"]._xmlid_to_res_id("mail.mt_note"),
             )
         rmas_to_return.write({"state": "waiting_return"})
 
@@ -1232,7 +1174,7 @@ class Rma(models.Model):
                 % (
                     {
                         "move_id": new_move.id,
-                        "move_name": new_move.name_get()[0][1],
+                        "move_name": new_move.display_name,
                         "picking_id": new_move.picking_id.id,
                         "picking_name": new_move.picking_id.name,
                     }
@@ -1425,10 +1367,7 @@ class Rma(models.Model):
         [stock.move]._action_cancel
         """
         rma = self.filtered(
-            lambda r: (
-                r.state == "waiting_replacement"
-                and 0 >= r.remaining_qty_to_done == r.remaining_qty
-            )
+            lambda r: (r.state == "waiting_replacement" and 0 >= r.remaining_qty)
         )
         if rma:
             rma.write({"state": "replaced"})
@@ -1436,7 +1375,7 @@ class Rma(models.Model):
     def update_returned_state(self):
         """Invoked by [stock.move]._action_done"""
         rma = self.filtered(
-            lambda r: (r.state == "waiting_return" and r.remaining_qty_to_done <= 0)
+            lambda r: (r.state == "waiting_return" and r.remaining_qty <= 0)
         )
         if rma:
             rma.write({"state": "returned"})

odoo/addons/rma/models/stock_move.py

@@ -59,7 +59,7 @@ class StockMove(models.Model):
         """
         for move in self.filtered(lambda r: r.state not in ("done", "cancel")):
             rma_receiver = move.sudo().rma_receiver_ids
-            if rma_receiver and move.quantity_done != rma_receiver.product_uom_qty:
+            if rma_receiver and move.quantity != rma_receiver.product_uom_qty:
                 raise ValidationError(
                     _(
                         "The quantity done for the product '%(id)s' must "

odoo/addons/rma/readme/CONFIGURE.md

@@ -0,0 +1,22 @@
+If you want RMAs to be created from incoming emails, you need to:
+
+1.  Go to *Settings \> General Settings*.
+2.  Check 'External Email Servers' checkbox under *Discuss* section.
+3.  Set an 'alias domain' and an incoming server.
+4.  Go to *RMA \> Configuration \> RMA Team* and select a team or create
+    a new one.
+5.  Go to 'Email' tab and set an 'Email Alias'.
+
+If you want to manually finish RMAs, you need to:
+
+1.  Go to *Settings \> Inventory*.
+2.  Set *Finish RMAs manually* checkbox on.
+
+By default, returns to customer are grouped by shipping address,
+warehouse and company. If you want to avoid this grouping you can:
+
+1.  Go to *Settings \> Inventory*.
+2.  Set *Group RMA returns by customer address and warehouse* checkbox
+    off.
+
+The users will still be able to group those pickings from the wizard.

odoo/addons/rma/readme/CONTRIBUTORS.md

@@ -0,0 +1,9 @@
+- [Tecnativa](https://www.tecnativa.com):
+  - Ernesto Tejeda
+  - Pedro M. Baeza
+  - David Vidal
+  - Víctor Martínez
+- Chafique Delli \<<chafique.delli@akretion.com>\>
+- Giovanni Serra - Ooops \<<giovanni@ooops404.com>\>
+- [APSL-Nagarro](https://www.apsl.tech):
+  - Antoni Marroig \<<amarroig@apsl.net>\>

odoo/addons/rma/readme/{DESCRIPTION.rst → DESCRIPTION.md}

@@ -1,8 +1,8 @@
-This module allows you to manage `Return Merchandise Authorization (RMA)
-<https://en.wikipedia.org/wiki/Return_merchandise_authorization>`_.
+This module allows you to manage [Return Merchandise Authorization
+(RMA)](https://en.wikipedia.org/wiki/Return_merchandise_authorization).
 RMA documents can be created from scratch, from a delivery order or from
 an incoming email. Product receptions and returning delivery operations
 of the RMA module are fully integrated with the Receipts and Deliveries
 Operations of Odoo inventory core module. It also allows you to generate
-refunds in the same way as Odoo generates it.
-Besides, you have full integration of the RMA documents in the customer portal.
+refunds in the same way as Odoo generates it. Besides, you have full
+integration of the RMA documents in the customer portal.

odoo/addons/rma/readme/ROADMAP.md

@@ -0,0 +1,3 @@
+- As soon as the picking is selected, the user should select the move,
+  but perhaps stock.move \_rec_name could be improved to better show
+  what the product of that move is.

odoo/addons/rma/readme/USAGE.md

@@ -0,0 +1,59 @@
+To use this module, you need to:
+
+1.  Go to *RMA \> Orders* and create a new RMA.
+2.  Select a partner, an invoice address, select a product (or select a
+    picking and a move instead), write a quantity, fill the rest of the
+    form and click on 'confirm' button in the status bar.
+3.  You will see an smart button labeled 'Receipt'. Click on that button
+    to see the reception operation form.
+4.  If everything is right, validate the operation and go back to the
+    RMA to see it in a 'received' state.
+5.  Now you are able to generate a refund, generate a delivery order to
+    return to the customer the same product or another product as a
+    replacement, split the RMA by extracting a part of the remaining
+    quantity to another RMA, preview the RMA in the website. All of
+    these operations can be done by clicking on the buttons in the
+    status bar.
+    - If you click on 'To Refund' button, a refund will be created, and it
+      will be accessible via the smart button labeled Refund. The RMA
+      will be set automatically to 'Refunded' state when the refund is
+      validated.
+    - If you click on 'Replace' or 'Return to customer' button instead,
+      a popup wizard will guide you to create a Delivery order to the
+      client and this order will be accessible via the smart button
+      labeled Delivery. The RMA will be set automatically to 'Replaced'
+      or 'Returned' state when the RMA quantity is equal or lower than
+      the quantity in done delivery orders linked to it.
+6.  You can also finish the RMA without further ado. To do so click on
+    the *Finish* button. A wizard will ask you for the reason from a
+    selection of preconfigured ones. Be sure to configure them in
+    advance on *RMA \> Configuration \> Finalization Reasons*. Once the
+    RMA is finished, it will be set to that state and the reason will be
+    registered.
+
+An RMA can also be created from a return of a delivery order:
+
+1.  Select a delivery order and click on 'Return' button to create a
+    return.
+2.  Check "Create RMAs" checkbox in the returning wizard, select the RMA
+    stock location and click on 'Return' button.
+3.  An RMA will be created for each product returned in the previous
+    step. Every RMA will be in confirmed state and they will be linked
+    to the returning operation generated previously.
+
+There are Optional RMA Teams that can be used for:
+
+> - Organize RMAs in sections.
+> - Subscribe users to notifications.
+> - Create RMAs from incoming mail to special aliases (See configuration
+>   section).
+
+To create an RMA Team (RMA Responsible user level required):
+
+> 1.  Go to *RMA \> Configuration \> RMA Teams*
+> 2.  Create a new team and assign a name, a responsible and members.
+> 3.  Subscribe users to notifications, that can be of these subtypes:
+>     - RMA draft. When a new RMA is created.
+>     - Notes, Debates, Activities. As in standard Odoo.
+> 4.  In the list view, use the cross handle to sort RMA Teams. The top
+>     team will be the default one if no team is set.