diff --git a/openerp-server b/openerp-server
index 12b6962e4e6..be0710cbce9 100755
--- a/openerp-server
+++ b/openerp-server
@@ -105,7 +105,7 @@ def run_test_file(dbname, test_file):
         db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
         cr = db.cursor()
         _logger.info('loading test file %s', test_file)
-        openerp.tools.convert_yaml_import(cr, 'base', file(test_file), {}, 'test', True)
+        openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
         cr.rollback()
         cr.close()
     except Exception:
diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 5b65bff4bd7..3fdb8c6448d 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -25,20 +25,21 @@
     'name': 'Base',
     'version': '1.3',
     'category': 'Hidden',
-    'description': """The kernel of OpenERP, needed for all installation.""",
+    'description': """
+The kernel of OpenERP, needed for all installation.
+===================================================
+""",
     'author': 'OpenERP SA',
     'maintainer': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': [],
-    'init_xml': [
+    'data': [
         'base_data.xml',
         'security/base_security.xml',
         'base_menu.xml',
         'res/res_security.xml',
         'res/res_config.xml',
-        'data/res.country.state.csv'
-    ],
-    'update_xml': [
+        'data/res.country.state.csv',
         'ir/wizard/wizard_menu_view.xml',
         'ir/ir.xml',
         'ir/ir_filters.xml',
@@ -77,7 +78,7 @@
         'res/res_widget_data.xml',
         'publisher_warranty/publisher_warranty_data.xml',
     ],
-    'demo_xml': [
+    'demo': [
         'base_demo.xml',
         'res/res_partner_demo.xml',
         'res/res_partner_demo.yml',
diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index fac2946e204..49bb719bad7 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -560,7 +560,6 @@
         <record model="ir.ui.view" id="view_ir_needaction_users_rel_tree">
             <field name="name">ir.needaction_users_rel.tree</field>
             <field name="model">ir.needaction_users_rel</field>
-            <field name="sequence">10</field>
             <field name="arch" type="xml">
                 <tree string="Subscription">
                     <field name="user_id"/>
diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index e777b390aa8..46ab8841deb 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -183,7 +183,6 @@ class ir_model(osv.osv):
         res = super(ir_model,self).create(cr, user, vals, context)
         if vals.get('state','base')=='manual':
             self.instanciate(cr, user, vals['model'], context)
-            self.pool.get(vals['model']).__init__(self.pool, cr)
             ctx = dict(context,
                 field_name=vals['name'],
                 field_state='manual',
@@ -198,7 +197,9 @@ class ir_model(osv.osv):
         x_custom_model._name = model
         x_custom_model._module = False
         a = x_custom_model.create_instance(self.pool, cr)
-        if (not a._columns) or ('x_name' in a._columns.keys()):
+        if not a._columns:
+            x_name = 'id'
+        elif 'x_name' in a._columns.keys():
             x_name = 'x_name'
         else:
             x_name = a._columns.keys()[0]
@@ -931,6 +932,9 @@ class ir_model_data(osv.osv):
 
         ir_model_relation = self.pool.get('ir.model.relation')
         relation_ids = ir_model_relation.search(cr, uid, [('module', 'in', modules_to_remove)])
+        ir_module_module = self.pool.get('ir.module.module')
+        modules_to_remove_ids = ir_module_module.search(cr, uid, [('name', 'in', modules_to_remove)])
+        relation_ids = ir_model_relation.search(cr, uid, [('module', 'in', modules_to_remove_ids)])
         ir_model_relation._module_data_uninstall(cr, uid, relation_ids, context)
 
         unlink_if_refcount((model, res_id) for model, res_id in to_unlink
diff --git a/openerp/addons/base/ir/ir_model_constraint.py b/openerp/addons/base/ir/ir_model_constraint.py
index 4a69bc2f0a7..a3099339131 100644
--- a/openerp/addons/base/ir/ir_model_constraint.py
+++ b/openerp/addons/base/ir/ir_model_constraint.py
@@ -45,7 +45,6 @@ class ir_model_constraint(Model):
         ids_set = set(ids)
         ids.sort()
         ids.reverse()
-        to_unlink = []
         for data in self.browse(cr, uid, ids, context):
             model = data.model.model
             model_obj = self.pool.get(model)
@@ -75,5 +74,4 @@ class ir_model_constraint(Model):
                     cr.execute('ALTER TABLE "%s" DROP CONSTRAINT "%s"' % (model_obj._table, name),)
                     _logger.info('Dropped CONSTRAINT %s@%s', name, model)
 
-            to_unlink.append(data.id)
-        self.unlink(cr, uid, to_unlink, context)
+        self.unlink(cr, uid, ids, context)
diff --git a/openerp/addons/base/ir/ir_model_relation.py b/openerp/addons/base/ir/ir_model_relation.py
index eede6eae44f..fc6dae2ca52 100644
--- a/openerp/addons/base/ir/ir_model_relation.py
+++ b/openerp/addons/base/ir/ir_model_relation.py
@@ -36,7 +36,6 @@ class ir_model_relation(Model):
         to_drop_table = []
         ids.sort()
         ids.reverse()
-        to_unlink = []
         for data in self.browse(cr, uid, ids, context):
             model = data.model
             model_obj = self.pool.get(model)
@@ -53,9 +52,7 @@ class ir_model_relation(Model):
             if cr.fetchone() and not name in to_drop_table:
                 to_drop_table.append(name)
 
-            to_unlink.append(data.id)
-
-        self.unlink(cr, uid, to_unlink, context)
+        self.unlink(cr, uid, ids, context)
 
         # drop m2m relation tables
         for table in to_drop_table:
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 5751ed678eb..617a31dae66 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -18,12 +18,14 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
+import base64
+from docutils.core import publish_string
 import imp
 import logging
 import re
 import urllib
 import zipimport
-import base64
 
 from openerp import modules, pooler, release, tools, addons
 from openerp.tools.parse_version import parse_version
@@ -94,6 +96,14 @@ class module(osv.osv):
                           'module %s', name, exc_info=True)
         return info
 
+    def _get_desc(self, cr, uid, ids, field_name=None, arg=None, context=None):
+        res = dict.fromkeys(ids, '')
+        for module in self.browse(cr, uid, ids, context=context):
+            overrides = dict(embed_stylesheet=False, doctitle_xform=False, output_encoding='unicode')
+            output = publish_string(source=module.description, writer_name='html', settings_overrides=overrides)
+            res[module.id] = output
+        return res
+
     def _get_latest_version(self, cr, uid, ids, field_name=None, arg=None, context=None):
         res = dict.fromkeys(ids, '')
         for m in self.browse(cr, uid, ids):
@@ -183,6 +193,7 @@ class module(osv.osv):
         'shortdesc': fields.char('Module Name', size=64, readonly=True, translate=True),
         'summary': fields.char('Summary', size=64, readonly=True, translate=True),
         'description': fields.text("Description", readonly=True, translate=True),
+        'description_html': fields.function(_get_desc, string='Description HTML', type='html', method=True, readonly=True),
         'author': fields.char("Author", size=128, readonly=True),
         'maintainer': fields.char('Maintainer', size=128, readonly=True),
         'contributors': fields.text('Contributors', readonly=True),
@@ -222,7 +233,7 @@ class module(osv.osv):
                 ('AGPL-3', 'Affero GPL-3'),
                 ('Other OSI approved licence', 'Other OSI Approved Licence'),
                 ('Other proprietary', 'Other Proprietary')
-            ], string='License', readonly=True),
+        ], string='License', readonly=True),
         'menus_by_module': fields.function(_get_views, string='Menus', type='text', multi="meta", store=True),
         'reports_by_module': fields.function(_get_views, string='Reports', type='text', multi="meta", store=True),
         'views_by_module': fields.function(_get_views, string='Views', type='text', multi="meta", store=True),
