[MERGE] fix bug lp:532148
authorRaphael Collet <rco@openerp.com>
Thu, 15 Sep 2011 09:04:43 +0000 (11:04 +0200)
committerRaphael Collet <rco@openerp.com>
Thu, 15 Sep 2011 09:04:43 +0000 (11:04 +0200)
commit24c115523a0b5db4c7e52c180ac39c86b9e1f655
treea92672e6eeb9741fabec24032ce7b149e8e9b2d5
parent30e06d65443a5b5603eb924dd2e33df661c88bdd
parent527fea675fe3f709dd5d13b8c0d0f9654e81c770
[MERGE] fix bug lp:532148

bzr revid: rco@openerp.com-20110915090443-5rkbourf0698t11v
addons/mrp/mrp_test.xml
addons/purchase/purchase.py