[MERGE] Forward-port saas-5 up to acbdac4
authorOlivier Dony <odo@openerp.com>
Thu, 14 Aug 2014 12:56:41 +0000 (14:56 +0200)
committerOlivier Dony <odo@openerp.com>
Thu, 14 Aug 2014 12:56:57 +0000 (14:56 +0200)
1  2 
addons/sale_stock/sale_stock_view.xml
addons/web/controllers/main.py
openerp/tools/translate.py

Simple merge
Simple merge
Simple merge