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

Terminologies 

bzr revid: fp@tinyerp.com-1d2f5e6a51fb63f9996690451cd79f7f6ad1cfb9
This commit is contained in:
Fabien Pinckaers 2007-08-09 10:08:21 +00:00
parent 69436dc0dc
commit 5689e2e10a
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -388,7 +388,7 @@
<menuitem name="Administration/Users/Users" action="action_res_users" id="menu_action_res_users"/>
<record model="ir.actions.act_window" id="action_res_users_my">
<field name="name">My Password</field>
<field name="name">Change My Password</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.users</field>
<field name="view_type">form</field>
@ -827,7 +827,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="edit_menu"/>
</record>
<menuitem name="Administration/Security/Grant Access to Menu"
<menuitem name="Administration/Security/Define Access to Menu-Items"
action="grant_menu_access" id="menu_grant_menu_access"/>
<!--

2
bin/addons/base/module/module.py
View File

@ -225,7 +225,7 @@ class module(osv.osv):
'dependencies_id': fields.one2many('ir.module.module.dependency',
'module_id', 'Dependencies', readonly=True),
'state': fields.selection([
('uninstallable','Uninstallable'),
('uninstallable','Not Installable'),
('uninstalled','Not Installed'),
('installed','Installed'),
('to upgrade','To be upgraded'),

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

@ -519,7 +519,7 @@
<field name="view_id" ref="view_partner_category_tree"/>
<field name="domain">[('parent_id','=',False)]</field>
</record>
<menuitem name="Partners/Configuration/Categories/Categories Structure" action="action_partner_category" id="menu_partner_category"/>
<menuitem name="Partners/Configuration/Categories/Category's Structure" action="action_partner_category" id="menu_partner_category"/>
<record model="ir.actions.act_window" id="action_partner_by_category">
<field name="res_model">res.partner</field>
@ -537,7 +537,7 @@
<menuitem
name="Partners/Categories of Partners"
name="Partners/Partners by Category"
sequence="1"
action="action_partner_category"
id="menu_partner_category_main"/>

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

@ -143,7 +143,9 @@ class users(osv.osv):
args=[]
if not context:
context={}
ids = self.search(cr, user, [('login','=',name)]+ args, limit=limit)
ids = []
if name:
ids = self.search(cr, user, [('login','=',name)]+ args, limit=limit)
if not ids:
ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
return self.name_get(cr, user, ids)