diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 00222223..e3b5f098 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Hibou RMAs',
-    'version': '11.0.1.0.0',
+    'version': '12.0.1.0.0',
     'category': 'Warehouse',
     'author': "Hibou Corp.",
     'license': 'AGPL-3',
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 15616885..bb401a7b 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -446,7 +446,7 @@ class RMALine(models.Model):
 
     rma_id = fields.Many2one('rma.rma', string='RMA')
     product_id = fields.Many2one('product.product', 'Product')
-    product_uom_id = fields.Many2one('product.uom', 'UOM')
+    product_uom_id = fields.Many2one('uom.uom', 'UOM')
     product_uom_qty = fields.Float(string='QTY')
     rma_template_usage = fields.Selection(related='rma_id.template_usage')
 
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 708c3500..b10bd343 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -102,9 +102,15 @@ class TestRMA(common.TransactionCase):
             'product_qty': 1.0,
         })
 
-        adj.action_done()
+        adj._action_done()
         self.assertEqual(self.product1.qty_available, 1.0)
         self.assertTrue(lot.quant_ids)
+        # Test some internals in Odoo 12.0
+        lot_internal_quants = lot.quant_ids.filtered(lambda q: q.location_id.usage in ['internal', 'transit'])
+        self.assertEqual(len(lot_internal_quants), 1)
+        self.assertEqual(lot_internal_quants.mapped('quantity'), [1.0])
+        # Re-compute qty as it does not depend on anything.
+        lot._product_qty()
         self.assertEqual(lot.product_qty, 1.0)
 
         # Create initial picking that will be returned by RMA
@@ -154,7 +160,7 @@ class TestRMA(common.TransactionCase):
         picking_out.move_line_ids.write({
             'qty_done': 1.0,
         })
-        picking_out.do_transfer()
+        picking_out.button_validate()
         self.assertEqual(picking_out.state, 'done')
 
         # Now we can 'return' that picking
@@ -172,10 +178,10 @@ class TestRMA(common.TransactionCase):
         pack_opt.qty_done = 1.0
         with self.assertRaises(UserError):
             # require a lot
-            rma.in_picking_id.do_transfer()
+            rma.in_picking_id.button_validate()
 
         pack_opt.lot_id = lot
-        rma.in_picking_id.do_transfer()
+        rma.in_picking_id.button_validate()
         rma.action_done()
 
         # Ensure that the same lot was in fact returned into our destination inventory
@@ -206,7 +212,7 @@ class TestRMA(common.TransactionCase):
         # Requires Lot
         with self.assertRaises(UserError):
             rma2.in_picking_id.move_line_ids.write({'qty_done': 1.0})
-            rma2.in_picking_id.do_transfer()
+            rma2.in_picking_id.button_validate()
 
         # Assign existing lot
         rma2.in_picking_id.move_line_ids.write({
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index 08ff002c..31b31b7f 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -125,7 +125,7 @@
     </record>
 
     <record id="view_rma_rma_search" model="ir.ui.view">
-        <field name="name">rma.rma.tree</field>
+        <field name="name">rma.rma.search</field>
         <field name="model">rma.rma</field>
         <field name="arch" type="xml">
             <search string="Search RMA">
@@ -138,8 +138,8 @@
                 <filter string="Confirmed" name="confirmed" domain="[('state', '=', 'confirmed')]"/>
                 <filter string="Expired" name="expired" domain="[('validity_date', '!=', False),('validity_date', '&lt;', datetime.datetime.now())]"/>
                 <group expand="0" name="group_by" string="Group By">
-                    <filter string="State" domain="[]" context="{'group_by': 'state'}"/>
-                    <filter string="Template" domain="[]" context="{'group_by': 'Template'}"/>
+                    <filter name="group_state" string="State" domain="[]" context="{'group_by': 'state'}"/>
+                    <filter name="group_template" string="Template" domain="[]" context="{'group_by': 'template_id'}"/>
                 </group>
             </search>
         </field>
diff --git a/rma/wizard/rma_lines.py b/rma/wizard/rma_lines.py
index c4ca8768..9232a3e7 100644
--- a/rma/wizard/rma_lines.py
+++ b/rma/wizard/rma_lines.py
@@ -19,8 +19,8 @@ class RMAPickingMakeLines(models.TransientModel):
         return {
             'rma_make_lines_id': self.id,
             'product_id': move.product_id.id,
-            'qty_ordered': move.ordered_qty,
-            'qty_delivered': move.product_uom_qty,
+            'qty_ordered': move.product_uom_qty,
+            'qty_delivered': move.product_qty,
             'product_uom_qty': 0.0,
             'product_uom_id': move.product_uom.id,
         }
@@ -54,4 +54,4 @@ class RMAPickingMakeLinesLine(models.TransientModel):
     qty_ordered = fields.Float(string='Ordered')
     qty_delivered = fields.Float(string='Delivered')
     product_uom_qty = fields.Float(string='QTY')
-    product_uom_id = fields.Many2one('product.uom', 'UOM')
+    product_uom_id = fields.Many2one('uom.uom', 'UOM')