diff --git a/rma/models/rma_order_line.py b/rma/models/rma_order_line.py
index 78e60dee..454af5cc 100644
--- a/rma/models/rma_order_line.py
+++ b/rma/models/rma_order_line.py
@@ -46,16 +46,18 @@ class RmaOrderLine(models.Model):
     @api.multi
     def _compute_in_shipment_count(self):
         for line in self:
-            line.in_shipment_count = len(self.env['stock.picking'].search(
-                [('origin', '=', line.name),
-                 ('picking_type_code', '=', 'incoming')]).ids)
+            moves = self.env['stock.move'].search([
+                ('rma_line_id', '=', line.id)])
+            line.in_shipment_count = len(moves.mapped('picking_id').filtered(
+                lambda p: p.picking_type_code == 'incoming').ids)
 
     @api.multi
     def _compute_out_shipment_count(self):
         for line in self:
-            line.out_shipment_count = len(self.env['stock.picking'].search(
-                [('origin', '=', line.name),
-                 ('picking_type_code', '=', 'outgoing')]).ids)
+            moves = self.env['stock.move'].search([
+                ('rma_line_id', '=', line.id)])
+            line.out_shipment_count = len(moves.mapped('picking_id').filtered(
+                lambda p: p.picking_type_code == 'outgoing').ids)
 
     @api.multi
     def _get_rma_move_qty(self, states, direction='in'):
diff --git a/rma/views/product_view.xml b/rma/views/product_view.xml
index aeb6da9d..a2810600 100755
--- a/rma/views/product_view.xml
+++ b/rma/views/product_view.xml
@@ -3,13 +3,16 @@
     <record id="product_category_form_view" model="ir.ui.view">
         <field name="name">product.category.form</field>
         <field name="model">product.category</field>
-        <field name="inherit_id" ref="product.product_category_form_view" />
+        <field name="inherit_id" ref="stock.product_category_form_view_inherit"/>
         <field name="arch" type="xml">
-            <field name="parent_id" position="after">
+            <field name="removal_strategy_id" position="after">
                 <group name="rma">
-                    <field name="rma_approval_policy" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
-                    <field name="rma_customer_operation_id" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
-                    <field name="rma_supplier_operation_id" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
+                    <field name="rma_approval_policy"
+                           groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
+                    <field name="rma_customer_operation_id"
+                           groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
+                    <field name="rma_supplier_operation_id"
+                           groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
                 </group>
             </field>
         </field>
@@ -20,11 +23,13 @@
         <field name="model">product.template</field>
         <field name="inherit_id" ref="product.product_template_form_view"/>
         <field name="arch" type="xml">
-             <group name="inventory" position="inside">
+            <group name="inventory" position="inside">
                 <group name="rma" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user">
                     <field name="rma_approval_policy"/>
-                    <field name="rma_customer_operation_id" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
-                    <field name="rma_supplier_operation_id" groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
+                    <field name="rma_customer_operation_id"
+                           groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
+                    <field name="rma_supplier_operation_id"
+                           groups="rma.group_rma_customer_user,rma.group_rma_supplier_user"/>
                 </group>
             </group>
         </field>
diff --git a/rma/wizards/rma_make_picking_view.xml b/rma/wizards/rma_make_picking_view.xml
index 126bf191..61bd41de 100755
--- a/rma/wizards/rma_make_picking_view.xml
+++ b/rma/wizards/rma_make_picking_view.xml
@@ -61,26 +61,26 @@
         <field name="name">Create Incoming Shipment</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">rma_make_picking.wizard</field>
-        <field name="src_model">rma.order.line</field>
         <field name="view_type">form</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
         <field name="view_id" ref="view_rma_picking"/>
         <field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]"/>
         <field name="context">{'picking_type': 'incoming'}</field>
+        <field name="binding_model_id" ref="rma.model_rma_order_line"/>
     </record>
 
     <record id="action_rma_picking_out" model="ir.actions.act_window">
         <field name="name">Create Delivery</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">rma_make_picking.wizard</field>
-        <field name="src_model">rma.order.line</field>
         <field name="view_type">form</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
         <field name="view_id" ref="view_rma_picking_out"/>
         <field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]"/>
         <field name="context">{'picking_type': 'outgoing'}</field>
+        <field name="binding_model_id" ref="rma.model_rma_order_line"/>
     </record>
 
     <record id="view_rma_line_button_form" model="ir.ui.view">
diff --git a/rma/wizards/rma_order_line_make_supplier_rma_view.xml b/rma/wizards/rma_order_line_make_supplier_rma_view.xml
index 1129702f..1ba47921 100755
--- a/rma/wizards/rma_order_line_make_supplier_rma_view.xml
+++ b/rma/wizards/rma_order_line_make_supplier_rma_view.xml
@@ -56,29 +56,20 @@
         <field name="view_mode">form</field>
         <field name="view_id" ref="view_rma_order_line_make_supplier_rma"/>
         <field name="target">new</field>
+        <field name="binding_model_id" ref="rma.model_rma_order_line"/>
     </record>
 
-    <!--record model="ir.values" id="rma_order_line_make_supplier_rma">
-        <field name="model_id" ref="model_rma_order_line" />
-        <field name="name">Create Supplier RMA Group</field>
-        <field name="key2">client_action_multi</field>
-        <field name="value"
-               eval="'ir.actions.act_window,' + str(ref('action_rma_order_line_make_supplier_rma'))" />
-        <field name="key">action</field>
-        <field name="model">rma.order.line</field>
-    </record-->
-
-     <record id="view_rma_line_supplier_rma_button_form" model="ir.ui.view">
-        <field name="name">rma.order.line.supplier.rma.form</field>
-        <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_form"/>
-        <field name="arch" type="xml">
-            <header position="inside">
-                <button name="%(action_rma_order_line_make_supplier_rma)d"
-                        states="approved"
-                        string="Create Supplier RMA Group" class="oe_highlight"
-                        type="action"/>
-            </header>
-        </field>
+    <record id="view_rma_line_supplier_rma_button_form" model="ir.ui.view">
+    <field name="name">rma.order.line.supplier.rma.form</field>
+    <field name="model">rma.order.line</field>
+    <field name="inherit_id" ref="rma.view_rma_line_form"/>
+    <field name="arch" type="xml">
+        <header position="inside">
+            <button name="%(action_rma_order_line_make_supplier_rma)d"
+                    states="approved"
+                    string="Create Supplier RMA Group" class="oe_highlight"
+                    type="action"/>
+        </header>
+    </field>
     </record>
 </odoo>