[MERGE] forward port of branch saas-5 up to 4cb5381d
Conflicts: openerp/addons/base/module/wizard/base_module_upgrade_view.xml
Showing
- addons/.bzrignore 0 additions, 2 deletionsaddons/.bzrignore
- addons/sale/sale.py 6 additions, 7 deletionsaddons/sale/sale.py
- addons/web/static/src/css/base.css 15 additions, 3 deletionsaddons/web/static/src/css/base.css
- addons/web/static/src/css/base.sass 11 additions, 2 deletionsaddons/web/static/src/css/base.sass
- addons/web/static/src/js/view_form.js 13 additions, 3 deletionsaddons/web/static/src/js/view_form.js
- addons/web/static/src/js/view_list_editable.js 7 additions, 10 deletionsaddons/web/static/src/js/view_list_editable.js
- openerp/addons/base/ir/ir_http.py 17 additions, 11 deletionsopenerp/addons/base/ir/ir_http.py
- openerp/addons/base/module/module.py 1 addition, 0 deletionsopenerp/addons/base/module/module.py
- openerp/addons/base/module/module_view.xml 1 addition, 2 deletionsopenerp/addons/base/module/module_view.xml
- openerp/addons/base/module/wizard/base_module_upgrade.py 14 additions, 0 deletionsopenerp/addons/base/module/wizard/base_module_upgrade.py
- openerp/addons/base/module/wizard/base_module_upgrade_view.xml 5 additions, 4 deletions...rp/addons/base/module/wizard/base_module_upgrade_view.xml
- openerp/addons/base/res/res_config.py 38 additions, 0 deletionsopenerp/addons/base/res/res_config.py
- openerp/http.py 9 additions, 2 deletionsopenerp/http.py
- openerp/service/server.py 9 additions, 2 deletionsopenerp/service/server.py
Loading
Please register or sign in to comment