diff --git a/cor_custom/models/analytic.py b/cor_custom/models/analytic.py index dc79a27..458a670 100755 --- a/cor_custom/models/analytic.py +++ b/cor_custom/models/analytic.py @@ -133,38 +133,46 @@ class AccountAnalyticLine(models.Model): res = super(AccountAnalyticLine, self).export_data(fields) for index, val in enumerate(res['datas']): #print("task_id", fields_name) - if fields_name.get('date') and fields_name.get('date') >= 0: + #if fields_name.get('date') and fields_name.get('date') >= 0: + if fields_name.get('date') is not None: tdateindex = fields_name.get('date') tdate = res['datas'][index][tdateindex] if tdate: res['datas'][index][tdateindex] = datetime.strftime(tdate, "%d/%m/%Y") - if fields_name.get('start_datetime') and fields_name.get('start_datetime') >= 0: + #if fields_name.get('start_datetime') and fields_name.get('start_datetime') >= 0: + if fields_name.get('start_datetime') is not None: start_datetime_index = fields_name.get('start_datetime') start_datetime = res['datas'][index][start_datetime_index] if start_datetime: res['datas'][index][start_datetime_index] = datetime.strftime(start_datetime, "%d/%m/%Y %H:%M") - if fields_name.get('end_datetime') and fields_name.get('end_datetime') >= 0: + if fields_name.get('end_datetime') is not None: end_datetime_index = fields_name.get('end_datetime') end_datetime= res['datas'][index][end_datetime_index] if end_datetime: res['datas'][index][end_datetime_index] = datetime.strftime(end_datetime, "%d/%m/%Y %H:%M") - if fields_name.get('task_id') and fields_name.get('task_id') >= 0: + if fields_name.get('task_id') is not None: taskindex = fields_name.get('task_id') ttask = res['datas'][index][taskindex] if type(ttask) == bool: res['datas'][index][taskindex] = '' - if fields_name.get('start_time') and fields_name.get('start_time') >= 0: + if fields_name.get('start_time') is not None: starttimeindex = fields_name.get('start_time') starttime = float(res['datas'][index][starttimeindex]) if starttime: start_time = tools.format_duration(starttime) res['datas'][index][starttimeindex] = start_time - if fields_name.get('end_time') and fields_name.get('end_time') >= 0: + if fields_name.get('end_time') is not None: endtimeindex = fields_name.get('end_time') endtime = float(res['datas'][index][endtimeindex]) if endtime: end_time = tools.format_duration(endtime) res['datas'][index][endtimeindex] = end_time + if fields_name.get('unit_amount') is not None: + durationindex = fields_name.get('unit_amount') + duration = res['datas'][index][durationindex] and float(res['datas'][index][durationindex]) + if duration: + duration_time = tools.format_duration(duration) + res['datas'][index][durationindex] = duration_time return res @api.model