From 5ed1a8f646acab52d31ca59a4eef1b2a3916f5e5 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 3 May 2012 10:44:53 +0530
Subject: [PATCH] [IMP]stock: set act_windoe for reception and delivery links
 of product kanban view

bzr revid: dbr@tinyerp.com-20120503051453-aay4p6ss3t3f52xz
---
 addons/crm/res_partner_view.xml | 17 +++++++++--------
 addons/stock/product_view.xml   | 25 +++++++++++++++++++++++--
 addons/stock/stock.py           |  1 +
 addons/stock/stock_view.xml     |  7 ++++++-
 4 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 3c9f76480c3..9436ec7269a 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -50,14 +50,15 @@
         view_mode="calendar,tree,form,gantt"
         context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
     />
-        <act_window
-            context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
-            id="act_res_partner_2_opportunity"
-            name="Opportunity"
-            view_mode="tree,form,graph,calendar"
-            domain="[('type','=','opportunity')]"
-            res_model="crm.lead"
-            src_model="res.partner"/>
+    	<act_window
+        id="act_res_partner_2_opportunity"
+        name="Opportunity"
+        res_model="crm.lead"
+        src_model="res.partner"
+        view_mode="tree,form,graph,calendar"
+        domain="[('type','=','opportunity')]"
+        context="{'search_default_partner_id': [active_id],'default_partner_id': active_id}"
+        />
 
 		<!-- Partner kanban view inherte -->
         <record model="ir.ui.view" id="crm_lead_partner_kanban_view">
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index aeda470740a..cfb7f282373 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -126,6 +126,27 @@
             </field>
         </record>
 
+        <act_window
+            id="act_product_2_reception"
+            name="Receptions"
+            view_mode="tree,form,calendar"
+            res_model="stock.picking"
+            src_model="product.product"
+            context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
+            domain="[('type','=','in')]"
+            />
+
+        <act_window
+            id="act_product_2_delivery"
+            name="Deliveries"
+            view_mode="tree,form"
+            res_model="stock.picking"
+            src_model="product.product"
+            context="{'search_default_product_id': [active_id], 'default_product_id': active_id}"
+            domain="[('type', '=', 'out')]"
+            />
+		
+
         <record model="ir.ui.view" id="product.product_kanban_view">
             <field name="name">Product Kanban</field>
             <field name="model">product.product</field>
@@ -152,10 +173,10 @@
                                         <li>Price: <field name="lst_price"></field></li>
                                         <li>Cost: <field name="standard_price"></field></li>
                                     </ul>
-                                    <a name="%(stock.action_picking_tree4)d" type="action">
+                                    <a name="%(act_product_2_reception)d" type="action">
                                         <t t-if="record.reception_count.value">Receptions(<t t-esc="record.reception_count.value"/>)</t>
                                     </a>
-                                    <a name="%(stock.action_out_picking_move)d" type="action">
+                                    <a name="%(act_product_2_delivery)d" type="action">
                                         <t t-if="record.delivery_count.value">Deliveries(<t t-esc="record.delivery_count.value"/>)</t>
                                     </a>
                                 </div>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index dee8e2a6c25..678cf4403c3 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -648,6 +648,7 @@ class stock_picking(osv.osv):
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  store=True, type='datetime', string='Max. Expected Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
+        'product_id': fields.related('move_lines','product_id', type='many2one', relation='product.product', string='Product',store=True),
         'auto_picking': fields.boolean('Auto-Picking'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'invoice_state': fields.selection([
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 14bb43a1edd..2aabf695bcb 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -838,6 +838,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="partner_id"/>
+                        <field name="product_id"/>
                         <field name="stock_journal_id" widget="selection"/>
                     </group>
                     <newline/>
@@ -1029,6 +1030,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="origin"/>
+                        <field name="product_id"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -1105,7 +1107,7 @@
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
                             <field name="origin"/>
-                            <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4"/>
+                            <field name="partner_id" on_change="onchange_partner_in(partner_id)" colspan="4"/>
                             <field name="invoice_state" string="Invoice Control"/>
                             <field name="backorder_id" readonly="1"/>
                         </group>
@@ -1244,7 +1246,9 @@
                         <field name="origin"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company" />
+                        <field name="product_id"/>
                     </group>
+                    
                     <newline/>
                     <group expand="0" string="Group By...">
                         <separator orientation="vertical" />
@@ -1302,6 +1306,7 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="origin"/>
+                        <field name="product_id"/>
                         <field name="stock_journal_id" widget="selection"/>
                         <field name="company_id" widget="selection"/>
                     </group>