From e6990ed2b87b09ced03f4a0f61559414aeeeac0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Lef=C3=A8vre?= Date: Mon, 5 Dec 2022 11:55:24 +0000 Subject: [PATCH] [FIX] spreadsheet_dashboard: remove currency formats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some of the dashboard files were using currency formats, which are hardcoded with a given currency. Because of that, some amounts are displayed with a $ sign, even if the amount is in €, according to the record's currency. It should use the automatic currency formatting of LIST functions to use the record's currency. This commits removes the hardcoded currency formats. Note that the automatic format displays the decimal values while the hardcoded format did not. This is a functional change. opw 3071160 opw 3058192 closes odoo/odoo#107557 X-original-commit: 54c99ede032775b9699ae85f3112de427c4b12b5 Related: odoo/enterprise#34834 Signed-off-by: Pierre Rousseau (pro) Signed-off-by: Lucas Lefèvre (lul) --- .../data/files/invoicing_dashboard.json | 21 ---------- .../data/files/expense_dashboard.json | 40 ------------------- .../data/files/vendors_dashboard.json | 40 ------------------- .../data/files/purchase_dashboard.json | 30 -------------- .../data/files/sales_dashboard.json | 20 ---------- 5 files changed, 151 deletions(-) diff --git a/addons/spreadsheet_dashboard_account/data/files/invoicing_dashboard.json b/addons/spreadsheet_dashboard_account/data/files/invoicing_dashboard.json index fe70e0d9f10..41d2a0206df 100644 --- a/addons/spreadsheet_dashboard_account/data/files/invoicing_dashboard.json +++ b/addons/spreadsheet_dashboard_account/data/files/invoicing_dashboard.json @@ -516,7 +516,6 @@ "format": 3 }, "C44": { - "format": 3, "content": "=iferror(if(B44,B44/ODOO.PIVOT(2,\"price_subtotal\"),\"\"),\"\")" }, "C45": { @@ -1003,52 +1002,42 @@ }, "G21": { "style": 17, - "format": 3, "content": "=ODOO.LIST(1,1,\"amount_untaxed_signed\")" }, "G22": { "style": 6, - "format": 3, "content": "=ODOO.LIST(1,2,\"amount_untaxed_signed\")" }, "G23": { "style": 17, - "format": 3, "content": "=ODOO.LIST(1,3,\"amount_untaxed_signed\")" }, "G24": { "style": 6, - "format": 3, "content": "=ODOO.LIST(1,4,\"amount_untaxed_signed\")" }, "G25": { "style": 17, - "format": 3, "content": "=ODOO.LIST(1,5,\"amount_untaxed_signed\")" }, "G26": { "style": 6, - "format": 3, "content": "=ODOO.LIST(1,6,\"amount_untaxed_signed\")" }, "G27": { "style": 17, - "format": 3, "content": "=ODOO.LIST(1,7,\"amount_untaxed_signed\")" }, "G28": { "style": 6, - "format": 3, "content": "=ODOO.LIST(1,8,\"amount_untaxed_signed\")" }, "G29": { "style": 17, - "format": 3, "content": "=ODOO.LIST(1,9,\"amount_untaxed_signed\")" }, "G30": { "style": 6, - "format": 3, "content": "=ODOO.LIST(1,10,\"amount_untaxed_signed\")" }, "G31": { @@ -1112,7 +1101,6 @@ "format": 3 }, "G44": { - "format": 3, "content": "=iferror(if(F44,F44/ODOO.PIVOT(1,\"price_subtotal\"),\"\"),\"\")" }, "G45": { @@ -1394,11 +1382,9 @@ "content": "=_t(\"KPI - Unpaid Invoices\")" }, "B1": { - "format": 4, "content": "=ODOO.PIVOT(5,\"price_subtotal\")" }, "B2": { - "format": 4, "content": "=IFERROR(ODOO.PIVOT(6,\"price_subtotal\")/B3)" }, "B3": { @@ -1406,23 +1392,18 @@ "content": "=ODOO.PIVOT(6,\"__count\")" }, "B4": { - "format": 4, "content": "=YEAR(TODAY())" }, "B5": { - "format": 4, "content": "=ODOO.BALANCE(ODOO.ACCOUNT.GROUP(\"asset_receivable\"),$B$4)" }, "B6": { - "format": 4, "content": "=-ODOO.BALANCE(ODOO.ACCOUNT.GROUP(\"income\"),$B$4)" }, "B7": { - "format": 4, "content": "=ODOO.BALANCE(ODOO.ACCOUNT.GROUP(\"expense_direct_cost\"),$B$4)" }, "B8": { - "format": 4, "content": "=B6-B7" }, "B9": { @@ -1433,7 +1414,6 @@ "content": "=ROUND(IFERROR(B5/B8*B9))" }, "B11": { - "format": 4, "content": "=ODOO.PIVOT(7,\"price_subtotal\")" }, "C1": { @@ -1442,7 +1422,6 @@ }, "C2": { "style": 15, - "format": 3, "content": "=FORMAT.LARGE.NUMBER(B2)" }, "C3": { 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 43d510baad3..fdf9c7f81c8 100644 --- a/addons/spreadsheet_dashboard_hr_expense/data/files/expense_dashboard.json +++ b/addons/spreadsheet_dashboard_hr_expense/data/files/expense_dashboard.json @@ -250,47 +250,37 @@ }, "C21": { "style": 7, - "format": 2, "content": "=ODOO.LIST(1,1,\"total_amount\")" }, "C22": { - "format": 2, "content": "=ODOO.LIST(1,2,\"total_amount\")" }, "C23": { "style": 7, - "format": 2, "content": "=ODOO.LIST(1,3,\"total_amount\")" }, "C24": { - "format": 2, "content": "=ODOO.LIST(1,4,\"total_amount\")" }, "C25": { "style": 7, - "format": 2, "content": "=ODOO.LIST(1,5,\"total_amount\")" }, "C26": { - "format": 2, "content": "=ODOO.LIST(1,6,\"total_amount\")" }, "C27": { "style": 7, - "format": 2, "content": "=ODOO.LIST(1,7,\"total_amount\")" }, "C28": { - "format": 2, "content": "=ODOO.LIST(1,8,\"total_amount\")" }, "C29": { "style": 7, - "format": 2, "content": "=ODOO.LIST(1,9,\"total_amount\")" }, "C30": { - "format": 2, "content": "=ODOO.LIST(1,10,\"total_amount\")" }, "C33": { @@ -300,47 +290,37 @@ }, "C34": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",1)" }, "C35": { - "format": 2, "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",2)" }, "C36": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",3)" }, "C37": { - "format": 2, "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",4)" }, "C38": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",5)" }, "C39": { - "format": 2, "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",6)" }, "C40": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",7)" }, "C41": { - "format": 2, "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",8)" }, "C42": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",9)" }, "C43": { - "format": 2, "content": "=ODOO.PIVOT(9,\"total_amount\",\"#sale_order_id\",10)" }, "E19": { @@ -530,47 +510,37 @@ }, "G21": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",1)" }, "G22": { - "format": 2, "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",2)" }, "G23": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",3)" }, "G24": { - "format": 2, "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",4)" }, "G25": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",5)" }, "G26": { - "format": 2, "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",6)" }, "G27": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",7)" }, "G28": { - "format": 2, "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",8)" }, "G29": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",9)" }, "G30": { - "format": 2, "content": "=ODOO.PIVOT(1,\"total_amount\",\"#product_id\",10)" }, "G33": { @@ -580,47 +550,37 @@ }, "G34": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",1)" }, "G35": { - "format": 2, "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",2)" }, "G36": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",3)" }, "G37": { - "format": 2, "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",4)" }, "G38": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",5)" }, "G39": { - "format": 2, "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",6)" }, "G40": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",7)" }, "G41": { - "format": 2, "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",8)" }, "G42": { "style": 7, - "format": 2, "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",9)" }, "G43": { - "format": 2, "content": "=ODOO.PIVOT(4,\"total_amount\",\"#employee_id\",10)" }, "A8": { diff --git a/addons/spreadsheet_dashboard_purchase/data/files/vendors_dashboard.json b/addons/spreadsheet_dashboard_purchase/data/files/vendors_dashboard.json index 848447d1ab3..60c44355973 100644 --- a/addons/spreadsheet_dashboard_purchase/data/files/vendors_dashboard.json +++ b/addons/spreadsheet_dashboard_purchase/data/files/vendors_dashboard.json @@ -897,182 +897,142 @@ }, "F21": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,1,\"amount_untaxed\")" }, "F22": { - "format": 2, "content": "=ODOO.LIST(1,2,\"amount_untaxed\")" }, "F23": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,3,\"amount_untaxed\")" }, "F24": { - "format": 2, "content": "=ODOO.LIST(1,4,\"amount_untaxed\")" }, "F25": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,5,\"amount_untaxed\")" }, "F26": { - "format": 2, "content": "=ODOO.LIST(1,6,\"amount_untaxed\")" }, "F27": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,7,\"amount_untaxed\")" }, "F28": { - "format": 2, "content": "=ODOO.LIST(1,8,\"amount_untaxed\")" }, "F29": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,9,\"amount_untaxed\")" }, "F30": { - "format": 2, "content": "=ODOO.LIST(1,10,\"amount_untaxed\")" }, "F31": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,11,\"amount_untaxed\")" }, "F32": { - "format": 2, "content": "=ODOO.LIST(1,12,\"amount_untaxed\")" }, "F33": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,13,\"amount_untaxed\")" }, "F34": { - "format": 2, "content": "=ODOO.LIST(1,14,\"amount_untaxed\")" }, "F35": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,15,\"amount_untaxed\")" }, "F36": { - "format": 2, "content": "=ODOO.LIST(1,16,\"amount_untaxed\")" }, "F37": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,17,\"amount_untaxed\")" }, "F38": { - "format": 2, "content": "=ODOO.LIST(1,18,\"amount_untaxed\")" }, "F39": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,19,\"amount_untaxed\")" }, "F40": { - "format": 2, "content": "=ODOO.LIST(1,20,\"amount_untaxed\")" }, "F41": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,21,\"amount_untaxed\")" }, "F42": { - "format": 2, "content": "=ODOO.LIST(1,22,\"amount_untaxed\")" }, "F43": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,23,\"amount_untaxed\")" }, "F44": { - "format": 2, "content": "=ODOO.LIST(1,24,\"amount_untaxed\")" }, "F45": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,25,\"amount_untaxed\")" }, "F46": { - "format": 2, "content": "=ODOO.LIST(1,26,\"amount_untaxed\")" }, "F47": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,27,\"amount_untaxed\")" }, "F48": { - "format": 2, "content": "=ODOO.LIST(1,28,\"amount_untaxed\")" }, "F49": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,29,\"amount_untaxed\")" }, "F50": { - "format": 2, "content": "=ODOO.LIST(1,30,\"amount_untaxed\")" }, "F51": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,31,\"amount_untaxed\")" }, "F52": { - "format": 2, "content": "=ODOO.LIST(1,32,\"amount_untaxed\")" }, "F53": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,33,\"amount_untaxed\")" }, "F54": { - "format": 2, "content": "=ODOO.LIST(1,34,\"amount_untaxed\")" }, "F55": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,35,\"amount_untaxed\")" }, "F56": { - "format": 2, "content": "=ODOO.LIST(1,36,\"amount_untaxed\")" }, "F57": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,37,\"amount_untaxed\")" }, "F58": { - "format": 2, "content": "=ODOO.LIST(1,38,\"amount_untaxed\")" }, "F59": { "style": 8, - "format": 2, "content": "=ODOO.LIST(1,39,\"amount_untaxed\")" }, "F60": { - "format": 2, "content": "=ODOO.LIST(1,40,\"amount_untaxed\")" }, "F61": { diff --git a/addons/spreadsheet_dashboard_purchase_stock/data/files/purchase_dashboard.json b/addons/spreadsheet_dashboard_purchase_stock/data/files/purchase_dashboard.json index e0bfc2b43a9..cae2ce49461 100644 --- a/addons/spreadsheet_dashboard_purchase_stock/data/files/purchase_dashboard.json +++ b/addons/spreadsheet_dashboard_purchase_stock/data/files/purchase_dashboard.json @@ -907,47 +907,37 @@ }, "E21": { "style": 12, - "format": 4, "content": "=ODOO.LIST(1,1,\"amount_untaxed\")" }, "E22": { - "format": 4, "content": "=ODOO.LIST(1,2,\"amount_untaxed\")" }, "E23": { "style": 12, - "format": 4, "content": "=ODOO.LIST(1,3,\"amount_untaxed\")" }, "E24": { - "format": 4, "content": "=ODOO.LIST(1,4,\"amount_untaxed\")" }, "E25": { "style": 12, - "format": 4, "content": "=ODOO.LIST(1,5,\"amount_untaxed\")" }, "E26": { - "format": 4, "content": "=ODOO.LIST(1,6,\"amount_untaxed\")" }, "E27": { "style": 12, - "format": 4, "content": "=ODOO.LIST(1,7,\"amount_untaxed\")" }, "E28": { - "format": 4, "content": "=ODOO.LIST(1,8,\"amount_untaxed\")" }, "E29": { "style": 12, - "format": 4, "content": "=ODOO.LIST(1,9,\"amount_untaxed\")" }, "E30": { - "format": 4, "content": "=ODOO.LIST(1,10,\"amount_untaxed\")" }, "E32": { @@ -961,47 +951,37 @@ }, "E34": { "style": 12, - "format": 4, "content": "=ODOO.LIST(2,1,\"amount_untaxed\")" }, "E35": { - "format": 4, "content": "=ODOO.LIST(2,2,\"amount_untaxed\")" }, "E36": { "style": 12, - "format": 4, "content": "=ODOO.LIST(2,3,\"amount_untaxed\")" }, "E37": { - "format": 4, "content": "=ODOO.LIST(2,4,\"amount_untaxed\")" }, "E38": { "style": 12, - "format": 4, "content": "=ODOO.LIST(2,5,\"amount_untaxed\")" }, "E39": { - "format": 4, "content": "=ODOO.LIST(2,6,\"amount_untaxed\")" }, "E40": { "style": 12, - "format": 4, "content": "=ODOO.LIST(2,7,\"amount_untaxed\")" }, "E41": { - "format": 4, "content": "=ODOO.LIST(2,8,\"amount_untaxed\")" }, "E42": { "style": 12, - "format": 4, "content": "=ODOO.LIST(2,9,\"amount_untaxed\")" }, "E43": { - "format": 4, "content": "=ODOO.LIST(2,10,\"amount_untaxed\")" }, "E45": { @@ -1015,47 +995,37 @@ }, "E47": { "style": 12, - "format": 4, "content": "=ODOO.LIST(3,1,\"partner_id\")" }, "E48": { - "format": 4, "content": "=ODOO.LIST(3,2,\"partner_id\")" }, "E49": { "style": 12, - "format": 4, "content": "=ODOO.LIST(3,3,\"partner_id\")" }, "E50": { - "format": 4, "content": "=ODOO.LIST(3,4,\"partner_id\")" }, "E51": { "style": 12, - "format": 4, "content": "=ODOO.LIST(3,5,\"partner_id\")" }, "E52": { - "format": 4, "content": "=ODOO.LIST(3,6,\"partner_id\")" }, "E53": { "style": 12, - "format": 4, "content": "=ODOO.LIST(3,7,\"partner_id\")" }, "E54": { - "format": 4, "content": "=ODOO.LIST(3,8,\"partner_id\")" }, "E55": { "style": 12, - "format": 4, "content": "=ODOO.LIST(3,9,\"partner_id\")" }, "E56": { - "format": 4, "content": "=ODOO.LIST(3,10,\"partner_id\")" }, "E57": { diff --git a/addons/spreadsheet_dashboard_sale/data/files/sales_dashboard.json b/addons/spreadsheet_dashboard_sale/data/files/sales_dashboard.json index 13c507964f4..b3257f4a2bb 100644 --- a/addons/spreadsheet_dashboard_sale/data/files/sales_dashboard.json +++ b/addons/spreadsheet_dashboard_sale/data/files/sales_dashboard.json @@ -724,47 +724,37 @@ }, "D21": { "style": 9, - "format": 2, "content": "=ODOO.LIST(1,1,\"amount_untaxed\")" }, "D22": { - "format": 2, "content": "=ODOO.LIST(1,2,\"amount_untaxed\")" }, "D23": { "style": 9, - "format": 2, "content": "=ODOO.LIST(1,3,\"amount_untaxed\")" }, "D24": { - "format": 2, "content": "=ODOO.LIST(1,4,\"amount_untaxed\")" }, "D25": { "style": 9, - "format": 2, "content": "=ODOO.LIST(1,5,\"amount_untaxed\")" }, "D26": { - "format": 2, "content": "=ODOO.LIST(1,6,\"amount_untaxed\")" }, "D27": { "style": 9, - "format": 2, "content": "=ODOO.LIST(1,7,\"amount_untaxed\")" }, "D28": { - "format": 2, "content": "=ODOO.LIST(1,8,\"amount_untaxed\")" }, "D29": { "style": 9, - "format": 2, "content": "=ODOO.LIST(1,9,\"amount_untaxed\")" }, "D30": { - "format": 2, "content": "=ODOO.LIST(1,10,\"amount_untaxed\")" }, "D32": { @@ -1664,47 +1654,37 @@ }, "I21": { "style": 9, - "format": 2, "content": "=ODOO.LIST(2,1,\"amount_untaxed\")" }, "I22": { - "format": 2, "content": "=ODOO.LIST(2,2,\"amount_untaxed\")" }, "I23": { "style": 9, - "format": 2, "content": "=ODOO.LIST(2,3,\"amount_untaxed\")" }, "I24": { - "format": 2, "content": "=ODOO.LIST(2,4,\"amount_untaxed\")" }, "I25": { "style": 9, - "format": 2, "content": "=ODOO.LIST(2,5,\"amount_untaxed\")" }, "I26": { - "format": 2, "content": "=ODOO.LIST(2,6,\"amount_untaxed\")" }, "I27": { "style": 9, - "format": 2, "content": "=ODOO.LIST(2,7,\"amount_untaxed\")" }, "I28": { - "format": 2, "content": "=ODOO.LIST(2,8,\"amount_untaxed\")" }, "I29": { "style": 9, - "format": 2, "content": "=ODOO.LIST(2,9,\"amount_untaxed\")" }, "I30": { - "format": 2, "content": "=ODOO.LIST(2,10,\"amount_untaxed\")" }, "I32": {