summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonin Bourguignon <abo@openerp.com>2012-08-22 20:11:27 +0200
committerAntonin Bourguignon <abo@openerp.com>2012-08-22 20:11:27 +0200
commitae70fc72444ba4e40bb37e47e2232c679d788e7c (patch)
tree81cb70d8178961e0d2dbdcd2d4ec588ba78a668a
parent121b351b59c013beb421830a39af3ddffb0bdb5b (diff)
parent014ee6e5f8d13aded30765e7aec9a12a8c1b789b (diff)
[MERGE] latest trunk
bzr revid: abo@openerp.com-20120822181127-mcs2n9b9l5ksonq0
-rw-r--r--addons/project/project.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/addons/project/project.py b/addons/project/project.py
index 1a8f8c8bfe5..ab1c3c47dfe 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -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'])},