pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] branch merged with lp:~openerp-dev/openobject-server/trunk-settings-configuration-improvements

Browse Source 
bzr revid: jap@tinyerp.com-20120427123212-mqmrqfaf57jdtuih
This commit is contained in:
Jagdish Panchal (Open ERP)
2012-04-27 18:02:12 +05:30
parent f7afab985f e9f04c536c
commit b002980d01
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/base_menu.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<menuitem id="menu_administration" name="Settings" sequence="100" icon="terp-administration"/>
<menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
<menuitem id="menu_config" name="General Settings" parent="menu_administration" sequence="1"/>
<menuitem id="menu_custom" name="Technical" parent="menu_config" sequence="8" groups="base.group_no_one"/>
<menuitem id="menu_custom" name="Technical" parent="menu_config" sequence="110" groups="base.group_no_one"/>
<menuitem id="next_id_2" name="User Interface" parent="menu_custom"/>
<menuitem id="menu_email" name="Email" parent="menu_custom" sequence="1"/>
<menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
openerp/addons/base/res/res_lang.py
-3
View File
@@ -58,9 +58,6 @@ class lang(osv.osv):
default_value = ir_values_obj.get(cr, uid, 'default', False, ['res.partner'])
if not default_value:
ir_values_obj.set(cr, uid, 'default', False, 'lang', ['res.partner'], lang)
default_value = ir_values_obj.get(cr, uid, 'default', False, ['res.users'])
if not default_value:
ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], lang)
return True
def load_lang(self, cr, uid, lang, lang_name=None):
openerp/addons/base/res/res_users.py
+3 -2
View File
@@ -324,10 +324,11 @@ class users(osv.osv):
# default avatar file name: avatar0 -> avatar6.png, choose randomly
avatar_path = openerp.modules.get_module_resource('base', 'static/src/img', 'avatar%d.png' % random.randint(0, 6))
return self._avatar_resize(cr, uid, open(avatar_path, 'rb').read().encode('base64'), context=context)
_defaults = {
'password' : '',
'context_lang': 'en_US',
'context_lang': lambda self, cr, uid, context: context.get('lang', 'en_US'),
'context_tz': lambda self, cr, uid, context: context.get('tz', False),
'avatar': _get_avatar,
'active' : True,
'menu_id': _get_menu,