[MERGE] Forward-port of saas-3 bugfixes up to 9f0ecb3
authorOlivier Dony <odo@openerp.com>
Thu, 12 Jun 2014 11:52:35 +0000 (13:52 +0200)
committerOlivier Dony <odo@openerp.com>
Thu, 12 Jun 2014 11:52:35 +0000 (13:52 +0200)
1  2 
addons/account/account.py
addons/sale_stock/sale_stock.py

Simple merge
Simple merge