From 072c756759ff9012cbd1b0e03ee9b18ae9dfc2d2 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Thu, 11 Mar 2010 12:40:06 +0530 Subject: [IMP] project_long_term: Improve the module and bug fixes and overall cleaning bzr revid: mra@tinyerp.com-20100311071006-u6usdghqls7t4inl --- .../project_long_term/wizard/compute_tasks_date.py | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'addons/project_long_term/wizard/compute_tasks_date.py') diff --git a/addons/project_long_term/wizard/compute_tasks_date.py b/addons/project_long_term/wizard/compute_tasks_date.py index cc6a443a454..1187980057b 100644 --- a/addons/project_long_term/wizard/compute_tasks_date.py +++ b/addons/project_long_term/wizard/compute_tasks_date.py @@ -18,18 +18,17 @@ # along with this program. If not, see . # ############################################################################## - -import wizard -import pooler -from tools.translate import _ import datetime - from resource.faces import * from new import classobj import operator import working_calendar as wkcal +import wizard +import pooler +from tools.translate import _ + compute_form = """
@@ -105,7 +104,7 @@ class wizard_compute_tasks(wizard.interface): try: resource = reduce(operator.or_, resources) except: - raise wizard.except_wizard(_('MemberError'), _('Project must have members assigned !')) + raise wizard.except_wizard(_('Error'), _('Project must have members assigned !')) minimum_time_unit = 1 if calendar_id: # If project has calendar working_days = wkcal.compute_working_calendar(cr, uid, calendar_id) @@ -131,29 +130,30 @@ class wizard_compute_tasks(wizard.interface): s_date = t.start.to_datetime() e_date = t.end.to_datetime() if loop_no == 0: - project_obj.write(cr, uid, [project_id], {'date' : e_date}) + project_obj.write(cr, uid, [project_id], {'date' : e_date}, context=context) else: + ctx = context.copy() + ctx.update({'scheduler': True}) user_id = user_obj.search(cr, uid, [('name', '=', t.booked_resource[0].__name__)]) task_pool.write(cr, uid, [task_objs[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'), 'user_id': user_id[0]}, - context={'scheduler': True - }) + context=ctx) loop_no +=1 return {} states = { 'init': { 'actions': [], - 'result': {'type':'form', 'arch':compute_form, 'fields':compute_fields, 'state':[ + 'result': {'type': 'form', 'arch': compute_form, 'fields': compute_fields, 'state': [ ('end', 'Cancel'), ('compute', 'Compute') ]}, }, 'compute': { 'actions': [_compute_date], - 'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]}, + 'result': {'type': 'form','arch': success_msg,'fields': {}, 'state': [('end', 'Ok')]}, } } wizard_compute_tasks('wizard.compute.tasks') -# 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