From 1f62c210a92a8dcb403ee459ea81efc4c5d2bf45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Maes?= Date: Thu, 26 Oct 2017 11:36:08 +0200 Subject: [PATCH] [FIX] sale_timesheet: fix multicurrency for invoice and to invoice amount Convert all amounts into the currency of current user. opw-777514 --- addons/sale_timesheet/controllers/main.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/sale_timesheet/controllers/main.py b/addons/sale_timesheet/controllers/main.py index 1f3e9b01103..5bfc5d7b96f 100644 --- a/addons/sale_timesheet/controllers/main.py +++ b/addons/sale_timesheet/controllers/main.py @@ -22,9 +22,10 @@ class SaleTimesheetController(http.Controller): def _prepare_plan_values(self, domain): timesheet_lines = request.env['account.analytic.line'].search(domain) + currency = request.env.user.company_id.currency_id values = { - 'currency': request.env.user.company_id.currency_id, + 'currency': currency, 'timesheet_lines': timesheet_lines, 'domain': domain, } @@ -61,8 +62,8 @@ class SaleTimesheetController(http.Controller): # money_amount so_lines = values['timesheet_lines'].mapped('so_line') invoice_lines = so_lines.mapped('invoice_lines') - dashboard_values['money_amount']['invoiced'] = sum([inv_line.price_unit * inv_line.quantity for inv_line in invoice_lines.filtered(lambda line: line.invoice_id.state in ['open', 'paid'])]) - dashboard_values['money_amount']['to_invoice'] = sum([sol.price_unit * sol.qty_to_invoice for sol in so_lines]) + sum([i.price_unit * i.quantity for i in invoice_lines.filtered(lambda line: line.invoice_id.state == 'draft')]) + dashboard_values['money_amount']['invoiced'] = sum([inv_line.currency_id.with_context(date=inv_line.invoice_id.date_invoice).compute(inv_line.price_unit * inv_line.quantity, currency) for inv_line in invoice_lines.filtered(lambda line: line.invoice_id.state in ['open', 'paid'])]) + dashboard_values['money_amount']['to_invoice'] = sum([sol.currency_id.compute(sol.price_unit * sol.qty_to_invoice, currency) for sol in so_lines]) + sum([i.currency_id.with_context(date=i.invoice_id.date_invoice).compute(i.price_unit * i.quantity, currency) for i in invoice_lines.filtered(lambda line: line.invoice_id.state == 'draft')]) dashboard_values['money_amount']['cost'] = sum(values['timesheet_lines'].mapped('amount')) dashboard_values['money_amount']['total'] = sum([dashboard_values['money_amount'][item] for item in dashboard_values['money_amount'].keys()])