[MERGE] forward port of branch saas-5 up to 9363bc9
authorChristophe Simonis <chs@odoo.com>
Thu, 4 Sep 2014 16:03:24 +0000 (18:03 +0200)
committerChristophe Simonis <chs@odoo.com>
Thu, 4 Sep 2014 16:03:24 +0000 (18:03 +0200)
commit41afeec7f14a2bafb976770afe76d24e15b13df6
tree599c293f9f4999f10e8b8bbea146c764f30f575b
parent2d9ddce327eb818dd6631b1bf1efb50f9be22540
parent9363bc9182b3eb70980b3a80e3ea2d4809f44840
[MERGE] forward port of branch saas-5 up to 9363bc9
addons/base_action_rule/__openerp__.py
addons/base_action_rule/base_action_rule.py
addons/calendar/__openerp__.py
addons/calendar/calendar.py
addons/crm_partner_assign/crm_portal_view.xml
addons/fetchmail/__openerp__.py
addons/fetchmail/fetchmail.py
addons/sale/sale.py
addons/web/static/src/js/views.js
openerp/addons/base/ir/ir_cron.py