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

odoo/addons/rma/static/description/index.html

@@ -366,16 +366,17 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:4883b701d44a55d02e769bdbf411c649efc42341792b63e965630e712a6406d9
+!! source digest: sha256:9ca167b75e0dcd82a66217ef64dd006910f4feda1f408dbdf09ef43e6555eb22
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/rma/tree/16.0/rma"><img alt="OCA/rma" src="https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/rma&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
-<p>This module allows you to manage <a class="reference external" href="https://en.wikipedia.org/wiki/Return_merchandise_authorization">Return Merchandise Authorization (RMA)</a>.
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/rma/tree/17.0/rma"><img alt="OCA/rma" src="https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/rma&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>This module allows you to manage <a class="reference external" href="https://en.wikipedia.org/wiki/Return_merchandise_authorization">Return Merchandise Authorization
+(RMA)</a>.
 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.</p>
+refunds in the same way as Odoo generates it. Besides, you have full
+integration of the RMA documents in the customer portal.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -398,8 +399,8 @@ Besides, you have full integration of the RMA documents in the customer portal.<
 <li>Go to <em>Settings &gt; General Settings</em>.</li>
 <li>Check ‘External Email Servers’ checkbox under <em>Discuss</em> section.</li>
 <li>Set an ‘alias domain’ and an incoming server.</li>
-<li>Go to <em>RMA &gt; Configuration &gt; RMA Team</em> and select a team or create a new
-one.</li>
+<li>Go to <em>RMA &gt; Configuration &gt; RMA Team</em> and select a team or create a
+new one.</li>
 <li>Go to ‘Email’ tab and set an ‘Email Alias’.</li>
 </ol>
 <p>If you want to manually finish RMAs, you need to:</p>
@@ -407,11 +408,12 @@ one.</li>
 <li>Go to <em>Settings &gt; Inventory</em>.</li>
 <li>Set <em>Finish RMAs manually</em> checkbox on.</li>
 </ol>
-<p>By default, returns to customer are grouped by shipping address, warehouse and company.
-If you want to avoid this grouping you can:</p>
+<p>By default, returns to customer are grouped by shipping address,
+warehouse and company. If you want to avoid this grouping you can:</p>
 <ol class="arabic simple">
 <li>Go to <em>Settings &gt; Inventory</em>.</li>
-<li>Set <em>Group RMA returns by customer address and warehouse</em> checkbox off.</li>
+<li>Set <em>Group RMA returns by customer address and warehouse</em> checkbox
+off.</li>
 </ol>
 <p>The users will still be able to group those pickings from the wizard.</p>
 </div>
@@ -420,51 +422,54 @@ If you want to avoid this grouping you can:</p>
 <p>To use this module, you need to:</p>
 <ol class="arabic simple">
 <li>Go to <em>RMA &gt; Orders</em> and create a new RMA.</li>
-<li>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.</li>
-<li>You will see an smart button labeled ‘Receipt’. Click on that button to see
-the reception operation form.</li>
-<li>If everything is right, validate the operation and go back to the RMA to
-see it in a ‘received’ state.</li>
-<li>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.<ul>
-<li>If you click on ‘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.</li>
+<li>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.</li>
+<li>You will see an smart button labeled ‘Receipt’. Click on that button
+to see the reception operation form.</li>
+<li>If everything is right, validate the operation and go back to the RMA
+to see it in a ‘received’ state.</li>
+<li>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.<ul>
+<li>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.</li>
 <li>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.</li>
+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.</li>
 </ul>
 </li>
-<li>You can also finish the RMA without further ado. To do so click on the <em>Finish</em>
-button. A wizard will ask you for the reason from a selection of preconfigured ones.
-Be sure to configure them in advance on <em>RMA &gt; Configuration &gt; Finalization Reasons</em>.
-Once the RMA is finished, it will be set to that state and the reason will be
+<li>You can also finish the RMA without further ado. To do so click on
+the <em>Finish</em> button. A wizard will ask you for the reason from a
+selection of preconfigured ones. Be sure to configure them in advance
+on <em>RMA &gt; Configuration &gt; Finalization Reasons</em>. Once the RMA is
+finished, it will be set to that state and the reason will be
 registered.</li>
 </ol>
 <p>An RMA can also be created from a return of a delivery order:</p>
 <ol class="arabic simple">
