diff --git a/crm_claim_rma/wizard/exchange_from_returned_lines_wizard_view.xml b/crm_claim_rma/wizard/exchange_from_returned_lines_wizard_view.xml
index 1ea0c0c6..d41d59de 100644
--- a/crm_claim_rma/wizard/exchange_from_returned_lines_wizard_view.xml
+++ b/crm_claim_rma/wizard/exchange_from_returned_lines_wizard_view.xml
@@ -49,7 +49,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{'claim_id':claim_id}</field> 
+            <!-- field name="context">{'claim_id':claim_id}</field --> 
         </record>
 
 <!-- TEMP EXCHANGE LINE VIEW -->
diff --git a/crm_claim_rma/wizard/picking_from_exchange_lines_wizard_view.xml b/crm_claim_rma/wizard/picking_from_exchange_lines_wizard_view.xml
index 6f720fdf..0fc9610b 100644
--- a/crm_claim_rma/wizard/picking_from_exchange_lines_wizard_view.xml
+++ b/crm_claim_rma/wizard/picking_from_exchange_lines_wizard_view.xml
@@ -50,7 +50,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field> 
-            <field name="context">{'claim_id':claim_id}</field> 
+            <!-- field name="context">{'claim_id':claim_id}</field --> 
         </record>
                 		
     </data>
diff --git a/crm_claim_rma/wizard/picking_from_returned_lines_wizard_view.xml b/crm_claim_rma/wizard/picking_from_returned_lines_wizard_view.xml
index 908e6d72..874c448d 100644
--- a/crm_claim_rma/wizard/picking_from_returned_lines_wizard_view.xml
+++ b/crm_claim_rma/wizard/picking_from_returned_lines_wizard_view.xml
@@ -51,8 +51,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field> 
-            <!--  field name="domain">['claim_id','=',claim_id}</field -->
-            <field name="context">{'claim_id':claim_id}</field> 
+            <!--  field name="domain">['claim_id','=',claim_id}</field 
+            <field name="context">{'claim_id':claim_id}</field> -->
         </record>	  
 
 
@@ -82,7 +82,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field> 
-            <field name="context">{'claim_id':claim_id}</field> 
+            <!--  <field name="context">{'claim_id':claim_id}</field> -->
         </record>
         		
     </data>
diff --git a/crm_claim_rma/wizard/refund_from_returned_lines.py b/crm_claim_rma/wizard/refund_from_returned_lines.py
index ae1bb52a..797e5e76 100644
--- a/crm_claim_rma/wizard/refund_from_returned_lines.py
+++ b/crm_claim_rma/wizard/refund_from_returned_lines.py
@@ -71,9 +71,9 @@ class refund_from_returned_lines(osv.osv_memory):
             claim_id = self.pool.get('crm.claim').browse(cr, uid, context['active_id'])
             partner_id = claim_id.partner_id.id
             # invoice type
-            invoice_type = 'out_refund'
+            invoice_type = "out_refund"
             if claim_id.claim_type == "supplier":
-                invoice_type = 'in_refund'
+                invoice_type = "in_refund"
             # create invoice
             invoice_id = self.pool.get('account.invoice').create(cr, uid, {
 					    'claim_origine' : "none",
@@ -110,7 +110,7 @@ class refund_from_returned_lines(osv.osv_memory):
 #					    'account_analytic_id':
 					    'company_id' : claim_id.company_id.id,
 					    'partner_id' : refund_line.invoice_id.partner_id.id,
-					    'note': 'RMA Refound',                        
+					    'note': 'RMA Refund',                        
 				        })
                 else:
                     raise osv.except_osv(_('Error !'), _('Cannot find any invoice for the return line!'))
@@ -118,7 +118,7 @@ class refund_from_returned_lines(osv.osv_memory):
             'name': 'Customer Refounds',
             'view_type': 'form',
             'view_mode': 'tree,form',
-            'domain' : "[('type', '=', %s),('partner_id','=',%s)]"%(invoice_type,partner_id),
+            'domain' : "[('type', '=', '"+invoice_type+"'),('partner_id','=',"+str(partner_id)+")]",
             'res_model': 'account.invoice',
             'type': 'ir.actions.act_window',
         }
diff --git a/crm_claim_rma/wizard/refund_from_returned_lines_wizard_view.xml b/crm_claim_rma/wizard/refund_from_returned_lines_wizard_view.xml
index e639c1f9..1aaa9fcc 100644
--- a/crm_claim_rma/wizard/refund_from_returned_lines_wizard_view.xml
+++ b/crm_claim_rma/wizard/refund_from_returned_lines_wizard_view.xml
@@ -50,7 +50,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field> 
-            <field name="context">{'claim_id':claim_id}</field> 
+            <!-- field name="context">{'claim_id':claim_id}</field --> 
         </record>	  
 		
     </data>