[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)
commitac2f58ce68481dfbc05ca8bb496c94c59b137565
tree1302e30ca19a6126a18ba7a0785c1729913ab901
parent2bcf94e6f69f064ebdb05cc815c6c13ba32ac977
parent522d612b8c02860922f8fe9f47f67b841aff1ca2
[MERGE] merge from trunk

bzr revid: ged@openerp.com-20140410145022-7nyixn0v2gwkuaje
addons/account/account_invoice.py