diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 96c12ceb404..f16d070f9b9 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -162,13 +162,13 @@
       <tr>
         <td>
           <para style="terp_default_Bold_9">Shipping Address :</para>
-          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title.name) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ picking.address_id and display_address(picking.address_id) ]]</para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.id and picking.address_id.title.name) or '' ]] [[ picking.address_id and picking.address_id.id and picking.address_id.name ]]</para>
+          <para style="terp_default_9">[[ picking.address_id and display_address(picking.address_id,'delivery') ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Contact Address :</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.title.name or '' ]] [[ picking.address_id and picking.address_id.name or '' ]]</para>
-          <para style="terp_default_9">[[ picking.address_id and display_address(picking.address_id) ]] </para>
+          <para style="terp_default_9">[[ picking.address_id and display_address(picking.address_id,'default') ]] </para>
         </td>
       </tr>
     </blockTable>