[REF] sale(_management): specify menus in a dedicated file

Use the recursive definition of menuitems
Only archive the root menu (to be unarchived in sale_management)

Clean menus specifications, order attributes, ...
This commit is contained in:
Victor Feyens
2022-01-03 12:22:46 +01:00
parent 7acd2adad9
commit c1289fc049
11 changed files with 188 additions and 182 deletions
+4 -2
View File
@@ -25,7 +25,10 @@ This module contains all the common features of Sales Management and eCommerce.
'data/mail_template_data.xml',
'data/mail_templates.xml',
'data/sale_data.xml',
'wizard/sale_make_invoice_advance_views.xml',
'wizard/sale_order_cancel_views.xml',
'wizard/sale_payment_link_views.xml',
'views/account_views.xml',
'views/sale_views.xml',
@@ -41,8 +44,7 @@ This module contains all the common features of Sales Management and eCommerce.
'views/product_views.xml',
'views/product_packaging_views.xml',
'views/utm_campaign_views.xml',
'wizard/sale_order_cancel_views.xml',
'wizard/sale_payment_link_views.xml',
'views/sale_menus.xml',
],
'demo': [
'data/product_product_demo.xml',
+2 -5
View File
@@ -8,8 +8,5 @@
<field name="domain">['|', ('res_model', '=', False), ('res_model', '=', 'sale.order')]</field>
<field name="context">{'default_res_model': 'sale.order'}</field>
</record>
<menuitem id="sale_menu_config_activity_type"
action="mail_activity_type_action_config_sale"
parent="menu_sale_config"
groups="base.group_no_one"/>
</odoo>
</odoo>
@@ -446,11 +446,4 @@
<field name="context">{'module' : 'sale_management', 'bin_size': False}</field>
</record>
<menuitem id="menu_sale_general_settings"
name="Settings"
parent="menu_sale_config"
sequence="0"
action="action_sale_config_settings"
groups="base.group_system"/>
</odoo>
+142
View File
@@ -0,0 +1,142 @@
<?xml version="1.0" encoding="UTF-8"?>
<odoo>
<menuitem id="sale_menu_root"
name="Sales"
web_icon="sale_management,static/description/icon.png"
active="False"
sequence="30">
<menuitem id="sale_order_menu"
name="Orders"
sequence="2">
<menuitem id="menu_sale_quotations"
action="action_quotations_with_onboarding"
groups="sales_team.group_sale_salesman"
sequence="1"/>
<menuitem id="menu_sale_order"
name="Orders"
action="action_orders"
groups="sales_team.group_sale_salesman"
sequence="2"/>
<menuitem id="report_sales_team"
name="Sales Teams"
action="sales_team.crm_team_action_sales"
groups="sales_team.group_sale_manager"
sequence="3"/>
<menuitem id="res_partner_menu"
action="account.res_partner_action_customer"
groups="sales_team.group_sale_salesman"
sequence="4"/>
</menuitem>
<menuitem id="menu_sale_invoicing"
name="To Invoice"
groups="sales_team.group_sale_salesman"
sequence="3">
<menuitem id="menu_sale_order_invoice"
action="action_orders_to_invoice"
sequence="2"/>
<menuitem id="menu_sale_order_upselling"
action="action_orders_upselling"
sequence="5"/>
</menuitem>
<menuitem id="product_menu_catalog"
name="Products"
groups="sales_team.group_sale_salesman"
sequence="4">
<menuitem id="menu_product"
name="Product Variants"
sequence="2"
groups="base.group_no_one"/>
<menuitem id="menu_product_template_action"
action="product_template_action"
sequence="1"/>
<menuitem id="menu_products"
action="product.product_normal_action_sell"
groups="product.group_product_variant"
sequence="2"/>
<menuitem id="menu_product_pricelist_main"
name="Pricelists"
action="product.product_pricelist_action2"
groups="product.group_product_pricelist"
sequence="3"/>
</menuitem>
<menuitem id="menu_sale_report"
name="Reporting"
groups="sales_team.group_sale_manager"
sequence="5">
<menuitem id="menu_report_product_all"
name="Sales"
action="action_order_report_all"
sequence="1"/>
</menuitem>
<menuitem id="menu_sale_config"
name="Configuration"
groups="sales_team.group_sale_manager"
sequence="35">
<menuitem id="menu_sale_general_settings"
name="Settings"
sequence="0"
action="action_sale_config_settings"
groups="base.group_system"/>
<menuitem id="sales_team_config"
name="Sales Teams"
action="sales_team.crm_team_action_config"
sequence="2"/>
<menuitem id="menu_sales_config"
sequence="4"
name="Sales Orders">
<menuitem id="menu_tag_config"
name="Tags"
action="sales_team.sales_team_crm_tag_action"
sequence="2"/>
</menuitem>
<menuitem id="prod_config_main"
name="Products"
sequence="5"/>
<menuitem id="next_id_16"
name="Units of Measure"
groups="uom.group_uom"
sequence="6">
<menuitem id="menu_product_uom_form_action"
action="uom.product_uom_form_action"
groups="base.group_no_one"
sequence="7"/>
<menuitem id="menu_product_uom_categ_form_action"
action="uom.product_uom_categ_form_action"
sequence="8"/>
</menuitem>
<menuitem id="sale_menu_config_activity_type"
action="mail_activity_type_action_config_sale"
groups="base.group_no_one"/>
</menuitem>
</menuitem>
</odoo>
-95
View File
@@ -1,76 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!-- Top menu item -->
<menuitem id="sale_menu_root"
name="Sales"
web_icon="sale_management,static/description/icon.png"
active="False"
sequence="30"/>
<menuitem id="sale_order_menu"
name="Orders"
parent="sale_menu_root"
sequence="2"/>
<menuitem id="report_sales_team"
name="Sales Teams"
parent="sale_order_menu"
groups="sales_team.group_sale_manager"
action="sales_team.crm_team_action_sales"
sequence="3"/>
<menuitem id="res_partner_menu"
parent="sale_order_menu"
action="account.res_partner_action_customer"
sequence="4" groups="sales_team.group_sale_salesman"/>
<menuitem id="menu_sale_report"
name="Reporting"
parent="sale_menu_root"
sequence="5"
groups="sales_team.group_sale_manager"/>
<menuitem id="menu_report_product_all"
name="Sales"
action="action_order_report_all"
parent="menu_sale_report"
sequence="1"/>
<menuitem id="menu_sale_config"
name="Configuration"
parent="sale_menu_root"
sequence="35"
groups="sales_team.group_sale_manager"/>
<menuitem id="sales_team_config"
name="Sales Teams"
parent="sale.menu_sale_config"
action="sales_team.crm_team_action_config"
sequence="2"/>
<menuitem id="menu_sales_config"
parent="menu_sale_config"
sequence="4"
name="Sales Orders"/>
<menuitem
id="menu_tag_config"
name="Tags"
parent="sale.menu_sales_config"
action="sales_team.sales_team_crm_tag_action"
sequence="2"/>
<menuitem id="product_menu_catalog" name="Products" parent="sale_menu_root" sequence="4" groups="sales_team.group_sale_salesman"/>
<menuitem id="menu_product" name="Product Variants" parent="product_menu_catalog" sequence="2" groups="base.group_no_one" active="False"/>
<menuitem action="product_template_action" id="menu_product_template_action" parent="product_menu_catalog" sequence="1" active="False"/>
<menuitem id="prod_config_main" name="Products" parent="menu_sale_config" sequence="5"/>
<menuitem id="menu_products" action="product.product_normal_action_sell" parent="product_menu_catalog" groups="product.group_product_variant" sequence="2" active="False"/>
<menuitem id="next_id_16" name="Units of Measure" parent="menu_sale_config" sequence="6" groups="uom.group_uom" active="False"/>
<menuitem action="uom.product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16" sequence="7" groups="base.group_no_one" active="False"/>
<menuitem action="uom.product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="next_id_16" sequence="8" active="False"/>
<menuitem id="menu_product_pricelist_main" name="Pricelists" parent="product_menu_catalog" action="product.product_pricelist_action2" groups="product.group_product_pricelist" sequence="3" active="False"/>
<record id="sale_order_view_activity" model="ir.ui.view">
<field name="name">sale.order.activity</field>
<field name="model">sale.order</field>
@@ -829,12 +759,6 @@
<field name="act_window_id" ref="action_orders"/>
</record>
<menuitem id="menu_sale_order"
name="Orders"
action="action_orders"
parent="sale_order_menu"
sequence="2" groups="sales_team.group_sale_salesman"/>
<record id="action_orders_to_invoice" model="ir.actions.act_window">
<field name="name">Orders to Invoice</field>
<field name="type">ir.actions.act_window</field>
@@ -862,16 +786,6 @@
<field name="code">action = records.action_quotation_sent()</field>
</record>
<menuitem id="menu_sale_invoicing"
name="To Invoice"
parent="sale_menu_root"
sequence="3" groups="sales_team.group_sale_salesman"/>
<menuitem id="menu_sale_order_invoice"
action="action_orders_to_invoice"
parent="sale.menu_sale_invoicing"
sequence="2" active="False"/>
<record id="action_orders_upselling" model="ir.actions.act_window">
<field name="name">Orders to Upsell</field>
<field name="type">ir.actions.act_window</field>
@@ -892,10 +806,6 @@
</p>
</field>
</record>
<menuitem action="action_orders_upselling"
id="menu_sale_order_upselling" parent="sale.menu_sale_invoicing"
sequence="5" active="False"/>
<record id="action_quotations_with_onboarding" model="ir.actions.act_window">
<field name="name">Quotations</field>
@@ -972,11 +882,6 @@
<field name="act_window_id" ref="action_quotations"/>
</record>
<menuitem id="menu_sale_quotations"
action="action_quotations_with_onboarding"
parent="sale_order_menu"
sequence="1" groups="sales_team.group_sale_salesman"/>
<record id="view_order_line_tree" model="ir.ui.view">
<field name="name">sale.order.line.tree</field>
<field name="model">sale.order.line</field>
+9 -5
View File
@@ -38,17 +38,21 @@ The Dashboard for the Sales Manager will include
'website': 'https://www.odoo.com/app/sales',
'depends': ['sale', 'digest'],
'data': [
'security/sale_management_security.xml',
# TODO VFE add data validation on manifest loading
# We were loading digest_data twice...
'data/digest_data.xml',
'security/ir.model.access.csv',
'security/sale_management_security.xml',
'report/sale_report_templates.xml',
'views/sale_portal_templates.xml',
'views/sale_order_template_views.xml',
'security/ir.model.access.csv',
'views/res_config_settings_views.xml',
'data/digest_data.xml',
'views/sale_management_views.xml',
'views/digest_views.xml',
'views/sale_order_views.xml',
'report/sale_report_templates.xml',
'views/sale_management_menus.xml',
],
'demo': [
'data/sale_order_template_demo.xml',
@@ -47,4 +47,14 @@
</field>
</record>
<record id="res_config_settings_view_form_inherit_sale_management" model="ir.ui.view">
<field name="name">res.config.settings.view.form.inherit.sale.management</field>
<field name="model">res.config.settings</field>
<field name="inherit_id" ref="sale.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@data-key='sale_management']" position="attributes">
<attribute name="class">app_settings_block</attribute>
</xpath>
</field>
</record>
</odoo>
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="sale.sale_menu_root" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<menuitem id="sale_order_template_menu"
name="Quotation Templates"
action="sale_order_template_action"
parent="sale.menu_sales_config"
groups="sale_management.group_sale_order_template"
sequence="1"/>
<menuitem id="menu_product_attribute_action"
action="product.attribute_action"
parent="sale.prod_config_main"
groups="product.group_product_variant"
sequence="1"/>
</odoo>
@@ -1,63 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="sale.sale_menu_root" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.menu_report_product_all" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.menu_sales_config" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.product_menu_catalog" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.menu_product" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.menu_product_template_action" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.prod_config_main" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.menu_products" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.next_id_16" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.menu_product_uom_categ_form_action" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.menu_product_pricelist_main" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.menu_sale_order" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.menu_sale_invoicing" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.menu_sale_order_invoice" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.menu_sale_order_upselling" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="sale.menu_sale_quotations" model="ir.ui.menu">
<field name="active" eval="True"/>
</record>
<record id="res_config_settings_view_form_inherit_sale_management" model="ir.ui.view">
<field name="name">res.config.settings.view.form.inherit.sale.management</field>
<field name="model">res.config.settings</field>
<field name="inherit_id" ref="sale.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@data-key='sale_management']" position="attributes">
<attribute name="class">app_settings_block</attribute>
</xpath>
</field>
</record>
</odoo>
@@ -144,6 +144,4 @@
</field>
</record>
<menuitem id="sale_order_template_menu" action="sale_order_template_action" parent="sale.menu_sales_config" sequence="1" name="Quotation Templates" groups="sale_management.group_sale_order_template"/>
</odoo>
@@ -103,7 +103,4 @@
</field>
</record>
<menuitem id="menu_product_attribute_action"
action="product.attribute_action"
parent="sale.prod_config_main" groups="product.group_product_variant" sequence="1"/>
</odoo>