summaryrefslogtreecommitdiff
path: root/addons/project_long_term/project_long_term.py
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2013-04-11 16:09:57 +0200
committerThibault Delavallée <tde@openerp.com>2013-04-11 16:09:57 +0200
commit4c4c48dc72024d92edc26ebb5885f41d5b10eb9d (patch)
tree93b5329fd8a37f5756a308e4c882bd478e8e1c1b /addons/project_long_term/project_long_term.py
parent385f4dbaaa71e4ff6adef6ad2209b25134e95025 (diff)
parentf728ec93fd506b5582725ca87c44e9ea819a99c8 (diff)
[MERGE] [FORWARD] Forward port of addons 7.0 until revision 9008
bzr revid: tde@openerp.com-20130411140957-tboxywmic8rxs4ns
Diffstat (limited to 'addons/project_long_term/project_long_term.py')
-rw-r--r--addons/project_long_term/project_long_term.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index e53ff9ed253..109f0c03c6f 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -283,9 +283,11 @@ class account_analytic_account(osv.osv):
res['value']['use_phases'] = template.use_phases
return res
+
def _trigger_project_creation(self, cr, uid, vals, context=None):
- res= super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
- return res or vals.get('use_phases')
+ if context is None: context = {}
+ res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
+ return res or (vals.get('use_phases') and not 'project_creation_in_progress' in context)
account_analytic_account()