From df55bf0013136ab66d89431cdc55736e77dabe74 Mon Sep 17 00:00:00 2001
From: Leonardo Donelli <learts92@gmail.com>
Date: Fri, 7 Aug 2015 11:48:40 +0200
Subject: [PATCH] Ensure recordset is a single record in methods, slight
 adjustments

---
 crm_claim_rma/models/crm_claim_rma.py | 29 +++++++++++++++------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/crm_claim_rma/models/crm_claim_rma.py b/crm_claim_rma/models/crm_claim_rma.py
index 9f950c4b..c372cde1 100644
--- a/crm_claim_rma/models/crm_claim_rma.py
+++ b/crm_claim_rma/models/crm_claim_rma.py
@@ -244,6 +244,7 @@ class ClaimLine(models.Model):
                 'warning': warning}
 
     def set_warranty_limit(self):
+        self.ensure_one()
         claim = self.claim_id
         try:
             values = self._warranty_limit_values(
@@ -336,19 +337,21 @@ class ClaimLine(models.Model):
         self.update(values)
 
     def _warranty_return_address_values(self, product, company, warehouse):
-        """Return the partner to be used as return destination and
+        """
+        Return the partner to be used as return destination and
         the destination stock location of the line in case of return.
 
-        We can have various case here:
+        We can have various cases here:
             - company or other: return to company partner or
               crm_return_address_id if specified
             - supplier: return to the supplier address
-
         """
         if not (product and company and warehouse):
-            return {'warranty_return_partner': False,
-                    'warranty_type': False,
-                    'location_dest_id': False}
+            return {
+                'warranty_return_partner': False,
+                'warranty_type': False,
+                'location_dest_id': False
+            }
         sellers = product.seller_ids
         if sellers:
             seller = sellers[0]
@@ -361,17 +364,17 @@ class ClaimLine(models.Model):
             return_address_id = return_address.id
             return_type = 'company'
         location_dest = self.get_destination_location(product, warehouse)
-        return {'warranty_return_partner': return_address_id,
-                'warranty_type': return_type,
-                'location_dest_id': location_dest.id}
+        return {
+            'warranty_return_partner': return_address_id,
+            'warranty_type': return_type,
+            'location_dest_id': location_dest.id
+        }
 
     def set_warranty_return_address(self):
+        self.ensure_one()
         claim = self.claim_id
-        product = self.product_id
-        company = claim.company_id
-        warehouse = claim.warehouse_id
         values = self._warranty_return_address_values(
-            product, company, warehouse)
+            self.product_id, claim.company_id, claim.warehouse_id)
         self.write(values)
         return True