diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 83d3162cf6d..31f5c25a9b3 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -261,7 +261,7 @@
Balance :
- [[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), 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 44a9485e6d8..30181f84512 100644
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.rml
@@ -159,7 +159,11 @@
|
[[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.name or '']]
- [[ o.mode and o.mode.bank_id.bank and display_address(o.mode.bank_id.bank)]]
+ [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street or '']]
+ [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street2 or removeParentNode('para')]]
+ [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.zip or '']] [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.city or '']]
+ [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.state and o.mode.bank_id.bank.state.name or removeParentNode('para') ]]
+ [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.country and o.mode.bank_id.bank.country.name or '']]
|
@@ -252,10 +256,10 @@
[[line.date=='False' and '-' or formatLang(line.date,date=True) ]]
- [[formatLang(line.amount) or '-' ]] [[get_company_currency_symbol()]]
+ [[formatLang(line.amount, currency_obj= user.company_id and user.company_id.currency_id) or '-' ]]
|
- [[ formatLang(line.amount_currency) ]] [[ line.currency.symbol]]
+ [[ formatLang(line.amount_currency, currency_obj= line.currency)]]
|
@@ -271,10 +275,10 @@
Total:
- [[ formatLang(get_amount_total(o)) or '' ]] [[get_company_currency_symbol()]]
+ [[ formatLang(get_amount_total(o), currency_obj= user.company_id and user.company_id.currency_id) or '' ]]
|
- [[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]]
+ [[ formatLang(get_amount_total_in_currency(o), currency_obj= user.company_id and user.company_id.currency_id) or '' ]]
|
diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py
index 0b2a8061906..0a87d281471 100644
--- a/addons/account_payment/report/payment_order.py
+++ b/addons/account_payment/report/payment_order.py
@@ -32,7 +32,6 @@ class payment_order(report_sxw.rml_parse):
'time': time,
'get_invoice_name': self._get_invoice_name,
'get_company_currency': self._get_company_currency,
- 'get_company_currency_symbol': self._get_company_currency_symbol,
'get_amount_total_in_currency': self._get_amount_total_in_currency,
'get_amount_total': self._get_amount_total,
'get_account_name': self._get_account_name,
@@ -72,11 +71,6 @@ class payment_order(report_sxw.rml_parse):
user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False
- def _get_company_currency_symbol(self):
- pool = pooler.get_pool(self.cr.dbname)
- user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
- return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False
-
def _get_account_name(self,bank_id):
if bank_id:
pool = pooler.get_pool(self.cr.dbname)
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 4b7088cb86f..30ef8242a85 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
@@ -210,7 +210,7 @@
[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]
- [[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]
+ [[ 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.rml b/addons/point_of_sale/report/pos_details.rml
index aeecc82f7ef..e7c4c756e64 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -289,7 +289,7 @@
[[ p['name'] or removeParentNode('para') ]]
- [[ formatLang(p['amount']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(p['amount'], currency_obj = company.currency_id) or removeParentNode('tr') ]]
|
@@ -320,7 +320,7 @@
[[ p['name'] or removeParentNode('para') ]]
- [[ formatLang(p['sum'], dp='Account') or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(p['sum'], dp='Account', currency_obj = company.currency_id) or removeParentNode('tr') ]]
|
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index 1e43b44cf05..bcc4b9ec261 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -201,7 +201,7 @@
Net Total:
- [[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]
+ [[ formatLang(pos_payment_total(o), currency_obj = company.currency_id) or removeParentNode('blockTable')]]
|
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 f945890d984..1d89d28c5f9 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -194,7 +194,7 @@
Total:
- [[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]
+ [[ formatLang(pos_payment_user_total(data['form'], currency_obj = company.currency_id)) or removeParentNode('blockTable')]]
|