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

[MERGE] merged the usability branch for small changes on res.users

Browse Source 
bzr revid: qdp-launchpad@tinyerp.com-20100927095431-l4a6kzah2s7ubj9c
This commit is contained in:
qdp-launchpad@tinyerp.com
2010-09-27 11:54:31 +02:00
parent ac199bb94e f9d16b73b0
commit f159662a68
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/base_update.xml
+10 -9
View File
@@ -82,16 +82,15 @@
context="{'user_id': self, 'user_preference': 1}" groups="base.group_multi_company"/>
<field name="view" readonly="0"/>
<label string="" colspan="2"/>
<field name="menu_tips" colspan="2" readonly="0"/>
<newline/>
<separator colspan="4" string="Preferences"/>
</page>
<page string="Preferences">
<field name="password" password="True" readonly="0" colspan="4"/>
<field name="password" password="True" readonly="0" />
<field name="context_lang" completion="1" readonly="0"/>
<label string="" colspan="1"/>
<label colspan="3" string="You must logout and login again after changing your password."/>
<field name="context_lang" completion="1" readonly="0"/>
<field name="context_tz" completion="1" readonly="0"/>
<field name="menu_tips" colspan="2" readonly="0"/>
<separator string="Email &amp; Signature" colspan="4"/>
<group colspan="4"><field name="user_email" widget="email"/></group>
<field colspan="4" name="signature" readonly="0" nolabel="1"/>
@@ -114,16 +113,18 @@
<newline/>
<notebook colspan="4">
<page string="User">
<field name="address_id" select="1"/>
<field name="user_email" widget="email"/>
<field name="company_id" required="1"
context="{'user_id': self, 'user_preference': 1}"
on_change="on_change_company_id(company_id)"
groups="base.group_multi_company"
/>
/>
<field name="address_id" select="1"/>
<field name="user_email" widget="email"/>
<field name="context_lang"/>
<field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
<field name="action_id" required="True"/>
<field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
<field name="context_lang"/>
<field name="context_tz"/>
<field name="view" readonly="0"/>
<field name="menu_tips" colspan="2"/>
bin/addons/base/res/res_user.py
+2 -2
View File
@@ -240,7 +240,7 @@ class users(osv.osv):
" aren't configured, it won't be possible to email new "
"users."),
'signature': fields.text('Signature', size=64),
'address_id': fields.many2one('res.partner.address', 'Address'),
'address_id': fields.many2one('res.partner.address', 'Company Address'),
'active': fields.boolean('Active'),
'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),
@@ -264,7 +264,7 @@ class users(osv.osv):
selection=[('simple','Simplified'),('extended','Extended')],
string='Interface', help="Choose between the simplified interface and the extended one"),
'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240),
'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to display tips on each menu action"),
'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
}