odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] res.users: slightly better views for email preferences 

More consistent, better-looking, and no hyphen in "email",
as this is the convention from now on for english labels

bzr revid: odo@openerp.com-20110809105724-sinwgr2du47kmime
This commit is contained in:
Olivier Dony 2011-08-09 12:57:24 +02:00
parent 13ecd980b7
commit 7742f7ff1a
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
openerp/addons/base/base_update.xml
View File

@ -95,9 +95,9 @@
<field name="company_id" widget="selection"
groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
</group>
<separator string="Email &amp; Signature" colspan="2"/>
<separator string="Email Preferences" colspan="4"/>
<field colspan="4" name="user_email" widget="email"/>
<field colspan="4" name="signature" nolabel="1"/>
<field colspan="4" name="signature"/>
</form>
</field>
</record>
@ -116,29 +116,32 @@
</group>
<notebook colspan="4">
<page string="User">
<group colspan="1" col="2">
<separator string="Preferences" colspan="2"/>
<field name="context_lang"/>
<field name="context_tz"/>
<field name="menu_tips"/>
<group colspan="4" col="6">
<!-- Second nested group to avoid misalignment with email prefs groups
in simplified view -->
<group colspan="6" col="6">
<group col="2" colspan="2">
<separator string="Preferences" colspan="2"/>
<field name="context_lang"/>
<field name="context_tz"/>
<field name="menu_tips"/>
</group>
<group name="default_filters" colspan="2" col="2">
<separator string="Default Filters" colspan="2"/>
<field name="company_id" required="1" context="{'user_preference': 0}" groups="base.group_multi_company"/>
</group>
<group colspan="2" col="2" groups="base.group_extended">
<separator string="Action" colspan="2"/>
<field name="action_id"/>
<field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
</group>
</group>
<group name="default_filters" colspan="1" col="2">
<separator string="Default Filters" colspan="2"/>
<field name="company_id" required="1"
context="{'user_preference': 0}"
groups="base.group_multi_company"/>
</group>
<group colspan="1" col="2" groups="base.group_extended">
<separator string="Action" colspan="2"/>
<field name="action_id"/>
<field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
</group>
<newline/>
<separator string="Email &amp; Signature" colspan="2"/>
<group colspan="4">
<group colspan="6" col="2">
<separator string="Email Preferences" colspan="2"/>
<field name="user_email" widget="email"/>
<field name="signature"/>
</group>
<field colspan="4" name="signature" nolabel="1"/>
</group>
</page>
<page string="Access Rights">
<field nolabel="1" name="groups_id"/>

2
openerp/addons/base/res/res_user.py
View File

@ -223,7 +223,7 @@ class users(osv.osv):
fnct_inv=_set_new_password,
string='Change password', help="Only specify a value if you want to change the user password. "
"This user will have to logout and login again!"),
'user_email': fields.char('E-mail', size=64),
'user_email': fields.char('Email', size=64),
'signature': fields.text('Signature', size=64),
'active': fields.boolean('Active'),
'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at logon for this user, in addition to the standard menu."),