summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrpa (Open ERP) <rpa@openerp.co.in>2010-02-26 14:55:25 +0530
committerrpa (Open ERP) <rpa@openerp.co.in>2010-02-26 14:55:25 +0530
commitc0dcc4ffac22f43aa5142fca3745b53fd21987c3 (patch)
tree9a1802b76153647cf63be7914185de0b921afa52
parentba21d4dd4058420d19a82b7d9012e1d7be6dcfab (diff)
[FIX]: Fixed problem of None type when selecting "Use Directly" after DB creation+ Problem of access of demo user
bzr revid: rpa@openerp.co.in-20100226092525-to25yxj4hlkdsv62
-rw-r--r--addons/base_setup/__init__.py3
-rw-r--r--addons/base_setup/base_setup_demo.xml8
2 files changed, 6 insertions, 5 deletions
diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 22e81a488b0..e4a4c3c80d8 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -62,12 +62,13 @@ class base_setup_config_choice(osv.osv_memory):
'type': menu.type,
'view_id': view_id,
'domain': menu.domain,
- 'res_users': menu.res_model,
+ 'res_model': menu.res_model,
'src_model': menu.src_model,
'view_type': menu.view_type,
'view_mode': menu.view_mode,
'views': menu.views,
}
+
def config(self, cr, uid, ids, context=None):
menu = self.get_default_menu(cr, uid, context=context)
self.set_default_menu(cr, uid, menu, context=context)
diff --git a/addons/base_setup/base_setup_demo.xml b/addons/base_setup/base_setup_demo.xml
index 364a0773a4c..ce0b4a7bbb6 100644
--- a/addons/base_setup/base_setup_demo.xml
+++ b/addons/base_setup/base_setup_demo.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
-
- <record id="base.user_demo" model="res.users">
- <field name="action_id" ref="action_base_setup"/>
- </record>
+ <!-- TODO: Remove comment after fixing bug #527050-->
+<!-- <record id="base.user_demo" model="res.users">-->
+<!-- <field name="action_id" ref="action_base_setup"/>-->
+<!-- </record>-->
</data>
</openerp>