From afd29b277dae14dbe6a8567d917e5503bf93e286 Mon Sep 17 00:00:00 2001
From: Rutul Raval <rra@openerp.com>
Date: Wed, 9 Dec 2015 11:26:12 +0530
Subject: [PATCH] [ADD] product: New entry in the app switcher / root menu:
 Products

    * This commit adds an easy access to products and variants from the app switcher / root menu, similar to what exists for contacts.
    * Move an action to view stockable products to stock, as it is only executed from stock.
---
 addons/product/product_view.xml               |  99 +++++++++++++++++-
 addons/product/res_config.py                  |   5 +-
 addons/product/res_config_view.xml            |   1 +
 .../static/description/product_catalog.png    | Bin 0 -> 1969 bytes
 addons/stock/stock_view.xml                   |  17 ++-
 addons/website_sale/views/views.xml           |   1 +
 6 files changed, 119 insertions(+), 4 deletions(-)
 create mode 100644 addons/product/static/description/product_catalog.png

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 3f5ec0acab2..f46b54fa58e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -407,13 +407,12 @@
             </field>
         </record>
 
-        <record id="product_template_action_product" model="ir.actions.act_window">
+        <record id="product_template_action_all" model="ir.actions.act_window">
             <field name="name">Products</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.template</field>
             <field name="view_mode">kanban,tree,form</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_products": 1, 'default_type': 'product'}</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
                     Click to define a new product.
@@ -826,5 +825,101 @@
         <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/product/res_config.py b/addons/product/res_config.py
index 1f1481f16d5..65ad6ae798d 100644
--- a/addons/product/res_config.py
+++ b/addons/product/res_config.py
@@ -9,7 +9,10 @@ class base_config_settings(osv.TransientModel):
             help="Share your product to all companies defined in your instance.\n"
                  " * Checked : Product are visible for every company, even if a company is defined on the partner.\n"
                  " * Unchecked : Each company can see only its product (product where company is defined). Product not related to a company are visible for all companies."),
-        'group_product_variant': fields.boolean('Manage Product Variants', 
+        'group_product_variant': fields.selection([
+            (0, "No variants on products"),
+            (1, 'Products can have several attributes, defining variants (Example: size, color,...)')
+        ], "Product Variants",
             help='Work with product variant allows you to define some variant of the same products, an ease the product management in the ecommerce for example',
             implied_group='product.group_product_variant'),
     }
diff --git a/addons/product/res_config_view.xml b/addons/product/res_config_view.xml
index 465f4ea8145..fa5ea2fb747 100644
--- a/addons/product/res_config_view.xml
+++ b/addons/product/res_config_view.xml
@@ -11,5 +11,6 @@
                 </xpath>
             </field>
         </record>
+
     </data>
 </openerp>
diff --git a/addons/product/static/description/product_catalog.png b/addons/product/static/description/product_catalog.png
new file mode 100644
index 0000000000000000000000000000000000000000..8dcc1fff2c38d13ab95ff52823d5778e8c8d7962
GIT binary patch
literal 1969
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
D!@sN)

literal 0
HcmV?d00001

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 77fb785fed1..d50b85834b7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -25,8 +25,23 @@
 
 
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
+
+        <record id="product_template_action_product" model="ir.actions.act_window">
+            <field name="name">Products</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.template</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="view_type">form</field>
+            <field name="context">{"search_default_products": 1, 'default_type': 'product'}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to define a new product.
+                </p>
+            </field>
+        </record>
+
         <menuitem
-            action="product.product_template_action_product" id="menu_product_variant_config_stock" name="Products"
+            action="product_template_action_product" id="menu_product_variant_config_stock" name="Products"
             parent="stock.menu_stock_inventory_control" sequence="1"/>
 
         <menuitem id="product_product_menu" name="Product Variants" action="product.product_normal_action"
diff --git a/addons/website_sale/views/views.xml b/addons/website_sale/views/views.xml
index 1390b5eeec2..8d9bd660ea6 100644
--- a/addons/website_sale/views/views.xml
+++ b/addons/website_sale/views/views.xml
@@ -115,6 +115,7 @@
         </field>
     </record>
     <menuitem action="product_public_category_action" id="menu_product_public_category" parent="product.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>