[MERGE] forward port of branch 7.0 up to 567ade5
This commit is contained in:
commit
ae634e7a04
|
@ -68,8 +68,12 @@ class account_statement_from_invoice_lines(osv.osv_memory):
|
||||||
amount = -line.credit
|
amount = -line.credit
|
||||||
|
|
||||||
if line.amount_currency:
|
if line.amount_currency:
|
||||||
amount = currency_obj.compute(cr, uid, line.currency_id.id,
|
if line.company_id.currency_id.id != statement.currency.id:
|
||||||
statement.currency.id, line.amount_currency, context=ctx)
|
# 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):
|
elif (line.invoice and line.invoice.currency_id.id <> statement.currency.id):
|
||||||
amount = currency_obj.compute(cr, uid, line.invoice.currency_id.id,
|
amount = currency_obj.compute(cr, uid, line.invoice.currency_id.id,
|
||||||
statement.currency.id, amount, context=ctx)
|
statement.currency.id, amount, context=ctx)
|
||||||
|
|
|
@ -1047,7 +1047,7 @@ instance.web.UserMenu = instance.web.Widget.extend({
|
||||||
instance.web.redirect('https://accounts.odoo.com/oauth2/auth?'+$.param(params));
|
instance.web.redirect('https://accounts.odoo.com/oauth2/auth?'+$.param(params));
|
||||||
}).fail(function(result, ev){
|
}).fail(function(result, ev){
|
||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
instance.web.redirect('https://accounts.odoo.com/web');
|
instance.web.redirect('https://accounts.odoo.com/account');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue