[MERGE] forward port of branch saas-4 up to a361947
authorChristophe Simonis <chs@odoo.com>
Thu, 10 Jul 2014 20:12:16 +0000 (22:12 +0200)
committerChristophe Simonis <chs@odoo.com>
Thu, 10 Jul 2014 20:12:16 +0000 (22:12 +0200)
commit73d39a0c8c8125fc7b1e888b1ed670f54711da6e
tree4fa82011f296244413d76e6313fba7d29e69a058
parent6191ed33a02e323ea677760c99bd958a57a1c1a2
parenta3619471438b2e6795d7ab7c5107a0434b1e0a65
[MERGE] forward port of branch saas-4 up to a361947
addons/account_analytic_analysis/account_analytic_analysis.py
addons/event/event.py
addons/event_sale/event_sale.py
addons/stock/security/ir.model.access.csv
addons/website_crm_partner_assign/controllers/main.py
openerp/osv/orm.py