Merge lp:~openerp-dev/openobject-addons/trunk-bug-1090503-cha into lp:openobject-addons

[Ajay Chauhan(OpenERP)]

Hello,

 I have solved https://bugs.launchpad.net/openobject-addons/+bug/1090503
   Currency symbol hardcoded in Reports (ver 7) .

Thanks,
Ajay Chauhan

Unmerged revisions

8376. By Ajay Chauhan(OpenERP) on 2012-12-18

[FIX] lunch: solved an issue of position of currency symbol in report

=== modified file 'lunch/report/order.rml'
--- lunch/report/order.rml	2012-11-29 22:26:45 +0000
+++ lunch/report/order.rml	2012-12-18 10:23:21 +0000
@@ -137,7 +137,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_9_right_bold"><u>[[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</u></para>
+            <para style="terp_default_9_right_bold"><u>[[ formatLang(get_total(o,objects), currency_obj=o.company_id.currency_id) ]]</u></para>
           </td>
         </tr>
       </blockTable>
@@ -155,7 +155,7 @@
               <para style="terp_default_9">[[ lines.note]]</para>
             </td>
             <td>
-              <para style="terp_default_9_right">[[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
+              <para style="terp_default_9_right">[[ formatLang(lines.price, currency_obj=o.company_id.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -172,7 +172,7 @@
           <para style="terp_tbl_detail_header">Total :</para>
         </td>
         <td>
-          <para style="terp_default_9_right_bold">[[ formatLang(get_nettotal()) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
+          <para style="terp_default_9_right_bold">[[ formatLang(get_nettotal(), currency_obj=o.company_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>