From 80cc3fca7e51f8690bfeb265fe403eb53987fea8 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Wed, 12 May 2010 17:14:34 +0530 Subject: [FIX] project_long_term: if user has not assighned resource bzr revid: mra@tinyerp.com-20100512114434-v5pu7p7r7gwvtpl7 --- addons/project_long_term/project_long_term.py | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 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 deff634aa68..8e67bc23766 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -350,20 +350,20 @@ class task(osv.osv): # Change the date_start and date_end # for previous and next tasks respectively based on valid condition - if vals.get('date_start', False) and vals['date_start'] < task_rec.date_start: - dt_start = mx.DateTime.strptime(vals['date_start'], '%Y-%m-%d %H:%M:%S') - work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, hrs or 0.0, resource.id or False) - if work_times: - vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') - for prv_task in task_rec.parent_ids: - self._check_date_start(cr, uid, prv_task, dt_start) - if vals.get('date_end', False) and vals['date_end'] > task_rec.date_end: - dt_end = mx.DateTime.strptime(vals['date_end'], '%Y-%m-%d %H:%M:%S') - work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, hrs or 0.0, resource.id or False) - if work_times: - vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S') - for next_task in task_rec.child_ids: - self._check_date_end(cr, uid, next_task, dt_end) + if vals.get('date_start', False) and vals['date_start'] < task_rec.date_start: + dt_start = mx.DateTime.strptime(vals['date_start'], '%Y-%m-%d %H:%M:%S') + work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, hrs or 0.0, resource.id or False) + if work_times: + vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S') + for prv_task in task_rec.parent_ids: + self._check_date_start(cr, uid, prv_task, dt_start) + if vals.get('date_end', False) and vals['date_end'] > task_rec.date_end: + dt_end = mx.DateTime.strptime(vals['date_end'], '%Y-%m-%d %H:%M:%S') + work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, hrs or 0.0, resource.id or False) + if work_times: + vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S') + for next_task in task_rec.child_ids: + self._check_date_end(cr, uid, next_task, dt_end) return super(task, self).write(cr, uid, ids, vals, context=context) -- cgit v1.2.3 From 22e38ea30b376bb7845fec26b4fec78453de4114 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Fri, 14 May 2010 14:45:02 +0530 Subject: [IMP] (task id=740) changes according to technical meeting review bzr revid: psi@tinyerp.co.in-20100514091502-ln2doe2ev1h70q58 --- addons/project_long_term/project_long_term.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 8e67bc23766..a925aeeb7aa 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -85,8 +85,8 @@ class project_phase(osv.osv): _columns = { 'name': fields.char("Phase Name", size=64, required=True), - 'date_start': fields.datetime('Starting Date'), - 'date_end': fields.datetime('End Date'), + 'date_start': fields.datetime('Starting Date', help="Start date of the phase"), + 'date_end': fields.datetime('End Date', help="End date of the phase"), 'constraint_date_start': fields.datetime('Start Date', help='force the phase to start after this date'), 'constraint_date_end': fields.datetime('End Date', help='force the phase to finish before this date'), 'project_id': fields.many2one('project.project', 'Project', required=True), @@ -104,8 +104,8 @@ class project_phase(osv.osv): } _defaults = { 'responsible_id': lambda obj,cr,uid,context: uid, - 'state': lambda *a: 'draft', - 'sequence': lambda *a: 10, + 'state': 'draft', + 'sequence': 10, } _order = "name" _constraints = [ @@ -237,7 +237,7 @@ class project_resource_allocation(osv.osv): 'useability': fields.float('Useability', help="Useability of this ressource for this project phase in percentage (=50%)"), } _defaults = { - 'useability': lambda *a: 100, + 'useability': 100, } project_resource_allocation() @@ -261,7 +261,7 @@ class task(osv.osv): 'planned_hours': fields.float('Planned Hours', required=True, help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'), } _defaults = { - 'occupation_rate':lambda *a: '1' + 'occupation_rate': '1' } def onchange_planned(self, cr, uid, ids, project, user_id=False, planned=0.0, effective=0.0, date_start=None, occupation_rate=0.0): @@ -368,4 +368,4 @@ class task(osv.osv): return super(task, self).write(cr, uid, ids, vals, context=context) task() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file -- cgit v1.2.3 From a3dd9f05dcd54cc3e8b99fb6026f42e85d32cb8d Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 19 May 2010 20:32:32 +0200 Subject: [FIX] 3 security rules, [IMP] object names for logs bzr revid: fp@tinyerp.com-20100519183232-9zieyfnah526r312 --- addons/project_long_term/project_long_term.py | 4 +--- 1 file changed, 1 insertion(+), 3 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 a925aeeb7aa..ebcc62b7bc3 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -244,7 +244,6 @@ project_resource_allocation() class project(osv.osv): _inherit = "project.project" - _description = "Project" _columns = { 'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"), 'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"), @@ -254,7 +253,6 @@ project() class task(osv.osv): _inherit = "project.task" - _description = "Task" _columns = { 'phase_id': fields.many2one('project.phase', 'Project Phase'), 'occupation_rate': fields.float('Occupation Rate', help='The occupation rate fields indicates how much of his time a user is working on a task. A 100% occupation rate means the user works full time on the tasks. The ending date of a task is computed like this: Starting Date + Duration / Occupation Rate.'), @@ -368,4 +366,4 @@ class task(osv.osv): return super(task, self).write(cr, uid, ids, vals, context=context) task() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3