From e5d11fa7a5ba583574a75eaddae1f21bd8137f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Lef=C3=A8vre?= Date: Thu, 20 Apr 2023 12:18:14 +0000 Subject: [PATCH] [FIX] spreadsheet_dashboard_hr_expense: don't mix currencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the Dashboard app, expenses KPI amounts are currently expressed in the currency they were made in, but with the currency symbol of the company currency. It also means amounts with different currencies are aggregated. We want the KPI to be expressed in the company currency and not in the expense currency. Note that even with this commit, the amounts are still mixing different currencies if multiple companies are active Task 3266092 closes odoo/odoo#119264 X-original-commit: e579ec5b3794d545676accdd23428557b75d05fa Signed-off-by: Lucas Lefèvre (lul) --- .../data/files/expense_dashboard.json | 125 +++++++++--------- 1 file changed, 62 insertions(+), 63 deletions(-) diff --git a/addons/spreadsheet_dashboard_hr_expense/data/files/expense_dashboard.json b/addons/spreadsheet_dashboard_hr_expense/data/files/expense_dashboard.json index c285781e3e5..f4b8b135286 100644 --- a/addons/spreadsheet_dashboard_hr_expense/data/files/expense_dashboard.json +++ b/addons/spreadsheet_dashboard_hr_expense/data/files/expense_dashboard.json @@ -50,7 +50,7 @@ "cells": { "A7": { "style": 1, - "content": "[Expenses Analysis](odoo://view/{\"viewType\":\"graph\",\"action\":{\"domain\":[],\"context\":{\"group_by\":[\"date:month\",\"product_id\"],\"graph_measure\":\"total_amount\",\"graph_mode\":\"bar\",\"graph_groupbys\":[\"date:month\",\"product_id\"]},\"modelName\":\"hr.expense\",\"views\":[[false,\"graph\"],[false,\"pivot\"],[false,\"list\"],[false,\"kanban\"],[false,\"form\"],[false,\"search\"]]},\"threshold\":0,\"name\":\"Expenses Analysis\",\"positional\":true})", + "content": "[Expenses Analysis](odoo://view/{\"viewType\":\"graph\",\"action\":{\"domain\":[],\"context\":{\"group_by\":[\"date:month\",\"product_id\"],\"graph_measure\":\"total_amount_company\",\"graph_mode\":\"bar\",\"graph_groupbys\":[\"date:month\",\"product_id\"]},\"modelName\":\"hr.expense\",\"views\":[[false,\"graph\"],[false,\"pivot\"],[false,\"list\"],[false,\"kanban\"],[false,\"form\"],[false,\"search\"]]},\"threshold\":0,\"name\":\"Expenses Analysis\",\"positional\":true})", "border": 1 }, "A19": { @@ -105,7 +105,7 @@ }, "A32": { "style": 1, - "content": "[Top Reinvoiced Orders](odoo://view/{\"viewType\":\"pivot\",\"action\":{\"domain\":[[\"sale_order_id\",\"!=\",false]],\"context\":{\"group_by\":[\"sale_order_id\"],\"pivot_measures\":[\"__count\",\"total_amount\"],\"pivot_column_groupby\":[],\"pivot_row_groupby\":[\"sale_order_id\"]},\"modelName\":\"hr.expense\",\"views\":[[false,\"graph\"],[false,\"pivot\"],[false,\"list\"],[false,\"kanban\"],[false,\"form\"],[false,\"search\"]]},\"threshold\":0,\"name\":\"Expenses Analysis\"})", + "content": "[Top Reinvoiced Orders](odoo://view/{\"viewType\":\"pivot\",\"action\":{\"domain\":[[\"sale_order_id\",\"!=\",false]],\"context\":{\"group_by\":[\"sale_order_id\"],\"pivot_measures\":[\"__count\",\"total_amount_company\"],\"pivot_column_groupby\":[],\"pivot_row_groupby\":[\"sale_order_id\"]},\"modelName\":\"hr.expense\",\"views\":[[false,\"graph\"],[false,\"pivot\"],[false,\"list\"],[false,\"kanban\"],[false,\"form\"],[false,\"search\"]]},\"threshold\":0,\"name\":\"Expenses Analysis\"})", "border": 1 }, "A33": { @@ -250,38 +250,38 @@ }, "C21": { "style": 7, - "content": "=ODOO.LIST(1,1,\"total_amount\")" + "content": "=ODOO.LIST(1,1,\"total_amount_company\")" }, "C22": { - "content": "=ODOO.LIST(1,2,\"total_amount\")" + "content": "=ODOO.LIST(1,2,\"total_amount_company\")" }, "C23": { "style": 7, - "content": "=ODOO.LIST(1,3,\"total_amount\")" + "content": "=ODOO.LIST(1,3,\"total_amount_company\")" }, "C24": { - "content": "=ODOO.LIST(1,4,\"total_amount\")" + "content": "=ODOO.LIST(1,4,\"total_amount_company\")" }, "C25": { "style": 7, - "content": "=ODOO.LIST(1,5,\"total_amount\")" + "content": "=ODOO.LIST(1,5,\"total_amount_company\")" }, "C26": { - "content": "=ODOO.LIST(1,6,\"total_amount\")" + "content": "=ODOO.LIST(1,6,\"total_amount_company\")" }, "C27": { "style": 7, - "content": "=ODOO.LIST(1,7,\"total_amount\")" + "content": "=ODOO.LIST(1,7,\"total_amount_company\")" }, "C28": { - "content": "=ODOO.LIST(1,8,\"total_amount\")" + "content": "=ODOO.LIST(1,8,\"total_amount_company\")" }, "C29": { "style": 7, - "content": "=ODOO.LIST(1,9,\"total_amount\")" + "content": "=ODOO.LIST(1,9,\"total_amount_company\")" }, "C30": { - "content": "=ODOO.LIST(1,10,\"total_amount\")" + "content": "=ODOO.LIST(1,10,\"total_amount_company\")" }, "C33": { "style": 8, @@ -290,42 +290,42 @@ }, "C34": { "style": 7, - "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",1)" + "content": "=ODOO.PIVOT(9,\"total_amount_company\",\"#sale_order_id\",1)" }, "C35": { - "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",2)" + "content": "=ODOO.PIVOT(9,\"total_amount_company\",\"#sale_order_id\",2)" }, "C36": { "style": 7, - "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",3)" + "content": "=ODOO.PIVOT(9,\"total_amount_company\",\"#sale_order_id\",3)" }, "C37": { - "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",4)" + "content": "=ODOO.PIVOT(9,\"total_amount_company\",\"#sale_order_id\",4)" }, "C38": { "style": 7, - "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",5)" + "content": "=ODOO.PIVOT(9,\"total_amount_company\",\"#sale_order_id\",5)" }, "C39": { - "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",6)" + "content": "=ODOO.PIVOT(9,\"total_amount_company\",\"#sale_order_id\",6)" }, "C40": { "style": 7, - "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",7)" + "content": "=ODOO.PIVOT(9,\"total_amount_company\",\"#sale_order_id\",7)" }, "C41": { - "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",8)" + "content": "=ODOO.PIVOT(9,\"total_amount_company\",\"#sale_order_id\",8)" }, "C42": { "style": 7, - "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",9)" + "content": "=ODOO.PIVOT(9,\"total_amount_company\",\"#sale_order_id\",9)" }, "C43": { - "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",10)" + "content": "=ODOO.PIVOT(9,\"total_amount_company\",\"#sale_order_id\",10)" }, "E19": { "style": 1, - "content": "[Top Categories](odoo://view/{\"viewType\":\"pivot\",\"action\":{\"domain\":[[\"product_id\",\"!=\",false]],\"context\":{\"group_by\":[\"product_id\"],\"pivot_measures\":[\"__count\",\"total_amount\"],\"pivot_column_groupby\":[],\"pivot_row_groupby\":[\"product_id\"]},\"modelName\":\"hr.expense\",\"views\":[[false,\"graph\"],[false,\"pivot\"],[false,\"list\"],[false,\"kanban\"],[false,\"form\"],[false,\"search\"]]},\"threshold\":0,\"name\":\"Expenses Analysis\"})", + "content": "[Top Categories](odoo://view/{\"viewType\":\"pivot\",\"action\":{\"domain\":[[\"product_id\",\"!=\",false]],\"context\":{\"group_by\":[\"product_id\"],\"pivot_measures\":[\"__count\",\"total_amount_company\"],\"pivot_column_groupby\":[],\"pivot_row_groupby\":[\"product_id\"]},\"modelName\":\"hr.expense\",\"views\":[[false,\"graph\"],[false,\"pivot\"],[false,\"list\"],[false,\"kanban\"],[false,\"form\"],[false,\"search\"]]},\"threshold\":0,\"name\":\"Expenses Analysis\"})", "border": 1 }, "E20": { @@ -375,7 +375,7 @@ }, "E32": { "style": 1, - "content": "[Top Employees](odoo://view/{\"viewType\":\"pivot\",\"action\":{\"domain\":[[\"product_id\",\"!=\",false]],\"context\":{\"group_by\":[\"product_id\"],\"pivot_measures\":[\"__count\",\"total_amount\"],\"pivot_column_groupby\":[],\"pivot_row_groupby\":[\"product_id\"]},\"modelName\":\"hr.expense\",\"views\":[[false,\"graph\"],[false,\"pivot\"],[false,\"list\"],[false,\"kanban\"],[false,\"form\"],[false,\"search\"]]},\"threshold\":0,\"name\":\"Expenses Analysis\"})", + "content": "[Top Employees](odoo://view/{\"viewType\":\"pivot\",\"action\":{\"domain\":[[\"product_id\",\"!=\",false]],\"context\":{\"group_by\":[\"product_id\"],\"pivot_measures\":[\"__count\",\"total_amount_company\"],\"pivot_column_groupby\":[],\"pivot_row_groupby\":[\"product_id\"]},\"modelName\":\"hr.expense\",\"views\":[[false,\"graph\"],[false,\"pivot\"],[false,\"list\"],[false,\"kanban\"],[false,\"form\"],[false,\"search\"]]},\"threshold\":0,\"name\":\"Expenses Analysis\"})", "border": 1 }, "E33": { @@ -510,38 +510,38 @@ }, "G21": { "style": 7, - "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",1)" + "content": "=ODOO.PIVOT(1,\"total_amount_company\",\"#product_id\",1)" }, "G22": { - "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",2)" + "content": "=ODOO.PIVOT(1,\"total_amount_company\",\"#product_id\",2)" }, "G23": { "style": 7, - "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",3)" + "content": "=ODOO.PIVOT(1,\"total_amount_company\",\"#product_id\",3)" }, "G24": { - "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",4)" + "content": "=ODOO.PIVOT(1,\"total_amount_company\",\"#product_id\",4)" }, "G25": { "style": 7, - "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",5)" + "content": "=ODOO.PIVOT(1,\"total_amount_company\",\"#product_id\",5)" }, "G26": { - "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",6)" + "content": "=ODOO.PIVOT(1,\"total_amount_company\",\"#product_id\",6)" }, "G27": { "style": 7, - "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",7)" + "content": "=ODOO.PIVOT(1,\"total_amount_company\",\"#product_id\",7)" }, "G28": { - "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",8)" + "content": "=ODOO.PIVOT(1,\"total_amount_company\",\"#product_id\",8)" }, "G29": { "style": 7, - "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",9)" + "content": "=ODOO.PIVOT(1,\"total_amount_company\",\"#product_id\",9)" }, "G30": { - "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",10)" + "content": "=ODOO.PIVOT(1,\"total_amount_company\",\"#product_id\",10)" }, "G33": { "style": 8, @@ -550,38 +550,38 @@ }, "G34": { "style": 7, - "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",1)" + "content": "=ODOO.PIVOT(4,\"total_amount_company\",\"#employee_id\",1)" }, "G35": { - "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",2)" + "content": "=ODOO.PIVOT(4,\"total_amount_company\",\"#employee_id\",2)" }, "G36": { "style": 7, - "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",3)" + "content": "=ODOO.PIVOT(4,\"total_amount_company\",\"#employee_id\",3)" }, "G37": { - "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",4)" + "content": "=ODOO.PIVOT(4,\"total_amount_company\",\"#employee_id\",4)" }, "G38": { "style": 7, - "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",5)" + "content": "=ODOO.PIVOT(4,\"total_amount_company\",\"#employee_id\",5)" }, "G39": { - "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",6)" + "content": "=ODOO.PIVOT(4,\"total_amount_company\",\"#employee_id\",6)" }, "G40": { "style": 7, - "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",7)" + "content": "=ODOO.PIVOT(4,\"total_amount_company\",\"#employee_id\",7)" }, "G41": { - "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",8)" + "content": "=ODOO.PIVOT(4,\"total_amount_company\",\"#employee_id\",8)" }, "G42": { "style": 7, - "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",9)" + "content": "=ODOO.PIVOT(4,\"total_amount_company\",\"#employee_id\",9)" }, "G43": { - "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",10)" + "content": "=ODOO.PIVOT(4,\"total_amount_company\",\"#employee_id\",10)" }, "A8": { "border": 2 @@ -665,7 +665,7 @@ "date:month", "product_id" ], - "measure": "total_amount", + "measure": "total_amount_company", "order": null, "resModel": "hr.expense" }, @@ -811,13 +811,13 @@ "content": "=ODOO.PIVOT(5,\"__count\")" }, "B2": { - "content": "=ODOO.PIVOT(6,\"total_amount\")" + "content": "=ODOO.PIVOT(6,\"total_amount_company\")" }, "B3": { - "content": "=ODOO.PIVOT(7,\"total_amount\")" + "content": "=ODOO.PIVOT(7,\"total_amount_company\")" }, "B4": { - "content": "=ODOO.PIVOT(8,\"total_amount\")" + "content": "=ODOO.PIVOT(8,\"total_amount_company\")" }, "C1": { "style": 7, @@ -912,7 +912,6 @@ "company_id", "attachment_number", "total_amount_company", - "total_amount", "state" ], "domain": [], @@ -920,7 +919,7 @@ "context": {}, "orderBy": [ { - "name": "total_amount", + "name": "total_amount_company", "asc": false } ], @@ -946,7 +945,7 @@ "field": "__count" }, { - "field": "total_amount" + "field": "total_amount_company" } ], "model": "hr.expense", @@ -959,7 +958,7 @@ [], [] ], - "measure": "total_amount", + "measure": "total_amount_company", "order": "desc" } }, @@ -979,7 +978,7 @@ "field": "__count" }, { - "field": "total_amount" + "field": "total_amount_company" } ], "model": "hr.expense", @@ -992,7 +991,7 @@ [], [] ], - "measure": "total_amount", + "measure": "total_amount_company", "order": "desc" } }, @@ -1014,7 +1013,7 @@ [], [] ], - "measure": "total_amount", + "measure": "total_amount_company", "order": "desc" } }, @@ -1031,7 +1030,7 @@ "id": "6", "measures": [ { - "field": "total_amount" + "field": "total_amount_company" } ], "model": "hr.expense", @@ -1042,7 +1041,7 @@ [], [] ], - "measure": "total_amount", + "measure": "total_amount_company", "order": "desc" } }, @@ -1059,7 +1058,7 @@ "id": "7", "measures": [ { - "field": "total_amount" + "field": "total_amount_company" } ], "model": "hr.expense", @@ -1070,7 +1069,7 @@ [], [] ], - "measure": "total_amount", + "measure": "total_amount_company", "order": "desc" } }, @@ -1087,7 +1086,7 @@ "id": "8", "measures": [ { - "field": "total_amount" + "field": "total_amount_company" } ], "model": "hr.expense", @@ -1098,7 +1097,7 @@ [], [] ], - "measure": "total_amount", + "measure": "total_amount_company", "order": "desc" } }, @@ -1126,7 +1125,7 @@ "field": "__count" }, { - "field": "total_amount" + "field": "total_amount_company" } ], "model": "hr.expense", @@ -1139,7 +1138,7 @@ [], [] ], - "measure": "total_amount", + "measure": "total_amount_company", "order": "desc" } }