From c2310c8ec915eacb66fa4dc14c4f5eeedba88fec Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Wed, 19 Jan 2011 11:10:36 +0530 Subject: [PATCH 1/8] [FIX]: Fix date not defined problem. bzr revid: atp@tinyerp.com-20110119054036-kowoc9x61g5179ir --- addons/base_calendar/base_calendar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 5bc12c69671..0f5848c286e 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -19,7 +19,7 @@ # ############################################################################## -from datetime import datetime, timedelta +from datetime import datetime, timedelta, date from dateutil import parser from dateutil import rrule from osv import fields, osv From 09c20f3890b24cbb165d563a57b574efd376be34 Mon Sep 17 00:00:00 2001 From: "Sbh (OpenERP)" Date: Wed, 19 Jan 2011 12:56:54 +0530 Subject: [PATCH 2/8] [Fix] crm: make the readonly rrule bzr revid: sbh@tinyerp.com-20110119072654-yy1umehx10oy7s1k --- addons/crm/crm_meeting_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index 960f83e43c9..aa74b0c91c5 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -70,7 +70,7 @@ - + From b965ec4ad094b4523c5bba96f5db57d923dd042a Mon Sep 17 00:00:00 2001 From: "Sbh (OpenERP)" Date: Wed, 19 Jan 2011 13:34:30 +0530 Subject: [PATCH 3/8] [FIX] base_calendar : TFR changes reverted bzr revid: sbh@tinyerp.com-20110119080430-feb2kpnys7nl7rgn --- addons/base_calendar/base_calendar.py | 62 ++++++++------------------- 1 file changed, 17 insertions(+), 45 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 0f5848c286e..98aea630ef1 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -19,7 +19,7 @@ # ############################################################################## -from datetime import datetime, timedelta, date +from datetime import datetime, timedelta from dateutil import parser from dateutil import rrule from osv import fields, osv @@ -30,7 +30,6 @@ import re import time import tools - months = { 1: "January", 2: "February", 3: "March", 4: "April", \ 5: "May", 6: "June", 7: "July", 8: "August", 9: "September", \ @@ -1081,6 +1080,8 @@ class calendar_event(osv.osv): for datas in self.read(cr, uid, ids, context=context): event = datas['id'] if datas.get('rrule_type'): + if datas['rrule_type']=='daily_working': + datas.update({'rrule_type': 'weekly'}) if datas.get('rrule_type') == 'none': result[event] = False cr.execute("UPDATE %s set exrule=Null where id=%%s" % self._table,( event,)) @@ -1266,8 +1267,6 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ until_date = base_until_date and datetime.strptime(base_until_date[:10]+ ' 23:59:59', "%Y-%m-%d %H:%M:%S") or False if count > limit: break - if not data['date']: - continue event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S") # To check: If the start date is replace by event date .. the event date will be changed by that of calendar code start_date = event_date @@ -1401,9 +1400,10 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ continue until_date = arg[2] res = super(calendar_event, self).search(cr, uid, args_without_date, \ - offset, limit, order, context, count=False) + offset, limit, order, context, count) + res = self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit) - return len(res) if count else res + return res def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True): """ @@ -1415,7 +1415,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ @param vals: Dictionary of field value. @param context: A standard dictionary for contextual values @return: True - """ + """ if context is None: context = {} if isinstance(ids, (str, int, long)): @@ -1425,26 +1425,19 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ new_ids = [] res = False for event_id in select: - real_event_id = base_calendar_id2real_id(event_id) - - event = self.browse(cr,uid, event_id, context=context) - if('edit_all' in vals): - edit_all = vals['edit_all'] - else: - edit_all = event.edit_all or not event.recurrency - - if not edit_all: + real_event_id = base_calendar_id2real_id(event_id) + if len(str(event_id).split('-')) > 1: data = self.read(cr, uid, event_id, ['date', 'date_deadline', \ 'rrule', 'duration']) if data.get('rrule'): - data.update(vals) data.update({ + 'recurrent_uid': real_event_id, + 'recurrent_id': data.get('date'), 'rrule_type': 'none', 'rrule': '' }) - + data.update(vals) new_id = self.copy(cr, uid, real_event_id, default=data, context=context) - self.unlink(cr, uid, [event_id], context=context) context.update({'active_id': new_id, 'active_ids': [new_id]}) continue if not real_event_id in new_ids: @@ -1461,7 +1454,6 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ context=context) vals.update(updated_vals.get('value', {})) - if new_ids: res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context) @@ -1523,8 +1515,6 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ for base_calendar_id, real_id in select: #REVET: Revision ID: olt@tinyerp.com-20100924131709-cqsd1ut234ni6txn res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, load=load) - if not res: - res = {} ls = base_calendar_id2real_id(base_calendar_id, with_date=res and res.get('duration', 0) or 0) if not isinstance(ls, (str, int, long)) and len(ls) >= 2: res['date'] = ls[1] @@ -1563,30 +1553,21 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ @return: True """ res = False - for event_datas in self.read(cr, uid, ids, ['date', 'rrule', 'exdate', 'edit_all'], context=context): + for event_datas in self.read(cr, uid, ids, ['date', 'rrule', 'exdate'], context=context): event_id = event_datas['id'] - edit_all = event_datas.get('edit_all', False) if isinstance(event_id, (int, long)): res = super(calendar_event, self).unlink(cr, uid, event_id, context=context) self.pool.get('res.alarm').do_alarm_unlink(cr, uid, [event_id], self._name) self.unlink_events(cr, uid, [event_id], context=context) else: - select = event_id.split('-') - if(len(select) < 2): - str_event = event_id - date_new = time.strftime("%Y%m%d%H%M%S", \ - time.strptime(event_datas['date'], "%Y-%m-%d %H:%M:%S")) - else: - str_event, date_new = select - - + str_event, date_new = event_id.split('-') event_id = int(str_event) - if event_datas['rrule'] and not edit_all: + if event_datas['rrule']: # Remove one of the recurrent event date_new = time.strftime("%Y%m%dT%H%M%S", \ time.strptime(date_new, "%Y%m%d%H%M%S")) exdate = (event_datas['exdate'] and (event_datas['exdate'] + ',') or '') + date_new - res = super(calendar_event, self).write(cr, uid, [event_id], {'exdate': exdate}) + res = self.write(cr, uid, [event_id], {'exdate': exdate}) else: res = super(calendar_event, self).unlink(cr, uid, [event_id], context=context) self.pool.get('res.alarm').do_alarm_unlink(cr, uid, [event_id], self._name) @@ -1620,9 +1601,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ res = super(calendar_event, self).create(cr, uid, vals, context) alarm_obj = self.pool.get('res.alarm') alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context) - records = self.browse(cr, uid, [res], context=context) - #return real_id2base_calendar_id(records[0].id, records[0].date) - return base_calendar_id2real_id(records[0].id) + return res def do_tentative(self, cr, uid, ids, context=None, *args): """ Makes event invitation as Tentative @@ -1745,13 +1724,6 @@ class ir_attachment(osv.osv): return super(ir_attachment, self).search(cr, uid, new_args, offset=offset, limit=limit, order=order, context=context, count=False) - - def create(self, cr, uid, vals, context=None): - if context: - id = context.get('default_res_id', False) - context.update({'default_res_id' : base_calendar_id2real_id(id)}) - return super(ir_attachment, self).create(cr, uid, vals, context=context) - ir_attachment() class ir_values(osv.osv): From 9913744c25d9a16f022772e827d96e3d9bb56163 Mon Sep 17 00:00:00 2001 From: "Sbh (OpenERP)" Date: Wed, 19 Jan 2011 13:38:26 +0530 Subject: [PATCH 4/8] [FIX] base_caelndar : import date added fixed bzr revid: sbh@tinyerp.com-20110119080826-72867u082nclm4al --- addons/base_calendar/base_calendar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 98aea630ef1..5567a5583b5 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -19,7 +19,7 @@ # ############################################################################## -from datetime import datetime, timedelta +from datetime import datetime, timedelta, date from dateutil import parser from dateutil import rrule from osv import fields, osv From cfae76c87640b1548b3890580406a147e1d606b6 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Wed, 19 Jan 2011 18:40:55 +0530 Subject: [PATCH 5/8] [FIX] crm: Recurrent meetings should not be allowed to set recurrent again. bzr revid: uco@tinyerp.com-20110119131055-qj9yg4y2d96gwka6 --- addons/crm/crm_meeting_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml index aa74b0c91c5..3ae0a49e72d 100644 --- a/addons/crm/crm_meeting_view.xml +++ b/addons/crm/crm_meeting_view.xml @@ -43,7 +43,7 @@ - + @@ -165,7 +165,7 @@ - + From 62a08860f4bcc9489dd678e7741f6bb16203dcf1 Mon Sep 17 00:00:00 2001 From: jam-openerp Date: Thu, 20 Jan 2011 11:16:30 +0530 Subject: [PATCH 6/8] [IMP] project_long_term : Resource allocation Scheduling Warning Message Improved bzr revid: jam@tinyerp.com-20110120054630-5iat436nbtuj9p62 --- addons/project_long_term/project_long_term.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 0e605ed4331..f8b91a200b5 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -368,7 +368,7 @@ def Phase_%d(): try: phase = Task.BalancedProject(Phase) except : - raise osv.except_osv(_('Error !'),_('Phase Scheduling is not possible.\nProject should have the Start date and member for scheduling.')) + raise osv.except_osv(_('Error !'),_('Invalid Project Members.\nPhase Scheduling is not possible.')) for task_id in task_ids: @@ -515,7 +515,7 @@ def Project_%d(): try: project = Task.BalancedProject(Project) except : - raise osv.except_osv(_('Error !'),_('Phase Scheduling is not possible.\nProject should have the Start date and member for scheduling.')) + raise osv.except_osv(_('Error !'),_('Invalid Project Members.\nPhase Scheduling is not possible.')) for phase_id in phase_ids: act_phase = phase_pool.browse(cr, uid, phase_id, context=context) From e286c21c27c303a45fbcf5eaf7a42effed71d0a1 Mon Sep 17 00:00:00 2001 From: jam-openerp Date: Thu, 20 Jan 2011 12:43:22 +0530 Subject: [PATCH 7/8] [IMP] project_long_term : Added new warning for the Phase Scheduling when invalid resource allocation done by user bzr revid: jam@tinyerp.com-20110120071322-b638ot2x2cth9lam --- addons/project_long_term/project_long_term.py | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index f8b91a200b5..ecc47a50f9d 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -444,6 +444,26 @@ class project(osv.osv): data_pool = self.pool.get('ir.model.data') resource_allocation_pool = self.pool.get('project.resource.allocation') data_model, day_uom_id = data_pool.get_object_reference(cr, uid, 'product', 'uom_day') + + #Checking the Valid Phase resource allocation from project member + for project in self.browse(cr, uid, ids, context=context): + flag = False + res_msg = '' + memebrs_ids = [] + resource_user_ids = [] + if project.members: + memebrs_ids = [use.id for use in project.members] + phase_ids = phase_pool.search(cr, uid, [('project_id', '=', project.id)], context=context) + if phase_ids: + for phase in phase_pool.browse(cr, uid, phase_ids, context=context): + if phase.resource_ids: + res_ids = [ re.id for re in phase.resource_ids] + for res in resource_allocation_pool.browse(cr, uid,res_ids, context=context): + if res.resource_id.user_id.id not in memebrs_ids: + res_msg += " '%s' %s , "%(res.resource_id.name,res.resource_id.user_id.name) + flag = True + if flag: + raise osv.except_osv(_('Warning !'),_("Resource %s is/are not Members of the Project '%s' .")%(res_msg[:-3], project.name)) for project in self.browse(cr, uid, ids, context=context): root_phase_ids = phase_pool.search(cr, uid, [('project_id', '=', project.id), From 21f2b42e92e2661b43c1770c954003967353e110 Mon Sep 17 00:00:00 2001 From: jam-openerp Date: Thu, 20 Jan 2011 14:23:36 +0530 Subject: [PATCH 8/8] [IMP] project_long_term : adding logger for Scheduling Traceback bzr revid: jam@tinyerp.com-20110120085336-wsqwuctt3g0tcnkn --- addons/project_long_term/project_long_term.py | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index ecc47a50f9d..af2e5f76f37 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -23,6 +23,7 @@ from datetime import datetime from tools.translate import _ from osv import fields, osv from resource.faces import task as Task +import logging class project_phase(osv.osv): _name = "project.phase" @@ -360,17 +361,18 @@ def Phase_%d(): parent = task task_ids.append(task.id) func_str += cls_str - + phase_id = phase.id # Allocating Memory for the required Project and Pahses and Resources exec(func_str) Phase = eval('Phase_%d' % phase.id) phase = None try: phase = Task.BalancedProject(Phase) - except : - raise osv.except_osv(_('Error !'),_('Invalid Project Members.\nPhase Scheduling is not possible.')) - - + except Exception, e: + import traceback + logging.getLogger('project').warning("Error on sheduling tasks of phase#%s: %s \n%s",phase_id, str(e), traceback.format_exc()) + raise osv.except_osv(_('Error !'),_('Sorry, Phase Scheduling is not possible due to some errors. Please check traceback in server log for more.')) + for task_id in task_ids: task = eval("phase.Task_%d" % task_id) start_date = task.start.to_datetime() @@ -528,14 +530,17 @@ def Project_%d(): func_str += phases phase_ids += child_phase_ids + project_id = project.id # Allocating Memory for the required Project and Pahses and Resources exec(func_str) Project = eval('Project_%d' % project.id) project = None try: project = Task.BalancedProject(Project) - except : - raise osv.except_osv(_('Error !'),_('Invalid Project Members.\nPhase Scheduling is not possible.')) + except Exception, e: + import traceback + logging.getLogger('project').warning("Error on sheduling phases of project#%s: %s \n%s", project_id, str(e), traceback.format_exc()) + raise osv.except_osv(_('Error !'),_('Sorry, Phase Scheduling is not possible due to some errors. Please check traceback in server log for more.')) for phase_id in phase_ids: act_phase = phase_pool.browse(cr, uid, phase_id, context=context) @@ -667,7 +672,7 @@ def Project_%d(): try: project = Task.BalancedProject(Project) except : - raise osv.except_osv(_('Error !'),_('Phase Scheduling is not possible.\nProject should have the Start date and member for scheduling.')) + raise osv.except_osv(_('Error !'),_('Task Scheduling is not possible.\nProject should have the Start date for scheduling.')) for task_id in task_ids: task = eval("project.Task_%d" % task_id)