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

[FIX] select current compay on users 

bzr revid: fp@tinyerp.com-20091209085739-sb1hq6c8ud7o7kmh
This commit is contained in:
Fabien Pinckaers 2009-12-09 09:57:39 +01:00
parent 6c730e4125
commit 920c9dd540
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/addons/base/base_update.xml
View File

@ -78,7 +78,7 @@
<form string="Users">
<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."/>
<field name="company"/>
<field name="company_id" widget="selection"/>
<field name="context_lang" completion="1" readonly="0"/>
<field name="context_tz" completion="1" readonly="0" colspan="4"/>
<newline/>

4
bin/addons/base/ir/ir.xml
View File

@ -1128,8 +1128,8 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Record rules">
<field name="model_id"/>
<field name="global"/>
<field name="model_id" select="1"/>
<field name="global" select="1"/>
<field colspan="4" name="name"/>
<group col="6" colspan="4" expand="1">
<field colspan="6" name="rules" nolabel="1"/>

12
bin/addons/base/res/partner/partner_view.xml
View File

@ -96,7 +96,6 @@
<field name="function"/>
<newline/>
<group string="Postal Address" colspan="2" col="2">
<field name="type" select="2" />
<field name="street" select="2"/>
<field name="street2"/>
<field name="zip" select="2"/>
@ -105,6 +104,7 @@
<field name="state_id" select="2"/>
</group>
<group string="Communication" colspan="2" col="2">
<field name="type" select="2" />
<field name="phone"/>
<field name="fax"/>
<field name="mobile" select="2"/>
@ -255,12 +255,14 @@
<page string="General">
<field colspan="4" mode="form,tree" name="address" nolabel="1" select="1" height="260">
<form string="Partner Contacts">
<field name="name" select="2"/>
<field domain="[('domain', '=', 'contact')]" name="title" string="Type"/>
<field name="function"/>
<group colspan="2" col="4">
<field name="name" select="2"/>
<field domain="[('domain', '=', 'contact')]" name="title" string="Type"/>
<field name="function"/>
<field name="type" select="2" colspan="4"/>
</group>
<newline/>
<group string="Postal Address" colspan="2" col="4">
<field name="type" select="2" colspan="4"/>
<field name="street" select="2" colspan="4"/>
<field name="street2" colspan="4"/>
<field name="zip" select="2"/>

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

@ -140,7 +140,7 @@ class users(osv.osv):
'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
'rules_id': fields.many2many('ir.rule.group', 'user_rule_group_rel', 'user_id', 'rule_group_id', 'Rules'),
'company_id': fields.many2one('res.company', 'Company'),
'company_id': fields.many2one('res.company', 'Company', help="The company this user is currently working on."),
'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Accepted Companies'),
'context_lang': fields.selection(_lang_get, 'Language', required=True),
'context_tz': fields.selection(_tz_get, 'Timezone', size=64),

2
bin/osv/orm.py
View File

@ -2317,7 +2317,7 @@ class orm(orm_template):
if isinstance(ids, (int, long)):
select = [ids]
else:
select = map(int,ids)
select = ids
select = map(lambda x: isinstance(x,dict) and x['id'] or x, select)
result = self._read_flat(cr, user, select, fields, context, load)