[MERGE] latest trunk

bzr revid: abo@openerp.com-20120629140209-lyd3iiap16r8tl59

addons/base_setup/res_config.py

@@ -43,7 +43,8 @@ class base_config_settings(osv.osv_memory):
             'view_mode': 'form',
             'res_model': 'res.company',
             'res_id': user.company_id.id,
-         }
+            'target': 'current',
+        }
 
 # Preferences wizard for Sales & CRM.
 # It is defined here because it is inherited independently in modules sale, crm,

addons/fetchmail/res_config.py

@@ -85,6 +85,7 @@ class fetchmail_config_settings(osv.osv_memory):
             'type': 'ir.actions.act_window',
             'res_model': 'fetchmail.server',
             'view_mode': 'form',
+            'target': 'current',
         }
         model_name = self._columns[field].fetchmail_model
         model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', model_name)])[0]