[MERGE] forward port of branch 7.0 up to 95cff0b
authorChristophe Simonis <chs@odoo.com>
Fri, 27 Jun 2014 14:00:28 +0000 (16:00 +0200)
committerChristophe Simonis <chs@odoo.com>
Fri, 27 Jun 2014 14:00:28 +0000 (16:00 +0200)
commitbdc4dd4a6581d5addfa3c2d4922b14d06414afb6
tree1bef3fb21130327cb778d9c3b9e0f0f3a48da1c7
parent9c5ecd3bc4eadde24bb8b555bf8312429d1142aa
parent95cff0ba3426932b687db333a73b8e4ef097b0ef
[MERGE] forward port of branch 7.0 up to 95cff0b
addons/base_action_rule/base_action_rule.py
addons/web/static/src/js/view_list.js
addons/web/static/src/js/views.js
openerp/modules/loading.py
openerp/report/report_sxw.py