odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] forward port of branch 7.0 up to f300d64

This commit is contained in:
Denis Ledoux 2015-05-07 11:33:59 +02:00
parent ae634e7a04 f300d648a8
commit da93981cb0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/report/account_entries_report.py
View File

@ -143,7 +143,7 @@ class account_entries_report(osv.osv):
l.amount_currency as amount_currency,
l.debit as debit,
l.credit as credit,
l.debit-l.credit as balance
coalesce(l.debit, 0.0) - coalesce(l.credit, 0.0) as balance
from
account_move_line l
left join account_account a on (l.account_id = a.id)

2
addons/web/controllers/main.py
View File

@ -574,7 +574,7 @@ def content_disposition(filename):
if browser == 'msie' and version < 9:
return "attachment; filename=%s" % escaped
elif browser == 'safari':
return "attachment; filename=%s" % filename
return "attachment; filename=\"%s\"" % filename
else:
return "attachment; filename*=UTF-8''%s" % escaped