[MERGE] trunk
authorSimon Lejeune <sle@openerp.com>
Mon, 24 Mar 2014 16:20:43 +0000 (17:20 +0100)
committerSimon Lejeune <sle@openerp.com>
Mon, 24 Mar 2014 16:20:43 +0000 (17:20 +0100)
commit9556cadbff5f1c4cb4782c066f2885716df9193e
tree684aecd9754949e9e16a2b0bfee82a7bbe2233d3
parent50fda546e28510de62c9db5c8c245679f0e79183
parent5692dbdb5eec6ca3bf52e4d66b9b6cec92d90d88
[MERGE] trunk

bzr revid: sle@openerp.com-20140324162043-dzdwcxdt32sfjy57
addons/purchase/purchase.py