Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
authorGéry Debongnie <ged@odoo.com>
Wed, 28 May 2014 08:37:16 +0000 (10:37 +0200)
committerGéry Debongnie <ged@odoo.com>
Wed, 28 May 2014 08:37:16 +0000 (10:37 +0200)
commit5cc8f9ca42169d6eb6c665214912a4205e669524
tree2ffdfac7a2507be5b2ec623ecba6ff30dfbfb394
parent1602ba44c942f57d0edba4ec437a236b723369e1
parent04211015fc3d4be2a8c65b9d977c2d9c4dac8be7
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
addons/account/account_invoice_view.xml
addons/account/account_view.xml
addons/account_analytic_analysis/account_analytic_analysis_view.xml
addons/mail/static/src/js/mail.js
addons/mail/static/src/xml/mail.xml
addons/web/static/src/js/view_form.js
addons/web/static/src/js/views.js