diff --git a/one_fm/one_fm/doctype/attendance_check/attendance_check.py b/one_fm/one_fm/doctype/attendance_check/attendance_check.py index 340dc17ca0..d2f4b7a2b5 100644 --- a/one_fm/one_fm/doctype/attendance_check/attendance_check.py +++ b/one_fm/one_fm/doctype/attendance_check/attendance_check.py @@ -70,7 +70,7 @@ def before_insert(self): # check shift permission shift_permission = frappe.db.get_value("Shift Permission", { "employee":self.employee, "date":self.date, "roster_type":self.roster_type, "docstatus":["!=", 0]}, - ["name", "date"], as_dict=1 + ["name"] ) if shift_permission: self.shift_permission = shift_permission diff --git a/one_fm/purchase/doctype/request_for_material/request_for_material.js b/one_fm/purchase/doctype/request_for_material/request_for_material.js index 85fe1f15a0..f40d4b8f58 100644 --- a/one_fm/purchase/doctype/request_for_material/request_for_material.js +++ b/one_fm/purchase/doctype/request_for_material/request_for_material.js @@ -76,6 +76,10 @@ frappe.ui.form.on('Request for Material', { frm.set_df_property('type', 'options', "\nIndividual\nDepartment\nProject\nOnboarding"); } } + if(frm.doc.workflow_state == "Approved" || frm.doc.workflow_state == "Rejected"){ + frm.set_df_property('items', 'allow_on_submit', 0); + frm.set_df_property('items', 'read_only', 1); + } if(frm.is_new()){ frappe.call({ doc: frm.doc,