[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)
commit863169202303889dbf6b1321ce258e561e5bad9c
treed124eea9f44869e08b538749070cf12c1d65f952
parent60645188bc08968230a254b04d36223d624580e7
parent9989113946b1dbdffbabfebc48f032d3e9b7581e
[MERGE] trunk-wms

bzr revid: qdp-launchpad@openerp.com-20140401092742-11g6j7rgcrpa9zo2
addons/stock/static/src/js/widgets.js
addons/stock/stock.py
addons/stock/stock_view.xml