[Merge]: Merge from lp:openobject-server.

bzr revid: rch@tinyerp.com-20101122045227-wofnz8tspt8diu6p
This commit is contained in:
rch-openerp
2010-11-22 10:22:27 +05:30
4 changed files with 13900 additions and 2337 deletions
File diff suppressed because it is too large Load Diff
+3956 -1965
View File
File diff suppressed because it is too large Load Diff
+685 -371
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -265,7 +265,7 @@ class users(osv.osv):
]
_sql_constraints = [
('login_key', 'UNIQUE (login)', _('You can not have two users with the same login !'))
('login_key', 'UNIQUE (login)', 'You can not have two users with the same login !')
]
def _get_email_from(self, cr, uid, ids, context=None):