fix

bzr revid: fp@tinyerp.com-20100612215945-06lxwldfydl8djkj

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 71c4fdc..b350300 100644 (file)
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -85,12 +85,15 @@
                         </page>
                          <page string="Preferences">
                             <field name="password" password="True" readonly="0"/>
-                            <label colspan="4" string="Please note that you will have to logout and relog if you change your password."/>
+                            <newline/>
+                            <label string="" colspan="1"
+                            <label colspan="3" string="Please note that you will have to logout and relog if you change your password."/>
                             <field name="context_lang" completion="1" readonly="0"/>
-                            <field name="context_tz" completion="1" readonly="0" colspan="4"/>
-                            <field name="view" colspan="4" readonly="0" />
+                            <field name="context_tz" completion="1" readonly="0"/>
+                            <field name="view" readonly="0"/>
                             <newline/>
-                            <field colspan="4" name="signature" readonly="0"/>
+                            <separator string="Signature" colspan="4"/>
+                            <field colspan="4" name="signature" readonly="0" nolabel="1"/>
                           </page>
                     </notebook>
                 </form>

diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index c94923e..8f98ef8 100644 (file)
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -43,8 +43,8 @@
 "access_wizard_module_lang_export_group_system","wizard_module_lang_export group_system","model_wizard_module_lang_export","group_system",1,1,1,1
 "access_res_company_group_erp_manager","res_company group_erp_manager","model_res_company","group_erp_manager",1,1,1,1
 "access_res_company_group_user","res_company group_user","model_res_company",,1,0,0,0
-"access_res_config_all","res_config all","model_res_config",,1,0,0,0
-"access_res_config_users_all","res_config_users all","model_res_config_users",,1,0,0,0
+"access_res_config_all","res_config all","model_res_config",group_system,1,1,1,1
+"access_res_config_users_all","res_config_users all","model_res_config_users",group_system,1,1,1,1
 "access_res_country_group_all","res_country group_user_all","model_res_country",,1,0,0,0
 "access_res_country_state_group_all","res_country_state group_user_all","model_res_country_state",,1,0,0,0
 "access_res_country_group_user","res_country group_user","model_res_country","group_partner_manager",1,1,1,1
@@ -121,9 +121,9 @@
 "access_res_bank_group_system","res_bank_group_system","model_res_bank","group_system",1,1,1,1
 "access_res_payterm_group_system","res_payterm_group_system","model_res_payterm","group_system",1,1,1,1
 "access_res_roles_group_erpmanager","res_roles_group_erp_manager","model_res_roles","group_erp_manager",1,1,1,1
-"access_res_config_view_group_erpmanager","res_config_view_erp_manager","model_res_config_view","group_erp_manager",1,1,1,1
+"access_res_config_view_group_erpmanager","res_config_view_erp_manager","model_res_config_view","group_system",1,1,1,1
 "access_res_roles_all","res_roles_all","model_res_roles",,1,0,0,0
-"access_res_config_view_all","res_config_view_all","model_res_config_view",,1,0,0,0
+"access_res_config_view_all","res_config_view_all","model_res_config_view",group_system,1,0,0,0
 "access_res_bank_group_partner_manager","res_bank_group_partner_manager","model_res_bank","group_partner_manager",1,1,1,1
 "access_res_bank_user","res_bank user","model_res_bank","group_user",1,0,0,0
 "access_maintenance_group_user","maintenance_contract group_user","model_maintenance_contract","group_system",1,1,1,1

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 95914a2..7aa1a4c 100644 (file)
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1224,7 +1224,6 @@ class orm_template(object):
                     attrs = {'views': views}
                     if node.get('widget') and node.get('widget') == 'selection':
                         if not check_group(node):
-                            # the field is just invisible. default value must be in the selection
                             name = node.get('name')
                             default = self.default_get(cr, user, [name], context=context).get(name)
                             if default:
@@ -1244,7 +1243,7 @@ class orm_template(object):
                             search_context = dict(context)
                             if column._context and not isinstance(column._context, basestring):
                                 search_context.update(column._context)
-                            attrs['selection'] = relation._name_search(cr, user, '', dom, context=search_context, limit=None, name_get_uid=1)
+                            attrs['selection'] = relation._name_search(cr, 1, '', dom, context=search_context, limit=None, name_get_uid=1)
                             if (node.get('required') and not int(node.get('required'))) or not column.required:
                                 attrs['selection'].append((False,''))
                 fields[node.get('name')] = attrs