[MERGE] OPW 581786: sale: resync 'Sale Order' sxw and rml files

bzr revid: xal@openerp.com-20121217094900-14aqiqk5tj5jud2z

diff --cc addons/sale/report/sale_order.rml
index 3aac9e4,3aac9e4..bf39f3b
--- 1/addons/sale/report/sale_order.rml
--- 2/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@@ -167,7 -167,7 +167,7 @@@
            </para>
            <para style="terp_default_Bold_9">Invoice address :</para>
            <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.title and o.partner_invoice_id.title.name) or '' ]] [[ (o.partner_invoice_id and o.partner_invoice_id.name) or '' ]]</para>
--          <para style="terp_default_9">[[ o.partner_invoice_id and display_address(o.partner_invoice_id) ]] </para>
++          <para style="terp_default_9">[[ o.partner_invoice_id and display_address(o.partner_invoice_id) ]]</para>
          </td>
          <td>
            <para style="terp_default_8">
@@@ -176,7 -176,7 +176,7 @@@
          </td>
          <td>
            <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
--          <para style="terp_default_9">[[ o.partner_order_id and display_address(o.partner_order_id) ]] </para>
++          <para style="terp_default_9">[[ o.partner_order_id and display_address(o.partner_order_id) ]]</para>
            <para style="terp_default_9">
              <font color="white"> </font>
            </para>
@@@ -275,7 -275,7 +275,7 @@@
              <para style="terp_default_Centre_9">[[ formatLang(line.discount) ]]</para>
            </td>
            <td>
--            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price'), currency_obj=o.pricelist_id.currency_id) ]] </para>
++            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price'), currency_obj=o.pricelist_id.currency_id) ]]</para>
            </td>
          </tr>
          <tr>