From 3902aa61dc2fda0408390af95bba2bcba11ae40b Mon Sep 17 00:00:00 2001 From: "Jitendra Prajapati (OpenERP)" Date: Tue, 13 Aug 2013 13:13:30 +0530 Subject: [PATCH 1/3] [IMP]Improve domain syntact bzr revid: prajapatijitendra7969@gmail.com-20130813074330-i1rp7ew5i0zvm7p2 --- addons/stock/stock_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index da202f04d10..0948f445f73 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1046,7 +1046,7 @@ ir.actions.act_window form tree,form - ['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False)] + ['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),('picking_id','!=',False)] {'product_receive': True, 'search_default_future': True} @@ -1141,7 +1141,7 @@ ir.actions.act_window form tree,form - ['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False)] + ['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),('picking_id','!=',False)] {'search_default_future': True} From 24b1f53cce839f6cf7602bfe7aecd5114fead50f Mon Sep 17 00:00:00 2001 From: "Jitendra Prajapati (OpenERP)" Date: Wed, 14 Aug 2013 18:43:02 +0530 Subject: [PATCH 2/3] [IMP]improve domain bzr revid: prajapatijitendra7969@gmail.com-20130814131302-t4k5258dixltd6dm --- addons/stock/stock_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 0948f445f73..3054abfd60f 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1046,7 +1046,7 @@ ir.actions.act_window form tree,form - ['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),('picking_id','!=',False)] + {'product_receive': True, 'search_default_future': True} @@ -1141,7 +1141,7 @@ ir.actions.act_window form tree,form - ['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),('picking_id','!=',False)] + {'search_default_future': True} From 0d56b1b2f08e0465d6072b5098445f21556f828e Mon Sep 17 00:00:00 2001 From: "Jitendra Prajapati (OpenERP)" Date: Mon, 19 Aug 2013 15:44:11 +0530 Subject: [PATCH 3/3] [MERGE] lp:~openerp-dev/openobject-addons/trunk-wmsimplement-seduce-fp-product_kanban_link-jitendra bzr revid: prajapatijitendra7969@gmail.com-20130819101411-bbqg50aqu719b9xh --- addons/stock/product_view.xml | 4 ++-- addons/stock/stock_view.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index d057c47cc80..9c14a150b96 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -48,7 +48,7 @@ ir.actions.act_window form tree,form - [('picking_type_id','=',ref("picking_type_in")), ('location_id.usage','!=','internal'), ('location_dest_id.usage', '=', 'internal')] + @@ -69,7 +69,7 @@ form tree,form - [('picking_type_id','=',ref("picking_type_out")), ('location_id.usage','=','internal'), ('location_dest_id.usage', '!=', 'internal')] +

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 3054abfd60f..575712ad771 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1046,7 +1046,7 @@ ir.actions.act_window form tree,form - + {'product_receive': True, 'search_default_future': True} @@ -1141,7 +1141,7 @@ ir.actions.act_window form tree,form - + {'search_default_future': True}