[MERGE] merge from trunk
authorGery Debongnie <ged@openerp.com>
Thu, 10 Apr 2014 14:50:22 +0000 (16:50 +0200)
committerGery Debongnie <ged@openerp.com>
Thu, 10 Apr 2014 14:50:22 +0000 (16:50 +0200)
bzr revid: ged@openerp.com-20140410145022-7nyixn0v2gwkuaje

1  2 
addons/account/account_invoice.py

Simple merge