[MERGE] forward port of branch saas-6 up to a6694333

.mailmap

addons/account/wizard/pos_box.py

addons/account_cancel/account_cancel_view.xml

addons/calendar/static/src/js/base_calendar.js

addons/delivery/models/sale_order.py

addons/event/data/email_template_data.xml

addons/google_calendar/google_calendar.py

addons/google_calendar/static/src/js/calendar_sync.js

addons/hr_recruitment/views/hr_recruitment_views.xml

addons/hr_timesheet_sheet/hr_timesheet_sheet.py

addons/hw_escpos/controllers/main.py

addons/hw_escpos/escpos/exceptions.py

addons/hw_escpos/escpos/printer.py

addons/hw_proxy/controllers/main.py

addons/l10n_sa/__init__.py

addons/l10n_sa/__openerp__.py

addons/l10n_sa/account.account.template.csv

addons/l10n_sa/account.chart.template.xml

addons/l10n_sa/account_type.xml

addons/l10n_sa/i18n_extra/ar.po