[MERGE] Forward-port of 7.0 up to 85d2b45
authorOlivier Dony <odo@openerp.com>
Thu, 14 Aug 2014 02:11:33 +0000 (04:11 +0200)
committerOlivier Dony <odo@openerp.com>
Thu, 14 Aug 2014 02:11:33 +0000 (04:11 +0200)
commit8b12d1c566449e74a9f614d8b42fb99df737cc7e
tree9546f9737e1dcad371968ecab18b03ae9f75c9de
parent303d2e09ebebd1ddad12442730f80b134d53805e
parent85d2b45aaa0a91e39fb585f873f5297e5977344b
[MERGE] Forward-port of 7.0 up to 85d2b45
addons/sale_stock/sale_stock_view.xml
openerp/tools/translate.py