[MERGE] merge from trunk
authorGery Debongnie <ged@openerp.com>
Fri, 2 May 2014 13:07:53 +0000 (15:07 +0200)
committerGery Debongnie <ged@openerp.com>
Fri, 2 May 2014 13:07:53 +0000 (15:07 +0200)
commit5aa2fa150c988cba26ba918857c402e528c6051c
treeff39eeb7fb02f0bc2db94393a0bc015dcb8457a8
parenta81ba2b1eaba206db3d0f932c7af80a5dfabc0a1
parenta22d0ce78aee714b5dbde24a0ac7c6755416b5b9
[MERGE] merge from trunk

bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
52 files changed:
addons/account/account_invoice.py
addons/account/partner_view.xml
addons/crm/crm_lead.py
addons/crm/crm_lead_view.xml
addons/crm/crm_phonecall_view.xml
addons/crm/res_partner.py
addons/crm/res_partner_view.xml
addons/event/event.py
addons/event/event_view.xml
addons/gamification/views/challenge.xml
addons/hr_payroll/hr_payroll_view.xml
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
addons/mass_mailing/views/mass_mailing.xml
addons/mrp/mrp_view.xml
addons/point_of_sale/point_of_sale_view.xml
addons/procurement/procurement.py
addons/project_issue/project_issue_view.xml
addons/project_long_term/i18n/ar.po
addons/project_long_term/i18n/ca.po
addons/project_long_term/i18n/cs.po
addons/project_long_term/i18n/da.po
addons/project_long_term/i18n/de.po
addons/project_long_term/i18n/es.po
addons/project_long_term/i18n/es_CR.po
addons/project_long_term/i18n/es_EC.po
addons/project_long_term/i18n/es_MX.po
addons/project_long_term/i18n/es_VE.po
addons/project_long_term/i18n/fi.po
addons/project_long_term/i18n/fr.po
addons/project_long_term/i18n/hr.po
addons/project_long_term/i18n/hu.po
addons/project_long_term/i18n/it.po
addons/project_long_term/i18n/ja.po
addons/project_long_term/i18n/lv.po
addons/project_long_term/i18n/mk.po
addons/project_long_term/i18n/mn.po
addons/project_long_term/i18n/nl.po
addons/project_long_term/i18n/pl.po
addons/project_long_term/i18n/project_long_term.pot
addons/project_long_term/i18n/pt.po
addons/project_long_term/i18n/pt_BR.po
addons/project_long_term/i18n/ro.po
addons/project_long_term/i18n/ru.po
addons/project_long_term/i18n/sl.po
addons/project_long_term/i18n/sv.po
addons/project_long_term/i18n/tr.po
addons/project_long_term/i18n/zh_CN.po
addons/purchase/purchase.py
addons/purchase/purchase_view.xml
addons/sale/sale_view.xml
addons/stock/stock.py
addons/stock/stock_view.xml