From 887706ce663acf198e9e4f4686180778149bb0ba Mon Sep 17 00:00:00 2001 From: "pap (openerp)" Date: Fri, 9 Jul 2010 12:57:50 +0530 Subject: [IMP]: bugfixing and code cleaning in project and project_* modules bzr revid: pap@tinyerp.co.in-20100709072750-dg3yv4fmn0g0edqm --- addons/project_long_term/__openerp__.py | 2 +- addons/project_long_term/wizard/project_compute_phases.py | 6 ++---- addons/project_long_term/wizard/project_schedule_tasks.py | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'addons/project_long_term') diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py index dfcddb75b48..ae391ebbb03 100644 --- a/addons/project_long_term/__openerp__.py +++ b/addons/project_long_term/__openerp__.py @@ -25,7 +25,7 @@ "author": "Tiny", "website": "http://www.openerp.com", "category": "Generic Modules/Projects & Services", - "depends": ["project", "resource"], + "depends": ["resource", "project"], "description": """ Long Term Project management module that tracks planning, scheduling, resources allocation. diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py index f4c5fbae443..bc377a5af7d 100644 --- a/addons/project_long_term/wizard/project_compute_phases.py +++ b/addons/project_long_term/wizard/project_compute_phases.py @@ -61,7 +61,6 @@ class project_compute_phases(osv.osv_memory): resource_obj = self.pool.get('resource.resource') uom_obj = self.pool.get('product.uom') phase_resource_obj = False - if context is None: context = {} if phase: @@ -134,14 +133,13 @@ class project_compute_phases(osv.osv_memory): if context is None: context = {} - project_obj = self.pool.get('project.project') phase_obj = self.pool.get('project.phase') data = self.read(cr, uid, ids, [], context=context)[0] if not data['project_id'] and data['target_project'] == 'one': raise osv.except_osv(_('Error!'), _('Please Specify Project to be schedule')) if data['project_id']: # If project mentioned find its phases - project_id = project_obj.browse(cr, uid, data['project_id'], context=context) - phase_ids = phase_obj.search(cr, uid, [('project_id', '=', project_id.id), + project_id = data['project_id'] + phase_ids = phase_obj.search(cr, uid, [('project_id', '=', project_id), ('state', 'in', ['draft', 'open', 'pending']), ('previous_phase_ids', '=', False) ]) diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py index f0ad7c51dae..d3c42a983d0 100644 --- a/addons/project_long_term/wizard/project_schedule_tasks.py +++ b/addons/project_long_term/wizard/project_schedule_tasks.py @@ -160,4 +160,5 @@ class project_schedule_task(osv.osv_memory): return {} project_schedule_task() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3 From b079e0fb2b5225f2f3a169cbf6c01f9b53577d03 Mon Sep 17 00:00:00 2001 From: "pap (openerp)" Date: Fri, 9 Jul 2010 14:15:01 +0530 Subject: [FIX]: Day to day in project_long_term.py bzr revid: pap@tinyerp.co.in-20100709084501-25dwdtdokqcj0woc --- addons/project_long_term/project_long_term.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project_long_term') diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 6cba9bc55d0..f76ab413e23 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -114,7 +114,7 @@ class project_phase(osv.osv): 'responsible_id': lambda obj,cr,uid,context: uid, 'state': 'draft', 'sequence': 10, - 'product_uom': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', 'Day')], context=c)[0] + 'product_uom': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', 'day')], context=c)[0] } _order = "name" _constraints = [ -- cgit v1.2.3