Merge lp:~openerp-dev/openobject-addons/6.1-opw-577185-jap into lp:openobject-addons/6.1

[Jagdish Panchal (Open ERP)]

Hello,

[FIX] improve the code in sxw files_Passed the code of printing symbol in formatLang() method

I have changed the code in sxw files for printing symbol and passed the code in formatLang() function, because while using the option "Conversion Braces---> Field" in OpenOffice the report removes the spaces between the amount and symbol.

Stpes:
1). Open "Invoices" report in OpenOffice
2). Click on "Conversion Braces---> Fields", and click on send to server
3). Now print the report you will see the spaces are remove from field "Price, Total, Tax an Net Total"

Thanks,
JAP

[lp:~openerp-dev/openobject-addons/6.1-opw-577185-jap]

6931. By Olivier Dony (Odoo) on 2012-08-03

[MERGE] project.issue: actually use the Reply-To address of the project when sending out messages

6932. By Launchpad Translations on behalf of openerp on 2012-08-04

Launchpad automatic translations update.

6933. By Launchpad Translations on behalf of openerp on 2012-08-05

Launchpad automatic translations update.

6934. By Launchpad Translations on behalf of openerp on 2012-08-06

Launchpad automatic translations update.

6935. By Launchpad Translations on behalf of openerp on 2012-08-07

Launchpad automatic translations update.

6936. By Xavier ALT on 2012-08-07

[MERGE] OPW 576898: stock: when changing stock.move product lot, do not crash if user didn't fill the product field

6937. By Launchpad Translations on behalf of openerp on 2012-08-08

Launchpad automatic translations update.

6938. By Amit Dodiya<email address hidden> on 2012-08-09

[FIX] (1) base report designer plugin removes the space from two attached string in report while using the option Conversion_Braces_to_fields (2) Improve the code in sxw files_Passed the code of printing symbol in formatLang() method

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed(partially) on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-577185-port-dhr/+merge/139390 and be informed once it's been 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

6938. By Amit Dodiya<email address hidden> on 2012-08-09

[FIX] (1) base report designer plugin removes the space from two attached string in report while using the option Conversion_Braces_to_fields (2) Improve the code in sxw files_Passed the code of printing symbol in formatLang() method

=== modified file 'account/report/account_aged_partner_balance.sxw'
 Binary files account/report/account_aged_partner_balance.sxw	2011-02-07 09:06:40 +0000 and account/report/account_aged_partner_balance.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'account/report/account_balance.sxw'
 Binary files account/report/account_balance.sxw	2011-10-27 21:11:24 +0000 and account/report/account_balance.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'account/report/account_general_ledger.sxw'
 Binary files account/report/account_general_ledger.sxw	2011-10-27 21:11:24 +0000 and account/report/account_general_ledger.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'account/report/account_general_ledger_landscape.sxw'
 Binary files account/report/account_general_ledger_landscape.sxw	2011-10-27 21:11:24 +0000 and account/report/account_general_ledger_landscape.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'account/report/account_partner_ledger.sxw'
 Binary files account/report/account_partner_ledger.sxw	2011-10-27 21:11:24 +0000 and account/report/account_partner_ledger.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'account/report/account_partner_ledger_other.sxw'
 Binary files account/report/account_partner_ledger_other.sxw	2011-10-27 21:11:24 +0000 and account/report/account_partner_ledger_other.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'account/report/account_print_invoice.sxw'
 Binary files account/report/account_print_invoice.sxw	2011-01-14 00:11:01 +0000 and account/report/account_print_invoice.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'account/report/account_print_overdue.rml'
--- account/report/account_print_overdue.rml	2011-12-22 15:17:58 +0000
+++ account/report/account_print_overdue.rml	2012-08-09 09:37:21 +0000
@@ -219,7 +219,7 @@
             <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]</para>
           </td>
           <td>
