diff options
| author | atp (Open ERP) <atp@tinyerp.co.in> | 2010-06-22 10:45:44 +0530 |
|---|---|---|
| committer | atp (Open ERP) <atp@tinyerp.co.in> | 2010-06-22 10:45:44 +0530 |
| commit | b0efd26edd9f4e2aa75424b787ea46d2be15cd04 (patch) | |
| tree | e78cdb693e62a5c9a17f77a395eec51fb34becbf /addons/project/project_resource.py | |
| parent | 46bb1ea51be702758d68a5f69db32c82dbccf9bd (diff) | |
| parent | 2319190c5a20cb8095f85cacca89a33164ba93d7 (diff) | |
[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: atp@tinyerp.co.in-20100622051544-c7hig73zk2at66cy
Diffstat (limited to 'addons/project/project_resource.py')
| -rw-r--r-- | addons/project/project_resource.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/addons/project/project_resource.py b/addons/project/project_resource.py index 75dd94ad5a3..478fd4316bc 100644 --- a/addons/project/project_resource.py +++ b/addons/project/project_resource.py @@ -18,10 +18,10 @@ def leaves_resource(cr,uid,calendar_id,resource_id=False,resource_calendar=False resource_leaves_pool = pool.get('resource.calendar.leaves') leaves = [] if resource_id: - resource_leave_ids = resource_leaves_pool.search(cr,uid,['|',('calendar_id','=',calendar_id),('calendar_id','=',resource_calendar),('resource_id','=',resource_id)]) + resource_leave_ids = resource_leaves_pool.search(cr, uid, ['|',('calendar_id','=',calendar_id),('calendar_id','=',resource_calendar),('resource_id','=',resource_id)]) else: - resource_leave_ids = resource_leaves_pool.search(cr,uid,[('calendar_id','=',calendar_id),('resource_id','=',False)]) - res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to']) + resource_leave_ids = resource_leaves_pool.search(cr, uid, [('calendar_id','=',calendar_id),('resource_id','=',False)]) + res_leaves = resource_leaves_pool.read(cr, uid, resource_leave_ids, ['date_from','date_to']) for leave in range(len(res_leaves)): dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S') dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S') @@ -42,8 +42,8 @@ def compute_working_calendar(cr,uid,calendar_id): wk_time = {} wktime_list = [] wktime_cal = [] - week_ids = resource_week_pool.search(cr,uid,[('calendar_id','=',calendar_id)]) - week_obj = resource_week_pool.read(cr,uid,week_ids,['dayofweek','hour_from','hour_to']) + week_ids = resource_week_pool.search(cr, uid, [('calendar_id','=',calendar_id)]) + week_obj = resource_week_pool.read(cr, uid, week_ids, ['dayofweek','hour_from','hour_to']) # Converting time formats into appropriate format required # and creating a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')] @@ -53,8 +53,8 @@ def compute_working_calendar(cr,uid,calendar_id): day = wk[week['dayofweek']] wk_days[week['dayofweek']] = wk[week['dayofweek']] - hour_from_str = timeformat_convert(cr,uid,week['hour_from']) - hour_to_str = timeformat_convert(cr,uid,week['hour_to']) + hour_from_str = timeformat_convert(cr, uid, week['hour_from']) + hour_to_str = timeformat_convert(cr, uid, week['hour_to']) res_str = hour_from_str + '-' + hour_to_str wktime_list.append((day,res_str)) |