[MERGE] forward port of branch 7.0 up to 7e85786

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 addons/web/static/src/js/view_list_editable.js
Simple merge

diff --cc openerp/addons/base/module/module.py
Simple merge

diff --cc openerp/addons/base/module/module_view.xml
index 8dac5b2,fb4295c..f336cb7
--- 1/openerp/addons/base/module/module_view.xml
--- 2/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@@ -76,36 -75,31 +76,35 @@@
                      <field name="icon_image" widget="image" class="oe_avatar oe_left"/>
                      <div class="oe_title">
                          <h1><field name="shortdesc"/></h1>
 -                        <h2 class="oe_fade"><field name="summary"/></h2>
 -                        <button name="button_immediate_install" states="uninstalled" string="Install" type="object" class="oe_highlight"/>
 -                        <button name="button_immediate_upgrade" states="installed" string="Upgrade" type="object" class="oe_highlight"/>
 +                        <h3 class="oe_fade">
 +                            By <field name="author" class="oe_inline"/>
 +                        </h3>
 +                        <div>
 +                            <button name="button_immediate_install" states="uninstalled" string="Install" type="object" class="oe_highlight"/>
 +                            <button name="button_immediate_upgrade" states="installed" string="Upgrade" type="object" class="oe_highlight"/>
-                             <button name="button_immediate_uninstall" states="installed" string="Uninstall" type="object"
-                                 confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
+                         <button name="button_uninstall" states="installed" string="Uninstall" type="object"/>
 -                        <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" type="object"/>
 -                        <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" type="object"/>
 -                        <button name="button_install_cancel" states="to install" string="Cancel Install" type="object"/>
 +                            <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" type="object"/>
 +                            <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" type="object"/>
 +                            <button name="button_install_cancel" states="to install" string="Cancel Install" type="object"/>
 +                        </div>
                      </div>
 -                    <group>
 -                        <group>
 -                            <field name="author"/>
 -                            <field name="website" widget="url" attrs="{'invisible':[('website','=',False)]}"/>
 -                            <field name="category_id" widget="selection"/>
 -                        </group>
 -                        <group>
 -                            <field name="name"/>
 -                            <field name="license"/>
 -                            <field name="installed_version"/>
 -                        </group>
 -                    </group>
 -                    <notebook>
 -                        <page string="Description">
 -                            <field name="description_html"/>
 +                    <div class="oe_clear"/>
 +                    <notebook groups="base.group_no_one">
 +                        <page string="Information">
 +                            <group>
 +                                <group>
 +                                    <field name="website" widget="url" attrs="{'invisible':[('website','=',False)]}"/>
 +                                    <field name="category_id" widget="selection"/>
 +                                    <field name="summary"/>
 +                                </group>
 +                                <group>
 +                                    <field name="name"/>
 +                                    <field name="license"/>
 +                                    <field name="installed_version"/>
 +                                </group>
 +                            </group>
                          </page>
 -                        <page string="Technical Data" groups="base.group_no_one">
 +                        <page string="Technical Data">
                              <group col="4">
                                  <field name="demo"/>
                                  <field name="application"/>

diff --cc openerp/addons/base/module/wizard/base_module_upgrade.py
Simple merge

diff --cc openerp/addons/base/res/res_config.py
index 4fe6ff1,42ef4ff..0b2bba7
--- 1/openerp/addons/base/res/res_config.py
--- 2/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@@ -27,7 -26,7 +27,8 @@@ from openerp import SUPERUSER_I
  from openerp.osv import osv, fields
  from openerp.tools import ustr
  from openerp.tools.translate import _
 +from openerp import exceptions
+ from lxml import etree
  
  _logger = logging.getLogger(__name__)