[MERGE]merge with trunk-wms-loconop-jco
authorCedric Snauwaert <csn@openerp.com>
Tue, 4 Mar 2014 09:24:18 +0000 (10:24 +0100)
committerCedric Snauwaert <csn@openerp.com>
Tue, 4 Mar 2014 09:24:18 +0000 (10:24 +0100)
commit992408c79fb6e77765c29996a5a283e9d8ba40de
treea843e61aeecbb12468cc8f335d25491ba8a702b5
parentb65690d6e140e0900d1d3e83464b061041477da3
parentd305b72bdee8e1cf2e63807d7a3383710fe2b2e6
[MERGE]merge with trunk-wms-loconop-jco

bzr revid: csn@openerp.com-20140304092418-ehpfvpx3hb7uq13n
addons/stock/stock.py
addons/stock/stock_view.xml