[MERGE] forward port of branch saas-5 up to 4cb5381

Conflicts:
	openerp/addons/base/module/wizard/base_module_upgrade_view.xml

diff --cc addons/sale/sale.py
Simple merge

diff --cc addons/web/static/src/css/base.css
Simple merge

diff --cc addons/web/static/src/css/base.sass
Simple merge

diff --cc addons/web/static/src/js/view_form.js
Simple merge

diff --cc openerp/addons/base/module/module_view.xml
Simple merge

diff --cc openerp/addons/base/module/wizard/base_module_upgrade_view.xml
index 25e7ac0,10c023e..ae135b8
--- 1/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
--- 2/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@@ -6,10 -6,11 +6,11 @@@
              <field name="name">Module Upgrade</field>
              <field name="model">base.module.upgrade</field>
              <field name="arch" type="xml">
 -                <form string="System Update" version="7.0">
 +                <form string="System Update">
-                     <div><label string="Your system will be updated."/></div>
-                     <div><label string="Note that this operation might take a few minutes."/></div>
-                     <separator string="Modules to Update"/>
+                     <p>This module will trigger the uninstallation of below modules.</p>
+                     <p><strong>This operation will permanently erase all data currently stored by the modules!</strong></p>
+                     <p>If you wish to cancel the process, press the cancel button below</p>
+                     <separator string="Impacted Modules"/>
                      <field name="module_info"/>
                      <footer>
                          <button name="upgrade_module" string="Update" type="object" class="oe_highlight"/>

diff --cc openerp/addons/base/res/res_config.py
Simple merge

diff --cc openerp/http.py
Simple merge