diff options
| author | mra (Open ERP) <mra@tinyerp.com> | 2010-05-14 15:20:39 +0530 |
|---|---|---|
| committer | mra (Open ERP) <mra@tinyerp.com> | 2010-05-14 15:20:39 +0530 |
| commit | cf2c2eb3cc7bc83978773edb9b32afbc490e2263 (patch) | |
| tree | f1acb630f914fb60f1827bdd9e5ca12c22fe06ff /addons/project_long_term/wizard | |
| parent | 9adbbcab873a8709c360fc14a66d8c392048cda0 (diff) | |
| parent | 5d74da23f56c155bccb4ae30b61d78c26e85bb93 (diff) | |
[MERGE] Merge psi branch : lp:~psi-tinyerp/openobject-addons/trunk-mode3-yaml:
-Improve resource calendar leave form view
-put selection box for working time
-search View : set user_id from project phase by deafult
-date_deadline should not use to compute effectivity. should use date_end
bzr revid: mra@tinyerp.com-20100514095039-5fsaxmmftl64wmk9
Diffstat (limited to 'addons/project_long_term/wizard')
3 files changed, 3 insertions, 4 deletions
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py index ddf8ba315c0..5353db25be6 100644 --- a/addons/project_long_term/wizard/project_compute_phases.py +++ b/addons/project_long_term/wizard/project_compute_phases.py @@ -48,7 +48,6 @@ class project_compute_phases(osv.osv_memory): return self.compute_date(cr, uid, ids, context=context) def _phase_schedule(self, cr, uid, phase, start_date, calendar_id=False, context=None): - """Schedule phase with the start date till all the next phases are completed. Arguements: start_dsate -- start date for the phase diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py index 90d2b428580..b86f9d862c9 100644 --- a/addons/project_long_term/wizard/project_compute_tasks.py +++ b/addons/project_long_term/wizard/project_compute_tasks.py @@ -132,7 +132,7 @@ class project_compute_tasks(osv.osv_memory): ctx.update({'scheduler': True}) user_id = user_obj.search(cr, uid, [('name', '=', t.booked_resource[0].__name__)]) task_pool.write(cr, uid, [tasks[loop_no-1].id], {'date_start': s_date.strftime('%Y-%m-%d %H:%M:%S'), - 'date_deadline': e_date.strftime('%Y-%m-%d %H:%M:%S'), + 'date_end': e_date.strftime('%Y-%m-%d %H:%M:%S'), 'user_id': user_id[0]}, context=ctx) loop_no +=1 diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py index 2d0071547be..8ec2d4c16e0 100644 --- a/addons/project_long_term/wizard/project_schedule_tasks.py +++ b/addons/project_long_term/wizard/project_schedule_tasks.py @@ -65,7 +65,7 @@ class project_schedule_task(osv.osv_memory): {'__doc__': res.user_id.name, '__name__': res.user_id.name, 'vacation': tuple(leaves), - 'efficiency': resource_eff + 'efficiency': resource_eff, })) return resource_objs @@ -149,7 +149,7 @@ class project_schedule_task(osv.osv_memory): ctx.update({'scheduler': True}) user_id = user_obj.search(cr, uid, [('name', '=', t.booked_resource[0].__name__)]) task_obj.write(cr, uid, [tasks[loop_no-1].id], {'date_start': s_date.strftime('%Y-%m-%d %H:%M:%S'), - 'date_deadline': e_date.strftime('%Y-%m-%d %H:%M:%S'), + 'date_end': e_date.strftime('%Y-%m-%d %H:%M:%S'), 'user_id': user_id[0]}, context=ctx) loop_no +=1 |