[MERGE]merge with latest trunk-wms
authorCedric Snauwaert <csn@openerp.com>
Tue, 4 Mar 2014 09:21:53 +0000 (10:21 +0100)
committerCedric Snauwaert <csn@openerp.com>
Tue, 4 Mar 2014 09:21:53 +0000 (10:21 +0100)
bzr revid: csn@openerp.com-20140304092153-s2gebsi21pm8ngyg

1  2 
addons/stock/static/src/js/widgets.js
addons/stock/stock.py
addons/stock/stock_view.xml

Simple merge
Simple merge
Simple merge