From 7c3b0569662059ea2d9384c37765912d41ac682a Mon Sep 17 00:00:00 2001
From: Adrien Dieudonne <adr@odoo.com>
Date: Wed, 8 Jun 2016 14:21:49 +0200
Subject: [PATCH] [IMP] product, website_sale: remove product from apps

---
 addons/product/pricelist_view.xml       |  5 --
 addons/product/product_view.xml         | 96 -------------------------
 addons/stock/views/stock_menu_views.xml |  6 ++
 addons/website_sale/views/views.xml     |  1 -
 4 files changed, 6 insertions(+), 102 deletions(-)

diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index c74e5a41201..465f9c3a0ff 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -169,10 +169,5 @@
             </field>
         </record>
 
-        <menuitem id="product_config_pricelist_section" name="Pricelists" 
-            parent="product_catalog_menu_configuration" groups="product.group_sale_pricelist" sequence="3"/>
-        <menuitem action="product_pricelist_action2" id="product_config_pricelists"
-            parent="product_config_pricelist_section" sequence="1" groups="product.group_sale_pricelist"/>
-
     </data>
 </openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index f42b84b1bd0..4318a9a903a 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -843,101 +843,5 @@
         <field name="context">{'visible_product_tmpl_id':False}</field>
     </record>
 
-    <!--App-like product catalog.-->
-    <menuitem id="product_catalog_menu"
-        name="Products"
-        sequence="5"
-        action="product_template_action_all"
-        web_icon="product,static/description/product_catalog.png"
-        groups="base.group_user"/>
-
-    <menuitem id="product_catalog_menu_product"
-        name="Products"
-        sequence="1"
-        parent="product_catalog_menu"
-        />
-
-    <menuitem id="product_template_menu_catalog"
-        action="product_template_action_all"
-        parent="product_catalog_menu_product"
-        sequence="1"/>
-
-    <menuitem id="product_product_menu_catalog"
-        action="product_normal_action"
-        parent="product_catalog_menu_product"
-        sequence="2"
-        groups="product.group_product_variant"/>
-
-    <menuitem id="product_catalog_menu_configuration"
-        name="Configuration"
-        sequence="2"
-        parent="product_catalog_menu"
-        />
-
-    <record id="base_config_settings_form_product_catalog" model="ir.ui.view">
-        <field name="name">base.config.settings.form.product.catalog</field>
-        <field name="model">base.config.settings</field>
-        <field name="priority">99</field>
-        <field name="arch" type="xml">
-            <form string="Configuration" class="oe_form_configuration">
-                    <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
-                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
-                    </header>
-                    <group string="Preferences">
-                        <field name="group_product_variant" widget="radio"/>
-                    </group>
-                </form>
-        </field>
-    </record>
-
-    <record id="base_config_settings_action_product_catalog" model="ir.actions.act_window">
-        <field name="name">Product Settings</field>
-        <field name="res_model">base.config.settings</field>
-        <field name="view_mode">form</field>
-        <field name="view_type">form</field>
-        <field name="target">inline</field>
-        <field name="view_id" ref="base_config_settings_form_product_catalog"/>
-    </record>
-
-    <menuitem id="product_config_menu_catalog"
-        name="Product Settings"
-        action="base_config_settings_action_product_catalog"
-        parent="product_catalog_menu_configuration"
-        sequence="1"/>
-
-    <menuitem id="product_parameters_menu"
-        name="Products"
-        parent="product_catalog_menu_configuration"/>
-
-    <menuitem id="product_categories_menu_catalog"
-        action="product_category_action_form"
-        name="Product Categories"
-        parent="product_parameters_menu"/>
-
-    <menuitem id="product_uom_menu_catalog"
-        action="product_uom_form_action"
-        name="Unit of Measures"
-        parent="product_parameters_menu"
-        groups="product.group_uom"/>
-
-    <menuitem id="product_uom_categ_menu_catalog"
-        action="product_uom_categ_form_action"
-        name="Unit of Measures Categories"
-        parent="product_parameters_menu"
-        groups="base.group_no_one"/>
-
-    <menuitem id="product_attribute_menu_catalog"
-        action="attribute_action"
-        name="Attributes"
-        parent="product_parameters_menu"
-        groups="product.group_product_variant"/>
-
-    <menuitem id="product_attribute_values_menu_catalog"
-        action="variants_action"
-        name="Attributes Values"
-        parent="product_parameters_menu"
-        groups="product.group_product_variant"/>
-
     </data>
 </openerp>
diff --git a/addons/stock/views/stock_menu_views.xml b/addons/stock/views/stock_menu_views.xml
index fd490c97c28..853caba6b26 100644
--- a/addons/stock/views/stock_menu_views.xml
+++ b/addons/stock/views/stock_menu_views.xml
@@ -19,6 +19,12 @@
     <menuitem
         action="product.product_category_action_form" id="menu_product_category_config_stock"
         parent="stock.menu_product_in_config_stock" sequence="2"/>
+    <menuitem
+        action="product.attribute_action" id="menu_attribute_action"
+        parent="menu_product_in_config_stock" sequence="4" groups="product.group_product_variant"/>
+    <menuitem
+        action="product.variants_action" id="menu_variants_action"
+        parent="menu_product_in_config_stock" sequence="5" groups="product.group_product_variant"/>
     <menuitem
         action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
         parent="menu_product_in_config_stock" sequence="5" groups="product.group_uom"/>
diff --git a/addons/website_sale/views/views.xml b/addons/website_sale/views/views.xml
index b29581d6b58..bbdc8cd59c3 100644
--- a/addons/website_sale/views/views.xml
+++ b/addons/website_sale/views/views.xml
@@ -117,7 +117,6 @@
         </field>
     </record>
     <menuitem action="product_public_category_action" id="menu_product_public_category" parent="sale.prod_config_main" sequence="2" />
-    <menuitem action="product_public_category_action" id="menu_product_public_category_product_catalog" parent="product.product_parameters_menu" sequence="2"/>
 
     <record id="website_sale_pricelists_by_website" model="ir.actions.act_window">
         <field name="name">Website Pricelist</field>