-<li>Select a delivery order and click on ‘Return’ button to create a return.</li>
+<li>Select a delivery order and click on ‘Return’ button to create a
+return.</li>
 <li>Check “Create RMAs” checkbox in the returning wizard, select the RMA
 stock location and click on ‘Return’ button.</li>
-<li>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.</li>
+<li>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.</li>
 </ol>
 <p>There are Optional RMA Teams that can be used for:</p>
 <blockquote>
 <ul class="simple">
 <li>Organize RMAs in sections.</li>
 <li>Subscribe users to notifications.</li>
-<li>Create RMAs from incoming mail to special aliases (See configuration
-section).</li>
+<li>Create RMAs from incoming mail to special aliases (See
+configuration section).</li>
 </ul>
 </blockquote>
 <p>To create an RMA Team (RMA Responsible user level required):</p>
@@ -477,8 +482,8 @@ section).</li>
 <li>Notes, Debates, Activities. As in standard Odoo.</li>
 </ul>
 </li>
-<li>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.</li>
+<li>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.</li>
 </ol>
 </blockquote>
 </div>
@@ -486,8 +491,8 @@ will be the default one if no team is set.</li>
 <h1><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h1>
 <ul class="simple">
 <li>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.</li>
+but perhaps stock.move _rec_name could be improved to better show
+what the product of that move is.</li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
@@ -495,7 +500,7 @@ the product of that move is.</li>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/rma/issues">GitHub Issues</a>.
 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
-<a class="reference external" href="https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -518,6 +523,10 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 </li>
 <li>Chafique Delli &lt;<a class="reference external" href="mailto:chafique.delli&#64;akretion.com">chafique.delli&#64;akretion.com</a>&gt;</li>
 <li>Giovanni Serra - Ooops &lt;<a class="reference external" href="mailto:giovanni&#64;ooops404.com">giovanni&#64;ooops404.com</a>&gt;</li>
+<li><a class="reference external" href="https://www.apsl.tech">APSL-Nagarro</a>:<ul>
+<li>Antoni Marroig &lt;<a class="reference external" href="mailto:amarroig&#64;apsl.net">amarroig&#64;apsl.net</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -529,7 +538,7 @@ mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/pedrobaeza"><img alt="pedrobaeza" src="https://github.com/pedrobaeza.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/chienandalu"><img alt="chienandalu" src="https://github.com/chienandalu.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/rma/tree/16.0/rma">OCA/rma</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/rma/tree/17.0/rma">OCA/rma</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

odoo/addons/rma/tests/test_rma.py

@@ -85,6 +85,8 @@ class TestRma(TransactionCase):
             vals["product_uom_qty"] = qty
         if location:
             vals["location_id"] = location.id
+
+        vals["user_id"] = self.env.user.id
         return self.env["rma"].create(vals)
 
     def _create_confirm_receive(
@@ -92,7 +94,7 @@ class TestRma(TransactionCase):
     ):
         rma = self._create_rma(partner, product, qty, location)
         rma.action_confirm()
-        rma.reception_move_id.quantity_done = rma.product_uom_qty
+        rma.reception_move_id.quantity = rma.product_uom_qty
         rma.reception_move_id.picking_id._action_done()
         return rma
 
