[MERGE] forward port of branch 7.0 up to 419d934
authorChristophe Simonis <chs@odoo.com>
Mon, 1 Dec 2014 14:33:48 +0000 (15:33 +0100)
committerChristophe Simonis <chs@odoo.com>
Mon, 1 Dec 2014 14:33:48 +0000 (15:33 +0100)
commite1e7dc0af90d2241e9ca88dbe02ec3ceb4c2d202
tree5bf21c7824bfdc8f0292aecc05c01696f95d8578
parentec30b2133680246d407ee75fd1fe8361100ca194
parent419d934143423c524fa5d5f9c6257ee4231b8502
[MERGE] forward port of branch 7.0 up to 419d934
addons/stock/stock_view.xml
addons/web/static/src/js/view_list.js