[MERGE]merge with latest trunk-wms
authorCedric Snauwaert <csn@openerp.com>
Mon, 10 Feb 2014 10:19:53 +0000 (11:19 +0100)
committerCedric Snauwaert <csn@openerp.com>
Mon, 10 Feb 2014 10:19:53 +0000 (11:19 +0100)
commit190b7010127d0a8a968c13cc3c59e30bd2c79379
tree41fb83dac76823a2c4c45af4d54502ace636104b
parent9502276166f95c451773a7c7358c83a6d4703f6e
parente0362bf34c43e2c9cf3604de3f8bc7642f32897f
[MERGE]merge with latest trunk-wms

bzr revid: csn@openerp.com-20140210101953-dnnm61zzjdeghkwm
addons/stock/stock.py
addons/stock/stock_view.xml