feat: add Employee Status filter in leave balance reports
This commit is contained in:
parent
86df7f835a
commit
ed8a49737a
@ -4,21 +4,21 @@
|
||||
frappe.query_reports["Employee Leave Balance"] = {
|
||||
"filters": [
|
||||
{
|
||||
"fieldname":"from_date",
|
||||
"fieldname": "from_date",
|
||||
"label": __("From Date"),
|
||||
"fieldtype": "Date",
|
||||
"reqd": 1,
|
||||
"default": frappe.defaults.get_default("year_start_date")
|
||||
},
|
||||
{
|
||||
"fieldname":"to_date",
|
||||
"fieldname": "to_date",
|
||||
"label": __("To Date"),
|
||||
"fieldtype": "Date",
|
||||
"reqd": 1,
|
||||
"default": frappe.defaults.get_default("year_end_date")
|
||||
},
|
||||
{
|
||||
"fieldname":"company",
|
||||
"fieldname": "company",
|
||||
"label": __("Company"),
|
||||
"fieldtype": "Link",
|
||||
"options": "Company",
|
||||
@ -26,16 +26,23 @@ frappe.query_reports["Employee Leave Balance"] = {
|
||||
"default": frappe.defaults.get_user_default("Company")
|
||||
},
|
||||
{
|
||||
"fieldname":"department",
|
||||
"fieldname": "department",
|
||||
"label": __("Department"),
|
||||
"fieldtype": "Link",
|
||||
"options": "Department",
|
||||
},
|
||||
{
|
||||
"fieldname":"employee",
|
||||
"fieldname": "employee",
|
||||
"label": __("Employee"),
|
||||
"fieldtype": "Link",
|
||||
"options": "Employee",
|
||||
},
|
||||
{
|
||||
"fieldname": "employee_status",
|
||||
"label": __("Employee Status"),
|
||||
"fieldtype": "Select",
|
||||
"options": ["", "Active", "Inactive", "Suspended", "Left"],
|
||||
"default": "Active",
|
||||
}
|
||||
],
|
||||
|
||||
|
@ -168,9 +168,8 @@ def get_opening_balance(
|
||||
|
||||
|
||||
def get_conditions(filters: Filters) -> Dict:
|
||||
conditions = {
|
||||
"status": "Active",
|
||||
}
|
||||
conditions = {}
|
||||
|
||||
if filters.get("employee"):
|
||||
conditions["name"] = filters.get("employee")
|
||||
|
||||
@ -180,6 +179,9 @@ def get_conditions(filters: Filters) -> Dict:
|
||||
if filters.get("department"):
|
||||
conditions["department"] = filters.get("department")
|
||||
|
||||
if filters.get("employee_status"):
|
||||
conditions["status"] = filters.get("employee_status")
|
||||
|
||||
return conditions
|
||||
|
||||
|
||||
|
@ -30,6 +30,13 @@ frappe.query_reports['Employee Leave Balance Summary'] = {
|
||||
label: __('Department'),
|
||||
fieldtype: 'Link',
|
||||
options: 'Department',
|
||||
},
|
||||
{
|
||||
fieldname: "employee_status",
|
||||
label: __("Employee Status"),
|
||||
fieldtype: "Select",
|
||||
options: ["", "Active", "Inactive", "Suspended", "Left"],
|
||||
default: "Active",
|
||||
}
|
||||
]
|
||||
};
|
||||
|
@ -35,9 +35,10 @@ def get_columns(leave_types):
|
||||
|
||||
def get_conditions(filters):
|
||||
conditions = {
|
||||
"status": "Active",
|
||||
"company": filters.company,
|
||||
}
|
||||
if filters.get("employee_status"):
|
||||
conditions.update({"status": filters.get("employee_status")})
|
||||
if filters.get("department"):
|
||||
conditions.update({"department": filters.get("department")})
|
||||
if filters.get("employee"):
|
||||
|
Loading…
x
Reference in New Issue
Block a user