diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 73edb2208c545dd7bc8f459c575a152b3dcd4a44..5bb2e01b651b08b3d3cd242a691b68756672a131 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -2014,7 +2014,9 @@
<field name="view_id" ref="product_product_view_tree"/>
</record>
- <menuitem id="menu_product_product_action" name="Products" action="product_product_action" parent="account.menu_finance_configuration" sequence="1"/>
+ <menuitem id="product_configuration_menu" name="Products" parent="account.menu_finance_configuration" sequence="1"/>
+
+ <menuitem id="menu_product_product_action" name="Products" action="product_product_action" parent="product_configuration_menu" sequence="1"/>
<menuitem id="menu_product_template_action" name="Sellable Products"
diff --git a/addons/account_accountant/__manifest__.py b/addons/account_accountant/__manifest__.py
index b438f5a03948fb9f1362baa14d6558aab50c940e..7f14d36e77b017cb119ca2dee0eddecc023cec13 100644
--- a/addons/account_accountant/__manifest__.py
+++ b/addons/account_accountant/__manifest__.py
@@ -21,6 +21,7 @@ It assigns manager and user access rights to the Administrator for the accountin
'security/account_accountant_security.xml',
'views/account_accountant_templates.xml',
'views/res_config_view.xml',
+ 'views/product_views.xml',
],
'demo': ['data/account_accountant_demo.xml'],
'test': [],
diff --git a/addons/account_accountant/views/product_views.xml b/addons/account_accountant/views/product_views.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3989f9c74394ba176bffca896cb6dde4d8ab0581
--- /dev/null
+++ b/addons/account_accountant/views/product_views.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+ <menuitem id="menu_product_product_categories"
+ action="product.product_category_action_form"
+ parent="account.product_configuration_menu" sequence="2"/>
+</odoo>
diff --git a/addons/point_of_sale/__manifest__.py b/addons/point_of_sale/__manifest__.py
index d2919abe3aa80c5c1b23ec928523a3ac2b457d24..2ff4b266761889d03e60f5b239f9de86066d1f65 100644
--- a/addons/point_of_sale/__manifest__.py
+++ b/addons/point_of_sale/__manifest__.py
@@ -43,8 +43,8 @@ Main Features
'views/point_of_sale_report.xml',
'views/point_of_sale_view.xml',
'views/pos_order_view.xml',
- 'views/product_view.xml',
'views/pos_category_view.xml',
+ 'views/product_view.xml',
'views/account_journal_view.xml',
'views/pos_config_view.xml',
'views/pos_session_view.xml',
diff --git a/addons/point_of_sale/views/point_of_sale_view.xml b/addons/point_of_sale/views/point_of_sale_view.xml
index a1bd791b63867c4fa330bd76ba5058ac2e1b1f2b..9e86f135c2341738e81e628b49a99e3ce63b43f1 100644
--- a/addons/point_of_sale/views/point_of_sale_view.xml
+++ b/addons/point_of_sale/views/point_of_sale_view.xml
@@ -34,9 +34,4 @@
parent="menu_point_config_product"
sequence="10"/>
- <menuitem id="pos_config_menu_configuration_product"
- name="Products"
- parent="menu_point_config_product"
- sequence="20"/>
-
</odoo>
diff --git a/addons/point_of_sale/views/pos_category_view.xml b/addons/point_of_sale/views/pos_category_view.xml
index 75a7609e7891ef5fe4eb11e49e59e608ed99b054..9ddfa08bb42994748a2063e1a735596a290dcfef 100644
--- a/addons/point_of_sale/views/pos_category_view.xml
+++ b/addons/point_of_sale/views/pos_category_view.xml
@@ -77,8 +77,4 @@
</field>
</record>
- <menuitem id="menu_product_pos_category"
- action="product_pos_category_action"
- parent="point_of_sale.pos_config_menu_configuration_product"
- sequence="30"/>
</odoo>
diff --git a/addons/point_of_sale/views/product_view.xml b/addons/point_of_sale/views/product_view.xml
index ced1a008238cd9a366a76d41650dea808d5537d6..387ee93d4bdfacd1fe6c5f9d382c7b53bed16613 100644
--- a/addons/point_of_sale/views/product_view.xml
+++ b/addons/point_of_sale/views/product_view.xml
@@ -60,7 +60,7 @@
<group name="email_template_and_project" position="before">
<group name="pos" string="Point of Sale">
<field name="available_in_pos"/>
- <field name="pos_categ_id" attrs="{'invisible': [('available_in_pos', '=', False)]}"/>
+ <field name="pos_categ_id" attrs="{'invisible': [('available_in_pos', '=', False)]}" string="PoS Category"/>
<field name="to_weight" attrs="{'invisible': [('available_in_pos', '=', False)]}"/>
</group>
</group>
@@ -81,26 +81,14 @@
action="product_product_action"
groups="product.group_product_variant"
sequence="10"/>
+ <menuitem id="menu_product_pos_category"
+ action="point_of_sale.product_pos_category_action"
+ parent="point_of_sale.pos_config_menu_catalog"
+ sequence="15"/>
<menuitem id="pos_config_menu_action_product_pricelist"
parent="point_of_sale.pos_config_menu_catalog"
action="product.product_pricelist_action2"
groups="product.group_sale_pricelist"
sequence="20"/>
- <!-- Config > Products sub menus -->
- <menuitem id="pos_config_menu_action_product_attribute"
- parent="point_of_sale.pos_config_menu_configuration_product"
- action="product.attribute_action"
- groups="product.group_product_variant"
- sequence="10"/>
- <menuitem id="pos_config_menu_action_product_attribute_val"
- parent="point_of_sale.pos_config_menu_configuration_product"
- action="product.variants_action"
- groups="product.group_product_variant"
- sequence="20"/>
- <menuitem id="pos_config_menu_action_product_category"
- name="Internal Categories"
- parent="point_of_sale.pos_config_menu_configuration_product"
- action="product_category_action"
- sequence="40"/>
</odoo>
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index c62732aa306d37f5dccd112e7ad97240193b3e89..60e7b46ad965fefb0092ec7b99c58d382181c894 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -44,7 +44,7 @@
<group>
<group name="group_general">
<field name="type"/>
- <field name="categ_id" string="Internal Category"/>
+ <field name="categ_id" string="Category"/>
</group>
<group name="group_standard_price">
<field name="list_price" widget='monetary' options="{'currency_field': 'currency_id'}"/>
@@ -440,7 +440,7 @@
</field>
</record>
<record id="product_category_action_form" model="ir.actions.act_window">
- <field name="name">Product Categories</field>
+ <field name="name">Categories</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">product.category</field>
<field name="view_type">form</field>
diff --git a/addons/purchase_requisition/views/purchase_requisition_views.xml b/addons/purchase_requisition/views/purchase_requisition_views.xml
index 8552b53848326c9fabc22c0cd703403145b88e36..c71ff071332cc6f93d4759f5e1864454857dc545 100644
--- a/addons/purchase_requisition/views/purchase_requisition_views.xml
+++ b/addons/purchase_requisition/views/purchase_requisition_views.xml
@@ -69,7 +69,7 @@
</record>
<menuitem
id="menu_purchase_requisition_type"
- sequence="100"
+ sequence="2"
parent="purchase.menu_purchase_config"
action="tender_type_action"/>
diff --git a/addons/sale_management/views/sale_management_views.xml b/addons/sale_management/views/sale_management_views.xml
index e60b15dcfcb961d5def12685ee2abf069bda78c0..3169272db098eb5a626a8ef38c17a4e9145508d9 100644
--- a/addons/sale_management/views/sale_management_views.xml
+++ b/addons/sale_management/views/sale_management_views.xml
@@ -22,7 +22,6 @@
<menuitem id="sale_management_menu_prod_config_main" name="Products" parent="sales_team.menu_sale_config" sequence="5"/>
<menuitem action="product.attribute_action" id="menu_attribute_action" parent="sale_management_menu_prod_config_main" sequence="1" groups="product.group_product_variant"/>
<menuitem action="product.variants_action" id="menu_variants_action" parent="sale_management_menu_prod_config_main" sequence="2" groups="product.group_product_variant"/>
- <menuitem action="product.product_category_action_form" name="Internal Categories" id="menu_product_category_action_form" parent="sale_management_menu_prod_config_main" sequence="4"/>
<menuitem id="next_id_16" name="Units of Measure" parent="sale_management_menu_prod_config_main" sequence="6" groups="product.group_uom"/>
<menuitem action="product.product_uom_form_action" id="menu_product_uom_form_action" parent="sale_management_menu_prod_config_main" sequence="7" groups="product.group_uom"/>
<menuitem action="product.product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="sale_management_menu_prod_config_main" sequence="8" groups="product.group_uom"/>
diff --git a/addons/website_sale/views/sale_order_views.xml b/addons/website_sale/views/sale_order_views.xml
index a4625b3e0eed1f28ab01d26b02ef4ee6c53a1255..9e8370ce8358b3eafb256ca3a763446aec49bc48 100644
--- a/addons/website_sale/views/sale_order_views.xml
+++ b/addons/website_sale/views/sale_order_views.xml
@@ -110,9 +110,12 @@
<menuitem id="product_catalog_variants" name="Product Variants"
action="product.product_normal_action"
parent="menu_catalog" groups="product.group_product_variant" sequence="2"/>
+ <menuitem id="menu_catalog_categories"
+ action="product_public_category_action"
+ parent="menu_catalog" sequence="3"/>
<menuitem id="menu_catalog_pricelists" name="Pricelists"
action="product.product_pricelist_action2"
- parent="menu_catalog" groups="product.group_sale_pricelist" sequence="3"/>
+ parent="menu_catalog" groups="product.group_sale_pricelist" sequence="4"/>
<!-- Reporting sub-menus -->
<menuitem id="menu_report_sales" name="Sales"
@@ -129,11 +132,5 @@
<menuitem id="menu_catalog_variants_action"
action="product.variants_action"
parent="menu_product_settings" groups="product.group_product_variant" sequence="2"/>
- <menuitem id="menu_catalog_categories" name="Website Categories"
- action="product_public_category_action"
- parent="menu_product_settings" sequence="3"/>
- <menuitem id="menu_internal_product_categories" name="Internal Categories"
- action="product.product_category_action_form"
- parent="menu_product_settings" sequence="4"/>
</odoo>