[MERGE] Forward-port of saas-5 up to 20cc18d
authorOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 18:46:47 +0000 (20:46 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 13 Aug 2014 18:46:47 +0000 (20:46 +0200)
commite11eddf75329273af825062e2752794bf1407c22
tree0ac30f8c8c42b102d8f4fd916394548875a1521d
parente0967ba2ced1bd84473be7e1fb3e18f326509ea0
parent20cc18dcf6331afb72a566f0a52ae2f89639f3f4
[MERGE] Forward-port of saas-5 up to 20cc18d
28 files changed:
addons/account/account_invoice.py
addons/calendar/controllers/main.py
addons/email_template/tests/test_mail.py
addons/fleet/fleet_view.xml
addons/gamification/models/goal.py
addons/l10n_be_coda/wizard/account_coda_import.py
addons/mail/mail_mail.py
addons/mail/mail_message.py
addons/mail/mail_thread.py
addons/mail/tests/test_mail_features.py
addons/mail/tests/test_mail_message.py
addons/point_of_sale/static/src/xml/pos.xml
addons/portal_sale/portal_sale.py
addons/procurement/procurement.py
addons/stock/procurement.py
addons/web/controllers/main.py
addons/web/static/src/js/search.js
addons/web/static/src/js/view_list.js
addons/web_kanban/static/src/js/kanban.js
addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
addons/website_customer/views/website_customer.xml
addons/website_event/controllers/main.py
addons/website_event/views/website_event.xml
addons/website_sale_delivery/views/website_sale_delivery.xml
openerp/addons/base/ir/ir_cron.py
openerp/addons/base/res/res_partner_view.xml
openerp/models.py
openerp/osv/fields.py