Merge pull request #703 from frappe/version-14-hotfix

frappe · Jul 19, 2023 · dd18161 · dd18161
2 parents cb9d5bc + 8b04fd8
commit dd18161
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/hrms/hr/doctype/employee_checkin/employee_checkin.py b/hrms/hr/doctype/employee_checkin/employee_checkin.py
@@ -21,7 +21,13 @@ def validate(self):
 
 	def validate_duplicate_log(self):
 		doc = frappe.db.exists(
-			"Employee Checkin", {"employee": self.employee, "time": self.time, "name": ["!=", self.name]}
+			"Employee Checkin",
+			{
+				"employee": self.employee,
+				"time": self.time,
+				"name": ("!=", self.name),
+				"log_type": self.log_type,
+			},
 		)
 		if doc:
 			doc_link = frappe.get_desk_link("Employee Checkin", doc)

diff --git a/hrms/public/node_modules b/hrms/public/node_modules