Merge pull request #24340 from ruchamahabal/make-ipme-entries-editable
fix: allow medication entries to be deleted from the table
diff --git a/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.js b/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.js
index ca97489..a7b06b1 100644
--- a/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.js
+++ b/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.js
@@ -5,6 +5,7 @@
refresh: function(frm) {
// Ignore cancellation of doctype on cancel all
frm.ignore_doctypes_on_cancel_all = ['Stock Entry'];
+ frm.fields_dict['medication_orders'].grid.wrapper.find('.grid-add-row').hide();
frm.set_query('item_code', () => {
return {
diff --git a/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.json b/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.json
index dd4c423..b1a6ee4 100644
--- a/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.json
+++ b/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.json
@@ -139,7 +139,6 @@
"fieldtype": "Table",
"label": "Inpatient Medication Orders",
"options": "Inpatient Medication Entry Detail",
- "read_only": 1,
"reqd": 1
},
{
@@ -180,7 +179,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2020-11-03 13:22:37.820707",
+ "modified": "2021-01-11 12:37:46.749659",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Inpatient Medication Entry",
diff --git a/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.py b/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.py
index 70ae713..bba5213 100644
--- a/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.py
+++ b/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.py
@@ -15,8 +15,6 @@
self.validate_medication_orders()
def get_medication_orders(self):
- self.validate_datetime_filters()
-
# pull inpatient medication orders based on selected filters
orders = get_pending_medication_orders(self)
@@ -27,22 +25,6 @@
self.set('medication_orders', [])
frappe.msgprint(_('No pending medication orders found for selected criteria'))
- def validate_datetime_filters(self):
- if self.from_date and self.to_date:
- self.validate_from_to_dates('from_date', 'to_date')
-
- if self.from_date and getdate(self.from_date) > getdate():
- frappe.throw(_('From Date cannot be after the current date.'))
-
- if self.to_date and getdate(self.to_date) > getdate():
- frappe.throw(_('To Date cannot be after the current date.'))
-
- if self.from_time and self.from_time > nowtime():
- frappe.throw(_('From Time cannot be after the current time.'))
-
- if self.to_time and self.to_time > nowtime():
- frappe.throw(_('To Time cannot be after the current time.'))
-
def add_mo_to_table(self, orders):
# Add medication orders in the child table
self.set('medication_orders', [])