chore: release v15 beta

hrms/hooks.py

@@ -159,6 +159,10 @@
  "hrms.overrides.company.set_default_hr_accounts",
  ],
  },
+ "Holiday List": {
+ "on_update": "hrms.utils.holiday_list.invalidate_cache",
+ "on_trash": "hrms.utils.holiday_list.invalidate_cache",
+ },
  "Timesheet": {"validate": "hrms.hr.utils.validate_active_employee"},
  "Payment Entry": {
  "on_submit": "hrms.hr.doctype.expense_claim.expense_claim.update_payment_for_expense_claim",

hrms/hr/doctype/full_and_final_statement/full_and_final_statement.py

@@ -8,8 +8,11 @@
 
 
 class FullandFinalStatement(Document):
- def validate(self):
+ def before_insert(self):
  self.get_outstanding_statements()
+
+ def validate(self):
+ self.get_assets_statements()
  if self.docstatus == 1:
  self.validate_settlement("payables")
  self.validate_settlement("receivables")
@@ -34,15 +37,17 @@ def get_outstanding_statements(self):
  if not len(self.get("receivables", [])):
  components = self.get_receivable_component()
  self.create_component_row(components, "receivables")
-
- if not len(self.get("assets_allocated", [])):
- for data in self.get_assets_movement():
- self.append("assets_allocated", data)
+ self.get_assets_statements()
  else:
  frappe.throw(
  _("Set Relieving Date for Employee: {0}").format(get_link_to_form("Employee", self.employee))
  )
 
+ def get_assets_statements(self):
+ if not len(self.get("assets_allocated", [])):
+ for data in self.get_assets_movement():
+ self.append("assets_allocated", data)
+
  def create_component_row(self, components, component_type):
  for component in components:
  self.append(

hrms/hr/doctype/leave_allocation/leave_allocation.py

@@ -53,9 +53,8 @@ def validate_leave_days_and_dates(self):
  def validate_leave_allocation_days(self):
  company = frappe.db.get_value("Employee", self.employee, "company")
  leave_period = get_leave_period(self.from_date, self.to_date, company)
- max_leaves_allowed = flt(
- frappe.db.get_value("Leave Type", self.leave_type, "max_leaves_allowed")
- )
+ max_leaves_allowed = frappe.db.get_value("Leave Type", self.leave_type, "max_leaves_allowed")
+
  if max_leaves_allowed > 0:
  leave_allocated = 0
  if leave_period:
@@ -251,8 +250,8 @@ def set_total_leaves_allocated(self):
 
  def limit_carry_forward_based_on_max_allowed_leaves(self):
  max_leaves_allowed = frappe.db.get_value("Leave Type", self.leave_type, "max_leaves_allowed")
- if max_leaves_allowed and self.total_leaves_allocated > flt(max_leaves_allowed):
- self.total_leaves_allocated = flt(max_leaves_allowed)
+ if max_leaves_allowed and self.total_leaves_allocated > max_leaves_allowed:
+ self.total_leaves_allocated = max_leaves_allowed
  self.unused_leaves = max_leaves_allowed - flt(self.new_leaves_allocated)
 
  def set_carry_forwarded_leaves_in_previous_allocation(self, on_cancel=False):

hrms/hr/doctype/leave_application/leave_application.py

@@ -1305,3 +1305,7 @@ def get_leave_approver(employee):
  )
 
  return leave_approver
+
+
+def on_doctype_update():
+ frappe.db.add_index("Leave Application", ["employee", "from_date", "to_date"])

hrms/hr/doctype/leave_type/leave_type.json

@@ -50,7 +50,7 @@
  },
  {
  "fieldname": "max_leaves_allowed",
- "fieldtype": "Int",
+ "fieldtype": "Float",
  "label": "Maximum Leave Allocation Allowed"
  },
  {

hrms/hr/doctype/leave_type/leave_type.py

@@ -48,3 +48,9 @@ def validate_leave_types(self):
  self.fraction_of_daily_salary_per_leave < 0 or self.fraction_of_daily_salary_per_leave > 1
  ):
  frappe.throw(_("The fraction of Daily Salary per Leave should be between 0 and 1"))
+
+ def clear_cache(self):
+ from hrms.payroll.doctype.salary_slip.salary_slip import LEAVE_TYPE_MAP
+
+ frappe.cache.delete_value(LEAVE_TYPE_MAP)
+ return super().clear_cache()

hrms/hr/doctype/shift_type/shift_type.json

@@ -23,10 +23,10 @@
  "process_attendance_after",
  "last_sync_of_checkin",
  "grace_period_settings_auto_attendance_section",
- "enable_entry_grace_period",
+ "enable_late_entry_marking",
  "late_entry_grace_period",
  "column_break_18",
