[MERGE] Forward-port saas-3 up to fc92027

author Olivier Dony <odo@openerp.com>

Fri, 1 Aug 2014 21:10:29 +0000 (23:10 +0200)

committer Olivier Dony <odo@openerp.com>

Fri, 1 Aug 2014 21:10:29 +0000 (23:10 +0200)
author Olivier Dony <odo@openerp.com>
Fri, 1 Aug 2014 21:10:29 +0000 (23:10 +0200)
committer Olivier Dony <odo@openerp.com>
Fri, 1 Aug 2014 21:10:29 +0000 (23:10 +0200)
diff --cc addons/website/views/website_templates.xml
Simple merge
diff --cc addons/website_sale/controllers/main.py
Simple merge
diff --cc openerp/osv/orm.py
Simple merge
author	Olivier Dony <odo@openerp.com>
	Fri, 1 Aug 2014 21:10:29 +0000 (23:10 +0200)
committer	Olivier Dony <odo@openerp.com>
	Fri, 1 Aug 2014 21:10:29 +0000 (23:10 +0200)
		1	2
addons/website/views/website_templates.xml	patch \|	diff1 \|	diff2 \|	blob \| history
addons/website_sale/controllers/main.py	patch \|	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	patch \|	diff1 \|	diff2 \|	blob \| history