fix: inpatient date validation removed, added role perms
service unit defaults not set when created from tree, added validations on after_insert
diff --git a/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.py b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.py
index 9720078..9e0417a 100644
--- a/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.py
+++ b/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.py
@@ -22,7 +22,7 @@
super(HealthcareServiceUnit, self).on_update()
self.validate_one_root()
- def validate(self):
+ def after_insert(self):
if self.is_group:
self.allow_appointments = 0
self.overlap_appointments = 0
diff --git a/erpnext/healthcare/doctype/inpatient_record/inpatient_record.json b/erpnext/healthcare/doctype/inpatient_record/inpatient_record.json
index d383540..5ced845 100644
--- a/erpnext/healthcare/doctype/inpatient_record/inpatient_record.json
+++ b/erpnext/healthcare/doctype/inpatient_record/inpatient_record.json
@@ -229,7 +229,8 @@
"fieldname": "chief_complaint",
"fieldtype": "Table MultiSelect",
"label": "Chief Complaint",
- "options": "Patient Encounter Symptom"
+ "options": "Patient Encounter Symptom",
+ "permlevel": 1
},
{
"fieldname": "admission_instruction",
@@ -259,34 +260,40 @@
"collapsible": 1,
"fieldname": "medication_section",
"fieldtype": "Section Break",
- "label": "Medications"
+ "label": "Medications",
+ "permlevel": 1
},
{
"fieldname": "drug_prescription",
"fieldtype": "Table",
- "options": "Drug Prescription"
+ "options": "Drug Prescription",
+ "permlevel": 1
},
{
"collapsible": 1,
"fieldname": "investigations_section",
"fieldtype": "Section Break",
- "label": "Investigations"
+ "label": "Investigations",
+ "permlevel": 1
},
{
"fieldname": "lab_test_prescription",
"fieldtype": "Table",
- "options": "Lab Prescription"
+ "options": "Lab Prescription",
+ "permlevel": 1
},
{
"collapsible": 1,
"fieldname": "procedures_section",
"fieldtype": "Section Break",
- "label": "Procedures"
+ "label": "Procedures",
+ "permlevel": 1
},
{
"fieldname": "procedure_prescription",
"fieldtype": "Table",
- "options": "Procedure Prescription"
+ "options": "Procedure Prescription",
+ "permlevel": 1
},
{
"depends_on": "eval:(doc.status != \"Admission Scheduled\")",
@@ -320,7 +327,8 @@
},
{
"fieldname": "discharge_note",
- "fieldtype": "Text Editor"
+ "fieldtype": "Text Editor",
+ "permlevel": 1
},
{
"fetch_from": "admission_encounter.company",
@@ -335,7 +343,8 @@
"collapsible_depends_on": "eval:(doc.status == \"Admitted\")",
"fieldname": "encounter_details_section",
"fieldtype": "Section Break",
- "label": "Encounter Impression"
+ "label": "Encounter Impression",
+ "permlevel": 1
},
{
"fieldname": "column_break_29",
@@ -345,7 +354,8 @@
"fieldname": "diagnosis",
"fieldtype": "Table MultiSelect",
"label": "Diagnosis",
- "options": "Patient Encounter Diagnosis"
+ "options": "Patient Encounter Diagnosis",
+ "permlevel": 1
},
{
"fieldname": "followup_date",
@@ -375,7 +385,8 @@
"collapsible": 1,
"fieldname": "rehabilitation_section",
"fieldtype": "Section Break",
- "label": "Rehabilitation"
+ "label": "Rehabilitation",
+ "permlevel": 1
},
{
"fieldname": "therapy_plan",
@@ -383,12 +394,14 @@
"hidden": 1,
"label": "Therapy Plan",
"options": "Therapy Plan",
+ "permlevel": 1,
"read_only": 1
},
{
"fieldname": "therapies",
"fieldtype": "Table",
- "options": "Therapy Plan Detail"
+ "options": "Therapy Plan Detail",
+ "permlevel": 1
},
{
"fieldname": "discharge_date",
@@ -398,7 +411,7 @@
}
],
"links": [],
- "modified": "2020-05-21 00:37:12.939925",
+ "modified": "2020-05-21 02:26:22.144575",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Inpatient Record",
@@ -415,6 +428,42 @@
"role": "Healthcare Administrator",
"share": 1,
"write": 1
+ },
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Physician",
+ "share": 1,
+ "write": 1
+ },
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Nursing User",
+ "share": 1,
+ "write": 1
+ },
+ {
+ "permlevel": 1,
+ "read": 1,
+ "role": "Physician",
+ "write": 1
+ },
+ {
+ "permlevel": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Nursing User"
}
],
"restrict_to_domain": "Healthcare",
diff --git a/erpnext/healthcare/doctype/inpatient_record/inpatient_record.py b/erpnext/healthcare/doctype/inpatient_record/inpatient_record.py
index 8056074..802ab41 100644
--- a/erpnext/healthcare/doctype/inpatient_record/inpatient_record.py
+++ b/erpnext/healthcare/doctype/inpatient_record/inpatient_record.py
@@ -26,12 +26,9 @@
frappe.db.set_value("Patient", self.patient, "inpatient_record", None)
def validate_dates(self):
- if (getdate(self.scheduled_date) < getdate(today())) or \
- (getdate(self.admitted_datetime) < getdate(today())):
- frappe.throw(_("Scheduled and Admitted dates can not be less than today"))
if (getdate(self.expected_discharge) < getdate(self.scheduled_date)) or \
(getdate(self.discharge_ordered_date) < getdate(self.scheduled_date)):
- frappe.throw(_("Expected and Discharge dates cannot be less than Admission Schedule date"))
+ frappe.throw(_('Expected and Discharge dates cannot be less than Admission Schedule date'))
def validate_already_scheduled_or_admitted(self):
query = """