This repository was archived by the owner on Oct 26, 2026. It is now read-only.
Repository navigation
[ERP-4737] Fix timestamp comparison - #789
Merged
Adam Smith (ScriptSmith) merged 1 commit intoMay 21, 2026
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes a 500 (
TypeError: can't compare offset-naive and offset-aware datetimes) on form save: since the Django 5 upgrade flippedUSE_TZtoTrue,timezone.now()is now timezone-aware, but clinical-data timestamps stored before the upgrade are naive ISO strings, so comparing them during the form-progress currency calculation raised aTypeError. This normalises naive datetimes to aware inparse_iso_datetime(and the twoPatientcurrency helpers that compare stored timestamps) so legacy and new timestamps compare safely.