diff options
| author | Raphael Collet <rco@openerp.com> | 2014-07-06 16:44:26 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2014-07-06 17:05:41 +0200 |
| commit | cbe2dbb672a6c55d86f2e515f9d1cdfee426ef80 (patch) | |
| tree | d6ff62b719fce32392397783c961b734b1e4c50e /addons/auth_ldap/users_ldap.py | |
| parent | d78192c489d3be66cd6487b39f5ce7ba4733a187 (diff) | |
[MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.
- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
Diffstat (limited to 'addons/auth_ldap/users_ldap.py')
| -rw-r--r-- | addons/auth_ldap/users_ldap.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py index e6a7f0f4716..9ddc3d6ed45 100644 --- a/addons/auth_ldap/users_ldap.py +++ b/addons/auth_ldap/users_ldap.py @@ -237,14 +237,14 @@ class res_company(osv.osv): _inherit = "res.company" _columns = { 'ldaps': fields.one2many( - 'res.company.ldap', 'company', 'LDAP Parameters'), + 'res.company.ldap', 'company', 'LDAP Parameters', copy=True), } class users(osv.osv): _inherit = "res.users" - def login(self, db, login, password): - user_id = super(users, self).login(db, login, password) + def _login(self, db, login, password): + user_id = super(users, self)._login(db, login, password) if user_id: return user_id registry = RegistryManager.get(db) |
