Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Nursing Task): unknown column duration error in Healthcare Activity (backport #440) #449

Merged
merged 3 commits into from
May 14, 2024
Merged

fix(Nursing Task): unknown column duration error in Healthcare Activity (backport #440) #449

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
248cf99
fix(Nursing Task): unknown column duration error in Healthcare Activity
Sajinsr May 7, 2024
6f26edc
Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr…
akurungadam May 13, 2024
4d9838c
Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr…
akurungadam May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion healthcare/healthcare/doctype/nursing_task/nursing_task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ def set_task_schedule(self):

if not self.requested_end_time:
if not self.duration:
self.duration = frappe.db.get_value("Healthcare Activity", self.activity, "duration")
self.duration = (
frappe.db.get_value("Healthcare Activity", self.activity, "activity_duration") or 0
)
self.requested_end_time = add_to_date(self.requested_start_time, seconds=self.duration)

# set date based on requested_start_time
Expand Down
Loading