[MERGE] forward port of branch 7.0 up to 2080ea0
authorDenis Ledoux <dle@odoo.com>
Thu, 27 Nov 2014 12:27:37 +0000 (13:27 +0100)
committerDenis Ledoux <dle@odoo.com>
Thu, 27 Nov 2014 12:27:37 +0000 (13:27 +0100)
commite347011f24358e8fa4c2528b82e688169fbc1f69
treefff14b5858ca9e5fa6bd408ea11f57be856b4dc4
parent117d0d0ca2460d8d840307c746e31aa7c4385a9e
parent2080ea0f0acfb0e03372e8abd264a5fb72d7d431
[MERGE] forward port of branch 7.0 up to 2080ea0
addons/stock/stock.py
addons/stock/wizard/stock_invoice_onshipping.py
addons/web/static/src/js/view_list.js