[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)
commit79570179bf4d1901ce6f42e6e26b8841c1bf8645
tree5dc3df9e8829f5ff53c7cc7c6eea0eddc392a887
parent6389181e8f4838ed9af911c6ec756dd2eed24af1
parentacbdac4e9fd5d63a2e7ac94f3552e36179ad2227
[MERGE] Forward-port saas-5 up to acbdac4
addons/sale_stock/sale_stock_view.xml
addons/web/controllers/main.py
openerp/tools/translate.py