diff options
| author | ksa (Open ERP) <ksa@tinyerp.co.in> | 2010-09-29 10:26:18 +0530 |
|---|---|---|
| committer | ksa (Open ERP) <ksa@tinyerp.co.in> | 2010-09-29 10:26:18 +0530 |
| commit | 780615974df733a623ab29dd3ca8a9d75a060205 (patch) | |
| tree | d3923bf67978ae08688eaaf5386a45d6d141a633 /addons/project_long_term/project_long_term.py | |
| parent | fe7e284a3158c6cf735500e72bfbbca310996b9c (diff) | |
| parent | 4356a354e448f160f81ea1890ff93c16b0c56125 (diff) | |
[MERGE]: Merge with lp:openobject-trunk-dev-addons2
bzr revid: ksa@tinyerp.co.in-20100929045618-5djfb3kqz0thlo73
Diffstat (limited to 'addons/project_long_term/project_long_term.py')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index a535015d067..9f8f5bf8d56 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -277,7 +277,6 @@ class project_phase(osv.osv): context = {} resource_pool = self.pool.get('resource.resource') uom_pool = self.pool.get('product.uom') - phase_resource = False if context is None: context = {} default_uom_id = self._get_default_uom_id(cr, uid) @@ -290,11 +289,11 @@ class project_phase(osv.osv): duration = str(avg_hours) + 'H' # Create a new project for each phase def Project(): + # If project has working calendar then that + # else the default one would be considered start = start_date minimum_time_unit = 1 resource = phase_resource_obj - # If project has working calendar then that - # else the default one would be considered if calendar_id: working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context) vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id)) |
