Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Make Discharge Schedule Date as Datetime (#24940)

Browse Source 
* refactor: Make Discharge Schedule Date as Datetime

Like Admitted Datetime make discharge date as discharge datetime.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: Add patch for renaming discharge_date to discharge_datetime

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: quote style

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
This commit is contained in:
Syed Mujeer Hashmi 2021-03-23 17:48:25 +05:30 committed by GitHub
parent 23b32381e7
commit f114da2f67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/healthcare/doctype/inpatient_record/inpatient_record.json
View File

@ -53,7 +53,7 @@
"discharge_ordered_date", "discharge_ordered_date",
"discharge_practitioner", "discharge_practitioner",
"discharge_encounter", "discharge_encounter",
"discharge_date", "discharge_datetime",
"cb_discharge", "cb_discharge",
"discharge_instructions", "discharge_instructions",
"followup_date", "followup_date",
@ -404,14 +404,15 @@
"permlevel": 1 "permlevel": 1
}, },
{ {
"fieldname": "discharge_date", "fieldname": "discharge_datetime",
"fieldtype": "Date", "fieldtype": "Datetime",
"label": "Discharge Date", "label": "Discharge Date",
"read_only": 1 "read_only": 1
} }
], ],
"index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2020-05-21 02:26:22.144575", "modified": "2021-03-18 14:44:11.689956",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Healthcare", "module": "Healthcare",
"name": "Inpatient Record", "name": "Inpatient Record",

2
erpnext/healthcare/doctype/inpatient_record/inpatient_record.py
View File

@ -151,7 +151,7 @@ def check_out_inpatient(inpatient_record):
def discharge_patient(inpatient_record): def discharge_patient(inpatient_record):
validate_inpatient_invoicing(inpatient_record) validate_inpatient_invoicing(inpatient_record)
inpatient_record.discharge_date = today() inpatient_record.discharge_datetime = now_datetime()
inpatient_record.status = "Discharged" inpatient_record.status = "Discharged"
inpatient_record.save(ignore_permissions = True) inpatient_record.save(ignore_permissions = True)

1
erpnext/patches.txt
View File

@ -760,3 +760,4 @@ erpnext.patches.v13_0.setup_fields_for_80g_certificate_and_donation
erpnext.patches.v13_0.rename_membership_settings_to_non_profit_settings erpnext.patches.v13_0.rename_membership_settings_to_non_profit_settings
erpnext.patches.v13_0.setup_gratuity_rule_for_india_and_uae erpnext.patches.v13_0.setup_gratuity_rule_for_india_and_uae
execute:frappe.db.set_value('System Settings', None, 'app_name', 'ERPNext') execute:frappe.db.set_value('System Settings', None, 'app_name', 'ERPNext')
erpnext.patches.v13_0.rename_discharge_date_in_ip_record

8
erpnext/patches/v13_0/rename_discharge_date_in_ip_record.py Normal file
View File

@ -0,0 +1,8 @@
from __future__ import unicode_literals
import frappe
from frappe.model.utils.rename_field import rename_field
def execute():
frappe.reload_doc("Healthcare", "doctype", "Inpatient Record")
if frappe.db.has_column("Inpatient Record", "discharge_date"):
rename_field("Inpatient Record", "discharge_date", "discharge_datetime")