Merge lp:~openerp-dev/openobject-addons/6.1-opw-577884-nep into lp:openobject-addons/6.1

[Nehal Panchal (OpenERP)]

Hello,

Steps:
1. Change the Symbol position in currency.
2. Open form view by selecting any record from Expenses list(menu:Human Resources/Expenses/Expenses) and print HR Expenses report.
You will get the currency symbol always after the amount.
This fixes the issue.

Thanks

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

sorry, .sxw too needs to be modified.

Thanks,
Naresh

review: Needs Fixing

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Already Fixed on Trunk (means that it was already fixed and merged in Trunk). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6939. By Nehal Panchal (OpenERP) on 2012-08-09

[FIX] hr_expense : Currency symbol position is not changed in HR Expense report as per currency(after/before) configuration

=== modified file 'hr_expense/report/expense.rml'
--- hr_expense/report/expense.rml	2011-12-21 09:08:11 +0000
+++ hr_expense/report/expense.rml	2012-08-09 13:25:16 +0000
@@ -231,7 +231,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line.unit_quantity) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.total_amount) ]] [[ o.currency_id.symbol ]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(line.total_amount, currency_obj=o.company_id.currency_id) ]] </para>
           </td>
         </tr>
         <tr>
@@ -277,7 +277,7 @@
           <para style="terp_tblheader_Details">Total:</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount, currency_obj=o.company_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>