diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml
index 26f3e8a2cd8..e9b42811414 100644
--- a/addons/sale/report/order.rml
+++ b/addons/sale/report/order.rml
@@ -144,14 +144,15 @@
           <para style="terp_default_9">[[ o.partner_shipping_id.title or '' ]][[ o.partner_shipping_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street2 or ''  ]]</para>
-          <para style="terp_default_9">[[ o.partner_shipping_id.city or '' ]][[ o.partner_shipping_id.zip or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_shipping_id.city or '' ]]  [[ o.partner_shipping_id.zip or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]][[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
           <para style="terp_default_Bold_9">Invoice address :</para>
           <para style="terp_default_9">[[ o.partner_invoice_id.street ]][[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.zip or ''  ]][[ o.partner_invoice_id.city or ''  ]][[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.city or ''  ]]  [[ o.partner_invoice_id.zip or ''  ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.country_id and ('%s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
         </td>
         <td>
           <para style="terp_default_8">
@@ -163,7 +164,7 @@
           <para style="terp_default_9">[[ o.partner_order_id.title or '' ]][[ o.partner_order_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street2 or '' ]]</para>
-          <para style="terp_default_9">[[ o.partner_order_id.zip or '' ]][[ o.partner_order_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_order_id.city or '' ]]  [[ o.partner_order_id.zip or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]][[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>