diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml
index 0c488eac400..1754988f7d6 100644
--- a/addons/account/project/report/analytic_balance.rml
+++ b/addons/account/project/report/analytic_balance.rml
@@ -163,7 +163,7 @@
[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]]
- [[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]
+ [[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]
|
[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]
@@ -187,7 +187,7 @@
[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]]
|
- [[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]
+ [[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]
|
[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]]
@@ -211,7 +211,7 @@
[[ formatLang(move_g['credit']) ]]
|
- [[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]]
+ [[ formatLang(move_g['balance'], currency_obj = company.currency_id) ]]
|
[[ formatLang(move_g['quantity']) ]]
diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml
index 7500b655ab3..1099a8b8b4e 100644
--- a/addons/account/project/report/cost_ledger.rml
+++ b/addons/account/project/report/cost_ledger.rml
@@ -224,7 +224,7 @@
[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]]
|
- [[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]
|
@@ -245,7 +245,7 @@
[[ formatLang (account_sum_credit(account,data['form']['date1'],data['form']['date2'])) ]]
- [[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]]
+ [[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]
|
@@ -266,7 +266,7 @@
[[ formatLang( move_g['credit']) ]]
- [[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang( move_g['balance'], currency_obj = company.currency_id) ]]
|
@@ -290,7 +290,7 @@
[[ formatLang( move_a['credit']) ]]
- [[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]]
+ [[ formatLang( move_a['balance'], currency_obj = company.currency_id)]]
|
diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml
index f112ec8fbd3..54b6878c407 100644
--- a/addons/account/project/report/inverted_analytic_balance.rml
+++ b/addons/account/project/report/inverted_analytic_balance.rml
@@ -164,7 +164,7 @@
[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]
- [[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol]]
+ [[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]
|
[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]
@@ -188,7 +188,7 @@
[[formatLang(move_g['credit'])]]
|
- [[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol]]
+ [[ formatLang(move_g['balance'], currency_obj = company.currency_id)]]
|
[[formatLang(move_g['quantity']) ]]
@@ -212,7 +212,7 @@
[[ formatLang(move_a['credit']) ]]
|
- [[ formatLang(move_a['balance']) ]] [[ company.currency_id.symbol]]
+ [[ formatLang(move_a['balance'], currency_obj = company.currency_id)]]
|
[[ formatLang(move_a['quantity']) ]]
diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 2d4238823da..83d3162cf6d 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -216,7 +216,7 @@
[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]
|
- [[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]
+ [[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit'], currency_obj = company.currency_id) ]]
|
[[ line['blocked'] and 'X' or '' ]]
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index bf456cfc4d6..3e07516c01b 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -231,7 +231,7 @@
[[ formatLang(line.unit_quantity) ]]
|
- [[ formatLang(line.total_amount) ]] [[ o.currency_id.symbol ]]
+ [[ formatLang(line.total_amount, currency_obj=o.currency_id) ]]
|
@@ -277,7 +277,7 @@
Total:
- [[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]
+ [[ formatLang(o.amount, currency_obj=o.currency_id) ]]
|
diff --git a/addons/hr_payroll/report/report_contribution_register.rml b/addons/hr_payroll/report/report_contribution_register.rml
index b3a5de9753d..8a5897c6091 100644
--- a/addons/hr_payroll/report/report_contribution_register.rml
+++ b/addons/hr_payroll/report/report_contribution_register.rml
@@ -206,7 +206,7 @@
[[ formatLang(r['amount']) ]]
- [[ formatLang(r['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]
+ [[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]]
|
@@ -222,7 +222,7 @@
Total:
- [[ formatLang(sum_total()) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]
+ [[ formatLang(sum_total(), currency_obj = o.company_id and o.company_id.currency_id)]]
|
diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml
index 4d96e4b5ef7..7b419ddc2ee 100644
--- a/addons/hr_payroll/report/report_payslip.rml
+++ b/addons/hr_payroll/report/report_payslip.rml
@@ -293,7 +293,7 @@
[[ formatLang(p.amount) ]]
- [[ formatLang(p.total) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]
+ [[ formatLang(p.total, currency_obj = o.company_id and o.company_id.currency_id)]]
|
diff --git a/addons/hr_payroll/report/report_payslip_details.rml b/addons/hr_payroll/report/report_payslip_details.rml
index fe6a10dd1f5..83e9e5c09a1 100644
--- a/addons/hr_payroll/report/report_payslip_details.rml
+++ b/addons/hr_payroll/report/report_payslip_details.rml
@@ -334,7 +334,7 @@
[[ '..'*h['level'] ]][[ h['rule_category'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]
- [[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
+ [[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
|
@@ -391,7 +391,7 @@
[[ formatLang(r['amount']) ]]
- [[ formatLang(r['total']) ]] [[ o.company_id and o.company_id.currency_id.symbol or '']][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]
+ [[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]
|
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
index 8f2a57d2018..0c0353a4045 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
@@ -284,7 +284,7 @@
[[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]]
- [[ formatLang(get_total()) ]] [[company.currency_id.symbol]]
+ [[ formatLang(get_total(), currency_obj = company.currency_id)]]
|
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
index 8ca1bae5ba5..879314a24d9 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
@@ -247,7 +247,7 @@
[[ line['acc_no'] ]]
- [[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[formatLang(line['bysal'], currency_obj = company.currency_id) ]]
|
[[ line['debit_credit'] ]]
@@ -296,7 +296,7 @@
[[ line['ifsc_code'] ]]
|
- [[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[formatLang(line['bysal'], currency_obj = company.currency_id) ]]
|
[[ line['debit_credit'] ]]
@@ -321,7 +321,7 @@
|
- [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]]
|
@@ -347,7 +347,7 @@
|
- [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]]
|
diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
index a7ab3db3185..76bf65c98ac 100644
--- a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
@@ -334,7 +334,7 @@
[[ '..'*h['level'] ]][[ h['rule_category'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]
|
- [[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
+ [[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
|
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index b09b59bb96b..0a13beb622c 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -137,7 +137,7 @@
- [[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]
+ [[ formatLang(get_total(o,objects), currency_obj = o.company_id and o.company_id.currency_id) ]]
|
@@ -155,7 +155,7 @@
[[ lines.descript]]
- [[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]
+ [[ formatLang(lines.price , currency_obj = o.company_id and o.company_id.currency_id) ]]
|
@@ -172,7 +172,7 @@
Total :
- [[ formatLang(get_nettotal()) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]
+ [[ formatLang(get_nettotal(), currency_obj = o.company_id and o.company_id.currency_id) ]]
|
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index be5737d4b85..202ed6e4684 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -312,7 +312,7 @@
[[ formatLang(line.price_unit) ]]
- [[ formatLang(line.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(line.price_subtotal, currency_obj = o.pricelist_id.currency_id) ]]
|
@@ -337,7 +337,7 @@
[[ formatLang(fees.price_unit) ]]
- [[ formatLang(fees.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(fees.price_subtotal, currency_obj = o.pricelist_id.currency_id) ]]
|
@@ -353,7 +353,7 @@
Net Total :
- [[ formatLang(o.amount_untaxed, dp='Sale Price')]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_untaxed, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]
|
@@ -367,7 +367,7 @@
Taxes:
- [[ formatLang(o.amount_tax, dp='Account')]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]
|
@@ -380,7 +380,7 @@
Total :
- [[ formatLang(total(o), dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(total(o), dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]
|
diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index dc6e6c5e64c..0b633f3f7c4 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -214,10 +214,10 @@
[[ formatLang(statement.closing_date,date_time=True)]]
- [[ formatLang(statement.balance_start, dp='Account') ]][[ company.currency_id.symbol ]]
+ [[ formatLang(statement.balance_start, dp='Account', currency_obj = company.currency_id) ]]
|
- [[ formatLang(statement.balance_end_real, dp='Account') ]][[ company.currency_id.symbol ]]
+ [[ formatLang(statement.balance_end_real, dp='Account', currency_obj = company.currency_id) ]]
|
@@ -250,7 +250,7 @@
[[ line_ids.partner_id.name ]]
- [[ formatLang(line_ids.amount, dp='Account') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids.amount, dp='Account', currency_obj=company.currency_id) ]]
|
@@ -267,7 +267,7 @@
Total :
- [[ formatLang(get_total(statement.line_ids), dp='Account') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(get_total(statement.line_ids), dp='Account', currency_obj = company.currency_id) ]]
|
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
index bb58c5e823d..4b7088cb86f 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
@@ -183,10 +183,10 @@
- [[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(get_net_total_starting(user)[1], currency_obj = company.currency_id)]]
|
- [[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]
+ [[ formatLang(get_net_total(user), currency_obj = company.currency_id)]]
|
@@ -236,7 +236,7 @@
- [[ formatLang(line_ids['amount']) ]] [[company.currency_id.symbol]]
+ [[ formatLang(line_ids['amount'], currency_obj = company.currency_id)]]
|
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index b0019133009..aeecc82f7ef 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -252,7 +252,7 @@
[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]
- [[ formatLang(line_ids['price_unit'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids['price_unit'], dp='Sale Price', currency_obj = company.currency_id) ]]
|
[[ formatLang(line_ids['qty']) ]] [[ line_ids['uom'] ]]
@@ -349,7 +349,7 @@
Sales total(Revenue)
|
- [[ formatLang(getsalestotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsalestotal2(), dp='Sale Price', currency_obj = company.currency_id) ]]
|
@@ -365,7 +365,7 @@
Total invoiced
- [[ formatLang(getsuminvoice2(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsuminvoice2(data['form']), dp='Sale Price', currency_obj = company.currency_id) ]]
|
@@ -373,7 +373,7 @@
Total discount
- [[ formatLang(getsumdisc(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsumdisc(), dp='Sale Price', currency_obj = company.currency_id) ]]
|
@@ -381,7 +381,7 @@
Total paid
- [[ formatLang(getpaidtotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getpaidtotal2(), dp='Sale Price', currency_obj = company.currency_id) ]]
|
@@ -389,7 +389,7 @@
Total of the day
- [[ formatLang(gettotalofthaday(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(gettotalofthaday(data['form']), dp='Sale Price', currency_obj = company.currency_id) ]]
|
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index be394ed4f16..1ed8e33eede 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -186,7 +186,7 @@
[[ formatLang(l.discount) ]]
- [[ formatLang(l.price_subtotal) ]] [[o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(l.price_subtotal, currency_obj=o.pricelist_id.currency_id) ]]
|
@@ -202,7 +202,7 @@
Net Total :
- [[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]
+ [[ formatLang(o.amount_total, currency_obj=o.pricelist_id.currency_id) ]]
|
@@ -215,7 +215,7 @@
Taxes :
- [[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_tax, currency_obj=o.pricelist_id.currency_id) ]]
|
@@ -228,7 +228,7 @@
Total:
- [[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_total + o.amount_tax, currency_obj=o.pricelist_id.currency_id) ]]
|
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index 757de687ee0..1e43b44cf05 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -183,7 +183,7 @@
[[ formatLang(line_ids['price_unit']) ]]
- [[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids['total'], currency_obj = company.currency_id) ]]
|
diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
index 3105441aa0c..f945890d984 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -168,7 +168,7 @@
[[ formatLang(line_ids['price_unit']) ]]
- [[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]
+ [[ formatLang(line_ids['total'], currency_obj = company.currency_id)]]
|
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index f3a8cfd77e8..9758e924ada 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -191,7 +191,7 @@
[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]
- [[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids['amt'], currency_obj = company.currency_id) ]]
|
@@ -208,7 +208,7 @@
Total :
- [[ formatLang(get_total(statement)) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(get_total(statement), currency_obj = company.currency_id) ]]
|
diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml
index c07bd06f402..fc410e04ce0 100644
--- a/addons/report_intrastat/report/invoice.rml
+++ b/addons/report_intrastat/report/invoice.rml
@@ -245,7 +245,7 @@
[[ l.discount and formatLang (l.discount) or '' ]]
- [[ formatLang(l.price_subtotal) ]] [[ o.currency_id.symbol ]]
+ [[ formatLang(l.price_subtotal, currency_obj=o.currency_id) ]]
|
@@ -301,7 +301,7 @@
Total (excl. taxes):
- [[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]
+ [[ formatLang(o.amount_untaxed, currency_obj=o.currency_id) ]]
|
@@ -314,7 +314,7 @@
Taxes:
- [[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]
+ [[ formatLang(o.amount_tax, currency_obj=o.currency_id) ]]
|
@@ -327,7 +327,7 @@
Total (inclu. taxes):
- [[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]
+ [[ formatLang(o.amount_total, currency_obj=o.currency_id) ]]
|
@@ -360,10 +360,10 @@
[[ t.name ]]
- [[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]
+ [[ formatLang(t.base, digits=get_digits(dp='Account'), currency_obj = o.currency_id) ]]
|
- [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]
+ [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]
|
diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml
index 9662eede03b..82c402a3fdf 100644
--- a/addons/stock/report/lot_overview.rml
+++ b/addons/stock/report/lot_overview.rml
@@ -184,7 +184,7 @@
[[ formatLang(p['price'], dp='Account') ]]
|
- [[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]]
+ [[ formatLang(p['price_value'], dp='Account', currency_obj = o.company_id.currency_id)]]
|
@@ -198,7 +198,7 @@
Total:
- [[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]
+ [[ formatLang(price_total(), dp='Account', currency_obj = o.company_id.currency_id) ]]
|
@@ -215,7 +215,7 @@
- [[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]
+ [[ formatLang(grand_total_price(), dp='Account', currency_obj = o.company_id.currency_id) ]]
|
diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml
index 3b2dc5f7751..51b93c6323b 100644
--- a/addons/stock/report/lot_overview_all.rml
+++ b/addons/stock/report/lot_overview_all.rml
@@ -184,7 +184,7 @@
[[ formatLang(p['price'], dp='Account') ]]
- [[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]]
+ [[ formatLang(p['price_value'], dp='Account', currency_obj = o.company_id.currency_id)]]
|
@@ -198,7 +198,7 @@
Total:
- [[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]
+ [[ formatLang(price_total(), dp='Account', currency_obj = o.company_id.currency_id) ]]
|
@@ -215,7 +215,7 @@
- [[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]
+ [[ formatLang(grand_total_price(), dp='Account', currency_obj = o.company_id.currency_id) ]]
|