From 7333aa1360b7998594acab2f25a243920b98e96f Mon Sep 17 00:00:00 2001
From: daniquilez <dani.quilez@gmail.com>
Date: Fri, 7 Mar 2025 12:38:28 +0100
Subject: [PATCH] =?UTF-8?q?[IMP]=20=E2=9C=A8=20Better=20menu=20structure?=
=?UTF-8?q?=20for=20service=20invoicing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
energy_communities/views/menus.xml | 69 ++++-----
.../views/menus.xml | 146 ++++++++++--------
.../views/service_invoicing_views.xml | 9 --
.../service_invoicing_action_create.xml | 8 -
4 files changed, 108 insertions(+), 124 deletions(-)
diff --git a/energy_communities/views/menus.xml b/energy_communities/views/menus.xml
index c4a37ce02..9bd2af50f 100644
--- a/energy_communities/views/menus.xml
+++ b/energy_communities/views/menus.xml
@@ -21,55 +21,38 @@
groups="role_platform_admin_res_groups,role_coord_admin_res_groups,role_coord_worker_res_groups,role_ce_admin,role_ce_manager"
web_icon="energy_communities,static/description/icon.png"
/>
- <!--<menuitem-->
- <!-- id="ce_root_menu_coord_admin"-->
- <!-- name="Coordinator management"-->
- <!-- sequence="10"-->
- <!-- groups="role_coord_admin_res_groups,role_coord_worker_res_groups"-->
- <!-- web_icon="energy_communities,static/description/icon.png"-->
- <!--/>-->
- <!--<menuitem-->
- <!-- id="ce_root_menu_community_admin"-->
- <!-- name="Community management"-->
- <!-- sequence="10"-->
- <!-- groups="role_ce_admin,role_ce_manager"-->
- <!-- web_icon="energy_communities,static/description/icon.png"-->
- <!--/>-->
- <menuitem
- id="ce_assistants_menu"
- name="Assistants"
- parent="ce_root_menu"
- groups="role_platform_admin_res_groups"
- sequence="99"
- />
<menuitem
id="ce_config_menu"
name="Configuration"
parent="ce_root_menu"
groups="role_platform_admin_res_groups"
sequence="999"
- />
- <menuitem
- id="ce_config_sources_menu"
- name="Source types"
- parent="ce_config_menu"
- action="ce_utm_sources_action"
- groups="group_platform_manager"
- />
- <menuitem
- id="energy_actions_menu"
- name="Energy actions"
- parent="ce_config_menu"
- action="energy_action_views"
- groups="group_platform_manager"
- />
- <menuitem
- id="ec_formulas_menu"
- name="Formulas"
- parent="ce_config_menu"
- action="view_ec_formulas_window"
- groups="group_platform_manager"
- />
+ >
+ <menuitem
+ id="ce_config_sources_menu"
+ name="Source types"
+ action="ce_utm_sources_action"
+ groups="group_platform_manager"
+ />
+ <menuitem
+ id="energy_actions_menu"
+ name="Energy actions"
+ action="energy_action_views"
+ groups="group_platform_manager"
+ />
+ <menuitem
+ id="ec_formulas_menu"
+ name="Formulas"
+ action="view_ec_formulas_window"
+ groups="group_platform_manager"
+ />
+ <menuitem
+ name="Tariffs"
+ id="view_service_tariffs_menu"
+ action="product.product_pricelist_action2"
+ groups="role_platform_admin_res_groups"
+ />
+ </menuitem>
<!-- Hide menu items unless platform manager -->
<record model="ir.ui.menu" id="mail.menu_root_discuss">
diff --git a/energy_communities_service_invoicing/views/menus.xml b/energy_communities_service_invoicing/views/menus.xml
index 9c615fc6f..442ea07a9 100644
--- a/energy_communities_service_invoicing/views/menus.xml
+++ b/energy_communities_service_invoicing/views/menus.xml
@@ -6,77 +6,95 @@
sequence="1"
groups="energy_communities.role_platform_admin_res_groups,energy_communities.role_coord_admin_res_groups"
/>
- <!--<menuitem id="ce_service_invoicing_menu_coord_admin" name="Services Coord" parent="energy_communities.ce_root_menu_platform_manager" sequence="1" />-->
+
+
<menuitem
- name="Service Contracts"
- id="view_service_invoicing_menu_platform_manager"
+ name="Activity"
+ id="view_service_invoicing_activity_menu"
parent="ce_service_invoicing_menu"
- action="view_service_invoicing_window_platform_manager"
- groups="energy_communities.role_platform_admin_res_groups"
- sequence="100"
- />
- <menuitem
- name="Service Contracts"
- id="view_service_invoicing_menu_coord_admin"
- parent="ce_service_invoicing_menu"
- action="view_service_invoicing_window_coord_admin"
- groups="energy_communities.role_coord_admin_res_groups"
sequence="100"
- />
+ >
+ <menuitem
+ name="Service Contracts"
+ id="view_service_invoicing_menu_platform_manager"
+ action="view_service_invoicing_window_platform_manager"
+ groups="energy_communities.role_platform_admin_res_groups"
+ sequence="100"
+ />
+ <menuitem
+ name="Service Contracts"
+ id="view_service_invoicing_menu_coord_admin"
+ action="view_service_invoicing_window_coord_admin"
+ groups="energy_communities.role_coord_admin_res_groups"
+ sequence="100"
+ />
+
+ <menuitem
+ name="Service invoices issued"
+ id="view_service_invoices_issued_menu"
+ action="view_service_invoices_issued_window"
+ groups="energy_communities.role_platform_admin_res_groups"
+ sequence="500"
+ />
+ <menuitem
+ name="Service invoices received"
+ id="view_service_invoices_received_menu"
+ action="view_service_invoices_received_window"
+ groups="energy_communities.role_platform_admin_res_groups,energy_communities.role_coord_admin_res_groups,energy_communities.role_coord_worker_res_groups"
+ sequence="500"
+ />
+ <menuitem
+ name="Service actions (sale orders)"
+ id="view_service_sale_orders_menu"
+ action="view_service_sale_orders_window"
+ groups="energy_communities.role_platform_admin_res_groups"
+ sequence="550"
+ />
+
+ </menuitem>
+
<menuitem
- name="Platform Services"
- id="view_services_menu"
+ name="Configuration"
+ id="view_service_invoicing_configuration_menu"
parent="ce_service_invoicing_menu"
- action="view_services_window"
- groups="energy_communities.role_platform_admin_res_groups,energy_communities.role_coord_admin_res_groups"
sequence="200"
- />
- <menuitem
- name="Service Packs"
- id="view_service_packs_menu"
- parent="ce_service_invoicing_menu"
- action="view_service_packs_window"
- groups="energy_communities.role_platform_admin_res_groups,energy_communities.role_coord_admin_res_groups"
- sequence="300"
- />
- <menuitem
- name="Service Packs templates"
- id="view_service_contract_templates_menu"
- parent="ce_service_invoicing_menu"
- action="view_service_contract_templates_window"
- groups="energy_communities.role_platform_admin_res_groups"
- sequence="400"
- />
+ >
+ <menuitem
+ name="Platform Services"
+ id="view_services_menu"
+ action="view_services_window"
+ groups="energy_communities.role_platform_admin_res_groups,energy_communities.role_coord_admin_res_groups"
+ sequence="200"
+ />
+ <menuitem
+ name="Service Packs"
+ id="view_service_packs_menu"
+ action="view_service_packs_window"
+ groups="energy_communities.role_platform_admin_res_groups,energy_communities.role_coord_admin_res_groups"
+ sequence="300"
+ />
+ <menuitem
+ name="Service Packs templates"
+ id="view_service_contract_templates_menu"
+ action="view_service_contract_templates_window"
+ groups="energy_communities.role_platform_admin_res_groups"
+ sequence="400"
+ />
+ </menuitem>
+
<menuitem
- name="Service invoices issued"
- id="view_service_invoices_issued_menu"
+ name="Assistants"
+ id="view_service_invoicing_assistants_menu"
parent="ce_service_invoicing_menu"
- action="view_service_invoices_issued_window"
groups="energy_communities.role_platform_admin_res_groups"
- sequence="500"
- />
- <menuitem
- name="Service invoices received"
- id="view_service_invoices_received_menu"
- parent="ce_service_invoicing_menu"
- action="view_service_invoices_received_window"
- groups="energy_communities.role_coord_admin_res_groups,energy_communities.role_coord_worker_res_groups"
- sequence="500"
- />
- <menuitem
- name="Service actions (sale orders)"
- id="view_service_sale_orders_menu"
- parent="ce_service_invoicing_menu"
- action="view_service_sale_orders_window"
- groups="energy_communities.role_platform_admin_res_groups"
- sequence="550"
- />
- <menuitem
- name="Tariffs"
- id="view_service_tariffs_menu"
- parent="ce_service_invoicing_menu"
- action="view_service_tariffs_window"
- groups="energy_communities.role_platform_admin_res_groups"
- sequence="600"
- />
+ sequence="300"
+ >
+ <menuitem
+ id="service_invoicing_action_create_wizard_menu"
+ name="Assign pack to community"
+ action="service_invoicing_action_create_wizard_action"
+ groups="energy_communities.role_platform_admin_res_groups"
+ sequence="100"
+ />
+ </menuitem>
</odoo>
diff --git a/energy_communities_service_invoicing/views/service_invoicing_views.xml b/energy_communities_service_invoicing/views/service_invoicing_views.xml
index a40d20f15..d965cf606 100644
--- a/energy_communities_service_invoicing/views/service_invoicing_views.xml
+++ b/energy_communities_service_invoicing/views/service_invoicing_views.xml
@@ -81,15 +81,6 @@
<field name="domain">[('service_invoicing_action','!=','none')]</field>
</record>
- <record
- id="view_service_tariffs_window"
- model="ir.actions.act_window"
- >
- <field name="name">Tariffs</field>
- <field name="res_model">product.pricelist</field>
- <field name="view_mode">tree,form</field>
- </record>
-
<record
id="action_view_service_invoicing_tree_platform_manager"
model="ir.actions.act_window.view"
diff --git a/energy_communities_service_invoicing/wizards/service_invoicing_action_create.xml b/energy_communities_service_invoicing/wizards/service_invoicing_action_create.xml
index c52f35648..69cfde32f 100644
--- a/energy_communities_service_invoicing/wizards/service_invoicing_action_create.xml
+++ b/energy_communities_service_invoicing/wizards/service_invoicing_action_create.xml
@@ -70,12 +70,4 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
- <menuitem
- id="service_invoicing_action_create_wizard_menu"
- name="Assign pack to community"
- action="service_invoicing_action_create_wizard_action"
- parent="energy_communities.ce_assistants_menu"
- groups="energy_communities.role_platform_admin_res_groups"
- sequence="100"
- />
</odoo>
--
GitLab