@@ -371,7 +382,8 @@ class module(osv.osv):
         ir_model_data = self.pool.get('ir.model.data')
         ir_model_constraint = self.pool.get('ir.model.constraint')
         modules_to_remove = [m.name for m in self.browse(cr, uid, ids, context)]
-        constraint_ids = ir_model_constraint.search(cr, uid, [('module', 'in', modules_to_remove)])
+        modules_to_remove_ids = [m.id for m in self.browse(cr, uid, ids, context)]
+        constraint_ids = ir_model_constraint.search(cr, uid, [('module', 'in', modules_to_remove_ids)])
         ir_model_constraint._module_data_uninstall(cr, uid, constraint_ids, context)
         ir_model_data._module_data_uninstall(cr, uid, modules_to_remove, context)
         self.write(cr, uid, ids, {'state': 'uninstalled'})
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 19f9dbdaa44..27eccf020b2 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -38,7 +38,7 @@
             <field name="model">ir.module.module</field>
             <field name="arch" type="xml">
                 <search string="Search modules">
-                    <field name="name" filter_domain="['|', '|', '|', ('description', 'ilike', self), ('summary', 'ilike', self), ('shortdesc', 'ilike', self), ('name',
+                    <field name="name" filter_domain="['|', '|', ('summary', 'ilike', self), ('shortdesc', 'ilike', self), ('name',
                         'ilike', self)]"/>
                     <filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
                     <filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
