Merge lp:~openerp-dev/openobject-addons/trunk-bug-1010426-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello Sir,

      stock: I Have fix the issue of to open a links of receptions and deliveries from kanban view

Thanks.
Mayur

[Purnendu Singh (OpenERP) (purnendu-singh)]

Hello Mayur,

Well done but it can be improve a little bit!!!

Say for example Kanban or Ice Cream shows Receptions(2) Deliveries(3) but if we click on Receptions(2) it will show all the receptions but user expected only 2 receptions which will make the user confuse!!!

So, Apply proper domain.

Thanks,
purnendu Singh

review: Needs Fixing

[Mayur Maheshwari(OpenERP) (mma-openerp)]

Hello Sir ,

      I have improve domain of action as per the count of [Receptions(2) Deliveries(3)]

      Kindly review it

Thanks.
Mayur

review: Needs Resubmitting

=== modified file 'stock/product_view.xml'
--- stock/product_view.xml	2012-06-19 08:56:18 +0000
+++ stock/product_view.xml	2012-06-21 11:42:23 +0000
@@ -130,7 +130,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('product_id','=',active_id),('picking_id.type','=','in')]</field>
+            <field name="domain">[('picking_id.type','=','in'),('state','not in',['cancel','done'])]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/>
             <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
@@ -143,7 +143,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('product_id','=',active_id),('picking_id.type','=','out')]</field>
+            <field name="domain">[('picking_id.type','=','out'),('state','not in',['cancel','done'])]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/>
             <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>