[MERGE] forward port of branch 7.0 up to 922a52d

author Denis Ledoux <dle@odoo.com>

Fri, 14 Nov 2014 16:59:00 +0000 (17:59 +0100)

committer Denis Ledoux <dle@odoo.com>

Fri, 14 Nov 2014 16:59:00 +0000 (17:59 +0100)
author Denis Ledoux <dle@odoo.com>
Fri, 14 Nov 2014 16:59:00 +0000 (17:59 +0100)
committer Denis Ledoux <dle@odoo.com>
Fri, 14 Nov 2014 16:59:00 +0000 (17:59 +0100)
diff --cc addons/purchase/stock.py
Simple merge
diff --cc addons/web/static/src/js/search.js
Simple merge
author	Denis Ledoux <dle@odoo.com>
	Fri, 14 Nov 2014 16:59:00 +0000 (17:59 +0100)
committer	Denis Ledoux <dle@odoo.com>
	Fri, 14 Nov 2014 16:59:00 +0000 (17:59 +0100)
		1	2
addons/purchase/stock.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/search.js	patch \|	diff1 \|	diff2 \|	blob \| history