From 510b98adad8adec80e7dc09fde88c9f8452ae5e7 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 13:40:20 +0530 Subject: [PATCH 1/2] fix: allow checkin at the same time as last checkout (backport #621) (#701) Co-authored-by: Rucha Mahabal Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> --- hrms/hr/doctype/employee_checkin/employee_checkin.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hrms/hr/doctype/employee_checkin/employee_checkin.py b/hrms/hr/doctype/employee_checkin/employee_checkin.py index 77c89276cf..90eed4d760 100644 --- 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) From 8b04fd8dd9f6536389e5b6efadf25c58972a7c09 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 19 Jul 2023 16:12:35 +0530 Subject: [PATCH 2/2] fix: public folder leaked (#702) --- hrms/public/node_modules | 1 - 1 file changed, 1 deletion(-) delete mode 120000 hrms/public/node_modules diff --git a/hrms/public/node_modules b/hrms/public/node_modules deleted file mode 120000 index bd0ce1a672..0000000000 --- a/hrms/public/node_modules +++ /dev/null @@ -1 +0,0 @@ -/Users/ruchamahabal/frappe-bench/apps/hrms/node_modules \ No newline at end of file