@@ -133,7 +133,7 @@
                     </group>
                     <notebook>
                         <page string="Description">
-                            <field name="description"/>
+                            <field name="description_html"/>
                         </page>
                         <page string="Technical Data" groups="base.group_no_one">
                             <group col="4">
diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml
index bdfd6ab329c..342aeaa6e0f 100644
--- a/openerp/addons/base/res/res_config.xml
+++ b/openerp/addons/base/res/res_config.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        
         <record id="res_config_view_base" model="ir.ui.view">
             <field name="name">res.config.view.base</field>
             <field name="model">res.config</field>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 43a37d1a79c..92a264f0089 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -95,7 +95,7 @@
             <field name="arch" type="xml">
                 <form string="Partners" version="7.0">
                 <sheet>
-                    <field name="image_medium" widget='image' class="oe_avatar oe_left"/>
+                    <field name="image" widget='image' class="oe_left" options='{"preview_image": "image_medium", "size": [90, 90]}'/>
                     <div class="oe_title">
                         <div class="oe_edit_only">
                             <label for="name"/> (
@@ -164,7 +164,7 @@
                                     <field name="phone"/>
                                     <field name="street"/>
                                     <field name="street2"/>
-                                    <field name="image_small"/>
+                                    <field name="image"/>
                                     <field name="zip"/>
                                     <field name="city"/>
                                     <field name="country_id"/>
@@ -177,7 +177,7 @@
                                                 <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
                                                 <div class="oe_module_vignette">
                                                 <a type="edit">
-                                                    <img t-att-src="kanban_image('res.partner', 'image_small', record.id.value)" class="oe_avatar oe_kanban_avatar_smallbox"/>
+                                                    <img t-att-src="kanban_image('res.partner', 'image', record.id.value, {'preview_image': 'image_small'})" class="oe_avatar oe_kanban_avatar_smallbox"/>
                                                 </a>
                                                     <div class="oe_module_desc">
                                                         <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
@@ -204,7 +204,7 @@
                                     </templates>
                                 </kanban>
                                 <form string="Contact" version="7.0">
-                                    <field name="image_small" widget='image' class="oe_avatar oe_left"/>
+                                    <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
                                     <div class="oe_title">
                                         <group>
                                             <field name="name"/>
@@ -293,7 +293,6 @@
                     <field name="phone"/>
                     <field name="street"/>
                     <field name="street2"/>
-                    <field name="image_small"/>
                     <field name="zip"/>
                     <field name="city"/>
                     <field name="country_id"/>
diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml
index f02abd90985..c7d2a77f846 100644
--- a/openerp/addons/base/res/res_security.xml
+++ b/openerp/addons/base/res/res_security.xml
@@ -1,42 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="0">
+    <data noupdate="1">
 
-    <record model="res.groups" id="group_partner_manager">
-        <field name="name">Partner Manager</field>
-    </record>
+        <record model="res.groups" id="group_partner_manager">
+            <field name="name">Partner Manager</field>
+        </record>
 
-    <record model="ir.ui.menu" id="menu_config_address_book">
-        <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
-    </record>
-    <record model="ir.ui.menu" id="menu_base_config">
-        <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
-    </record>
-    <record model="ir.ui.menu" id="menu_base_partner">
-        <field eval="[(6,0,[ref('group_partner_manager')])]" name="groups_id"/>
-    </record>
+        <record model="ir.ui.menu" id="menu_config_address_book">
+            <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
+        </record>
+        <record model="ir.ui.menu" id="menu_base_config">
+            <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/>
+        </record>
+        <record model="ir.ui.menu" id="menu_base_partner">
+            <field eval="[(6,0,[ref('group_partner_manager')])]" name="groups_id"/>
+        </record>
 
-</data>
+        <!-- Record Rule For Company -->
+        <record id="res_company_rule" model="ir.rule">
+            <field name="name">company rule</field>
+            <field model="ir.model" name="model_id" ref="model_res_company"/>
+            <field eval="True" name="global"/>
+            <!-- TODO: review this <field name="domain_force">['|', ('child_ids', 'child_of', [user.company_id.id]), ('parent_id', 'child_of', [user.company_id.id])]</field> -->
+            <field name="domain_force">[('id','child_of',[user.company_id.id])]</field>
+        </record>
 
-<data noupdate="1">
+        <!-- Record Rule For User -->
+        <record id="res_users_rule" model="ir.rule">
+            <field name="name">user rule</field>
+            <field model="ir.model" name="model_id" ref="model_res_users"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">[('company_ids','child_of',[user.company_id.id])]</field>
+        </record>
 
-    <!-- Record Rule For Company -->
-
-    <record id="res_company_rule" model="ir.rule">
-        <field name="name">company rule</field>
-        <field model="ir.model" name="model_id" ref="model_res_company"/>
-        <field eval="True" name="global"/>
-        <!-- TODO: review this <field name="domain_force">['|', ('child_ids', 'child_of', [user.company_id.id]), ('parent_id', 'child_of', [user.company_id.id])]</field> -->
-        <field name="domain_force">[('id','child_of',[user.company_id.id])]</field>
-    </record>
-
-    <!-- Record Rule For User -->
-    <record id="res_users_rule" model="ir.rule">
-        <field name="name">user rule</field>
-        <field model="ir.model" name="model_id" ref="model_res_users"/>
-        <field eval="True" name="global"/>
-        <field name="domain_force">[('company_ids','child_of',[user.company_id.id])]</field>
-    </record>
-    
-</data> 
+    </data>
 </openerp>
diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index cd0b7e999b3..8eb832ea618 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -1,54 +1,51 @@
 <?xml version="1.0"?>
 <openerp>
-    <data noupdate="0">
-
-<!--
- Users Groups
-    [Note] Field 'category_id' is set later in base/module/module_data.xml
--->
-    <record model="res.groups" id="group_erp_manager">
-        <field name="name">Access Rights</field>
-    </record>
-    <record model="res.groups" id="group_system">
-        <field name="name">Configuration</field>
-        <field name="implied_ids" eval="[(4, ref('group_erp_manager'))]"/>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
-
-    <record model="res.groups" id="group_user">
-        <field name="name">Employee</field>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
-
-    <record model="res.groups" id="group_multi_company">
-        <field name="name">Multi Companies</field>
-    </record>
-    
-    <record model="res.groups" id="group_multi_currency">
-        <field name="name">Multi Currencies</field>
-    </record>
-
-    <record model="res.groups" id="group_no_one">
-        <field name="name">Technical Features</field>
-    </record>
-
-    <record id="group_sale_salesman" model="res.groups">
-        <field name="name">User</field>
-    </record>
-    <record id="group_sale_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="implied_ids" eval="[(4, ref('group_sale_salesman'))]"/>
-    </record>
-
-    <!-- Set accesses to menu -->
-    <record model="ir.ui.menu" id="base.menu_administration">
-        <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
-    </record>
-
-    </data>
-
     <data noupdate="1">
 
+        <!--
+            Users Groups
+            Note that the field 'category_id' is set later in
+            base/module/module_data.xml
+        -->
+        <record model="res.groups" id="group_erp_manager">
+            <field name="name">Access Rights</field>
+        </record>
+        <record model="res.groups" id="group_system">
+            <field name="name">Configuration</field>
+            <field name="implied_ids" eval="[(4, ref('group_erp_manager'))]"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        </record>
+
+        <record model="res.groups" id="group_user">
+            <field name="name">Employee</field>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        </record>
+
+        <record model="res.groups" id="group_multi_company">
+            <field name="name">Multi Companies</field>
+        </record>
+
+        <record model="res.groups" id="group_multi_currency">
+            <field name="name">Multi Currencies</field>
+        </record>
+
+        <record model="res.groups" id="group_no_one">
+            <field name="name">Technical Features</field>
+        </record>
+
+        <record id="group_sale_salesman" model="res.groups">
+            <field name="name">User</field>
+        </record>
+        <record id="group_sale_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="implied_ids" eval="[(4, ref('group_sale_salesman'))]"/>
+        </record>
+
+        <!-- Set accesses to menu -->
+        <record model="ir.ui.menu" id="base.menu_administration">
+            <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
+        </record>
+
         <record model="ir.rule" id="res_widget_user_rule">
             <field name="name">res.widget.user rule</field>
             <field name="model_id" ref="model_res_widget_user"/>
@@ -58,8 +55,11 @@
         <record model="ir.rule" id="res_partner_rule">
             <field name="name">res.partner company</field>
             <field name="model_id" ref="model_res_partner"/>
-            <!-- Show partners from ancestors and descendants companies (or company-less), this is usually a better
-                 default for multicompany setups. -->
+            <!--
+                Show partners from ancestors and descendants companies
+                (or company-less), this is usually a better default for
+                multicompany setups.
+            -->
             <field name="domain_force">['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
         </record>
 
diff --git a/openerp/addons/base/test/base_test.yml b/openerp/addons/base/test/base_test.yml
index fe22e3a4935..1aea2363f84 100644
--- a/openerp/addons/base/test/base_test.yml
+++ b/openerp/addons/base/test/base_test.yml
@@ -42,15 +42,13 @@
 -
     !python {model: ir.model}: |
         from tools.safe_eval import safe_eval
+        from tools.misc import mute_logger
         try:
-           safe_eval('open("/etc/passwd","r")')
-           assert False, "safe_eval should not allow calling open() builtin"
+            with mute_logger('openerp.tools.safe_eval'):
+                safe_eval('open("/etc/passwd","r")')
+            assert False, "safe_eval should not allow calling open() builtin"
         except NameError:
-           pass
-        except:
-           # NameError should be raised because open() builtin is not found,
-           # but other exceptions probably indicate that open() was executed!
-           assert False, "safe_eval should not allow calling open() builtin"
+            pass
 
 -
     "ORM test: verify that parent_store computation are going right"
diff --git a/openerp/import_xml.rng b/openerp/import_xml.rng
index bf5a9e1800e..5dd789c6e95 100644
--- a/openerp/import_xml.rng
+++ b/openerp/import_xml.rng
@@ -185,7 +185,6 @@
             <rng:optional> <rng:attribute name="string"/> </rng:optional>
             <rng:optional> <rng:attribute name="sequence"/> </rng:optional>
             <rng:optional> <rng:attribute name="groups"/> </rng:optional>
-            <rng:optional> <rng:attribute name="type"/> </rng:optional>
             <rng:optional> <rng:attribute name="menu"/> </rng:optional>
             <rng:empty />
         </rng:element>
diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index 874a6ce7063..8a2c43e6ed2 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#    Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
+#    Copyright (C) 2010-2012 OpenERP s.a. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -84,7 +84,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
             _load_data(cr, module_name, idref, mode, 'test')
             return True
         except Exception:
-            _logger.error(
+            _logger.exception(
                 'module %s: an exception occurred in a test', module_name)
             return False
         finally:
@@ -119,7 +119,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
                 elif ext == '.sql':
                     process_sql_file(cr, fp)
                 elif ext == '.yml':
-                    tools.convert_yaml_import(cr, module_name, fp, idref, mode, noupdate, report)
+                    tools.convert_yaml_import(cr, module_name, fp, kind, idref, mode, noupdate, report)
                 else:
                     tools.convert_xml_import(cr, module_name, fp, idref, mode, noupdate, report)
             finally:
diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 506c1e4bcba..170108a13ad 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -3,7 +3,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 OpenERP SA (<http://www.openerp.com>)
+#    Copyright (C) 2004-2012 OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -376,11 +376,11 @@ def dispatch_rpc(service_name, method, params):
     except openerp.exceptions.Warning:
         raise
     except openerp.exceptions.DeferredException, e:
-        _logger.error(tools.exception_to_unicode(e))
+        _logger.exception(tools.exception_to_unicode(e))
         post_mortem(e.traceback)
         raise
     except Exception, e:
-        _logger.error(tools.exception_to_unicode(e))
+        _logger.exception(tools.exception_to_unicode(e))
         post_mortem(sys.exc_info())
         raise
 
diff --git a/openerp/tests/addons/test_impex/tests/test_import.py b/openerp/tests/addons/test_impex/tests/test_import.py
index ab12f0375b5..4712d53feff 100644
--- a/openerp/tests/addons/test_impex/tests/test_import.py
+++ b/openerp/tests/addons/test_impex/tests/test_import.py
@@ -3,6 +3,7 @@ import openerp.modules.registry
 import openerp
 
 from openerp.tests import common
+from openerp.tools.misc import mute_logger
 
 def ok(n):
     """ Successful import of ``n`` records
@@ -221,6 +222,7 @@ class test_integer_field(ImporterCase):
             -1, -42, -(2**31 - 1), -(2**31), -12345678
         ], values(self.read()))
 
+    @mute_logger('openerp.sql_db')
     def test_out_of_range(self):
         self.assertEqual(
             self.import_(['value'], [[str(2**31)]]),
diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index b1af4338312..53c67c68844 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import os
+import threading
 import time
 import unittest2
 import xmlrpclib
@@ -11,6 +12,13 @@ ADDONS_PATH = openerp.tools.config['addons_path']
 PORT = openerp.tools.config['xmlrpc_port']
 DB = openerp.tools.config['db_name']
 
+# If the database name is not provided on the command-line,
+# use the one on the thread (which means if it is provided on
+# the command-line, this will break when installing another
+# database from XML-RPC).
+if not DB and hasattr(threading.current_thread(), 'dbname'):
+    DB = threading.current_thread().dbname
+
 HOST = '127.0.0.1'
 
 ADMIN_USER = 'admin'
diff --git a/openerp/tests/test_ir_sequence.py b/openerp/tests/test_ir_sequence.py
index fcc5888e47e..b1076e830ee 100644
--- a/openerp/tests/test_ir_sequence.py
+++ b/openerp/tests/test_ir_sequence.py
@@ -22,6 +22,16 @@ def registry(model):
 def cursor():
     return openerp.modules.registry.RegistryManager.get(DB).db.cursor()
 
+
+def drop_sequence(code):
+    cr = cursor()
+    for model in ['ir.sequence', 'ir.sequence.type']:
+        s = registry(model)
+        ids = s.search(cr, ADMIN_USER_ID, [('code', '=', code)])
+        s.unlink(cr, ADMIN_USER_ID, ids)
+    cr.commit()
+    cr.close()
+
 class test_ir_sequence_standard(unittest2.TestCase):
     """ A few tests for a 'Standard' (i.e. PostgreSQL) sequence. """
 
@@ -48,7 +58,7 @@ class test_ir_sequence_standard(unittest2.TestCase):
     def test_ir_sequence_draw(self):
         """ Try to draw a number. """
         cr = cursor()
-        n = registry('ir.sequence').get(cr, ADMIN_USER_ID, 'test_sequence_type', {})
+        n = registry('ir.sequence').next_by_code(cr, ADMIN_USER_ID, 'test_sequence_type', {})
         assert n
         cr.commit()
         cr.close()
@@ -57,15 +67,19 @@ class test_ir_sequence_standard(unittest2.TestCase):
         """ Try to draw a number from two transactions. """
         cr0 = cursor()
         cr1 = cursor()
-        n0 = registry('ir.sequence').get(cr0, ADMIN_USER_ID, 'test_sequence_type', {})
+        n0 = registry('ir.sequence').next_by_code(cr0, ADMIN_USER_ID, 'test_sequence_type', {})
         assert n0
-        n1 = registry('ir.sequence').get(cr1, ADMIN_USER_ID, 'test_sequence_type', {})
+        n1 = registry('ir.sequence').next_by_code(cr1, ADMIN_USER_ID, 'test_sequence_type', {})
         assert n1
         cr0.commit()
         cr1.commit()
         cr0.close()
         cr1.close()
 
+    @classmethod
+    def tearDownClass(cls):
+        drop_sequence('test_sequence_type')
+
 class test_ir_sequence_no_gap(unittest2.TestCase):
     """ Copy of the previous tests for a 'No gap' sequence. """
 
@@ -85,7 +99,7 @@ class test_ir_sequence_no_gap(unittest2.TestCase):
     def test_ir_sequence_draw_no_gap(self):
         """ Try to draw a number. """
         cr = cursor()
-        n = registry('ir.sequence').get(cr, ADMIN_USER_ID, 'test_sequence_type_2', {})
+        n = registry('ir.sequence').next_by_code(cr, ADMIN_USER_ID, 'test_sequence_type_2', {})
         assert n
         cr.commit()
         cr.close()
@@ -99,12 +113,16 @@ class test_ir_sequence_no_gap(unittest2.TestCase):
         cr1._default_log_exceptions = False # Prevent logging a traceback
         msg_re = '^could not obtain lock on row in relation "ir_sequence"$'
         with self.assertRaisesRegexp(psycopg2.OperationalError, msg_re):
-            n0 = registry('ir.sequence').get(cr0, ADMIN_USER_ID, 'test_sequence_type_2', {})
+            n0 = registry('ir.sequence').next_by_code(cr0, ADMIN_USER_ID, 'test_sequence_type_2', {})
             assert n0
-            n1 = registry('ir.sequence').get(cr1, ADMIN_USER_ID, 'test_sequence_type_2', {})
+            n1 = registry('ir.sequence').next_by_code(cr1, ADMIN_USER_ID, 'test_sequence_type_2', {})
         cr0.close()
         cr1.close()
 
+    @classmethod
+    def tearDownClass(cls):
+        drop_sequence('test_sequence_type_2')
+
 class test_ir_sequence_change_implementation(unittest2.TestCase):
     """ Create sequence objects and change their ``implementation`` field. """
 
@@ -146,6 +164,11 @@ class test_ir_sequence_change_implementation(unittest2.TestCase):
         cr.commit()
         cr.close()
 
+    @classmethod
+    def tearDownClass(cls):
+        drop_sequence('test_sequence_type_3')
+        drop_sequence('test_sequence_type_4')
+
 class test_ir_sequence_generate(unittest2.TestCase):
     """ Create sequence objects and generate some values. """
 
@@ -162,7 +185,7 @@ class test_ir_sequence_generate(unittest2.TestCase):
         cr.close()
 
         cr = cursor()
-        f = lambda *a: registry('ir.sequence').get(cr, ADMIN_USER_ID, 'test_sequence_type_5', {})
+        f = lambda *a: registry('ir.sequence').next_by_code(cr, ADMIN_USER_ID, 'test_sequence_type_5', {})
         assert all(str(x) == f() for x in xrange(1,1000))
         cr.commit()
         cr.close()
@@ -180,11 +203,15 @@ class test_ir_sequence_generate(unittest2.TestCase):
         cr.close()
 
         cr = cursor()
-        f = lambda *a: registry('ir.sequence').get(cr, ADMIN_USER_ID, 'test_sequence_type_6', {})
+        f = lambda *a: registry('ir.sequence').next_by_code(cr, ADMIN_USER_ID, 'test_sequence_type_6', {})
         assert all(str(x) == f() for x in xrange(1,1000))
         cr.commit()
         cr.close()
-        
+
+    @classmethod
+    def tearDownClass(cls):
+        drop_sequence('test_sequence_type_5')
+        drop_sequence('test_sequence_type_6')
 
 
 if __name__ == '__main__':
diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 36f560ba62c..be8465055ee 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -591,7 +591,11 @@ form: module.record_id""" % (xml_id,)
 
         if rec.get('action'):
             a_action = rec.get('action','').encode('utf8')
-            a_type = rec.get('type','').encode('utf8') or 'act_window'
+
+            # determine the type of action
+            a_type, a_id = self.model_id_get(cr, a_action)
+            a_type = a_type.split('.')[-1] # keep only type part
+
             icons = {
                 "act_window": 'STOCK_NEW',
                 "report.xml": 'STOCK_PASTE',
@@ -601,8 +605,8 @@ form: module.record_id""" % (xml_id,)
                 "server": 'STOCK_EXECUTE',
             }
             values['icon'] = icons.get(a_type,'STOCK_NEW')
+
             if a_type=='act_window':
-                a_id = self.id_get(cr, a_action)
                 cr.execute('select view_type,view_mode,name,view_id,target from ir_act_window where id=%s', (int(a_id),))
                 rrres = cr.fetchone()
                 assert rrres, "No window action defined for this id %s !\n" \
@@ -627,9 +631,8 @@ form: module.record_id""" % (xml_id,)
                     values['icon'] = 'STOCK_EXECUTE'
                 if not values.get('name', False):
                     values['name'] = action_name
-            
+
             elif a_type in ['wizard', 'url', 'client', 'server'] and not values.get('name'):
-                a_id = self.id_get(cr, a_action)
                 a_table = 'ir_act_%s' % a_type
                 cr.execute('select name from %s where id=%%s' % a_table, (int(a_id),))
                 resw = cr.fetchone()
@@ -667,9 +670,6 @@ form: module.record_id""" % (xml_id,)
             self.idref[rec_id] = int(pid)
 
         if rec.get('action') and pid:
-            a_action = rec.get('action').encode('utf8')
-            a_type = rec.get('type','').encode('utf8') or 'act_window'
-            a_id = self.id_get(cr, a_action)
             action = "ir.actions.%s,%d" % (a_type, a_id)
             self.pool.get('ir.model.data').ir_set(cr, self.uid, 'action', 'tree_but_open', 'Menuitem', [('ir.ui.menu', int(pid))], action, True, True, xml_id=rec_id)
         return ('ir.ui.menu', pid)
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index e90fadf0492..7763b3af3b2 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -1140,4 +1140,37 @@ class UnquoteEvalContext(defaultdict):
     def __missing__(self, key):
         return unquote(key)
 
+
+class mute_logger(object):
+    """Temporary suppress the logging.
+    Can be used as context manager or decorator.
+
+        @mute_logger('openerp.plic.ploc')
+        def do_stuff():
+            blahblah()
+
+        with mute_logger('openerp.foo.bar'):
+            do_suff()
+
+    """
+    def __init__(self, *loggers):
+        self.loggers = loggers
+
+    def filter(self, record):
+        return 0
+
+    def __enter__(self):
+        for logger in self.loggers:
+            logging.getLogger(logger).addFilter(self)
+
+    def __exit__(self, exc_type=None, exc_val=None, exc_tb=None):
+        for logger in self.loggers:
+            logging.getLogger(logger).removeFilter(self)
+
+    def __call__(self, func):
+        @wraps(func)
+        def deco(*args, **kwargs):
+            with self:
+                return func(*args, **kwargs)
+        return deco
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 136d1bcee7b..57af9e45e89 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -100,7 +100,7 @@ class RecordDictWrapper(dict):
         return dict.__getitem__(self, key)
 
 class YamlInterpreter(object):
-    def __init__(self, cr, module, id_map, mode, filename, report=None, noupdate=False):
+    def __init__(self, cr, module, id_map, mode, filename, report=None, noupdate=False, loglevel=logging.DEBUG):
         self.cr = cr
         self.module = module
         self.id_map = id_map
@@ -110,6 +110,7 @@ class YamlInterpreter(object):
             report = assertion_report.assertion_report()
         self.assertion_report = report
         self.noupdate = noupdate
+        self.loglevel = loglevel
         self.pool = pooler.get_pool(cr.dbname)
         self.uid = 1
         self.context = {} # opererp context
@@ -119,6 +120,9 @@ class YamlInterpreter(object):
                              'datetime': datetime,
                              'timedelta': timedelta}
 
+    def _log(self, *args, **kwargs):
+        _logger.log(self.loglevel, *args, **kwargs)
+
     def _ref(self):
         return lambda xml_id: self.get_id(xml_id)
 
@@ -484,12 +488,10 @@ class YamlInterpreter(object):
             self.noupdate = node.noupdate
 
     def process_python(self, node):
-        def log(msg, *args):
-            _logger.log(logging.TEST, msg, *args)
         python, statements = node.items()[0]
         model = self.get_model(python.model)
         statements = statements.replace("\r\n", "\n")
-        code_context = {'model': model, 'cr': self.cr, 'uid': self.uid, 'log': log, 'context': self.context}
+        code_context = {'model': model, 'cr': self.cr, 'uid': self.uid, 'log': self._log, 'context': self.context}
         code_context.update({'self': model}) # remove me when no !python block test uses 'self' anymore
         try:
             code_obj = compile(statements, self.filename, 'exec')
@@ -720,7 +722,7 @@ class YamlInterpreter(object):
             if len(ids):
                 self.pool.get(node.model).unlink(self.cr, self.uid, ids)
         else:
-            _logger.log(logging.TEST, "Record not deleted.")
+            self._log("Record not deleted.")
 
     def process_url(self, node):
         self.validate_xml_id(node.id)
@@ -805,7 +807,7 @@ class YamlInterpreter(object):
 
         is_preceded_by_comment = False
         for node in yaml.load(yaml_string):
-            is_preceded_by_comment = self._log(node, is_preceded_by_comment)
+            is_preceded_by_comment = self._log_node(node, is_preceded_by_comment)
             try:
                 self._process_node(node)
             except YamlImportException, e:
@@ -852,26 +854,27 @@ class YamlInterpreter(object):
         else:
             raise YamlImportException("Can not process YAML block: %s" % node)
 
-    def _log(self, node, is_preceded_by_comment):
+    def _log_node(self, node, is_preceded_by_comment):
         if is_comment(node):
             is_preceded_by_comment = True
-            _logger.log(logging.TEST, node)
+            self._log(node)
         elif not is_preceded_by_comment:
             if isinstance(node, types.DictionaryType):
                 msg = "Creating %s\n with %s"
                 args = node.items()[0]
-                _logger.log(logging.TEST, msg, *args)
+                self._log(msg, *args)
             else:
-                _logger.log(logging.TEST, node)
+                self._log(node)
         else:
             is_preceded_by_comment = False
         return is_preceded_by_comment
 
-def yaml_import(cr, module, yamlfile, idref=None, mode='init', noupdate=False, report=None):
+def yaml_import(cr, module, yamlfile, kind, idref=None, mode='init', noupdate=False, report=None):
     if idref is None:
         idref = {}
+    loglevel = logging.TEST if kind == 'test' else logging.DEBUG
     yaml_string = yamlfile.read()
-    yaml_interpreter = YamlInterpreter(cr, module, idref, mode, filename=yamlfile.name, report=report, noupdate=noupdate)
+    yaml_interpreter = YamlInterpreter(cr, module, idref, mode, filename=yamlfile.name, report=report, noupdate=noupdate, loglevel=loglevel)
     yaml_interpreter.process(yaml_string)
 
 # keeps convention of convert.py
diff --git a/setup.py b/setup.py
index 6e1adadde82..5925a0484ba 100755
--- a/setup.py
+++ b/setup.py
@@ -96,6 +96,7 @@ setuptools.setup(
         # our tree.) http://download.gna.org/pychart/
         # TODO  'pychart',
           'babel',
+          'docutils',
           'feedparser',
           'gdata',
           'lxml',