[MERGE] from trunk
authorChristophe Matthieu <chm@openerp.com>
Thu, 11 Oct 2012 07:16:02 +0000 (09:16 +0200)
committerChristophe Matthieu <chm@openerp.com>
Thu, 11 Oct 2012 07:16:02 +0000 (09:16 +0200)
bzr revid: chm@openerp.com-20121011071602-u23xansbga1i41vs

1  2 
addons/purchase/purchase.py

Simple merge