diff --git a/crm_claim_rma/crm_claim_rma.py b/crm_claim_rma/crm_claim_rma.py
index bf9cefbc..c11c9e21 100644
--- a/crm_claim_rma/crm_claim_rma.py
+++ b/crm_claim_rma/crm_claim_rma.py
@@ -254,6 +254,16 @@ class claim_line(orm.Model):
             context=context)
         return True
 
+    def auto_set_warranty(self, cr, uid, ids, context):
+        """ For each line, if the user has not himself pressed 
+        on 'calculate warranty state', it sets warranty"""
+        if context is None:
+            context = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            if not line.warning:
+                self.set_warranty(cr, uid, [line.id], context=context)
+        return True
+
     def get_destination_location(self, cr, uid, product_id,
                                  warehouse_id, context=None):
         """Compute and return the destination location ID to take
diff --git a/crm_claim_rma/wizard/claim_make_picking.py b/crm_claim_rma/wizard/claim_make_picking.py
index e8ee5343..c2f3ad7a 100644
--- a/crm_claim_rma/wizard/claim_make_picking.py
+++ b/crm_claim_rma/wizard/claim_make_picking.py
@@ -106,17 +106,6 @@ class claim_make_picking(orm.TransientModel):
             loc_id = line_location[0]
         return loc_id
 
-    def _auto_set_warranty(self, cr, uid, line_ids, context):
-        """ For each line, if the user has not himself pressed 
-        on 'calculate warranty state', it sets warranty"""
-        if context is None:
-            context = {}
-        line_obj = self.pool.get('claim.line')
-        for line in line_obj.browse(cr, uid, line_ids, context=context):
-            if not line.warning:
-                line_obj.set_warranty(cr, uid, [line.id], context=context)
-        return True
-
     def _get_common_partner_from_line(self, cr, uid, line_ids, context):
         """Return the ID of the common partner between all lines. If no common
         partner was found, return False"""
@@ -205,7 +194,9 @@ class claim_make_picking(orm.TransientModel):
                     _('A product return cannot be created for various '
                       'destination locations, please choose line with a '
                       'same destination location.'))
-            self._auto_set_warranty(cr, uid, line_ids, context=context)
+            self.pool.get('claim.line').auto_set_warranty(cr, uid,
+                                                          line_ids,
+                                                          context=context)
             common_dest_partner_id = self._get_common_partner_from_line(
                 cr, uid, line_ids, context=context)
             if not common_dest_partner_id: