[MERGE] merge from rma branch
authorGery Debongnie <ged@openerp.com>
Thu, 10 Apr 2014 14:51:31 +0000 (16:51 +0200)
committerGery Debongnie <ged@openerp.com>
Thu, 10 Apr 2014 14:51:31 +0000 (16:51 +0200)
commit2e9ee9c76e7eae0a98af773ad8abd7585d4ea0ec
tree7bff96787a2521001e88f9a985f07c584b85516f
parentac2f58ce68481dfbc05ca8bb496c94c59b137565
parent4c0f7b1be8d188734b44856f093fa525f6837489
[MERGE] merge from rma branch

bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
addons/account_voucher/account_voucher_view.xml
addons/crm/crm_lead.py
addons/event/event.py
addons/hr_payroll/hr_payroll.py
addons/procurement/procurement.py
addons/project/project.py
addons/project/project_view.xml
addons/project_issue/project_issue.py
addons/project_long_term/project_long_term.py
addons/sale/sale.py
addons/website_event_track/views/event_backend.xml