pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] spreadsheet_dashboard_*: fix dashboards

Browse Source 
Update dashboard with latest version.

closes odoo/odoo#107512

X-original-commit: bd116406002f9d0a196141fe742de36ac6dbaa55
Related: odoo/enterprise#34815
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
This commit is contained in:
Adrien Minne
2022-12-09 16:41:01 +01:00
committed by Lucas Lefèvre
parent 999043b36c
commit f043908df8
12 changed files with 201 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/spreadsheet_dashboard_account/data/files/invoicing_dashboard.json
+8 -10
View File
@@ -839,8 +839,7 @@
"border": 2
},
"F21": {
"style": 14,
"format": 1,
"style": 15,
"content": "=ODOO.LIST(1,1,\"invoice_date\")"
},
"F22": {
@@ -1235,7 +1234,6 @@
"tag": "chart",
"data": {
"title": "",
"id": "5ea5dd7f-9f83-4482-a2bb-2ec72ab35912",
"background": "#FFFFFF",
"legendPosition": "none",
"metaData": {
@@ -1401,7 +1399,7 @@
},
"B2": {
"format": 4,
"content": "=ODOO.PIVOT(6,\"price_subtotal\")/B3"
"content": "=IFERROR(ODOO.PIVOT(6,\"price_subtotal\")/B3)"
},
"B3": {
"format": 1,
@@ -1952,7 +1950,7 @@
"id": "757a1b4b-e339-4879-beb6-9851050387cf",
"type": "date",
"label": "Period",
"defaultValue": "last_year",
"defaultValue": "last_three_months",
"rangeType": "relative",
"defaultsToCurrentPeriod": true,
"pivotFields": {
@@ -2048,7 +2046,7 @@
},
"listFields": {
"1": {
"field": "partner_id",
"field": "partner_id.country_id",
"type": "many2one"
}
},
@@ -2100,8 +2098,8 @@
},
"listFields": {
"1": {
"field": "invoice_line_ids",
"type": "one2many"
"field": "invoice_line_ids.product_id.categ_id",
"type": "many2one"
}
},
"graphFields": {
@@ -2152,8 +2150,8 @@
},
"listFields": {
"1": {
"field": "invoice_line_ids",
"type": "one2many"
"field": "invoice_line_ids.product_id",
"type": "many2one"
}
},
"graphFields": {
addons/spreadsheet_dashboard_event_sale/data/files/events_dashboard.json
+66 -3
View File
@@ -607,7 +607,6 @@
"tag": "chart",
"data": {
"title": "",
"id": "d9898682-9b91-4fe2-9900-a4b2583eb459",
"background": "#FFFFFF",
"legendPosition": "none",
"metaData": {
@@ -643,7 +642,6 @@
"tag": "chart",
"data": {
"title": "",
"id": "092dd971-dc10-41c5-96c4-d760820e9cf2",
"background": "#FFFFFF",
"legendPosition": "none",
"metaData": {
@@ -1294,6 +1292,22 @@
"field": "address_id",
"type": "many2one"
},
"5": {
"field": "event_id.address_id",
"type": "many2one"
},
"6": {
"field": "event_id.address_id",
"type": "many2one"
},
"7": {
"field": "event_id.address_id",
"type": "many2one"
},
"8": {
"field": "event_id.address_id",
"type": "many2one"
},
"9": {
"field": "address_id",
"type": "many2one"
@@ -1304,7 +1318,16 @@
}
},
"listFields": {},
"graphFields": {}
"graphFields": {
"d9898682-9b91-4fe2-9900-a4b2583eb459": {
"field": "event_id.address_id",
"type": "many2one"
},
"092dd971-dc10-41c5-96c4-d760820e9cf2": {
"field": "address_id",
"type": "many2one"
}
}
},
{
"id": "d9cfb0b0-01a0-45be-996e-723f4283000b",
@@ -1332,6 +1355,14 @@
"field": "event_type_id",
"type": "many2one"
},
"5": {
"field": "event_id.event_type_id",
"type": "many2one"
},
"6": {
"field": "event_id.event_type_id",
"type": "many2one"
},
"7": {
"field": "event_type_id",
"type": "many2one"
@@ -1351,6 +1382,10 @@
},
"listFields": {},
"graphFields": {
"d9898682-9b91-4fe2-9900-a4b2583eb459": {
"field": "event_id.event_type_id",
"type": "many2one"
},
"092dd971-dc10-41c5-96c4-d760820e9cf2": {
"field": "event_type_id",
"type": "many2one"
@@ -1383,6 +1418,22 @@
"field": "tag_ids",
"type": "many2many"
},
"5": {
"field": "event_id.tag_ids",
"type": "many2many"
},
"6": {
"field": "event_id.tag_ids",
"type": "many2many"
},
"7": {
"field": "event_id.tag_ids",
"type": "many2many"
},
"8": {
"field": "event_id.tag_ids",
"type": "many2many"
},
"9": {
"field": "tag_ids",
"type": "many2many"
@@ -1394,6 +1445,10 @@
},
"listFields": {},
"graphFields": {
"d9898682-9b91-4fe2-9900-a4b2583eb459": {
"field": "event_id.tag_ids",
"type": "many2many"
},
"092dd971-dc10-41c5-96c4-d760820e9cf2": {
"field": "tag_ids",
"type": "many2many"
@@ -1434,6 +1489,14 @@
"field": "event_organizer_id",
"type": "many2one"
},
"7": {
"field": "event_id.organizer_id",
"type": "many2one"
},
"8": {
"field": "event_id.organizer_id",
"type": "many2one"
},
"9": {
"field": "organizer_id",
"type": "many2one"
addons/spreadsheet_dashboard_hr_expense/data/files/expense_dashboard.json
+17 -18
View File
@@ -698,7 +698,6 @@
"tag": "chart",
"data": {
"title": "",
"id": "6ce637db-4068-457f-91a4-ce83736932ff",
"background": "#FFFFFF",
"legendPosition": "right",
"metaData": {
@@ -1191,9 +1190,9 @@
{
"id": "54e94f8d-739d-4a02-8205-c25be895720e",
"type": "date",
"label": "Year",
"defaultValue": {},
"rangeType": "year",
"label": "Period",
"defaultValue": "last_year",
"rangeType": "relative",
"defaultsToCurrentPeriod": true,
"pivotFields": {
"1": {
@@ -1201,11 +1200,6 @@
"type": "date",
"offset": 0
},
"3": {
"field": "date",
"type": "date",
"offset": 0
},
"4": {
"field": "date",
"type": "date",
@@ -1261,10 +1255,6 @@
"field": "product_id",
"type": "many2one"
},
"3": {
"field": "product_id",
"type": "many2one"
},
"4": {
"field": "product_id",
"type": "many2one"
@@ -1284,6 +1274,10 @@
"8": {
"field": "product_id",
"type": "many2one"
},
"9": {
"field": "product_id",
"type": "many2one"
}
},
"listFields": {
@@ -1344,7 +1338,12 @@
"type": "many2one"
}
},
"graphFields": {}
"graphFields": {
"6ce637db-4068-457f-91a4-ce83736932ff": {
"field": "sale_order_id",
"type": "many2one"
}
}
},
{
"id": "88fbcc54-dcb5-42ec-86e9-1676c4c73c6e",
@@ -1360,10 +1359,6 @@
"field": "employee_id",
"type": "many2one"
},
"3": {
"field": "employee_id",
"type": "many2one"
},
"4": {
"field": "employee_id",
"type": "many2one"
@@ -1383,6 +1378,10 @@
"8": {
"field": "employee_id",
"type": "many2one"
},
"9": {
"field": "employee_id",
"type": "many2one"
}
},
"listFields": {
addons/spreadsheet_dashboard_im_livechat/data/files/livechat_dashboard.json
+11 -11
View File
@@ -281,47 +281,47 @@
"F21": {
"style": 7,
"format": 2,
"content": "=-ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",1)"
"content": "=ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",1)"
},
"F22": {
"format": 2,
"content": "=-ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",2)"
"content": "=ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",2)"
},
"F23": {
"style": 7,
"format": 2,
"content": "=-ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",3)"
"content": "=ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",3)"
},
"F24": {
"format": 2,
"content": "=-ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",4)"
"content": "=ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",4)"
},
"F25": {
"style": 7,
"format": 2,
"content": "=-ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",5)"
"content": "=ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",5)"
},
"F26": {
"format": 2,
"content": "=-ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",6)"
"content": "=ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",6)"
},
"F27": {
"style": 7,
"format": 2,
"content": "=-ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",7)"
"content": "=ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",7)"
},
"F28": {
"format": 2,
"content": "=-ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",8)"
"content": "=ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",8)"
},
"F29": {
"style": 7,
"format": 2,
"content": "=-ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",9)"
"content": "=ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",9)"
},
"F30": {
"format": 2,
"content": "=-ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",10)"
"content": "=ODOO.PIVOT(3,\"time_to_answer\",\"#partner_id\",10)"
},
"G7": {
"style": 5,
@@ -1044,4 +1044,4 @@
}
}
]
}
}
addons/spreadsheet_dashboard_pos_hr/data/files/pos_dashboard.json
+8 -4
View File
@@ -1083,7 +1083,6 @@
"tag": "chart",
"data": {
"title": "",
"id": "e012bf45-55dc-4c46-b069-bc090a467d73",
"background": "#FFFFFF",
"legendPosition": "none",
"metaData": {
@@ -1495,7 +1494,7 @@
"id": "ff0e1a26-3d4c-48b6-85a6-2777b522bb52",
"type": "date",
"label": "Period",
"defaultValue": "last_month",
"defaultValue": "last_three_months",
"rangeType": "relative",
"defaultsToCurrentPeriod": false,
"pivotFields": {
@@ -1724,10 +1723,15 @@
"type": "many2one"
}
},
"listFields": {},
"listFields": {
"1": {
"field": "lines.product_id",
"type": "many2one"
}
},
"graphFields": {
"e012bf45-55dc-4c46-b069-bc090a467d73": {
"field": "product_id",
"field": "product_tmpl_id",
"type": "many2one"
}
}
addons/spreadsheet_dashboard_purchase/data/files/vendors_dashboard.json
+8 -4
View File
@@ -240,7 +240,7 @@
},
"B20": {
"style": 2,
"content": "=_t(\"Ordered on\")",
"content": "=_t(\"Ordered\")",
"border": 2
},
"B21": {
@@ -1651,7 +1651,6 @@
"tag": "chart",
"data": {
"title": "",
"id": "155096a3-ad7f-4e64-bf38-051fcfc90ee0",
"background": "#FFFFFF",
"legendPosition": "none",
"metaData": {
@@ -2254,7 +2253,12 @@
"type": "many2one"
}
},
"listFields": {},
"listFields": {
"1": {
"field": "partner_id.country_id",
"type": "many2one"
}
},
"graphFields": {
"155096a3-ad7f-4e64-bf38-051fcfc90ee0": {
"field": "country_id",
@@ -2339,7 +2343,7 @@
},
"listFields": {
"1": {
"field": "activity_user_id",
"field": "user_id",
"type": "many2one"
}
},
addons/spreadsheet_dashboard_purchase/i18n/spreadsheet_dashboard_purchase.pot
+4 -4
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0beta\n"
"Project-Id-Version: Odoo Server 16.0+e\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-09-27 15:12+0000\n"
"PO-Revision-Date: 2022-09-27 15:12+0000\n"
"POT-Creation-Date: 2022-10-26 07:30+0000\n"
"PO-Revision-Date: 2022-10-26 07:30+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr ""
#. openerp-web
#: code:addons/spreadsheet_dashboard_purchase/data/files/vendors_dashboard.json:0
#, python-format
msgid "Ordered on"
msgid "Ordered"
msgstr ""
#. module: spreadsheet_dashboard_purchase
addons/spreadsheet_dashboard_purchase_stock/data/files/purchase_dashboard.json
+37 -12
View File
@@ -280,7 +280,7 @@
},
"B20": {
"style": 2,
"content": "=_t(\"Open since\")",
"content": "=_t(\"Opened\")",
"border": 2
},
"B21": {
@@ -339,7 +339,7 @@
},
"B33": {
"style": 2,
"content": "=_t(\"Ordered on\")",
"content": "=_t(\"Ordered\")",
"border": 2
},
"B34": {
@@ -398,7 +398,7 @@
},
"B46": {
"style": 2,
"content": "=_t(\"Ordered on\")",
"content": "=_t(\"Ordered\")",
"border": 2
},
"B47": {
@@ -666,7 +666,7 @@
},
"C59": {
"style": 11,
"content": "=_t(\"Quantity Ordered\")",
"content": "=_t(\"Qty Ordered\")",
"border": 2
},
"C60": {
@@ -1378,7 +1378,7 @@
},
"H46": {
"style": 11,
"content": "=_t(\"Quantity Ordered\")",
"content": "=_t(\"Qty Ordered\")",
"border": 2
},
"H47": {
@@ -1432,7 +1432,7 @@
},
"H59": {
"style": 11,
"content": "=_t(\"Quantity Ordered\")",
"content": "=_t(\"Qty Ordered\")",
"border": 2
},
"H60": {
@@ -1762,7 +1762,6 @@
"tag": "chart",
"data": {
"title": "",
"id": "40aef9ad-8e20-47d1-861c-9e9121a4cdd0",
"background": "#FFFFFF",
"legendPosition": "none",
"metaData": {
@@ -2592,7 +2591,20 @@
"type": "many2one"
}
},
"listFields": {},
"listFields": {
"1": {
"field": "partner_id.country_id",
"type": "many2one"
},
"2": {
"field": "partner_id.country_id",
"type": "many2one"
},
"3": {
"field": "partner_id.country_id",
"type": "many2one"
}
},
"graphFields": {
"40aef9ad-8e20-47d1-861c-9e9121a4cdd0": {
"field": "country_id",
@@ -2699,7 +2711,20 @@
"type": "many2one"
}
},
"listFields": {},
"listFields": {
"1": {
"field": "product_id.categ_id",
"type": "many2one"
},
"2": {
"field": "product_id.categ_id",
"type": "many2one"
},
"3": {
"field": "product_id.categ_id",
"type": "many2one"
}
},
"graphFields": {
"40aef9ad-8e20-47d1-861c-9e9121a4cdd0": {
"field": "category_id",
@@ -2808,15 +2833,15 @@
},
"listFields": {
"1": {
"field": "activity_user_id",
"field": "user_id",
"type": "many2one"
},
"2": {
"field": "activity_user_id",
"field": "user_id",
"type": "many2one"
},
"3": {
"field": "activity_user_id",
"field": "user_id",
"type": "many2one"
}
},
addons/spreadsheet_dashboard_purchase_stock/i18n/spreadsheet_dashboard_purchase_stock.pot
+6 -6
View File
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0beta\n"
"Project-Id-Version: Odoo Server 16.0+e\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-09-27 15:12+0000\n"
"PO-Revision-Date: 2022-09-27 15:12+0000\n"
"POT-Creation-Date: 2022-10-26 07:30+0000\n"
"PO-Revision-Date: 2022-10-26 07:30+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -128,7 +128,7 @@ msgstr ""
#. openerp-web
#: code:addons/spreadsheet_dashboard_purchase_stock/data/files/purchase_dashboard.json:0
#, python-format
msgid "Open since"
msgid "Opened"
msgstr ""
#. module: spreadsheet_dashboard_purchase_stock
@@ -143,7 +143,7 @@ msgstr ""
#: code:addons/spreadsheet_dashboard_purchase_stock/data/files/purchase_dashboard.json:0
#: code:addons/spreadsheet_dashboard_purchase_stock/data/files/purchase_dashboard.json:0
#, python-format
msgid "Ordered on"
msgid "Ordered"
msgstr ""
#. module: spreadsheet_dashboard_purchase_stock
@@ -242,7 +242,7 @@ msgstr ""
#: code:addons/spreadsheet_dashboard_purchase_stock/data/files/purchase_dashboard.json:0
#: code:addons/spreadsheet_dashboard_purchase_stock/data/files/purchase_dashboard.json:0
#, python-format
msgid "Quantity Ordered"
msgid "Qty Ordered"
msgstr ""
#. module: spreadsheet_dashboard_purchase_stock
addons/spreadsheet_dashboard_sale/data/files/sales_dashboard.json
+25 -26
View File
@@ -43,10 +43,10 @@
},
"cols": {
"0": {
"size": 175
"size": 100
},
"1": {
"size": 100
"size": 175
},
"2": {
"size": 100
@@ -58,10 +58,10 @@
"size": 50
},
"5": {
"size": 175
"size": 100
},
"6": {
"size": 100
"size": 175
},
"7": {
"size": 100
@@ -2083,7 +2083,6 @@
"tag": "chart",
"data": {
"title": "",
"id": "a527960b-0812-4291-baba-f6b4b5280a0d",
"background": "#FFFFFF",
"legendPosition": "none",
"metaData": {
@@ -2865,7 +2864,7 @@
"id": "13d30fda-b14d-4a56-b186-25468af3b1e9",
"type": "date",
"label": "Period",
"defaultValue": "last_month",
"defaultValue": "last_three_months",
"rangeType": "relative",
"defaultsToCurrentPeriod": false,
"pivotFields": {
@@ -2983,21 +2982,21 @@
"type": "many2one"
},
"11": {
"field": "tax_country_id",
"field": "partner_id.country_id",
"type": "many2one"
},
"12": {
"field": "tax_country_id",
"field": "partner_id.country_id",
"type": "many2one"
}
},
"listFields": {
"1": {
"field": "tax_country_id",
"field": "partner_id.country_id",
"type": "many2one"
},
"2": {
"field": "tax_country_id",
"field": "partner_id.country_id",
"type": "many2one"
}
},
@@ -3051,22 +3050,22 @@
"type": "many2one"
},
"11": {
"field": "order_line",
"type": "one2many"
"field": "order_line.product_id",
"type": "many2one"
},
"12": {
"field": "order_line",
"type": "one2many"
"field": "order_line.product_id",
"type": "many2one"
}
},
"listFields": {
"1": {
"field": "order_line",
"type": "one2many"
"field": "order_line.product_id",
"type": "many2one"
},
"2": {
"field": "order_line",
"type": "one2many"
"field": "order_line.product_id",
"type": "many2one"
}
},
"graphFields": {
@@ -3187,22 +3186,22 @@
"type": "many2one"
},
"11": {
"field": "order_line",
"type": "one2many"
"field": "order_line.product_id.categ_id",
"type": "many2one"
},
"12": {
"field": "order_line",
"type": "one2many"
"field": "order_line.product_id.categ_id",
"type": "many2one"
}
},
"listFields": {
"1": {
"field": "order_line",
"type": "one2many"
"field": "order_line.product_id.categ_id",
"type": "many2one"
},
"2": {
"field": "order_line",
"type": "one2many"
"field": "order_line.product_id.categ_id",
"type": "many2one"
}
},
"graphFields": {
addons/spreadsheet_dashboard_stock_account/data/files/inventory_on_hand_dashboard.json
+9 -2
View File
@@ -598,7 +598,6 @@
"tag": "chart",
"data": {
"title": "",
"id": "d84bdd18-3c66-4153-ae2e-7f4ec1672cfb",
"background": "#FFFFFF",
"legendPosition": "right",
"metaData": {
@@ -662,7 +661,7 @@
},
"B2": {
"style": 7,
"content": "=ODOO.PIVOT(1,\"value\")"
"content": "=FORMAT.LARGE.NUMBER(ODOO.PIVOT(1,\"value\"))"
}
},
"conditionalFormats": [],
@@ -874,6 +873,10 @@
"rangeType": "year",
"defaultsToCurrentPeriod": false,
"pivotFields": {
"1": {
"field": "stock_move_id.location_dest_id",
"type": "many2one"
},
"2": {
"field": "location_id",
"type": "many2one"
@@ -940,6 +943,10 @@
"rangeType": "year",
"defaultsToCurrentPeriod": false,
"pivotFields": {
"1": {
"field": "stock_move_id.lot_ids",
"type": "many2many"
},
"2": {
"field": "lot_id",
"type": "many2one"
addons/spreadsheet_dashboard_website_sale_slides/data/files/elearning_dashboard.json
+2 -2
View File
@@ -5,7 +5,7 @@
"id": "sheet1",
"name": "Dashboard",
"colNumber": 11,
"rowNumber": 30,
"rowNumber": 37,
"rows": {
"6": {
"size": 40
@@ -802,7 +802,7 @@
"id": "46b74887-ff98-4c97-9629-4a5a14084321",
"type": "date",
"label": "Period",
"defaultValue": "last_three_months",
"defaultValue": "last_year",
"rangeType": "relative",
"defaultsToCurrentPeriod": false,
"pivotFields": {