[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)
commitacbdac4e9fd5d63a2e7ac94f3552e36179ad2227
tree422b666cf32e6b360678c291debff9dbfb1be229
parent6189c44d9799c615145b4d3a2f92d6d6c977792c
parent9a84d55036bba1a8268934e3935c77c976f98ed4
[MERGE] Forward-port saas-4 up to 9a84d55
addons/sale_stock/sale_stock_view.xml
addons/web/controllers/main.py