[MERGE] forward port of branch 7.0 up to 922a52d
authorDenis Ledoux <dle@odoo.com>
Fri, 14 Nov 2014 16:59:00 +0000 (17:59 +0100)
committerDenis Ledoux <dle@odoo.com>
Fri, 14 Nov 2014 16:59:00 +0000 (17:59 +0100)
commitc5714135c20e671990fbe4564884ebddacbe0206
tree0664bb5d9062b86a11b47d6addfd4fc87b555976
parent7ab413724acd917be5bfacf734ed4dbd9098102e
parent922a52dcde24749aa3e640a940be462b85c075dd
[MERGE] forward port of branch 7.0 up to 922a52d
addons/purchase/stock.py
addons/web/static/src/js/search.js