-             <para style="terp_default_Right_9">[[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]] </para>
+             <para style="terp_default_Right_9">[[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit'], currency_obj=company.currency_id) ]] </para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ line['blocked'] and 'X' or '' ]]</para>
 
=== modified file 'account/report/account_print_overdue.sxw'
 Binary files account/report/account_print_overdue.sxw	2011-12-21 09:55:12 +0000 and account/report/account_print_overdue.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'account_analytic_plans/report/crossovered_analytic.sxw'
 Binary files account_analytic_plans/report/crossovered_analytic.sxw	2011-01-14 00:11:01 +0000 and account_analytic_plans/report/crossovered_analytic.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'account_budget/report/analytic_account_budget_report.sxw'
 Binary files account_budget/report/analytic_account_budget_report.sxw	2011-01-14 00:11:01 +0000 and account_budget/report/analytic_account_budget_report.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'account_budget/report/crossovered_budget_report.sxw'
 Binary files account_budget/report/crossovered_budget_report.sxw	2011-01-14 00:11:01 +0000 and account_budget/report/crossovered_budget_report.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'account_invoice_layout/report/report_account_invoice_layout.py'
--- account_invoice_layout/report/report_account_invoice_layout.py	2011-04-29 08:49:48 +0000
+++ account_invoice_layout/report/report_account_invoice_layout.py	2012-08-09 09:37:21 +0000
@@ -70,7 +70,7 @@
                 res['quantity'] = self.formatLang(entry.quantity, digits=self.get_digits(dp='Account'))
                 res['price_unit'] = self.formatLang(entry.price_unit, digits=self.get_digits(dp='Account'))
                 res['discount'] = self.formatLang(entry.discount, digits=self.get_digits(dp='Account'))
-                res['price_subtotal'] = self.formatLang(entry.price_subtotal, digits=self.get_digits(dp='Account'))
+                res['price_subtotal'] = self.formatLang(entry.price_subtotal, digits=self.get_digits(dp='Account'), currency_obj=invoice.currency_id)
                 sub_total[i] = entry.price_subtotal
                 i = i + 1
                 res['note'] = entry.note
 
=== modified file 'account_invoice_layout/report/report_account_invoice_layout.rml'
--- account_invoice_layout/report/report_account_invoice_layout.rml	2011-12-22 15:17:58 +0000
+++ account_invoice_layout/report/report_account_invoice_layout.rml	2012-08-09 09:37:21 +0000
@@ -293,7 +293,7 @@
             <para style="terp_default_Centre_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['discount'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['price_subtotal'] ]] [[ a['currency'] ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['price_subtotal'] ]]</para>
           </td>
         </tr>
         <tr>
@@ -377,7 +377,7 @@
           <para style="terp_default_9">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -392,7 +392,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -407,7 +407,7 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -443,10 +443,10 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Account', currency_obj=o.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account', currency_obj=o.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_8">
 
=== modified file 'account_invoice_layout/report/report_account_invoice_layout.sxw'
 Binary files account_invoice_layout/report/report_account_invoice_layout.sxw	2011-01-14 00:11:01 +0000 and account_invoice_layout/report/report_account_invoice_layout.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'account_invoice_layout/report/special_message_invoice.py'
--- account_invoice_layout/report/special_message_invoice.py	2011-04-29 08:49:48 +0000
+++ account_invoice_layout/report/special_message_invoice.py	2012-08-09 09:37:21 +0000
@@ -80,7 +80,7 @@
                 res['quantity'] = self.formatLang(entry.quantity, digits=self.get_digits(dp='Account'))
                 res['price_unit'] = self.formatLang(entry.price_unit, digits=self.get_digits(dp='Account'))
                 res['discount'] = self.formatLang(entry.discount, digits=self.get_digits(dp='Account'))
-                res['price_subtotal'] = self.formatLang(entry.price_subtotal, digits=self.get_digits(dp='Account'))
+                res['price_subtotal'] = self.formatLang(entry.price_subtotal, digits=self.get_digits(dp='Account'), currency_obj=invoice.currency_id)
                 sub_total[i] = entry.price_subtotal
                 i = i + 1
                 res['note'] = entry.note
 
=== modified file 'account_invoice_layout/report/special_message_invoice.rml'
--- account_invoice_layout/report/special_message_invoice.rml	2011-12-22 15:17:58 +0000
+++ account_invoice_layout/report/special_message_invoice.rml	2012-08-09 09:37:21 +0000
@@ -297,7 +297,7 @@
             <para style="terp_default_Centre_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['discount'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['price_subtotal'] ]] [[ a['currency'] ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['price_subtotal'] ]]</para>
           </td>
         </tr>
         <tr>
@@ -381,7 +381,7 @@
           <para style="terp_default_9">Net Total : </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Account', currency_obj=o.currency_id.symbol) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -396,7 +396,7 @@
           <para style="terp_default_9">Taxes : </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -411,7 +411,7 @@
           <para style="terp_default_Bold_9">Total : </para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Account', currency_obj=o.currency_id.symbol) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -447,10 +447,10 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Account', currency_obj=o.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account', currency_obj=o.currency_id.symbol) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_8">
 
=== modified file 'account_invoice_layout/report/special_message_invoice.sxw'
 Binary files account_invoice_layout/report/special_message_invoice.sxw	2011-01-14 00:11:01 +0000 and account_invoice_layout/report/special_message_invoice.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'base_report_designer/plugin/openerp_report_designer.zip'
 Binary files base_report_designer/plugin/openerp_report_designer.zip	2011-06-17 14:10:24 +0000 and base_report_designer/plugin/openerp_report_designer.zip	2012-08-09 09:37:21 +0000 differ
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py	2011-12-19 16:54:40 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py	2012-08-09 09:37:21 +0000
@@ -268,7 +268,7 @@
                         if res[1]<>"Expression":
                             oInputList.Items=(u""+found.String,u""+found.String)
                         else:
-                            oInputList.Items=(u"?",u""+found.String)
+                            oInputList.Items=(u"?",u" "+found.String)
                         aReportSyntex.append([oInputList,res[1]])
                         text.insertTextContent(found,oInputList,False)
                         found.String =""
 
=== 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 09:37:21 +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.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.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
 
=== modified file 'hr_expense/report/expense.sxw'
 Binary files hr_expense/report/expense.sxw	2011-01-14 00:11:01 +0000 and hr_expense/report/expense.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'hr_payroll/report/report_contribution_register.rml'
--- hr_payroll/report/report_contribution_register.rml	2011-12-21 09:08:11 +0000
+++ hr_payroll/report/report_contribution_register.rml	2012-08-09 09:37:21 +0000
@@ -206,7 +206,7 @@
             <para style="P2">[[ formatLang(r['amount']) ]]</para>
           </td>
           <td>
-            <para style="P3">[[ formatLang(r['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
+            <para style="P3">[[ formatLang(r['total'], currency_obj=o.company_id.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -222,7 +222,7 @@
           <para style="P15">Total:</para>
         </td>
         <td>
-          <para style="P11">[[ formatLang(sum_total()) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
+          <para style="P11">[[ formatLang(sum_total(), currency_obj=o.company_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
 
=== modified file 'hr_payroll/report/report_contribution_register.sxw'
 Binary files hr_payroll/report/report_contribution_register.sxw	2011-06-29 10:31:10 +0000 and hr_payroll/report/report_contribution_register.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'hr_payroll/report/report_payslip.rml'
--- hr_payroll/report/report_payslip.rml	2011-12-21 09:08:11 +0000
+++ hr_payroll/report/report_payslip.rml	2012-08-09 09:37:21 +0000
@@ -293,7 +293,7 @@
             <para style="P4">[[ formatLang(p.amount) ]]</para>
           </td>
           <td>
-            <para style="P5">[[ formatLang(p.total) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
+            <para style="P5">[[ formatLang(p.total, currency_obj=o.company_id.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
 
=== modified file 'hr_payroll/report/report_payslip.sxw'
 Binary files hr_payroll/report/report_payslip.sxw	2011-06-03 10:32:38 +0000 and hr_payroll/report/report_payslip.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'hr_payroll/report/report_payslip_details.rml'
--- hr_payroll/report/report_payslip_details.rml	2011-12-21 09:08:11 +0000
+++ hr_payroll/report/report_payslip_details.rml	2012-08-09 09:37:21 +0000
@@ -334,7 +334,7 @@
             <para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
           </td>
           <td>
-            <para style="P6">[[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
+            <para style="P6">[[ formatLang(h['total'], currency_obj=o.company_id.currency_id) ]]<font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
           </td>
         </tr>
       </blockTable>
@@ -391,7 +391,7 @@
             <para style="P5">[[ formatLang(r['amount']) ]]</para>
           </td>
           <td>
-            <para style="P6">[[ formatLang(r['total']) ]] [[ o.company_id and o.company_id.currency_id.symbol or '']]<font face="Helvetica">[[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]</font></para>
+            <para style="P6">[[ formatLang(r['total'], currency_obj=o.company_id.currency_id) ]]<font face="Helvetica">[[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]</font></para>
           </td>
         </tr>
       </blockTable>
 
=== modified file 'hr_payroll/report/report_payslip_details.sxw'
 Binary files hr_payroll/report/report_payslip_details.sxw	2011-06-03 10:32:38 +0000 and hr_payroll/report/report_payslip_details.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'mrp_repair/report/order.rml'
--- mrp_repair/report/order.rml	2011-12-22 15:17:58 +0000
+++ mrp_repair/report/order.rml	2012-08-09 09:37:21 +0000
@@ -312,7 +312,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line.price_unit) ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, currency_obj=o.pricelist_id.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -337,7 +337,7 @@
           <para style="terp_default_Right_9">[[ formatLang(fees.price_unit) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(fees.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(fees.price_subtotal, currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -353,7 +353,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="P26">[[ formatLang(o.amount_untaxed, dp='Sale Price')]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="P26">[[ formatLang(o.amount_untaxed, dp='Sale Price', currency_obj=o.pricelist_id.currency_id)]]</para>
         </td>
 
       </tr>
@@ -367,7 +367,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="P26">[[ formatLang(o.amount_tax, dp='Account')]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="P26">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id)]]</para>
         </td>
       </tr>
       <tr>
@@ -380,7 +380,7 @@
           <para style="terp_tblheader_Details">Total :</para>
         </td>
         <td>
-          <para style="terp_default_right_bold_9">[[ formatLang(total(o), dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_right_bold_9">[[ formatLang(total(o), dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
 
=== modified file 'point_of_sale/report/account_statement.rml'
--- point_of_sale/report/account_statement.rml	2011-12-21 09:08:11 +0000
+++ point_of_sale/report/account_statement.rml	2012-08-09 09:37:21 +0000
@@ -214,10 +214,10 @@
           <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date_time=True)]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, dp='Account') ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, dp='Account', currency_obj=o.company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, dp='Account') ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, dp='Account', currency_obj=o.company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -250,7 +250,7 @@
               <para style="terp_default_9">[[ line_ids.partner_id.name ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(line_ids.amount, dp='Account') ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids.amount, dp='Account', currency_obj=o.company.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -267,7 +267,7 @@
           <para style="terp_tblheader_Details">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids), dp='Account') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids), dp='Account', currency_obj=o.company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
 
=== modified file 'point_of_sale/report/account_statement.sxw'
 Binary files point_of_sale/report/account_statement.sxw	2011-01-14 00:11:01 +0000 and point_of_sale/report/account_statement.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'point_of_sale/report/all_closed_cashbox_of_the_day.rml'
--- point_of_sale/report/all_closed_cashbox_of_the_day.rml	2011-12-21 09:08:11 +0000
+++ point_of_sale/report/all_closed_cashbox_of_the_day.rml	2012-08-09 09:37:21 +0000
@@ -183,10 +183,10 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]</u></para>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1], currency_obj=o.company.currency_id) ]]</u></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]</u></para>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user), currency_obj=o.company.currency_id) ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -207,10 +207,10 @@
             <para style="terp_default_Bold_8">[[ statement['closing_date'] ]]</para>
           </td>
           <td>
-            <para style="P1"><u>[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</u></para>
+            <para style="P1"><u>[[ (get_bal(statement)) or '0.00' , currency_obj=o.company.currency_id]]</u></para>
           </td>
           <td>
-            <para style="P1"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]</u></para>
+            <para style="P1"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date']) ,currency_obj=o.company.currency_id) ]]</u></para>
           </td>
         </tr>
       </blockTable>
@@ -236,7 +236,7 @@
               </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(line_ids['amount']) ]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids['amount'], currency_obj=o.company.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
 
=== modified file 'point_of_sale/report/all_closed_cashbox_of_the_day.sxw'
 Binary files point_of_sale/report/all_closed_cashbox_of_the_day.sxw	2011-01-14 00:11:01 +0000 and point_of_sale/report/all_closed_cashbox_of_the_day.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'point_of_sale/report/pos_details.rml'
--- point_of_sale/report/pos_details.rml	2011-12-29 16:58:23 +0000
+++ point_of_sale/report/pos_details.rml	2012-08-09 09:37:21 +0000
@@ -252,7 +252,7 @@
             <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit'], dp='Sale Price', currency_obj=o.company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ formatLang(line_ids['qty']) ]] [[ line_ids['uom'] ]]</para>
@@ -289,7 +289,7 @@
             <para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(p['amount']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(p['amount'], currency_obj=o.company.currency_id) or removeParentNode('tr') ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -320,7 +320,7 @@
             <para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(p['sum'], dp='Account') or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(p['sum'], dp='Account', currency_obj=o.company.currency_id) or removeParentNode('tr') ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -349,7 +349,7 @@
           <para style="terp_default_Bold_9">Sales total(Revenue)</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(getsalestotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsalestotal2(), dp='Sale Price', currency_obj=o.company.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -365,7 +365,7 @@
           <para style="terp_default_Bold_9">Total invoiced</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(getsuminvoice2(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsuminvoice2(data['form']), dp='Sale Price', currency_obj=o.company.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -373,7 +373,7 @@
           <para style="terp_default_Bold_9">Total discount</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(), dp='Sale Price', currency_obj=o.company.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -381,7 +381,7 @@
           <para style="terp_default_Bold_9">Total paid</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(getpaidtotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getpaidtotal2(), dp='Sale Price', currency_obj=o.company.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -389,7 +389,7 @@
           <para style="terp_default_Bold_9">Total of the day</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(gettotalofthaday(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(gettotalofthaday(data['form']), dp='Sale Price', currency_obj=o.company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
 
=== modified file 'point_of_sale/report/pos_details.sxw'
 Binary files point_of_sale/report/pos_details.sxw	2011-11-25 09:47:15 +0000 and point_of_sale/report/pos_details.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'point_of_sale/report/pos_payment_report_user.rml'
--- point_of_sale/report/pos_payment_report_user.rml	2011-12-21 09:08:11 +0000
+++ point_of_sale/report/pos_payment_report_user.rml	2012-08-09 09:37:21 +0000
@@ -168,7 +168,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total'], currency_obj=o.company.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -194,7 +194,7 @@
           <para style="terp_tblheader_General_Right">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form']), currency_obj=o.company.currency_id) or removeParentNode('blockTable')]]</para>
         </td>
       </tr>
     </blockTable>
 
=== modified file 'point_of_sale/report/pos_payment_report_user.sxw'
 Binary files point_of_sale/report/pos_payment_report_user.sxw	2011-01-14 00:11:01 +0000 and point_of_sale/report/pos_payment_report_user.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'point_of_sale/report/pos_users_product.rml'
--- point_of_sale/report/pos_users_product.rml	2011-12-21 09:08:11 +0000
+++ point_of_sale/report/pos_users_product.rml	2012-08-09 09:37:21 +0000
@@ -191,7 +191,7 @@
               <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids['amt'], currency_obj=o.company.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -208,7 +208,7 @@
           <para style="terp_tblheader_General_Right">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement)) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement), currency_obj=o.company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
 
=== modified file 'point_of_sale/report/pos_users_product.sxw'
 Binary files point_of_sale/report/pos_users_product.sxw	2011-01-14 00:11:01 +0000 and point_of_sale/report/pos_users_product.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'purchase/report/order.sxw'
 Binary files purchase/report/order.sxw	2011-11-03 11:53:04 +0000 and purchase/report/order.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'sale/report/sale_order.sxw'
 Binary files sale/report/sale_order.sxw	2011-05-10 09:14:36 +0000 and sale/report/sale_order.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'sale_layout/report/report_sale_layout.py'
--- sale_layout/report/report_sale_layout.py	2011-07-18 06:44:21 +0000
+++ sale_layout/report/report_sale_layout.py	2012-08-09 09:37:21 +0000
@@ -67,7 +67,7 @@
                 sub_total[i] = entry.price_subtotal and entry.price_subtotal
                 i = i + 1
                 res['note'] = entry.notes or ''
-                res['currency'] = sale_order.pricelist_id.currency_id.symbol
+                res['currency'] = sale_order.pricelist_id.currency_id
                 res['layout_type'] = entry.layout_type
             else:
                 res['product_uom_qty'] = ''
 
=== modified file 'sale_layout/report/report_sale_layout.rml'
--- sale_layout/report/report_sale_layout.rml	2012-03-15 18:11:12 +0000
+++ sale_layout/report/report_sale_layout.rml	2012-08-09 09:37:21 +0000
@@ -257,7 +257,7 @@
             <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['discount']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ a['currency'] ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price'), currency_obj=a['currency']) ]]</para>
           </td>
         </tr>
         <tr>
@@ -313,7 +313,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed , digits=get_digits(dp='Sale Price'), currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -326,7 +326,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax , digits=get_digits(dp='Sale Price'), currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -339,7 +339,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total , digits=get_digits(dp='Sale Price'), currency_obj=o.pricelist_id.currency_id) ]] </para>
         </td>
       </tr>
     </blockTable>
 
=== modified file 'sale_layout/report/report_sale_layout.sxw'
 Binary files sale_layout/report/report_sale_layout.sxw	2011-05-10 09:14:36 +0000 and sale_layout/report/report_sale_layout.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'stock/report/lot_overview.rml'
--- stock/report/lot_overview.rml	2011-12-21 09:08:11 +0000
+++ stock/report/lot_overview.rml	2012-08-09 09:37:21 +0000
@@ -184,7 +184,7 @@
                 <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account', currency_obj=o.company_id.currency_id) ]]</para>
               </td>
             </tr>
           </blockTable>
@@ -198,7 +198,7 @@
               <para style="terp_default_Bold_9">Total:</para>
             </td>
             <td>
-              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
+              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account', currency_obj=o.company.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -215,7 +215,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account', currency_obj=o.company_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
 
=== modified file 'stock/report/lot_overview.sxw'
 Binary files stock/report/lot_overview.sxw	2011-01-14 00:11:01 +0000 and stock/report/lot_overview.sxw	2012-08-09 09:37:21 +0000 differ
=== modified file 'stock/report/lot_overview_all.rml'
--- stock/report/lot_overview_all.rml	2011-12-21 09:08:11 +0000
+++ stock/report/lot_overview_all.rml	2012-08-09 09:37:21 +0000
@@ -184,7 +184,7 @@
                 <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account', currency_obj=o.company_id.currency_id) ]] </para>
               </td>
             </tr>
           </blockTable>
@@ -198,7 +198,7 @@
               <para style="terp_default_Bold_9">Total:</para>
             </td>
             <td>
-              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
+              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account', currency_obj=o.company_id.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -215,7 +215,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account' , currency_obj=o.company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
 
=== modified file 'stock/report/lot_overview_all.sxw'
 Binary files stock/report/lot_overview_all.sxw	2011-01-14 00:11:01 +0000 and stock/report/lot_overview_all.sxw	2012-08-09 09:37:21 +0000 differ