[MERGE] forward port of branch saas-4 up to b49755b
authorDenis Ledoux <dle@odoo.com>
Wed, 13 Aug 2014 08:45:36 +0000 (10:45 +0200)
committerDenis Ledoux <dle@odoo.com>
Wed, 13 Aug 2014 08:45:36 +0000 (10:45 +0200)
commitfe83c11301b1d2449b45701869269837ad9ac0fc
tree874a0f01ca6e0c6b6915853c5bf491ea2a2c5fc5
parentbbbd1465e5c35ad5d4349a7f0a4509776fc862fb
parentb49755b54554c1f85a53b4283a3b513400b82096
[MERGE] forward port of branch saas-4 up to b49755b

The forward port of the fix 3609ba10f2d00a608d8f32334ae1b9a25b34f037 will be done separately, as the mrp scheduler has been completely refactored from saas-5.

Conflicts:
addons/l10n_be_coda/wizard/account_coda_import.py
addons/point_of_sale/static/src/xml/pos.xml
addons/procurement/schedulers.py
13 files changed:
addons/account/account_invoice.py
addons/calendar/controllers/main.py
addons/fleet/fleet_view.xml
addons/l10n_be_coda/wizard/account_coda_import.py
addons/mail/mail_mail.py
addons/mail/tests/test_mail_features.py
addons/point_of_sale/static/src/xml/pos.xml
addons/web_kanban/static/src/js/kanban.js
addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
addons/website_customer/controllers/main.py
addons/website_customer/views/website_customer.xml
addons/website_event/controllers/main.py
addons/website_event/views/website_event.xml