From 99bd47ccf96e779b9cf5f7565fd888e1320f11e1 Mon Sep 17 00:00:00 2001
From: Jasmin Solanki <jasmin.solanki@forgeflow.com>
Date: Fri, 7 Jan 2022 16:37:52 +0530
Subject: [PATCH] [MIG] rma: Migration to 15.0

---
 rma/__manifest__.py             |  5 ++---
 rma/models/rma_order.py         | 27 +++++++++----------------
 rma/report/rma_report.xml       | 36 ++++++++++++++++++---------------
 rma/tests/test_rma.py           |  4 ++--
 rma/wizards/rma_make_picking.py |  2 +-
 5 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 545b1b5e..1051a70c 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,11 +3,10 @@
 
 {
     "name": "RMA (Return Merchandise Authorization)",
-    "version": "14.0.1.0.0",
+    "version": "15.0.1.0.0",
     "license": "LGPL-3",
     "category": "RMA",
-    "summary": "Introduces the return merchandise authorization (RMA) process "
-    "in odoo",
+    "summary": "Introduces the return merchandise authorization (RMA) process in odoo",
     "author": "ForgeFlow",
     "website": "https://github.com/ForgeFlow/stock-rma",
     "depends": ["stock", "mail", "web"],
diff --git a/rma/models/rma_order.py b/rma/models/rma_order.py
index 0439ac06..db17e0d7 100644
--- a/rma/models/rma_order.py
+++ b/rma/models/rma_order.py
@@ -266,29 +266,20 @@ class RmaOrder(models.Model):
     @api.onchange("in_warehouse_id")
     def _onchange_in_warehouse_id(self):
         if self.in_warehouse_id and self.rma_line_ids:
-            self.rma_line_ids.write(
-                {
-                    "in_warehouse_id": self.in_warehouse_id.id,
-                    "location_id": self.in_warehouse_id.lot_rma_id.id,
-                }
-            )
+            for rma_line in self.rma_line_ids:
+                rma_line.in_warehouse_id = self.in_warehouse_id.id
+                rma_line.location_id = self.in_warehouse_id.lot_rma_id.id
 
     @api.onchange("customer_to_supplier", "supplier_address_id")
     def _onchange_customer_to_supplier(self):
         if self.type == "customer" and self.rma_line_ids:
-            self.rma_line_ids.write(
-                {
-                    "customer_to_supplier": self.customer_to_supplier,
-                    "supplier_address_id": self.supplier_address_id.id,
-                }
-            )
+            for rma_line in self.rma_line_ids:
+                rma_line.customer_to_supplier = self.customer_to_supplier
+                rma_line.supplier_address_id = self.supplier_address_id.id
 
     @api.onchange("supplier_to_customer", "customer_address_id")
     def _onchange_supplier_to_customer(self):
         if self.type == "supplier" and self.rma_line_ids:
-            self.rma_line_ids.write(
-                {
-                    "supplier_to_customer": self.supplier_to_customer,
-                    "customer_address_id": self.customer_address_id.id,
-                }
-            )
+            for rma_line in self.rma_line_ids:
+                rma_line.supplier_to_customer = self.supplier_to_customer
+                rma_line.customer_address_id = self.customer_address_id.id
diff --git a/rma/report/rma_report.xml b/rma/report/rma_report.xml
index 531fb5cb..a9717720 100644
--- a/rma/report/rma_report.xml
+++ b/rma/report/rma_report.xml
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <data>
-        <report
-            id="rma_order_line_report"
-            string="RMA"
-            model="rma.order.line"
-            report_type="qweb-pdf"
-            file="rma.report_rma_order_line"
-            name="rma.report_rma_order_line"
-        />
-        <report
-            id="rma_order_report"
-            string="RMA Group"
-            model="rma.order"
-            report_type="qweb-pdf"
-            file="rma.report_rma_order"
-            name="rma.report_rma_order"
-        />
+        <record id="rma_order_line_report" model="ir.actions.report">
+            <field name="name">RMA</field>
+            <field name="model">rma.order.line</field>
+            <field name="report_type">qweb-pdf</field>
+            <field name="report_name">rma.report_rma_order_line</field>
+            <field name="report_file">rma.report_rma_order_line</field>
+            <field name="print_report_name">('RMA - %s' % (object.name))</field>
+            <field name="binding_model_id" ref="model_rma_order_line" />
+            <field name="binding_type">report</field>
+        </record>
+        <record id="rma_order_report" model="ir.actions.report">
+            <field name="name">RMA Group</field>
+            <field name="model">rma.order</field>
+            <field name="report_type">qweb-pdf</field>
+            <field name="report_name">rma.report_rma_order</field>
+            <field name="report_file">rma.report_rma_order</field>
+            <field name="print_report_name">('RMA Group - %s' % (object.name))</field>
+            <field name="binding_model_id" ref="model_rma_order" />
+            <field name="binding_type">report</field>
+        </record>
     </data>
 </odoo>
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index f4a17f17..f69b7173 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -5,7 +5,7 @@ from odoo.exceptions import ValidationError
 from odoo.tests import common
 
 
-class TestRma(common.SavepointCase):
+class TestRma(common.TransactionCase):
     """ Test the routes and the quantities """
 
     @classmethod
@@ -245,7 +245,7 @@ class TestRma(common.SavepointCase):
             )
             self.assertEqual(line.origin, line.reference_move_id.picking_id.name)
             self.assertEqual(
-                line.delivery_address_id, line.reference_move_id.picking_partner_id
+                line.delivery_address_id, line.reference_move_id.picking_id.partner_id
             )
             self.assertEqual(
                 line.qty_to_receive, line.reference_move_id.product_uom_qty
diff --git a/rma/wizards/rma_make_picking.py b/rma/wizards/rma_make_picking.py
index 0bb780d3..83512014 100644
--- a/rma/wizards/rma_make_picking.py
+++ b/rma/wizards/rma_make_picking.py
@@ -166,7 +166,7 @@ class RmaMakePicking(models.TransientModel):
             procurements.append(procurement)
             self.env["procurement.group"].run(procurements)
         except UserError as error:
-            errors.append(error.name)
+            errors.append(error.args[0])
         if errors:
             raise UserError("\n".join(errors))
         return procurements