From 7897eb3898ddbf84e0478e627e2279909534c514 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Fri, 5 Apr 2013 11:04:44 +0200 Subject: [FIX] Only create project once bzr revid: jco@openerp.com-20130405090444-rqlawt05gsj5mvsk --- addons/project_long_term/project_long_term.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project_long_term/project_long_term.py') diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index e53ff9ed253..2afaeb40eb0 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -285,7 +285,7 @@ class account_analytic_account(osv.osv): 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') + return res account_analytic_account() -- cgit v1.2.3 From 3887d1e6fa8a7ad3339ac8710760721bacd2404a Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Wed, 10 Apr 2013 10:46:38 +0200 Subject: [FIX] Adapt like issues and tasks bzr revid: jco@openerp.com-20130410084638-v9yeobgc91yy7lyx --- addons/project_long_term/project_long_term.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'addons/project_long_term/project_long_term.py') diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 2afaeb40eb0..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 + 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() -- cgit v1.2.3 From e69326ee3b32bf50805bf1aca73d941a3bbcd2fe Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 15 Apr 2013 12:23:49 +0200 Subject: [REF] removed explicit model instanciations. bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz --- addons/project_long_term/project_long_term.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'addons/project_long_term/project_long_term.py') diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 109f0c03c6f..a950907fb69 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -198,7 +198,6 @@ class project_phase(osv.osv): result += "\n" return result -project_phase() class project_user_allocation(osv.osv): _name = 'project.user.allocation' @@ -211,7 +210,6 @@ class project_user_allocation(osv.osv): 'date_start': fields.datetime('Start Date', help="Starting Date"), 'date_end': fields.datetime('End Date', help="Ending Date"), } -project_user_allocation() class project(osv.osv): _inherit = "project.project" @@ -267,7 +265,6 @@ class project(osv.osv): 'date_end': p.end.strftime('%Y-%m-%d %H:%M:%S') }, context=context) return True -project() class account_analytic_account(osv.osv): _inherit = 'account.analytic.account' @@ -289,13 +286,11 @@ class account_analytic_account(osv.osv): 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() class project_task(osv.osv): _inherit = "project.task" _columns = { 'phase_id': fields.many2one('project.phase', 'Project Phase', domain="[('project_id', '=', project_id)]"), } -project_task() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3