Skip to content

Commit

Permalink
Fix instrument expiry date display in listing view (#2127)
Browse files Browse the repository at this point in the history
* Fix instrument expiry date

* Changelog updated
  • Loading branch information
ramonski committed Sep 11, 2022
1 parent 060f603 commit 430a247
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Changelog
2.3.0 (unreleased)
------------------

- #2127 Fix instrument expiry date display in listing view
- #2123 Add Sample Form: Save and Copy Action
- #2119 Fix linked client contact user can not see existing samples
- #2118 Customized Quickinstaller Configlet
Expand Down
5 changes: 2 additions & 3 deletions src/bika/lims/controlpanel/bika_instruments.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,8 @@ def folderitem(self, obj, item, index):
if expiry_date is None:
item["ExpiryDate"] = _("No date set")
else:

item["ExpiryDate"] = expiry_date.asdatetime().strftime(
self.date_format_short)
item["ExpiryDate"] = self.ulocalized_time(
expiry_date, long_format=0)

if obj.isOutOfDate():
item["WeeksToExpire"] = _("Out of date")
Expand Down

0 comments on commit 430a247

Please sign in to comment.