[MERGE] merge from trunk
authorGery Debongnie <ged@openerp.com>
Tue, 15 Apr 2014 15:01:46 +0000 (17:01 +0200)
committerGery Debongnie <ged@openerp.com>
Tue, 15 Apr 2014 15:01:46 +0000 (17:01 +0200)
commitf57b76736148b6b7fa9326e62c907b63cd405052
tree1b892de773ac3c53a62f12206e86bdf67bdf3f18
parent9d358bad71e85c2a49654d0b0529ebca919498a4
parent1c5ed2973e12c602477d583662761d13c5e8070e
[MERGE] merge from trunk

bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
15 files changed:
addons/account/account_invoice.py
addons/account_asset/account_asset.py
addons/crm/crm_lead.py
addons/crm/crm_lead_view.xml
addons/event/event.py
addons/event/event_view.xml
addons/gamification/views/challenge.xml
addons/hr_evaluation/hr_evaluation.py
addons/hr_evaluation/hr_evaluation_view.xml
addons/hr_recruitment/hr_recruitment.py
addons/hr_recruitment/hr_recruitment_view.xml
addons/hr_timesheet/hr_timesheet_view.xml
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
addons/sale/sale.py
addons/stock/product_view.xml