[MERGE] merge from trunk
authorGery Debongnie <ged@openerp.com>
Thu, 17 Apr 2014 06:53:56 +0000 (08:53 +0200)
committerGery Debongnie <ged@openerp.com>
Thu, 17 Apr 2014 06:53:56 +0000 (08:53 +0200)
commit0c24df7074d7c454ab56effd4b9f83280b54b2c8
tree36d3652dd9b0ceb59a7443a6edd62ea03a0f741e
parentf57b76736148b6b7fa9326e62c907b63cd405052
parent8c19dab41355b52ddb354cbd348bdc7e08249aae
[MERGE] merge from trunk

bzr revid: ged@openerp.com-20140417065356-x7o3jg5bo5430zth
addons/account/account_invoice.py
addons/crm/crm_lead.py
addons/email_template/email_template_view.xml
addons/gamification/views/challenge.xml
addons/hr_recruitment/hr_recruitment.py
addons/purchase/purchase.py