diff --git a/crm_claim_rma/models/account_invoice.py b/crm_claim_rma/models/account_invoice.py
index 1255ab46..8b000cd3 100644
--- a/crm_claim_rma/models/account_invoice.py
+++ b/crm_claim_rma/models/account_invoice.py
@@ -61,7 +61,7 @@ class AccountInvoice(models.Model):
                     elif field_name == 'invoice_line_tax_id':
                         tax_ids = inv_line[field_name].ids
                         clean_line[field_name] = [(6, 0, tax_ids)]
-                clean_line['quantity'] = claim_line['product_returned_quantity']
+                clean_line['quantity'] = claim_line.product_returned_quantity
                 clean_line['claim_line_id'] = [claim_line.id]
                 new_lines.append(clean_line)
         if not new_lines:
diff --git a/crm_claim_rma/models/crm_claim_rma.py b/crm_claim_rma/models/crm_claim_rma.py
index c372cde1..88f88647 100644
--- a/crm_claim_rma/models/crm_claim_rma.py
+++ b/crm_claim_rma/models/crm_claim_rma.py
@@ -248,7 +248,8 @@ class ClaimLine(models.Model):
         claim = self.claim_id
         try:
             values = self._warranty_limit_values(
-                claim.invoice_id, claim.claim_type, self.product_id, claim.date)
+                claim.invoice_id, claim.claim_type,
+                self.product_id, claim.date)
         except InvoiceNoDate:
             raise exceptions.Warning(
                 _('Error'), _('Cannot find any date for invoice. '
diff --git a/crm_claim_rma/wizards/claim_make_picking.py b/crm_claim_rma/wizards/claim_make_picking.py
index 26152b1d..c2fcc6a3 100644
--- a/crm_claim_rma/wizards/claim_make_picking.py
+++ b/crm_claim_rma/wizards/claim_make_picking.py
@@ -55,7 +55,8 @@ class ClaimMakePicking(models.TransientModel):
         warehouse_id = self.env.context.get('warehouse_id')
 
         if picking_type == 'out' and warehouse_id:
-            return self.env['stock.warehouse'].browse(warehouse_id).lot_stock_id
+            return self.env['stock.warehouse'].browse(
+                warehouse_id).lot_stock_id
 
         if partner_id:
             partner = self.env['res.partner'].browse(partner_id)
@@ -130,7 +131,7 @@ class ClaimMakePicking(models.TransientModel):
         return {
             'origin': claim.code,
             'picking_type_id': picking_type.id,
-            'move_type': 'one', # direct
+            'move_type': 'one',  # direct
             'state': 'draft',
             'date': time.strftime(DT_FORMAT),
             'partner_id': partner_id,