diff --git a/rma_repair/__openerp__.py b/rma_repair/__openerp__.py
index 0a792d0a..839a4ade 100644
--- a/rma_repair/__openerp__.py
+++ b/rma_repair/__openerp__.py
@@ -8,7 +8,7 @@
     "license": "LGPL-3",
     "category": "RMA",
     "summary": "Links RMA with Repairs.",
-    "author": "Eficent",
+    "author": "Eficent, Odoo Community Association (OCA)",
     "website": "http://www.github.com/OCA/rma",
     "depends": ["rma_account", "mrp_repair_refurbish"],
     "data": ["views/rma_order_view.xml",
diff --git a/rma_repair/models/rma_order_line.py b/rma_repair/models/rma_order_line.py
index c88f2bb9..62f801c3 100644
--- a/rma_repair/models/rma_order_line.py
+++ b/rma_repair/models/rma_order_line.py
@@ -9,26 +9,26 @@ from openerp.addons import decimal_precision as dp
 class RmaOrderLine(models.Model):
     _inherit = "rma.order.line"
 
-    @api.one
     @api.depends('repair_ids', 'repair_type', 'repair_ids.state',
                  'qty_to_receive')
     def _compute_qty_to_repair(self):
-        if self.repair_type == 'no':
-            self.qty_to_repair = 0.0
-        elif self.repair_type == 'ordered':
-            qty = self._get_rma_repaired_qty()
-            self.qty_to_repair = self.product_qty - qty
-        elif self.repair_type == 'received':
-            qty = self._get_rma_repaired_qty()
-            self.qty_to_repair = self.qty_received - qty
-        else:
-            self.qty_to_repair = 0.0
+        for line in self:
+            if line.repair_type == 'no':
+                line.qty_to_repair = 0.0
+            elif line.repair_type == 'ordered':
+                qty = line._get_rma_repaired_qty()
+                line.qty_to_repair = line.product_qty - qty
+            elif line.repair_type == 'received':
+                qty = line._get_rma_repaired_qty()
+                line.qty_to_repair = line.qty_received - qty
+            else:
+                line.qty_to_repair = 0.0
 
-    @api.one
     @api.depends('repair_ids', 'repair_type', 'repair_ids.state',
                  'qty_to_receive')
     def _compute_qty_repaired(self):
-        self.qty_repaired = self._get_rma_repaired_qty()
+        for line in self:
+            line.qty_repaired = line._get_rma_repaired_qty()
 
     @api.multi
     def _compute_repair_count(self):
diff --git a/rma_repair/tests/__init__.py b/rma_repair/tests/__init__.py
new file mode 100644
index 00000000..dfa77946
--- /dev/null
+++ b/rma_repair/tests/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# © 2017 Eficent Business and IT Consulting Services S.L.
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
+from . import test_rma
+from . import test_supplier_rma
+from . import test_rma_dropship
diff --git a/rma_repair/tests/test_rma.py b/rma_repair/tests/test_rma.py
new file mode 100644
index 00000000..d7d88676
--- /dev/null
+++ b/rma_repair/tests/test_rma.py
@@ -0,0 +1,374 @@
+# -*- coding: utf-8 -*-
+# © 2017 Eficent Business and IT Consulting Services S.L.
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
+
+from openerp.tests import common
+
+
+class TestRma(common.TransactionCase):
+
+    """ Test the routes and the quantities """
+
+    def setUp(self):
+        super(TestRma, self).setUp()
+
+        self.rma_make_picking = self.env['rma_make_picking.wizard']
+        self.make_supplier_rma = self.env["rma.order.line.make.supplier.rma"]
+        self.rma_add_stock_move = self.env['rma_add_stock_move']
+        self.stockpicking = self.env['stock.picking']
+        self.rma = self.env['rma.order']
+        self.rma_line = self.env['rma.order.line']
+        self.rma_op = self.env['rma.operation']
+        self.rma_cust_replace_op_id = self.env.ref(
+            'rma.rma_operation_customer_replace')
+        self.rma_sup_replace_op_id = self.env.ref(
+            'rma.rma_operation_supplier_replace')
+        self.product_id = self.env.ref('product.product_product_4')
+        self.product_1 = self.env.ref('product.product_product_25')
+        self.product_2 = self.env.ref('product.product_product_30')
+        self.product_3 = self.env.ref('product.product_product_33')
+        self.uom_unit = self.env.ref('product.product_uom_unit')
+        # assign an operation
+        self.product_1.write(
+            {'rma_customer_operation_id': self.rma_cust_replace_op_id.id,
+             'rma_supplier_operation_id': self.rma_sup_replace_op_id.id})
+        self.product_2.write(
+            {'rma_customer_operation_id': self.rma_cust_replace_op_id.id,
+             'rma_supplier_operation_id': self.rma_sup_replace_op_id.id})
+        self.product_3.write(
+            {'rma_customer_operation_id': self.rma_cust_replace_op_id.id,
+             'rma_supplier_operation_id': self.rma_sup_replace_op_id.id})
+        self.partner_id = self.env.ref('base.res_partner_12')
+        self.stock_location = self.env.ref('stock.stock_location_stock')
+        self.stock_rma_location = self.env.ref('rma.location_rma')
+        self.customer_location = self.env.ref(
+            'stock.stock_location_customers')
+        self.supplier_location = self.env.ref(
+            'stock.stock_location_suppliers')
+        self.product_uom_id = self.env.ref('product.product_uom_unit')
+        products2move = [(self.product_1, 3), (self.product_2, 5),
+                         (self.product_3, 2)]
+        self.rma_customer_id = self._create_rma_from_move(
+            products2move, 'customer', self.env.ref('base.res_partner_2'),
+            dropship=False)
+
+    def _create_picking(self, partner):
+        return self.stockpicking.create({
+            'partner_id': partner.id,
+            'picking_type_id': self.env.ref('stock.picking_type_in').id,
+            'location_id': self.stock_location.id,
+            'location_dest_id': self.supplier_location.id
+            })
+
+    def _create_rma_from_move(self, products2move, type, partner, dropship,
+                              supplier_address_id=None):
+        picking_in = self._create_picking(partner)
+
+        moves = []
+        if type == 'customer':
+            for item in products2move:
+                move_values = self._prepare_move(
+                    item[0], item[1], self.stock_location,
+                    self.customer_location, picking_in)
+                moves.append(self.env['stock.move'].create(move_values))
+        else:
+            for item in products2move:
+                move_values = self._prepare_move(
+                    item[0], item[1], self.supplier_location,
+                    self.stock_rma_location, picking_in)
+                moves.append(self.env['stock.move'].create(move_values))
+        # Create the RMA from the stock_move
+        rma_id = self.rma.create(
+            {
+                'reference': '0001',
+                'type': type,
+                'partner_id': partner.id,
+                'company_id': self.env.ref('base.main_company').id
+            })
+        for move in moves:
+            if type == 'customer':
+                wizard = self.rma_add_stock_move.with_context(
+                    {'stock_move_id': move.id, 'customer': True,
+                     'active_ids': rma_id.id,
+                     'active_model': 'rma.order',
+                     }
+                ).create({})
+                data = wizard._prepare_rma_line_from_stock_move(move)
+                wizard.add_lines()
+            else:
+                wizard = self.rma_add_stock_move.with_context(
+                    {'stock_move_id': move.id, 'supplier': True,
+                     'active_ids': rma_id.id,
+                     'active_model': 'rma.order',
+                     }
+                ).create({})
+                data = wizard._prepare_rma_line_from_stock_move(move)
+                wizard.add_lines()
+            if dropship:
+                data.update(customer_to_supplier=dropship,
+                            supplier_address_id=supplier_address_id.id)
+            self.line = self.rma_line.create(data)
+            # approve the RMA Line
+            self.rma_line.action_rma_to_approve()
+            self.line.action_rma_approve()
+        rma_id._get_default_type()
+        rma_id._compute_in_shipment_count()
+        rma_id._compute_out_shipment_count()
+        rma_id._compute_supplier_line_count()
+        rma_id._compute_line_count()
+        rma_id.action_view_in_shipments()
+        rma_id.action_view_out_shipments()
+        rma_id.action_view_lines()
+
+        rma_id.partner_id.action_open_partner_rma()
+        rma_id.partner_id._compute_rma_line_count()
+        # approve the RMA
+#        rma_id.action_rma_to_approve()
+#        rma_id.action_rma_approve()
+        return rma_id
+
+    def _prepare_move(self, product, qty, src, dest, picking_in):
+        res = {
+            'partner_id': self.partner_id.id,
+            'product_id': product.id,
+            'name': product.partner_ref,
+            'state': 'confirmed',
+            'product_uom': self.product_uom_id.id or product.uom_id.id,
+            'product_uom_qty': qty,
+            'origin': 'Test RMA',
+            'location_id': src.id,
+            'location_dest_id': dest.id,
+            'picking_id': picking_in.id
+        }
+        return res
+
+    def test_rma_order_line(self):
+        for line in self.rma_customer_id.rma_line_ids:
+            line.with_context({'default_rma_id': line.rma_id.id
+                               })._default_warehouse_id()
+            line._default_location_id()
+            line.with_context({'partner_id': line.rma_id.partner_id.id
+                               })._default_delivery_address()
+            line._compute_in_shipment_count()
+            line._compute_out_shipment_count()
+            line._compute_procurement_count()
+
+            data = {'reference_move_id': line.reference_move_id.id}
+            new_line = self.rma_line.new(data)
+            new_line._onchange_reference_move_id()
+
+            line.action_rma_to_approve()
+            line.action_rma_draft()
+            line.action_rma_done()
+
+            data = {'product_id': line.product_id.id}
+            new_line = self.rma_line.new(data)
+            new_line._onchange_product_id()
+
+            data = {'operation_id': line.operation_id.id}
+            new_line = self.rma_line.new(data)
+            new_line._onchange_operation_id()
+
+            data = {'customer_to_supplier': line.customer_to_supplier}
+            new_line = self.rma_line.new(data)
+            new_line._onchange_receipt_policy()
+
+            data = {'lot_id': line.lot_id.id}
+            new_line = self.rma_line.new(data)
+            new_line._onchange_lot_id()
+
+            line.action_view_in_shipments()
+            line.action_view_out_shipments()
+            line.action_view_procurements()
+
+        self.rma_customer_id.action_view_supplier_lines()
+
+    def test_rma_order_line_make_repair_wizard(self):
+        self.rma_line_repair_item = self.env['rma.order.line.make.repair.item']
+        self.rma_line_repair = self.env['rma.order.line.make.repair']
+
+        self.product_id.income =\
+            self.env.ref('account.data_account_type_receivable').id
+        self.product_id.expense =\
+            self.env.ref('account.data_account_type_expenses').id
+        location_id = self.env.ref('stock.stock_location_stock')
+        location_dest_id = self.env.ref('stock.stock_location_customers')
+
+        self.product_id.write({'refurbish_product_id': self.product_1.id})
+
+        repair_id = self.rma_line_repair.with_context({
+            'active_ids': self.rma_customer_id.rma_line_ids.ids,
+            'active_model': 'rma.order.line',
+            'active_id': 1
+        }).create({'item_ids': [(0, 0, {
+            'line_id': self.rma_customer_id.rma_line_ids[0].id,
+            'rma_id': self.rma_customer_id.id,
+            'product_id': self.product_id.id,
+            'name': 'Test RMA Refund',
+            'product_qty': self.rma_customer_id.rma_line_ids[0].product_qty,
+            'invoice_method': 'after_repair',
+            'location_id': location_id.id,
+            'location_dest_id': location_dest_id.id,
+            'refurbish_product_id': self.product_1.id,
+            'to_refurbish': True
+            })]})
+        repair_id.default_get([str(repair_id.item_ids)])
+        repair_id.make_repair_order()
+
+        data = {'to_refurbish': True}
+        new_line = self.rma_line_repair_item.new(data)
+        new_line._onchange_to_refurbish()
+
+        self.rma_customer_id._compute_repair_count()
+        self.rma_customer_id.action_view_repair_order()
+        for line in self.rma_customer_id.rma_line_ids:
+            line.refund_policy = 'ordered'
+            line._compute_qty_to_repair()
+            line._compute_qty_repaired()
+            line._compute_repair_count()
+            line.action_view_repair_order()
+
+    def test_customer_rma(self):
+        wizard = self.rma_make_picking.with_context({
+            'active_ids': self.rma_customer_id.rma_line_ids.ids,
+            'active_model': 'rma.order.line',
+            'picking_type': 'incoming',
+            'active_id': 1
+        }).create({})
+        procurements = wizard._create_picking()
+        group_ids = set([proc.group_id.id for proc in procurements if
+                         proc.group_id])
+        domain = [('group_id', 'in', list(group_ids))]
+        picking = self.stockpicking.search(domain)
+        self.assertEquals(len(picking), 1,
+                          "Incorrect number of pickings created")
+        moves = picking.move_lines
+        self.assertEquals(len(moves), 3,
+                          "Incorrect number of moves created")
+        for line in self.rma_customer_id.rma_line_ids:
+            # common qtys for all products
+            self.assertEquals(line.qty_received, 0,
+                              "Wrong qty received")
+            self.assertEquals(line.qty_to_deliver, 0,
+                              "Wrong qty to deliver")
+            self.assertEquals(line.qty_outgoing, 0,
+                              "Wrong qty outgoing")
+            self.assertEquals(line.qty_delivered, 0,
+                              "Wrong qty delivered")
+            # product specific
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_to_receive, 3,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_incoming, 3,
+                                  "Wrong qty incoming")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_to_receive, 5,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_incoming, 5,
+                                  "Wrong qty incoming")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_to_receive, 2,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_incoming, 2,
+                                  "Wrong qty incoming")
+        picking.action_assign()
+        picking.do_transfer()
+        for line in self.rma_customer_id.rma_line_ids:
+            self.assertEquals(line.qty_to_receive, 0,
+                              "Wrong qty to_receive")
+            self.assertEquals(line.qty_incoming, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_outgoing, 0,
+                              "Wrong qty outgoing")
+            self.assertEquals(line.qty_delivered, 0,
+                              "Wrong qty delivered")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_received, 3,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_to_deliver, 3,
+                                  "Wrong qty to_deliver")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_received, 5,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_to_deliver, 5,
+                                  "Wrong qty to_deliver")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_received, 2,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_to_deliver, 2,
+                                  "Wrong qty to_deliver")
+
+        wizard = self.rma_make_picking.with_context({
+            'active_id': 1,
+            'active_ids': self.rma_customer_id.rma_line_ids.ids,
+            'active_model': 'rma.order.line',
+            'picking_type': 'outgoing',
+        }).create({})
+        procurements = wizard._create_picking()
+        group_ids = set([proc.group_id.id for proc in procurements if
+                         proc.group_id])
+        domain = [('group_id', 'in', list(group_ids))]
+        pickings = self.stockpicking.search(domain)
+        self.assertEquals(len(pickings), 2,
+                          "Incorrect number of pickings created")
+        picking_out = pickings[1]
+        moves = picking_out.move_lines
+        self.assertEquals(len(moves), 3,
+                          "Incorrect number of moves created")
+        for line in self.rma_customer_id.rma_line_ids:
+            self.assertEquals(line.qty_to_receive, 0,
+                              "Wrong qty to receive")
+            self.assertEquals(line.qty_incoming, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_delivered, 0,
+                              "Wrong qty delivered")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_to_deliver, 3,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_outgoing, 3,
+                                  "Wrong qty outgoing")
+                self.assertEquals(line.qty_received, 3,
+                                  "Wrong qty received")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_received, 5,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_to_deliver, 5,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_outgoing, 5,
+                                  "Wrong qty outgoing")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_received, 2,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_to_deliver, 2,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_outgoing, 2,
+                                  "Wrong qty outgoing")
+        picking_out.action_assign()
+        picking_out.do_transfer()
+        for line in self.rma_customer_id.rma_line_ids:
+            self.assertEquals(line.qty_to_receive, 0,
+                              "Wrong qty to receive")
+            self.assertEquals(line.qty_incoming, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_to_deliver, 0,
+                              "Wrong qty to deliver")
+            self.assertEquals(line.qty_outgoing, 0,
+                              "Wrong qty outgoing")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_received, 3,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_delivered, 3,
+                                  "Wrong qty delivered")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_received, 5,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_delivered, 5,
+                                  "Wrong qty delivered")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_received, 2,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_delivered, 2,
+                                  "Wrong qty delivered")
+            self.line.action_rma_done()
+            self.assertEquals(self.line.state, 'done',
+                              "Wrong State")
diff --git a/rma_repair/tests/test_rma_dropship.py b/rma_repair/tests/test_rma_dropship.py
new file mode 100644
index 00000000..9c99a538
--- /dev/null
+++ b/rma_repair/tests/test_rma_dropship.py
@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+# © 2017 Eficent Business and IT Consulting Services S.L.
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
+
+from . import test_rma
+
+
+class TestRmaDropship(test_rma.TestRma):
+
+    def setUp(self):
+        super(TestRmaDropship, self).setUp()
+        products2move = [(self.product_1, 3), (self.product_2, 5),
+                         (self.product_3, 2)]
+        self.rma_droship_id = self._create_rma_from_move(
+            products2move, 'customer', self.env.ref('base.res_partner_2'),
+            dropship=True,
+            supplier_address_id=self.env.ref('base.res_partner_3'))
+
+    def test_dropship(self):
+        wizard = self.make_supplier_rma.with_context({
+            'active_ids': self.rma_droship_id.rma_line_ids.ids,
+            'active_model': 'rma.order.line',
+            'active_id': 1
+        }).create({})
+        res = wizard.make_supplier_rma()
+        supplier_rma = self.rma.browse(res['res_id'])
+        for line in supplier_rma.rma_line_ids:
+            line.action_rma_to_approve()
+            line.action_rma_approve()
+        wizard = self.rma_make_picking.with_context({
+            'active_id': 1,
+            'active_ids': supplier_rma.rma_line_ids.ids,
+            'active_model': 'rma.order.line',
+            'picking_type': 'incoming',
+        }).create({})
+        procurements = wizard._create_picking()
+        group_ids = set([proc.group_id.id for proc in procurements if
+                         proc.group_id])
+        domain = [('group_id', 'in', list(group_ids))]
+        picking = self.stockpicking.search(domain)
+        self.assertEquals(len(picking), 1,
+                          "Incorrect number of pickings created")
+        moves = picking.move_lines
+        self.assertEquals(len(moves), 3,
+                          "Incorrect number of moves created")
+        for line in supplier_rma.rma_line_ids:
+            # common qtys for all products
+            self.assertEquals(line.qty_received, 0,
+                              "Wrong qty received")
+            self.assertEquals(line.qty_outgoing, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_delivered, 0,
+                              "Wrong qty delivered")
+            # product specific
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_to_receive, 3,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_to_deliver, 3,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_incoming, 3,
+                                  "Wrong qty outgoing")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_to_receive, 5,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_to_deliver, 5,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_incoming, 5,
+                                  "Wrong qty outgoing")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_to_receive, 2,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_to_deliver, 2,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_incoming, 2,
+                                  "Wrong qty outgoing")
+
+        for line in self.rma_droship_id.rma_line_ids:
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_to_supplier_rma, 0,
+                                  "Wrong qty to supplier rma")
+                self.assertEquals(line.qty_in_supplier_rma, 3,
+                                  "Wrong qty in supplier rma")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_to_supplier_rma, 0,
+                                  "Wrong qty to supplier rma")
+                self.assertEquals(line.qty_in_supplier_rma, 5,
+                                  "Wrong qty in supplier rma")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_to_supplier_rma, 0,
+                                  "Wrong qty to supplier rma")
+                self.assertEquals(line.qty_in_supplier_rma, 2,
+                                  "Wrong qty in supplier rma")
+        for line in self.rma_droship_id.rma_line_ids:
+            line.action_rma_done()
+            self.assertEquals(line.state, 'done',
+                              "Wrong State")
diff --git a/rma_repair/tests/test_supplier_rma.py b/rma_repair/tests/test_supplier_rma.py
new file mode 100644
index 00000000..8aa24518
--- /dev/null
+++ b/rma_repair/tests/test_supplier_rma.py
@@ -0,0 +1,156 @@
+# -*- coding: utf-8 -*-
+# © 2017 Eficent Business and IT Consulting Services S.L.
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
+
+from . import test_rma
+
+
+class TestSupplierRma(test_rma.TestRma):
+
+    def setUp(self):
+        super(TestSupplierRma, self).setUp()
+        products2move = [(self.product_1, 3), (self.product_2, 5),
+                         (self.product_3, 2)]
+        self.rma_supplier_id = self._create_rma_from_move(
+            products2move, 'supplier', self.env.ref('base.res_partner_1'),
+            dropship=False)
+
+    def test_supplier_rma(self):
+        wizard = self.rma_make_picking.with_context({
+            'active_ids': self.rma_supplier_id.rma_line_ids.ids,
+            'active_model': 'rma.order.line',
+            'picking_type': 'outgoing',
+            'active_id': 1
+        }).create({})
+        procurements = wizard._create_picking()
+        group_ids = set([proc.group_id.id for proc in procurements if
+                         proc.group_id])
+        domain = [('group_id', 'in', list(group_ids))]
+        picking = self.stockpicking.search(domain)
+        self.assertEquals(len(picking), 1,
+                          "Incorrect number of pickings created")
+        moves = picking.move_lines
+        self.assertEquals(len(moves), 3,
+                          "Incorrect number of moves created")
+        for line in self.rma_supplier_id.rma_line_ids:
+            # common qtys for all products
+            self.assertEquals(line.qty_received, 0,
+                              "Wrong qty received")
+            self.assertEquals(line.qty_incoming, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_delivered, 0,
+                              "Wrong qty delivered")
+            # product specific
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_to_receive, 3,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_to_deliver, 3,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_outgoing, 3,
+                                  "Wrong qty outgoing")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_to_receive, 5,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_to_deliver, 5,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_outgoing, 5,
+                                  "Wrong qty outgoing")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_to_receive, 2,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_to_deliver, 2,
+                                  "Wrong qty to deliver")
+                self.assertEquals(line.qty_outgoing, 2,
+                                  "Wrong qty outgoing")
+
+        picking.action_assign()
+        picking.do_transfer()
+        for line in self.rma_supplier_id.rma_line_ids:
+            self.assertEquals(line.qty_incoming, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_received, 0,
+                              "Wrong qty received")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_delivered, 3,
+                                  "Wrong qty delivered")
+                self.assertEquals(line.qty_to_receive, 3,
+                                  "Wrong qty to receive")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_outgoing, 5,
+                                  "Wrong qty delivered")
+                self.assertEquals(line.qty_to_receive, 5,
+                                  "Wrong qty to receive")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_outgoing, 2,
+                                  "Wrong qty delivered")
+                self.assertEquals(line.qty_to_receive, 2,
+                                  "Wrong qty to receive")
+        wizard = self.rma_make_picking.with_context({
+            'active_id': 1,
+            'active_ids': self.rma_supplier_id.rma_line_ids.ids,
+            'active_model': 'rma.order.line',
+            'picking_type': 'incoming',
+        }).create({})
+        procurements = wizard._create_picking()
+        group_ids = set([proc.group_id.id for proc in procurements if
+                         proc.group_id])
+        domain = [('group_id', 'in', list(group_ids))]
+        pickings = self.stockpicking.search(domain)
+        self.assertEquals(len(pickings), 3,
+                          "Incorrect number of pickings created")
+        picking_out = pickings[0]
+        moves = picking_out.move_lines
+        self.assertEquals(len(moves), 2,
+                          "Incorrect number of moves created")
+        for line in self.rma_supplier_id.rma_line_ids:
+            self.assertEquals(line.qty_incoming, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_received, 0,
+                              "Wrong qty received")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_to_receive, 3,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_incoming, 0,
+                                  "Wrong qty incoming")
+                self.assertEquals(line.qty_delivered, 3,
+                                  "Wrong qty delivered")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_to_receive, 5,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_to_deliver, 5,
+                                  "Wrong qty to deliver")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_to_receive, 2,
+                                  "Wrong qty to receive")
+                self.assertEquals(line.qty_to_deliver, 2,
+                                  "Wrong qty to deliver")
+        picking_out.action_assign()
+        picking_out.do_transfer()
+        for line in self.rma_supplier_id.rma_line_ids[0]:
+            self.assertEquals(line.qty_to_receive, 3,
+                              "Wrong qty to receive")
+            self.assertEquals(line.qty_incoming, 0,
+                              "Wrong qty incoming")
+            self.assertEquals(line.qty_to_deliver, 0,
+                              "Wrong qty to deliver")
+            self.assertEquals(line.qty_outgoing, 3,
+                              "Wrong qty outgoing")
+            if line.product_id == self.product_1:
+                self.assertEquals(line.qty_received, 0,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_delivered, 3,
+                                  "Wrong qty delivered")
+            if line.product_id == self.product_2:
+                self.assertEquals(line.qty_received, 0,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_delivered, 5,
+                                  "Wrong qty delivered")
+            if line.product_id == self.product_3:
+                self.assertEquals(line.qty_received, 2,
+                                  "Wrong qty received")
+                self.assertEquals(line.qty_delivered, 2,
+                                  "Wrong qty delivered")
+        for line in self.rma_supplier_id.rma_line_ids:
+            line.action_rma_done()
+            self.assertEquals(line.state, 'done',
+                              "Wrong State")