@@ -107,7 +109,7 @@ class TestRma(TransactionCase):
             limit=1,
         )
         picking_form = Form(
-            recordp=self.env["stock.picking"].with_context(
+            record=self.env["stock.picking"].with_context(
                 default_picking_type_id=picking_type.id
             ),
             view="stock.view_picking_form",
@@ -124,7 +126,7 @@ class TestRma(TransactionCase):
         picking = picking_form.save()
         picking.action_confirm()
         for move in picking.move_ids:
-            move.quantity_done = move.product_uom_qty
+            move.quantity = move.product_uom_qty
         picking.button_validate()
         return picking
 
@@ -157,7 +159,7 @@ class TestRmaCase(TestRma):
             limit=1,
         )
         picking_form = Form(
-            recordp=self.env["stock.picking"].with_context(
+            record=self.env["stock.picking"].with_context(
                 default_picking_type_id=outgoing_picking_type.id
             ),
             view="stock.view_picking_form",
@@ -203,13 +205,13 @@ class TestRmaCase(TestRma):
         self.assertEqual(rma.reception_move_id.product_uom_qty, 10)
         self.assertEqual(rma.reception_move_id.product_uom, rma.product_uom)
         self.assertEqual(rma.state, "confirmed")
-        rma.reception_move_id.quantity_done = 9
+        rma.reception_move_id.quantity = 9
         with self.assertRaises(ValidationError):
             rma.reception_move_id.picking_id._action_done()
-        rma.reception_move_id.quantity_done = 10
+        rma.reception_move_id.quantity = 10
         rma.reception_move_id.picking_id._action_done()
         self.assertEqual(rma.reception_move_id.picking_id.state, "done")
-        self.assertEqual(rma.reception_move_id.quantity_done, 10)
+        self.assertEqual(rma.reception_move_id.quantity, 10)
         self.assertEqual(rma.state, "received")
 
     def test_cancel(self):
@@ -386,8 +388,6 @@ class TestRmaCase(TestRma):
         self.assertTrue(rma.can_be_replaced)
         self.assertEqual(rma.delivered_qty, 2)
         self.assertEqual(rma.remaining_qty, 8)
-        self.assertEqual(rma.delivered_qty_done, 0)
-        self.assertEqual(rma.remaining_qty_to_done, 10)
         first_move = rma.delivery_move_ids
         picking = first_move.picking_id
         # Replace again with another product with the remaining quantity
@@ -413,18 +413,13 @@ class TestRmaCase(TestRma):
         self.assertTrue(picking.state, "waiting")
         self.assertEqual(rma.delivered_qty, 10)
         self.assertEqual(rma.remaining_qty, 0)
-        self.assertEqual(rma.delivered_qty_done, 0)
-        self.assertEqual(rma.remaining_qty_to_done, 10)
         # remaining_qty is 0 but rma is not set to 'replaced' until
-        # remaining_qty_to_done is less than or equal to 0
-        first_move.quantity_done = 2
-        second_move.quantity_done = 8
+        first_move.quantity = 2
+        second_move.quantity = 8
         picking.button_validate()
         self.assertEqual(picking.state, "done")
         self.assertEqual(rma.delivered_qty, 10)
         self.assertEqual(rma.remaining_qty, 0)
-        self.assertEqual(rma.delivered_qty_done, 10)
-        self.assertEqual(rma.remaining_qty_to_done, 0)
         # The RMA is now in 'replaced' state
         self.assertEqual(rma.state, "replaced")
         self.assertFalse(rma.can_be_refunded)
@@ -457,18 +452,14 @@ class TestRmaCase(TestRma):
         self.assertTrue(rma.can_be_returned)
         self.assertEqual(rma.delivered_qty, 2)
         self.assertEqual(rma.remaining_qty, 8)
-        self.assertEqual(rma.delivered_qty_done, 0)
-        self.assertEqual(rma.remaining_qty_to_done, 10)
         first_move = rma.delivery_move_ids
         picking = first_move.picking_id
         # Validate the picking
-        first_move.quantity_done = 2
+        first_move.quantity = 2
         picking.button_validate()
         self.assertEqual(picking.state, "done")
         self.assertEqual(rma.delivered_qty, 2)
         self.assertEqual(rma.remaining_qty, 8)
-        self.assertEqual(rma.delivered_qty_done, 2)
-        self.assertEqual(rma.remaining_qty_to_done, 8)
         # Return the remaining quantity to the customer
         delivery_form = Form(
             self.env["rma.delivery.wizard"].with_context(
@@ -479,21 +470,16 @@ class TestRmaCase(TestRma):
         delivery_wizard = delivery_form.save()
         delivery_wizard.action_deliver()
         second_move = rma.delivery_move_ids - first_move
-        second_move.quantity_done = 8
+        second_move.quantity = 8
         self.assertEqual(rma.delivered_qty, 10)
         self.assertEqual(rma.remaining_qty, 0)
-        self.assertEqual(rma.delivered_qty_done, 2)
-        self.assertEqual(rma.remaining_qty_to_done, 8)
         self.assertEqual(rma.state, "waiting_return")
         # remaining_qty is 0 but rma is not set to 'returned' until
-        # remaining_qty_to_done is less than or equal to 0
         picking_2 = second_move.picking_id
         picking_2.button_validate()
         self.assertEqual(picking_2.state, "done")
         self.assertEqual(rma.delivered_qty, 10)
         self.assertEqual(rma.remaining_qty, 0)
-        self.assertEqual(rma.delivered_qty_done, 10)
-        self.assertEqual(rma.remaining_qty_to_done, 0)
         # The RMA is now in 'returned' state
         self.assertEqual(rma.state, "returned")
         self.assertFalse(rma.can_be_refunded)
@@ -579,7 +565,7 @@ class TestRmaCase(TestRma):
             self.assertEqual(rma.product_id, rma.delivery_move_ids.product_id)
             self.assertEqual(rma.product_uom_qty, rma.delivery_move_ids.product_uom_qty)
             self.assertEqual(rma.product_uom, rma.delivery_move_ids.product_uom)
-            rma.delivery_move_ids.quantity_done = rma.product_uom_qty
+            rma.delivery_move_ids.quantity = rma.product_uom_qty
         pick_1.button_validate()
         pick_2.button_validate()
         self.assertEqual(all_rmas.mapped("state"), ["returned"] * 4)
@@ -643,8 +629,8 @@ class TestRmaCase(TestRma):
         self.assertTrue(reception_moves[1].rma_receiver_ids)
         self.assertEqual(reception_moves.mapped("rma_receiver_ids"), rmas)
         # Validate the reception picking to set rmas to 'received' state
-        reception_moves[0].quantity_done = reception_moves[0].product_uom_qty
-        reception_moves[1].quantity_done = reception_moves[1].product_uom_qty
+        reception_moves[0].quantity = reception_moves[0].product_uom_qty
+        reception_moves[1].quantity = reception_moves[1].product_uom_qty
         reception.button_validate()
         self.assertEqual(rmas.mapped("state"), ["received"] * 2)
 
@@ -658,7 +644,7 @@ class TestRmaCase(TestRma):
         )
         rma = rma_form.save()
         rma.action_confirm()
-        rma.reception_move_id.quantity_done = 10
+        rma.reception_move_id.quantity = 10
         rma.reception_move_id.picking_id._action_done()
         # Return quantity 4 of the same product to the customer
         delivery_form = Form(
@@ -670,7 +656,7 @@ class TestRmaCase(TestRma):
         delivery_form.product_uom_qty = 4
         delivery_wizard = delivery_form.save()
         delivery_wizard.action_deliver()
-        rma.delivery_move_ids.quantity_done = 4
+        rma.delivery_move_ids.quantity = 4
         rma.delivery_move_ids.picking_id.button_validate()
         self.assertEqual(rma.state, "waiting_return")
         # Extract the remaining quantity to another RMA
@@ -690,8 +676,6 @@ class TestRmaCase(TestRma):
         self.assertEqual(new_rma.origin_split_rma_id, rma)
         self.assertEqual(new_rma.delivered_qty, 0)
         self.assertEqual(new_rma.remaining_qty, 6)
-        self.assertEqual(new_rma.delivered_qty_done, 0)
-        self.assertEqual(new_rma.remaining_qty_to_done, 6)
         self.assertEqual(new_rma.state, "received")
         self.assertTrue(new_rma.can_be_refunded)
         self.assertTrue(new_rma.can_be_returned)
@@ -699,8 +683,8 @@ class TestRmaCase(TestRma):
         self.assertEqual(new_rma.move_id, rma.move_id)
         self.assertEqual(new_rma.reception_move_id, rma.reception_move_id)
         self.assertEqual(new_rma.product_uom_qty + rma.product_uom_qty, 10)
-        self.assertEqual(new_rma.move_id.quantity_done, 10)
-        self.assertEqual(new_rma.reception_move_id.quantity_done, 10)
+        self.assertEqual(new_rma.move_id.quantity, 10)
+        self.assertEqual(new_rma.reception_move_id.quantity, 10)
 
     def test_rma_to_receive_on_delete_invoice(self):
         rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
@@ -763,7 +747,7 @@ class TestRmaCase(TestRma):
         )
         # Now we'll confirm the incoming goods picking and the automatic
         # reception notification should be sent
-        rma.reception_move_id.quantity_done = rma.product_uom_qty
+        rma.reception_move_id.quantity = rma.product_uom_qty
         rma.reception_move_id.picking_id.button_validate()
         mail_receipt = (
             self.env["mail.message"].search([("partner_ids", "in", self.partner.ids)])

odoo/addons/rma/views/res_config_settings_views.xml

@@ -5,154 +5,85 @@
         <field name="inherit_id" ref="stock.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath
-                expr="//div[@data-key='stock']/div[hasclass('o_settings_container')]"
+                expr="//block[@name='operations_setting_container']"
                 position="inside"
             >
-                <div class="col-12 col-lg-6 o_setting_box" title="Finish RMAs manually">
-                    <div class="o_setting_left_pane">
+                <setting
+                    title="Finish RMAs manually"
+                    help=" When the RMA is receive, allow to finsish it manually choosing a finalization reason."
+                >
                         <field name="group_rma_manual_finalization" />
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label
-                            for="group_rma_manual_finalization"
-                            string="RMA Manual Finalization"
-                        />
-                        <div class="text-muted">
-                            When the RMA is receive, allow to finsish it manually choosing
-                            a finalization reason.
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-lg-6 o_setting_box">
-                    <div class="o_setting_left_pane">
+                </setting>
+                <setting
+                    title="Values set here are company-specific."
+                    help="Group RMA returns by customer and warehouse."
+                >
                         <field name="rma_return_grouping" />
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="rma_return_grouping" />
-                        <span
-                            class="fa fa-lg fa-building-o"
-                            title="Values set here are company-specific."
-                            groups="base.group_multi_company"
-                        />
-                        <div class="text-muted">
-                            Group RMA returns by customer and warehouse.
-                        </div>
-                    </div>
-                </div>
-                <div
-                    class="col-12 col-lg-6 o_setting_box"
+                </setting>
+                <setting
                     title="Send automatic RMA info to customer"
+                    help="When the RMA is confirmed, send an automatic information email."
                 >
-                    <div class="o_setting_left_pane">
                         <field name="send_rma_confirmation" />
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label
-                            for="send_rma_confirmation"
-                            string="RMA Confirmation Email"
-                        />
-                        <span
-                            class="fa fa-lg fa-building-o"
-                            title="Values set here are company-specific."
-                            groups="base.group_multi_company"
-                        />
-                        <div class="text-muted">
-                            When the RMA is confirmed, send an automatic information email.
-                        </div>
-                        <div
-                            class="row mt16"
-                            attrs="{'invisible': [('send_rma_confirmation', '=', False)]}"
-                        >
+                        <div class="row mt16" invisible="not send_rma_confirmation">
                             <label
-                                for="rma_mail_confirmation_template_id"
-                                string="Email Template"
-                                class="col-lg-4 o_light_label"
-                            />
+                            for="rma_mail_confirmation_template_id"
+                            string="Email Template"
+                            class="col-lg-4 o_light_label"
+                        />
                             <field
-                                name="rma_mail_confirmation_template_id"
-                                class="oe_inline"
-                                attrs="{'required': [('send_rma_confirmation', '=', True)]}"
-                                context="{'default_model': 'rma'}"
-                            />
+                            name="rma_mail_confirmation_template_id"
+                            class="oe_inline"
+                            required="send_rma_confirmation"
+                            context="{'default_model': 'rma'}"
+                        />
                         </div>
-                    </div>
-                </div>
-                <div
-                    class="col-12 col-lg-6 o_setting_box"
+                </setting>
+                <setting
                     title="Send automatic RMA products reception notification to customer"
+                    help="When the RMA products are received, send an automatic information email."
                 >
-                    <div class="o_setting_left_pane">
                         <field name="send_rma_receipt_confirmation" />
-                    </div>
-                    <div class="o_setting_right_pane">
+                        <div
+                        class="row mt16"
+                        invisible="not send_rma_receipt_confirmation"
+                    >
                         <label
-                            for="send_rma_receipt_confirmation"
-                            string="RMA Receipt Confirmation Email"
+                            for="rma_mail_receipt_confirmation_template_id"
+                            string="Email Template"
+                            class="col-lg-4 o_light_label"
                         />
-                        <span
-                            class="fa fa-lg fa-building-o"
-                            title="Values set here are company-specific."
-                            groups="base.group_multi_company"
+
+                        <field
+                            name="rma_mail_receipt_confirmation_template_id"
+                            class="oe_inline"
+                            required="send_rma_receipt_confirmation"
+                            context="{'default_model': 'rma'}"
                         />
-                        <div class="text-muted">
-                            When the RMA products are received, send an automatic information email.
-                        </div>
-                        <div
-                            class="row mt16"
-                            attrs="{'invisible': [('send_rma_receipt_confirmation', '=', False)]}"
-                        >
-                            <label
-                                for="rma_mail_receipt_confirmation_template_id"
-                                string="Email Template"
-                                class="col-lg-4 o_light_label"
-                            />
-                            <field
-                                name="rma_mail_receipt_confirmation_template_id"
-                                class="oe_inline"
-                                attrs="{'required': [('send_rma_receipt_confirmation', '=', True)]}"
-                                context="{'default_model': 'rma'}"
-                            />
                         </div>
-                    </div>
-                </div>
-                <div
-                    class="col-12 col-lg-6 o_setting_box"
+                </setting>
+                <setting
                     title="Send automatic notification when the customer places an RMA"
+                    help="When customers themselves place an RMA from the portal, send an automatic notification acknowleging it."
                 >
-                    <div class="o_setting_left_pane">
                         <field name="send_rma_draft_confirmation" />
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label
-                            for="send_rma_draft_confirmation"
-                            string="RMA draft notification Email"
-                        />
-                        <span
-                            class="fa fa-lg fa-building-o"
-                            title="Values set here are company-specific."
-                            groups="base.group_multi_company"
-                        />
-                        <div class="text-muted">
-                            When customers themselves place an RMA from the portal, send an automatic notification acknowleging it.
-                        </div>
                         <div
-                            class="row mt16"
-                            attrs="{'invisible': [('send_rma_draft_confirmation', '=', False)]}"
-                        >
+                        class="row mt16"
+                        invisible="not send_rma_draft_confirmation"
+                    >
                             <label
-                                for="rma_mail_draft_confirmation_template_id"
-                                string="Email Template"
-                                class="col-lg-4 o_light_label"
-                            />
+                            for="rma_mail_draft_confirmation_template_id"
+                            string="Email Template"
+                            class="col-lg-4 o_light_label"
+                        />
                             <field
-                                name="rma_mail_draft_confirmation_template_id"
-                                class="oe_inline"
-                                attrs="{'required': [('send_rma_draft_confirmation', '=', True)]}"
-                                context="{'default_model': 'rma'}"
-                            />
+                            name="rma_mail_draft_confirmation_template_id"
+                            class="oe_inline"
+                            required="send_rma_draft_confirmation"
+                            context="{'default_model': 'rma'}"
+                        />
                         </div>
-                    </div>
-                </div>
+                </setting>
             </xpath>
         </field>
     </record>

odoo/addons/rma/views/res_partner_views.xml

@@ -14,7 +14,7 @@
                     type="object"
                     class="oe_stat_button"
                     icon="fa-reply"
-                    attrs="{'invisible': [('rma_count', '=', 0)]}"
+                    invisible="rma_count == 0"
                     groups="rma.rma_group_user_own"
                 >
                     <field name="rma_count" widget="statinfo" string="RMA" />

odoo/addons/rma/views/rma_finalization_views.xml

@@ -28,7 +28,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active"
                     />
                     <group>
                         <field name="name" />

odoo/addons/rma/views/rma_team_views.xml

@@ -10,7 +10,7 @@
                 <field name="name" />
                 <field name="user_id" />
                 <field name="company_id" groups="base.group_multi_company" />
-                <field name="company_id" invisible="1" />
+                <field name="company_id" column_invisible="1" />
             </tree>
         </field>
     </record>
@@ -81,11 +81,7 @@
                                 </kanban>
                             </field>
                         </page>
-                        <page
-                            name="emails"
-                            string="Email"
-                            attrs="{'invisible': [('alias_domain', '=', False)]}"
-                        >
+                        <page name="emails" string="Email" invisible="not alias_domain">
                             <group name="group_alias">
                                 <label for="alias_name" string="Email Alias" />
                                 <div name="alias_def">