Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
authorGéry Debongnie <ged@odoo.com>
Wed, 11 Jun 2014 08:10:58 +0000 (10:10 +0200)
committerGéry Debongnie <ged@odoo.com>
Wed, 11 Jun 2014 08:10:58 +0000 (10:10 +0200)
commitaf58bc5914b610b00dd245808c4ce1a289e2dd8c
tree40f94b660de641f9f3de2d88b82d2815e1520bd6
parent197d4b597c3117dc7ffe2089bc5ee694dfd0cf0b
parent6981af02217edd8fcdf12505783bd59a58b64bd0
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
addons/account_analytic_analysis/account_analytic_analysis_view.xml
addons/web/static/src/js/view_form.js
addons/web/static/src/xml/base.xml
openerp/addons/base/res/res_partner_view.xml