diff --git a/ordr2/models/orders.py b/ordr2/models/orders.py index 1d21938..4aea105 100644 --- a/ordr2/models/orders.py +++ b/ordr2/models/orders.py @@ -107,9 +107,12 @@ class Order(Base): return '' if some_one: # in the new system a status change also stores the purchaser - return '{!s} by {!s}'.format(some_date, some_one) + return '{!s} by {!s}'.format( + some_date.strftime('%Y-%m-%d %H:%M'), + some_one + ) # historical data does not have a purchaser associated with a date - return '{!s}'.format(some_date) + return '{!s}'.format(some_date.strftime('%Y-%m-%d %H:%M')) @property def placed(self): diff --git a/ordr2/templates/orders/delete.jinja2 b/ordr2/templates/orders/delete.jinja2 index dba95fd..d6d8263 100755 --- a/ordr2/templates/orders/delete.jinja2 +++ b/ordr2/templates/orders/delete.jinja2 @@ -37,7 +37,7 @@ - {{ order.created_date }} + {{ order.created_date.strftime('%Y-%m-%d %H:%M') }} {{ order.cas_description }} {{ order.vendor }} diff --git a/ordr2/templates/orders/edit_multiple_stati.jinja2 b/ordr2/templates/orders/edit_multiple_stati.jinja2 index 930e09a..d048e21 100644 --- a/ordr2/templates/orders/edit_multiple_stati.jinja2 +++ b/ordr2/templates/orders/edit_multiple_stati.jinja2 @@ -35,7 +35,7 @@ {% for order in orders %} - {{ order.created_date }} + {{ order.created_date.strftime('%Y-%m-%d %H:%M') }} {{ order.cas_description }} {{ order.vendor }} {{ order.created_by }} diff --git a/ordr2/templates/orders/list.jinja2 b/ordr2/templates/orders/list.jinja2 index 336bf81..5178253 100644 --- a/ordr2/templates/orders/list.jinja2 +++ b/ordr2/templates/orders/list.jinja2 @@ -83,7 +83,7 @@ {% endif %} - {{ order.model.created_date }} + {{ order.model.created_date.strftime('%Y-%m-%d %H:%M') }} {{ order.model.cas_description }} {{ order.model.vendor }} {{ order.model.catalog_nr }}