summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqdp-odoo <qdp@openerp.com>2014-08-11 15:23:05 +0200
committerqdp-odoo <qdp@openerp.com>2014-08-11 15:23:05 +0200
commit9b0cac0aa0f5250b1eec5a11a46a02483c29b5ff (patch)
tree6b4167e10bbd95412c244c8a70a46605d6db3d7c
parent8dc8302dadfbc16592d18669c0b99edcbb123f86 (diff)
[FIX] account_followup: total in foreign currency displayed in the right currency instead of company currency
-rw-r--r--addons/account_followup/report/account_followup_print.py2
-rw-r--r--addons/account_followup/views/report_followup.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index bf20527d3fa..a8c71a94232 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -72,7 +72,7 @@ class report_rappel(report_sxw.rml_parse):
}
lines_per_currency[currency].append(line_data)
- return [{'line': lines} for lines in lines_per_currency.values()]
+ return [{'line': lines, 'currency': currency} for currency, lines in lines_per_currency.items()]
def _get_text(self, stat_line, followup_id, context=None):
context = dict(context or {}, lang=stat_line.partner_id.lang)
diff --git a/addons/account_followup/views/report_followup.xml b/addons/account_followup/views/report_followup.xml
index c0d98e7bb28..a79945b93de 100644
--- a/addons/account_followup/views/report_followup.xml
+++ b/addons/account_followup/views/report_followup.xml
@@ -47,7 +47,7 @@
</table>
<t t-set="total" t-value="reduce(lambda x,y: x+y['balance'], cur_lines['line'], 0.00)"/>
- <p>Total: <span t-esc="formatLang(total, currency_obj=res_company.currency_id)"/></p>
+ <p>Total: <span t-esc="formatLang(total, currency_obj=cur_lines['currency'])"/></p>
</t>
</div>
</t>