[MERGE] from master

[odoo/odoo.git] / addons / website / models / res_config.py

diff --git a/addons/website/models/res_config.py b/addons/website/models/res_config.py
index bec1a44..bd6f2e9 100644 (file)
--- a/addons/website/models/res_config.py
+++ b/addons/website/models/res_config.py
@@ -7,6 +7,7 @@ class website_config_settings(osv.osv_memory):
 
     _columns = {
         'website_id': fields.many2one('website', string="website", required=True),
+        'website_name': fields.related('website_id', 'name', type="char", string="Website Name"),
 
         'language_ids': fields.related('website_id', 'language_ids', type='many2many', relation='res.lang', string='Languages'),
         'default_lang_id': fields.related('website_id', 'default_lang_id', type='many2one', relation='res.lang', string='Default language'),
@@ -27,7 +28,7 @@ class website_config_settings(osv.osv_memory):
 
     def on_change_website_id(self, cr, uid, ids, website_id, context=None):
         website_data = self.pool.get('website').read(cr, uid, [website_id], [], context=context)[0]
-        values = {}
+        values = {'website_name': website_data['name']}
         for fname, v in website_data.items():
             if fname in self._columns:
                 values[fname] = v[0] if v and self._columns[fname]._type == 'many2one' else v