diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 34f026d26b5..577cb9142a2 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -236,7 +236,7 @@
[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]]
- [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0)), currency_obj=company.currency_id) ]]
|
diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml
index 30181f84512..7ad897890e4 100644
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.rml
@@ -256,7 +256,7 @@
[[line.date=='False' and '-' or formatLang(line.date,date=True) ]]
|
- [[formatLang(line.amount, currency_obj= user.company_id and user.company_id.currency_id) or '-' ]]
+ [[formatLang(line.amount, currency_obj= user.company_id.currency_id) or '-' ]]
|
[[ formatLang(line.amount_currency, currency_obj= line.currency)]]
@@ -275,10 +275,10 @@
Total:
|
- [[ formatLang(get_amount_total(o), currency_obj= user.company_id and user.company_id.currency_id) or '' ]]
+ [[ formatLang(get_amount_total(o), currency_obj= user.company_id.currency_id) or '' ]]
|
- [[ formatLang(get_amount_total_in_currency(o), currency_obj= user.company_id and user.company_id.currency_id) or '' ]]
+ [[ formatLang(get_amount_total_in_currency(o), currency_obj= user.company_id.currency_id) or '' ]]
|
diff --git a/addons/account_voucher/report/account_voucher_print.rml b/addons/account_voucher/report/account_voucher_print.rml
index 923e900887a..9f0f2e1f07e 100644
--- a/addons/account_voucher/report/account_voucher_print.rml
+++ b/addons/account_voucher/report/account_voucher_print.rml
@@ -219,7 +219,7 @@
[[ p['pname'] ]]
- [[ p['amount'] ]] [[ voucher.currency_id.symbol ]]
+ [[ formatLang(p['amount'], currency_obj=voucher.currency_id) ]]
|
@@ -323,7 +323,7 @@
- [[ voucher.amount ]] [[ voucher.currency_id.symbol ]]
+ [[ formatLang(voucher.amount, currency_obj=voucher.currency_id) ]]
|
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
index 415f3a08f1f..ff1a2c2064d 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
@@ -108,7 +108,7 @@
[[ l['code'] (l['intra_code']) ]]
- [[ l['amount'] or O.OO ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(l['amount'], currency_obj=company.currency_id) ]]
|
@@ -129,7 +129,7 @@
Total:
- [[ data['form']['amountsum'] or 0.00 ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(data['form']['amountsum'], currency_obj=company.currency_id) ]]
|
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
index 0e75e7f7ae1..dc3b432728f 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -73,7 +73,7 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
if res:
return res[0]['bal']
else:
- return False
+ return 0
def _get_sub_total(self, user, data, date):
res={}
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 30ef8242a85..4f16031c8b3 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
@@ -207,7 +207,7 @@
[[ statement['closing_date'] ]]
- [[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]
+ [[ formatLang(get_bal(statement), currency_obj = company.currency_id)]]
|
[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date']), currency_obj = company.currency_id )]]
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index d12cdec2598..b1c71db7d40 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -204,7 +204,7 @@
[[ p[0] ]]
|
- [[ p[1] ]] [[company.currency_id.symbol]]
+ [[ formatLang(p[1], currency_obj=company.currency_id) ]]
|
@@ -235,7 +235,7 @@
[[ t[0] ]]
- [[ '%.2f' % (t[1],) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[1], currency_obj=company.currency_id) ]]
|
@@ -280,7 +280,7 @@
Total invoiced
- [[ '%.2f' % getsuminvoice(objects) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsuminvoice(objects), currency_obj=company.currency_id) ]]
|
@@ -288,7 +288,7 @@
Total discount
- [[ '%.2f' % getsumdisc(objects) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsumdisc(objects), currency_obj=company.currency_id) ]]
|
@@ -296,7 +296,7 @@
Total paid
- [[ '%.2f' % getpaidtotal(objects) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getpaidtotal(objects), currency_obj=company.currency_id) ]]
|
@@ -304,7 +304,7 @@
Total of the day
- [[ '%.2f' % gettotalofthaday(objects) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(gettotalofthaday(objects), currency_obj=company.currency_id) ]]
|
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 484d125ab82..d7b8b08ad29 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -108,7 +108,7 @@
[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]
- [[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] [[company.currency_id.symbol]] [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.2f' % line.discount ]]%) [[company.currency_id.symbol]]
+ [[o.state=='cancel' and o.statement_ids and '-' or '']][[ formatLang(net(line.id), currency_obj=company.currency_id) ]] [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ formatLang(line.discount, currency_obj=company.currency_id) ]])
|
@@ -118,7 +118,7 @@
Taxes :
- [[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_tax]] [[company.currency_id.symbol]]
+ [[o.state=='cancel' and o.statement_ids and '-' or '']][[formatLang(o.amount_tax, currency_obj=company.currency_id)]]
|
@@ -128,7 +128,7 @@
Total :
- [[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total]] [[company.currency_id.symbol]]
+ [[o.state=='cancel' and o.statement_ids and '-' or '']][[formatLang(o.amount_total, currency_obj=company.currency_id)]]
|
@@ -157,7 +157,7 @@
- [[ '%.2f' %(d['amt'] or 0) ]] [[company.currency_id.symbol]]
+ [[ formatLang(d['amt'] or 0, currency_obj=company.currency_id) ]]
|