[MERGE] trunk-wms
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 1 Apr 2014 09:27:42 +0000 (11:27 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 1 Apr 2014 09:27:42 +0000 (11:27 +0200)
bzr revid: qdp-launchpad@openerp.com-20140401092742-11g6j7rgcrpa9zo2

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

Simple merge
Simple merge
Simple merge