[MERGE] forward port of branch saas-3 up to da93981
This commit is contained in:
commit
272e085df4
|
@ -134,7 +134,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)
|
||||
|
|
|
@ -450,7 +450,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
|
||||
|
||||
|
|
Loading…
Reference in New Issue