diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 94e37dfd8cb..d668c83b84d 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -198,9 +198,11 @@
                             <field colspan="4" name="signature"/>
                         </page>
                         <page string="Groups">
+                            <label string="Groups are used to defined access rights on each screen and menu." align="0.0" colspan="4"/>
                             <field colspan="4" nolabel="1" name="groups_id"/>
                         </page>
                         <page string="Roles">
+                            <label string="Roles are used to defined available actions, provided by workflows." align="0.0" colspan="4"/>
                             <field colspan="4" nolabel="1" name="roles_id"/>
                         </page>
                     </notebook>
diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index 54d613cf1b5..982476a17d7 100644
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -234,7 +234,8 @@ class ir_ui_menu(osv.osv):
         'child_id' : fields.one2many('ir.ui.menu', 'parent_id','Child ids'),
         'parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', select=True),
         'groups_id': many2many_unique('res.groups', 'ir_ui_menu_group_rel',
-            'menu_id', 'gid', 'Groups'),
+            'menu_id', 'gid', 'Groups', help="If you put groups, the visibility of this menu will be based on these groups. "\
+                "If this field is empty, Open ERP will compute visibility based on the related object's read access."),
         'complete_name': fields.function(_get_full_name, method=True,
             string='Complete Name', type='char', size=128),
         'icon': fields.selection(tools.icons, 'Icon', size=64),
diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py
index 35b594812d7..faafab6be2d 100644
--- a/bin/addons/base/ir/workflow/workflow.py
+++ b/bin/addons/base/ir/workflow/workflow.py
@@ -153,7 +153,7 @@ class wkf_instance(osv.osv):
     _rec_name = 'res_type'
     _log_access = False
     _columns = {
-        'wkf_id': fields.many2one('workflow', 'Workflow', ondelete='restrict', select=True),
+        'wkf_id': fields.many2one('workflow', 'Workflow', ondelete='cascade', select=True),
         'uid': fields.integer('User ID'),
         'res_id': fields.integer('Resource ID', select=True),
         'res_type': fields.char('Resource Object', size=64, select=True),
diff --git a/bin/addons/base/res/bank.py b/bin/addons/base/res/bank.py
index aa44e9ec32c..af3ff9492ab 100644
--- a/bin/addons/base/res/bank.py
+++ b/bin/addons/base/res/bank.py
@@ -55,6 +55,11 @@ class Bank(osv.osv):
     _defaults = {
         'active': lambda *a: 1,
     }
+    def name_get(self, cr, uid, ids, context=None):
+        result = []
+        for bank in self.browse(cr, uid, ids, context):
+            result.append((bank.id, (bank.bic and (bank.bic + ' - ') or '') + bank.name))
+        return result
 
 Bank()
 
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 1146d019426..f07eba1c177 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -336,7 +336,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
         </record>
-        <menuitem action="action_partner_customer_form_new" id="menu_partner_customer_form_new" parent="menu_partner_form"/>
+        <menuitem
+            action="action_partner_customer_form_new"
+            sequence="50"
+            id="menu_partner_customer_form_new" parent="menu_partner_form"/>
 
         <record id="view_payterm_form" model="ir.ui.view">
             <field name="name">res.payterm</field>
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 554006565a0..fed44126277 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -938,16 +938,13 @@ class orm_template(object):
                                 parent.insertBefore(child, node)
                         parent.removeChild(node)
                     else:
+                        sib = node.nextSibling
                         for child in node2.childNodes:
                             if child.nodeType == child.ELEMENT_NODE:
                                 if pos == 'inside':
                                     node.appendChild(child)
                                 elif pos == 'after':
-                                    sib = node.nextSibling
-                                    if sib:
-                                        node.parentNode.insertBefore(child, sib)
-                                    else:
-                                        node.parentNode.appendChild(child)
+                                    node.parentNode.insertBefore(child, sib)
                                 elif pos=='before':
                                     node.parentNode.insertBefore(child, node)
                                 else: