diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-04-11 12:36:45 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-04-11 12:36:45 +0200 |
| commit | fe2ea997a2a317278610b7d0f462f7a1b01c5f35 (patch) | |
| tree | 16ff118484943daaa5a55a687ce15d5a2519c19d /addons/project_long_term/project_long_term.py | |
| parent | e3ac95411a3ce2cb885f85799b2f55f1528b9d96 (diff) | |
| parent | 748681e5d2b911638d5a01315c48ca48ae63ed41 (diff) | |
[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130411103645-rmr3sa8p9ropx2gc
Diffstat (limited to 'addons/project_long_term/project_long_term.py')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 6 |
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() |