[MERGE] merged trunk up to revision 9350
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 16 Apr 2014 15:05:51 +0000 (17:05 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 16 Apr 2014 15:05:51 +0000 (17:05 +0200)
commitfbd3255e376acbe8aaf2f873774db0568a8036c6
treeb4e02a071482a87d47a7d57afa06924818d6db70
parentc41941d9780e0fdc6c584baf6f56dff6f4763034
parent75850c8f954e2e77e2a395cc9ff078743d96fc79
[MERGE] merged trunk up to revision 9350

bzr revid: qdp-launchpad@openerp.com-20140416150551-lxpscdd74mgv99r1
addons/purchase/purchase.py
addons/sale/sale.py