[MERGE] Forward-port saas-4 up to 9a84d55
authorOlivier Dony <odo@openerp.com>
Thu, 14 Aug 2014 12:48:55 +0000 (14:48 +0200)
committerOlivier Dony <odo@openerp.com>
Thu, 14 Aug 2014 12:54:37 +0000 (14:54 +0200)
1  2 
addons/sale_stock/sale_stock_view.xml
addons/web/controllers/main.py

Simple merge
Simple merge