Merge pull request #71 from wfmexpert/fix_43662

43662 fix date field
wfmexpert · Mar 26, 2024 · fb714c6 · fb714c6
2 parents 9197ae3 + 37bb93e
commit fb714c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name='verme-logs',
-    version='1.28.41',
+    version='1.28.42',
     packages=find_packages(),
     include_package_data=True,
     license='BSD License',  # example license

diff --git a/xlsexport/parsers.py b/xlsexport/parsers.py
@@ -10,6 +10,8 @@
 from django.db.models import Q
 from openpyxl import load_workbook
 
+HARDCODE_DATE_FORMAT = ('%d-%m-%Y', '%d.%m.%Y', '%d/%m/%Y')
+
 
 class CustomException(Exception):
     pass
@@ -330,7 +332,8 @@ def get_formatted_field(value, format, file_format):
                 try:
                     formatted_value = datetime.datetime.strptime(value, format)
                 except TypeError:
-                    if isinstance(value, datetime.datetime) and format == '%Y-%m-%d':
+                    # Для случаев, когда у модели поле вида Date, а не DateTime.
+                    if isinstance(value, datetime.datetime) and format in HARDCODE_DATE_FORMAT:
                         formatted_value = value.date()
                     else:
                         formatted_value = get_cell_date(value, file_format)