diff --git a/cor_custom/models/analytic.py b/cor_custom/models/analytic.py index a449304..a142200 100755 --- a/cor_custom/models/analytic.py +++ b/cor_custom/models/analytic.py @@ -132,23 +132,34 @@ class AccountAnalyticLine(models.Model): fields_name = dict(zip(fields, index)) res = super(AccountAnalyticLine, self).export_data(fields) for index, val in enumerate(res['datas']): - if fields_name.get('date') >= 0: + #print("task_id", fields_name) + if fields_name.get('date') and fields_name.get('date') >= 0: 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('task_id') >= 0: + if fields_name.get('start_datetime') and fields_name.get('start_datetime') >= 0: + 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: + 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: 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') >= 0: + if fields_name.get('start_time') and fields_name.get('start_time') >= 0: 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') >= 0: + if fields_name.get('end_time') and fields_name.get('end_time') >= 0: endtimeindex = fields_name.get('end_time') endtime = float(res['datas'][index][endtimeindex]) if endtime: diff --git a/cor_custom/report/project_hours_report_view.xml b/cor_custom/report/project_hours_report_view.xml index 6292df7..cce1b1b 100755 --- a/cor_custom/report/project_hours_report_view.xml +++ b/cor_custom/report/project_hours_report_view.xml @@ -70,17 +70,15 @@ project.consultant.hrs.report + date_stop="end_date" create="0" quick_add="False" + mode="month"> + Consultant Allocation diff --git a/mail_outbound_static/README.rst b/mail_outbound_static/README.rst old mode 100644 new mode 100755 diff --git a/mail_outbound_static/__init__.py b/mail_outbound_static/__init__.py old mode 100644 new mode 100755 diff --git a/mail_outbound_static/__manifest__.py b/mail_outbound_static/__manifest__.py old mode 100644 new mode 100755 diff --git a/mail_outbound_static/i18n/es.po b/mail_outbound_static/i18n/es.po old mode 100644 new mode 100755 diff --git a/mail_outbound_static/i18n/mail_outbound_static.pot b/mail_outbound_static/i18n/mail_outbound_static.pot old mode 100644 new mode 100755 diff --git a/mail_outbound_static/models/__init__.py b/mail_outbound_static/models/__init__.py old mode 100644 new mode 100755 diff --git a/mail_outbound_static/models/ir_mail_server.py b/mail_outbound_static/models/ir_mail_server.py old mode 100644 new mode 100755 diff --git a/mail_outbound_static/readme/CONTRIBUTORS.rst b/mail_outbound_static/readme/CONTRIBUTORS.rst old mode 100644 new mode 100755 diff --git a/mail_outbound_static/readme/DESCRIPTION.rst b/mail_outbound_static/readme/DESCRIPTION.rst old mode 100644 new mode 100755 diff --git a/mail_outbound_static/readme/ROADMAP.rst b/mail_outbound_static/readme/ROADMAP.rst old mode 100644 new mode 100755 diff --git a/mail_outbound_static/readme/USAGE.rst b/mail_outbound_static/readme/USAGE.rst old mode 100644 new mode 100755 diff --git a/mail_outbound_static/static/description/icon.png b/mail_outbound_static/static/description/icon.png old mode 100644 new mode 100755 diff --git a/mail_outbound_static/static/description/index.html b/mail_outbound_static/static/description/index.html old mode 100644 new mode 100755 diff --git a/mail_outbound_static/tests/__init__.py b/mail_outbound_static/tests/__init__.py old mode 100644 new mode 100755 diff --git a/mail_outbound_static/tests/test.msg b/mail_outbound_static/tests/test.msg old mode 100644 new mode 100755 diff --git a/mail_outbound_static/tests/test_ir_mail_server.py b/mail_outbound_static/tests/test_ir_mail_server.py old mode 100644 new mode 100755 diff --git a/mail_outbound_static/views/ir_mail_server_view.xml b/mail_outbound_static/views/ir_mail_server_view.xml old mode 100644 new mode 100755