- "enable_exit_grace_period",
+ "enable_early_exit_marking",
  "early_exit_grace_period"
  ],
  "fields": [
@@ -92,13 +92,7 @@
  "label": "Begin check-in before shift start time (in minutes)"
  },
  {
- "default": "0",
- "fieldname": "enable_entry_grace_period",
- "fieldtype": "Check",
- "label": "Enable Entry Grace Period"
- },
- {
- "depends_on": "enable_entry_grace_period",
+ "depends_on": "enable_late_entry_marking",
  "description": "The time after the shift start time when check-in is considered as late (in minutes).",
  "fieldname": "late_entry_grace_period",
  "fieldtype": "Int",
@@ -109,13 +103,7 @@
  "fieldtype": "Column Break"
  },
  {
- "default": "0",
- "fieldname": "enable_exit_grace_period",
- "fieldtype": "Check",
- "label": "Enable Exit Grace Period"
- },
- {
- "depends_on": "eval:doc.enable_exit_grace_period",
+ "depends_on": "enable_early_exit_marking",
  "description": "The time before the shift end time when check-out is considered as early (in minutes).",
  "fieldname": "early_exit_grace_period",
  "fieldtype": "Int",
@@ -138,7 +126,7 @@
  "depends_on": "enable_auto_attendance",
  "fieldname": "grace_period_settings_auto_attendance_section",
  "fieldtype": "Section Break",
- "label": "Grace Period Settings For Auto Attendance"
+ "label": "Late Entry & Early Exit Settings for Auto Attendance"
  },
  {
  "default": "0",
@@ -165,10 +153,22 @@
  "fieldname": "mark_auto_attendance_on_holidays",
  "fieldtype": "Check",
  "label": "Mark Auto Attendance on Holidays"
+ },
+ {
+ "default": "0",
+ "fieldname": "enable_late_entry_marking",
+ "fieldtype": "Check",
+ "label": "Enable Late Entry Marking"
+ },
+ {
+ "default": "0",
+ "fieldname": "enable_early_exit_marking",
+ "fieldtype": "Check",
+ "label": "Enable Early Exit Marking"
  }
  ],
  "links": [],
- "modified": "2023-05-02 11:49:20.020685",
+ "modified": "2023-08-22 11:31:24.381593",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "Shift Type",

hrms/hr/doctype/shift_type/shift_type.py

@@ -103,14 +103,14 @@ def get_attendance(self, logs):
  logs, self.determine_check_in_and_check_out, self.working_hours_calculation_based_on
  )
  if (
- cint(self.enable_entry_grace_period)
+ cint(self.enable_late_entry_marking)
  and in_time
  and in_time > logs[0].shift_start + timedelta(minutes=cint(self.late_entry_grace_period))
  ):
  late_entry = True
 
  if (
- cint(self.enable_exit_grace_period)
+ cint(self.enable_early_exit_marking)
  and out_time
  and out_time < logs[0].shift_end - timedelta(minutes=cint(self.early_exit_grace_period))
  ):

hrms/hr/doctype/shift_type/test_shift_type.py

@@ -83,8 +83,8 @@ def test_entry_and_exit_grace(self):
  # doesn't mark late entry until 60 mins after shift start i.e. till 9
  # doesn't mark late entry until 60 mins before shift end i.e. 11
  shift_type = setup_shift_type(
- enable_entry_grace_period=1,
- enable_exit_grace_period=1,
+ enable_late_entry_marking=1,
+ enable_early_exit_marking=1,
  late_entry_grace_period=60,
  early_exit_grace_period=60,
  )

hrms/hr/report/shift_attendance/shift_attendance.js

@@ -0,0 +1,73 @@
+// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Shift Attendance"] = {
+ filters: [
+ {
+ fieldname: "from_date",
+ label: __("From Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.month_start(),
+ },
+ {
+ fieldname: "to_date",
+ label: __("To Date"),
+ fieldtype: "Date",
+ reqd: 1,
+ default: frappe.datetime.month_end(),
+ },
+ {
+ fieldname: "employee",
+ label: __("Employee"),
+ fieldtype: "Link",
+ options: "Employee",
+ },
+ {
+ fieldname: "shift",
+ label: __("Shift Type"),
+ fieldtype: "Link",
+ options: "Shift Type",
+ },
+ {
+ fieldname: "department",
+ label: __("Department"),
+ fieldtype: "Link",
+ options: "Department",
+ },
+ {
+ fieldname: "company",
+ label: __("Company"),
+ fieldtype: "Link",
+ options: "Company",
+ reqd: 1,
+ default: frappe.defaults.get_user_default("Company"),
+ },
+ {
+ fieldname: "late_entry",
+ label: __("Late Entry"),
+ fieldtype: "Check",
+ },
+ {
+ fieldname: "early_exit",
+ label: __("Early Exit"),
+ fieldtype: "Check",
+ },
+ {
+ fieldname: "consider_grace_period",
+ label: __("Consider Grace Period"),
+ fieldtype: "Check",
+ default: 1
+ },
+ ],
+ formatter: (value, row, column, data, default_formatter) => {
+ value = default_formatter(value, row, column, data);
+ if (
+ (column.fieldname === "in_time" && data.late_entry) ||
+ (column.fieldname === "out_time" && data.early_exit)
+ ) {
+ value = `<span style='color:red!important'>${value}</span>`;
+ }
+ return value;
+ },
+};

hrms/hr/report/shift_attendance/shift_attendance.json

@@ -0,0 +1,38 @@
+{
+ "add_total_row": 0,
+ "columns": [],
+ "creation": "2023-08-04 11:29:44.327488",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "filters": [],
+ "idx": 0,
+ "is_standard": "Yes",
+ "letterhead": null,
+ "modified": "2023-08-04 11:29:44.327488",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Shift Attendance",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "Attendance",
+ "report_name": "Shift Attendance",
+ "report_type": "Script Report",
+ "roles": [
+ {
+ "role": "HR User"
+ },
+ {
+ "role": "System Manager"
+ },
+ {
+ "role": "HR Manager"
+ },
+ {
+ "role": "Employee Self Service"
+ },
+ {
+ "role": "Employee"
+ }
+ ]
+}