summaryrefslogtreecommitdiff
path: root/addons/project
diff options
context:
space:
mode:
authorFabien Pinckaers <fp@tinyerp.com>2012-12-10 20:28:10 +0100
committerFabien Pinckaers <fp@tinyerp.com>2012-12-10 20:28:10 +0100
commit2f96683e20a3e29bc930ce99219f2fc83116e034 (patch)
tree04e901fe6d0e57a2d0360d6d96dfdf5cca23a71d /addons/project
parent456ce8cd36590483fca9d77b656cab90952d117a (diff)
[IMP] contract management
bzr revid: fp@tinyerp.com-20121210192810-eff3qaqn90vgl5q3
Diffstat (limited to 'addons/project')
-rw-r--r--addons/project/project.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/project/project.py b/addons/project/project.py
index 302b1b1db21..df05e4cd65e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -548,7 +548,8 @@ def Project():
model_name=vals.get('alias_model', 'project.task'),
context=context)
vals['alias_id'] = alias_id
- vals['type'] = 'contract'
+ if vals.get('type', False) not in ('template','contract'):
+ vals['type'] = 'contract'
project_id = super(project, self).create(cr, uid, vals, context)
mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'project_id': project_id} }, context)
self.create_send_note(cr, uid, [project_id], context=context)
@@ -1377,6 +1378,7 @@ class account_analytic_account(osv.osv):
project_values = {
'name': vals.get('name'),
'analytic_account_id': analytic_account_id,
+ 'type': vals.get('type','contract'),
}
return project_pool.create(cr, uid, project_values, context=context)
return False
@@ -1395,6 +1397,7 @@ class account_analytic_account(osv.osv):
for account in self.browse(cr, uid, ids, context=context):
if not name:
vals['name'] = account.name
+ vals['type'] = account.type
self.project_create(cr, uid, account.id, vals, context=context)
return super(account_analytic_account, self).write(cr, uid, ids, vals, context=context)