Merge remote-tracking branch 'odoo/7.0' into 7.0

author OCA git bot <OCA-git-bot@therp.nl>

Fri, 14 Nov 2014 22:42:46 +0000 (23:42 +0100)

committer OCA git bot <OCA-git-bot@therp.nl>

Fri, 14 Nov 2014 22:42:46 +0000 (23:42 +0100)
author OCA git bot <OCA-git-bot@therp.nl>
Fri, 14 Nov 2014 22:42:46 +0000 (23:42 +0100)
committer OCA git bot <OCA-git-bot@therp.nl>
Fri, 14 Nov 2014 22:42:46 +0000 (23:42 +0100)
diff --cc addons/purchase/purchase.py
Simple merge
diff --cc addons/stock/stock.py
Simple merge
diff --cc addons/web/static/src/js/view_form.js
Simple merge
author	OCA git bot <OCA-git-bot@therp.nl>
	Fri, 14 Nov 2014 22:42:46 +0000 (23:42 +0100)
committer	OCA git bot <OCA-git-bot@therp.nl>
	Fri, 14 Nov 2014 22:42:46 +0000 (23:42 +0100)
		1	2
addons/purchase/purchase.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	patch \|	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	patch \|	diff1 \|	diff2 \|	blob \| history