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

[MERGE] forward port of branch saas-3 up to ae634e7

This commit is contained in:
Denis Ledoux 2015-05-05 17:55:25 +02:00
parent 0c665edb66 ae634e7a04
commit a939a272ef
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/account/wizard/account_statement_from_invoice.py
View File

@ -63,8 +63,12 @@ class account_statement_from_invoice_lines(osv.osv_memory):
amount = -line.credit
if line.amount_currency:
amount = currency_obj.compute(cr, uid, line.currency_id.id,
statement.currency.id, line.amount_currency, context=ctx)
if line.company_id.currency_id.id != statement.currency.id:
# In the specific case where the company currency and the statement currency are the same
# the debit/credit field already contains the amount in the right currency.
# We therefore avoid to re-convert the amount in the currency, to prevent Gain/loss exchanges
amount = currency_obj.compute(cr, uid, line.currency_id.id,
statement.currency.id, line.amount_currency, context=ctx)
elif (line.invoice and line.invoice.currency_id.id != statement.currency.id):
amount = currency_obj.compute(cr, uid, line.invoice.currency_id.id,
statement.currency.id, amount, context=ctx)

0
addons/web/static/lib/datejs/globalization/bs-BS.js → addons/web/static/lib/datejs/globalization/bs-BA.js
View File

0
addons/web/static/lib/datejs/globalization/lo-LA.js Normal file
View File

2
addons/web/static/src/js/chrome.js
View File

@ -1078,7 +1078,7 @@ instance.web.UserMenu = instance.web.Widget.extend({
instance.web.redirect('https://accounts.odoo.com/oauth2/auth?'+$.param(params));
}).fail(function(result, ev){
ev.preventDefault();
instance.web.redirect('https://accounts.odoo.com/web');
instance.web.redirect('https://accounts.odoo.com/account');
});
}
},