diff --git a/addons/mrp_repair/report/order.py b/addons/mrp_repair/report/order.py
index 298e1f237ff..9ed63548e18 100644
--- a/addons/mrp_repair/report/order.py
+++ b/addons/mrp_repair/report/order.py
@@ -48,7 +48,7 @@ class order(report_sxw.rml_parse):
             res_partner_address = pooler.get_pool(self.cr.dbname).get('res.partner.address')
             addresses = res_partner.address_get(self.cr, self.uid, [partner.id], [type])
             adr_id = addresses and addresses[type] or False
-            return adr_id and res_partner_address.read(self.cr, self.uid, [adr_id])[0] or False
+            return adr_id and res_partner_address.read(self.cr, self.uid, [adr_id])[0] or {}
 
 report_sxw.report_sxw('report.repair.order','mrp.repair','addons/mrp_repair/report/order.rml',parser=order)
 
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index c71abb614cf..b3c1855260b 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -175,7 +175,7 @@
           <para style="P3">
             <font color="white"> </font>
           </para>
-          <para style="P13">Invoice address</para>
+          <para style="P13">Invoice address :</para>
           <para style="P3">[[ o.partner_id and o.partner_id.property_payment_term.name ]]</para>
           <para style="P3">[[ o.partner_invoice_id.street ]]</para>
           <para style="P3">[[ o.partner_invoice_id.street2 or removeParentNode('para') ]]</para>
@@ -189,12 +189,12 @@
           </para>
         </td>
         <td>
-          <para style="P3">[[ o.partner_id.name ]]</para>
-          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['street'] ]]</para>
-          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['street2'] or removeParentNode('para') ]]</para>
-          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['zip'] ]][[ o.partner_id and adr_get(o.partner_id, 'default')['city'] ]]</para>
-          <para style="P3">[[ (o.partner_id and adr_get(o.partner_id, 'default')['state_id'] and adr_get(o.partner_id, 'default')['state_id'][1]) or removeParentNode('para') ]]</para>
-          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default')['country_id'] and adr_get(o.partner_id, 'default')['country_id'][1] ]]</para>
+          <para style="P3">[[ o.partner_id.name or removeParentNode('para') ]]</para>
+          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('street','') or removeParentNode('para') ]]</para>
+          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('street2','') or removeParentNode('para') ]]</para>
+          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('zip','') or removeParentNode('para') ]][[ o.partner_id and adr_get(o.partner_id, 'default').get('city','') or removeParentNode('para') ]]</para>
+          <para style="P3">[[ (o.partner_id and adr_get(o.partner_id, 'default').get('state_id','') and adr_get(o.partner_id, 'default').get('state_id',[])[1]) or removeParentNode('para') ]]</para>
+          <para style="P3">[[ o.partner_id and adr_get(o.partner_id, 'default').get('country_id','') and adr_get(o.partner_id, 'default').get('country_id',[])[1] or removeParentNode('para') ]]</para>
           <para style="P3">
             <font color="white"> </font>
           </para>