From b3ffcdc7ea1c88358b55589ea24a4d647aa3b15c Mon Sep 17 00:00:00 2001
From: Pierre Masereel <pim@odoo.com>
Date: Tue, 27 Dec 2016 16:29:31 +0100
Subject: [PATCH] [IMP] product: improve product packagings management

First of all we restrict the domain, of the action that shows product
packagings, to only show the packagings having a 'product_id' which
means that they are 'Product packagings' and not 'delivery' or 'stock'
packagings.

We also add the field product packaging to the 'product.packaging' form
view to easily create product packagings from the product packaging tree
view.
---
 addons/product/views/product_views.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index db8786e77fb..3bbc078c6cf 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -55,7 +55,8 @@
                                         options="{'no_create': True}"/>
                                     <field name="uom_id" groups="product.group_uom" options="{'no_create': True}"/>
                                     <field name="uom_po_id" groups="product.group_uom" options="{'no_create': True}"/>
-                                    <field name="currency_id" invisible="1"/> 
+                                    <field name="currency_id" invisible="1"/>
+                                    <field name="product_variant_id" invisible="1"/>
                                 </group>
                             </group>
                         </page>
@@ -64,7 +65,7 @@
                                 colspan="4"
                                 attrs="{'invisible':['|', ('type', 'not in', ['product', 'consu']), ('product_variant_count', '>', 1)]}"
                                 groups="product.group_stock_packaging">
-                                <field name="packaging_ids" nolabel="1"/>
+                                <field name="packaging_ids" nolabel="1" context="{'default_product_id': product_variant_id}"/>
                             </group>
                         </page>
                         <page string="Sales" attrs="{'invisible':[('sale_ok','=',False)]}" name="sales">
@@ -182,6 +183,7 @@
             <field name="arch" type="xml">
                 <form string="Variant Information">
                     <sheet>
+                        <field name="id" invisible="1"/>
                         <field name="image_medium" widget="image" class="oe_avatar"/>
                         <div class="oe_title">
                             <label class="oe_edit_only" for="name" string="Product Name"/>
@@ -443,6 +445,7 @@
         <record model="ir.actions.act_window" id="action_packaging_view">
             <field name="name">Packagings</field>
             <field name="res_model">product.packaging</field>
+            <field name="domain">[('product_id', '!=', False)]</field>
         </record>
 
         <record id="product_packaging_tree_view" model="ir.ui.view">
@@ -468,6 +471,10 @@
                             <field name="name"/>
                         </h1>
                         <group>
+                            <field name="id" invisible='1'/>
+                            <group>
+                                <field name="product_id" attrs="{'readonly': [('id', '!=', False)]}"/>
+                            </group>
                             <group name="qty">
                                 <field name="qty"/>
                                 <field name="barcode"/>