pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merge from trunk addons

Browse Source 
bzr revid: mra@mra-laptop-20110103090825-h3f9ie8qu7l09ceb
This commit is contained in:
Mustufa Rangwala
2011-01-03 14:38:25 +05:30
parent 5fefd9f529 b7d5d7c008
commit 3bdca04e28
431 changed files with 26163 additions and 4518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project_long_term/project_long_term.py
+27 -73
View File
@@ -19,7 +19,7 @@
#
##############################################################################
from datetime import datetime
from datetime import datetime, timedelta
from dateutil.relativedelta import relativedelta
from tools.translate import _
from osv import fields, osv
@@ -105,8 +105,8 @@ class project_phase(osv.osv):
_columns = {
'name': fields.char("Name", size=64, required=True),
'date_start': fields.date('Start Date', help="Starting Date of the phase", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'date_end': fields.date('End Date', help="Ending Date of the phase", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'date_start': fields.date('Start Date', help="It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phases", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'date_end': fields.date('End Date', help=" It's computed by the scheduler according to the start date and the duration.", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'constraint_date_start': fields.date('Minimum Start Date', help='force the phase to start after this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'constraint_date_end': fields.date('Deadline', help='force the phase to finish before this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'project_id': fields.many2one('project.project', 'Project', required=True),
@@ -144,13 +144,6 @@ class project_phase(osv.osv):
result['date_start'] = project_id.date_start
return {'value': result}
def onchange_days(self, cr, uid, ids, project, context=None):
result = {}
for id in ids:
project_id = self.browse(cr, uid, id, context=context)
newdate = datetime.strptime(project_id.date_start, '%Y-%m-%d') + relativedelta(days=project_id.duration or 0.0)
result['date_end'] = newdate.strftime('%Y-%m-%d')
return {'value': result}
def _check_date_start(self, cr, uid, phase, date_end, context=None):
"""
@@ -192,55 +185,6 @@ class project_phase(osv.osv):
dt_end = work_times[-1][1].strftime('%Y-%m-%d')
self.write(cr, uid, [phase.id], {'date_start': date_start.strftime('%Y-%m-%d'), 'date_end': dt_end}, context=context)
def write(self, cr, uid, ids, vals, context=None):
resource_calendar_obj = self.pool.get('resource.calendar')
resource_obj = self.pool.get('resource.resource')
uom_obj = self.pool.get('product.uom')
if context is None:
context = {}
res = super(project_phase, self).write(cr, uid, ids, vals, context=context)
if context.get('scheduler',False):
return res
# Consider calendar and efficiency if the phase is performed by a resource
# otherwise consider the project's working calendar
#TOCHECK : why need this ?
if isinstance(ids, (int, long)):
ids = [ids]
default_uom_id = self._get_default_uom_id(cr, uid)
for phase in self.browse(cr, uid, ids, context=context):
calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)],context=context)
if resource_id:
cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id
if cal_id:
calendar_id = cal_id
avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
# Change the date_start and date_end
# for previous and next phases respectively based on valid condition
if vals.get('date_start', False) and vals['date_start'] < phase.date_start:
dt_start = datetime.strptime(vals['date_start'], '%Y-%m-%d')
work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, avg_hours or 0.0, resource_id and resource_id[0] or False)
if work_times:
vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d')
for prv_phase in phase.previous_phase_ids:
if prv_phase.id == phase.id:
continue
self._check_date_start(cr, uid, prv_phase, dt_start, context=context)
if vals.get('date_end', False) and vals['date_end'] > phase.date_end:
dt_end = datetime.strptime(vals['date_end'], '%Y-%m-%d')
work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, avg_hours or 0.0, resource_id and resource_id[0] or False)
if work_times:
vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d')
for next_phase in phase.next_phase_ids:
if next_phase.id == phase.id:
continue
self._check_date_end(cr, uid, next_phase, dt_end, context=context)
return res
def copy(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
@@ -291,9 +235,10 @@ class project_phase(osv.osv):
if context is None:
context = {}
resource_pool = self.pool.get('resource.resource')
data_pool = self.pool.get('ir.model.data')
resource_allocation_pool = self.pool.get('project.resource.allocation')
uom_pool = self.pool.get('product.uom')
default_uom_id = self._get_default_uom_id(cr, uid)
data_model, day_uom_id = data_pool.get_object_reference(cr, uid, 'product', 'uom_day')
for phase in self.browse(cr, uid, ids, context=context):
if not phase.responsible_id:
raise osv.except_osv(_('No responsible person assigned !'),_("You must assign a responsible person for phase '%s' !") % (phase.name,))
@@ -301,9 +246,11 @@ class project_phase(osv.osv):
if not start_date:
start_date = phase.project_id.date_start or phase.date_start or datetime.now().strftime("%Y-%m-%d")
start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d")
phase_resource_obj = resource_pool.generate_resources(cr, uid, [phase.responsible_id.id], calendar_id, context=context)
avg_hours = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
duration = str(avg_hours) + 'H'
phase_resource_obj = self.generate_resources(cr, uid, [phase.id], context=context)[phase.id]
avg_days = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration, day_uom_id)
if not phase_resource_obj: #TOCHECK: why need this ?
avg_days = avg_days - 1
duration = str(avg_days) + 'd'
# Create a new project for each phase
def Project():
# If project has working calendar then that
@@ -311,14 +258,17 @@ class project_phase(osv.osv):
start = start_date
minimum_time_unit = 1
resource = phase_resource_obj
working_hours_per_day = 24
vacation = []
if calendar_id:
working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
working_hours_per_day = 8 #TODO: it should be come from calendars
vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id))
working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
def phase():
effort = duration
project = Task.BalancedProject(Project)
s_date = project.phase.start.to_datetime()
e_date = project.phase.end.to_datetime()
# Recalculate date_start and date_end
@@ -347,10 +297,10 @@ class project_phase(osv.osv):
'date_end': end_date.strftime('%Y-%m-%d')
}, context=ctx)
# Recursive call till all the next phases scheduled
for phase in phase.next_phase_ids:
if phase.state in ['draft', 'open', 'pending']:
id_cal = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
self.generate_schedule(cr, uid, [phase.id], date_start, id_cal, context=context)
for next_phase in phase.next_phase_ids:
if next_phase.state in ['draft', 'open', 'pending']:
id_cal = next_phase.project_id.resource_calendar_id and next_phase.project_id.resource_calendar_id.id or False
self.generate_schedule(cr, uid, [next_phase.id], date_start+timedelta(days=1), id_cal, context=context)
else:
continue
return True
@@ -371,7 +321,7 @@ class project_phase(osv.osv):
start_date = datetime.now().strftime("%Y-%m-%d")
resources = resources_list.get(phase.id, [])
calendar_id = phase.project_id.resource_calendar_id.id
task_ids = map(lambda x : x.id, (filter(lambda x : x.state in ['open', 'draft', 'pending'] , phase.task_ids)))
task_ids = map(lambda x : x.id, (filter(lambda x : x.state in ['draft'] , phase.task_ids))) #reassign only task not yet started
if task_ids:
task_pool.generate_schedule(cr, uid, task_ids, resources, calendar_id, start_date, context=context)
@@ -507,6 +457,7 @@ class project_task(osv.osv):
"""
Schedule the tasks according to resource available and priority.
"""
resource_pool = self.pool.get('resource.resource')
if not ids:
return False
if context is None:
@@ -535,11 +486,14 @@ class project_task(osv.osv):
try:
resource = reduce(operator.or_, resources)
except:
raise osv.except_osv(_('Error'), _('Should have Resources Allocation or Project Members!'))
raise osv.except_osv(_('Error'), _('Resources should be allocated to your phases and Members should be assigned to your Project!'))
minimum_time_unit = 1
if calendar_id: # If project has working calendar
working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
working_hours_per_day = 24
vacation = []
if calendar_id:
working_hours_per_day = 8 #TODO: it should be come from calendars
vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id, context=context))
working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
# Dynamic creation of tasks
task_number = 0
for openobect_task in self.browse(cr, uid, ids, context=context):