[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)
1  2 
addons/stock/stock.py
addons/stock/wizard/stock_invoice_onshipping.py
addons/web/static/src/js/view_list.js

Simple merge
Simple merge