inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-19 05:25:42 +00:00
Code Activity

Merge branch 'inventree:master' into matmair/issue2279

Browse Source
This commit is contained in:
Matthias Mair
2022-03-08 21:26:05 +01:00
committed by GitHub
parent 2c8e7ac810 8a8fd1b4ba
commit 0a9e85e801
29 changed files with 20091 additions and 18654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
InvenTree/part/templatetags/inventree_extras.py
View File

@ -5,7 +5,7 @@ This module provides template tags for extra functionality,
over and above the built-in Django tags.
"""
from datetime import date
from datetime import date, datetime
import os
import sys
@ -87,7 +87,9 @@ def render_date(context, date_object):
# Update the context cache
context['user_date_format'] = user_date_format
return date_object.strftime(user_date_format)
if isinstance(date_object, (datetime, date)):
return date_object.strftime(user_date_format)
return date_object
@register.simple_tag()