From bcad5e7606a4ff6cc80821baaa4dc2e73f9edb6d Mon Sep 17 00:00:00 2001 From: projectsodoo Date: Thu, 18 Feb 2021 13:57:46 +0530 Subject: [PATCH] Export code updated --- cor_custom/models/analytic.py | 9 +++++---- mail_outbound_static/README.rst | 0 mail_outbound_static/__init__.py | 0 mail_outbound_static/__manifest__.py | 0 mail_outbound_static/i18n/es.po | 0 mail_outbound_static/i18n/mail_outbound_static.pot | 0 mail_outbound_static/models/__init__.py | 0 mail_outbound_static/models/ir_mail_server.py | 0 mail_outbound_static/readme/CONTRIBUTORS.rst | 0 mail_outbound_static/readme/DESCRIPTION.rst | 0 mail_outbound_static/readme/ROADMAP.rst | 0 mail_outbound_static/readme/USAGE.rst | 0 mail_outbound_static/static/description/icon.png | Bin mail_outbound_static/static/description/index.html | 0 mail_outbound_static/tests/__init__.py | 0 mail_outbound_static/tests/test.msg | 0 mail_outbound_static/tests/test_ir_mail_server.py | 0 mail_outbound_static/views/ir_mail_server_view.xml | 0 18 files changed, 5 insertions(+), 4 deletions(-) mode change 100644 => 100755 mail_outbound_static/README.rst mode change 100644 => 100755 mail_outbound_static/__init__.py mode change 100644 => 100755 mail_outbound_static/__manifest__.py mode change 100644 => 100755 mail_outbound_static/i18n/es.po mode change 100644 => 100755 mail_outbound_static/i18n/mail_outbound_static.pot mode change 100644 => 100755 mail_outbound_static/models/__init__.py mode change 100644 => 100755 mail_outbound_static/models/ir_mail_server.py mode change 100644 => 100755 mail_outbound_static/readme/CONTRIBUTORS.rst mode change 100644 => 100755 mail_outbound_static/readme/DESCRIPTION.rst mode change 100644 => 100755 mail_outbound_static/readme/ROADMAP.rst mode change 100644 => 100755 mail_outbound_static/readme/USAGE.rst mode change 100644 => 100755 mail_outbound_static/static/description/icon.png mode change 100644 => 100755 mail_outbound_static/static/description/index.html mode change 100644 => 100755 mail_outbound_static/tests/__init__.py mode change 100644 => 100755 mail_outbound_static/tests/test.msg mode change 100644 => 100755 mail_outbound_static/tests/test_ir_mail_server.py mode change 100644 => 100755 mail_outbound_static/views/ir_mail_server_view.xml diff --git a/cor_custom/models/analytic.py b/cor_custom/models/analytic.py index 3df681a..2c123ea 100755 --- a/cor_custom/models/analytic.py +++ b/cor_custom/models/analytic.py @@ -118,23 +118,24 @@ 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('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/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