[MERGE] latest trunk

bzr revid: abo@openerp.com-20120822181127-mcs2n9b9l5ksonq0
This commit is contained in:
Antonin Bourguignon
2012-08-22 20:11:27 +02:00
+1 -4
View File
@@ -250,9 +250,6 @@ class project(osv.osv):
type='many2many', relation='res.users', string='Followers'),
}
def dummy(self, cr, uid, ids, context):
return True
def _get_type_common(self, cr, uid, context):
ids = self.pool.get('project.task.type').search(cr, uid, [('case_default','=',1)], context=context)
return ids
@@ -526,7 +523,7 @@ def Project():
mail_alias = self.pool.get('mail.alias')
if not vals.get('alias_id'):
vals.pop('alias_name', None) # prevent errors during copy()
alias_id = mail_alias.create_unique_alias(cr, uid,
alias_id = mail_alias.create_unique_alias(cr, uid,
# Using '+' allows using subaddressing for those who don't
# have a catchall domain setup.
{'alias_name': "project+"+short_name(vals['name'])},