feat: Add employee grade filter in payroll entry (#960)

frappe · Nov 1, 2023 · eccac65 · eccac65
1 parent 1485c78
commit eccac65
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/hrms/payroll/doctype/payroll_entry/payroll_entry.js b/hrms/payroll/doctype/payroll_entry/payroll_entry.js
@@ -212,7 +212,7 @@ frappe.ui.form.on('Payroll Entry', {
 		let filters = {};
 
 		let fields = ['company', 'start_date', 'end_date', 'payroll_frequency', 'payroll_payable_account',
-			'currency', 'department', 'branch', 'designation', 'salary_slip_based_on_timesheet'];
+			'currency', 'department', 'branch', 'designation', 'salary_slip_based_on_timesheet','grade'];
 
 		fields.forEach(field => {
 			if (frm.doc[field]) {
@@ -283,7 +283,9 @@ frappe.ui.form.on('Payroll Entry', {
 	department: function (frm) {
 		frm.events.clear_employee_table(frm);
 	},
-
+	grade: function (frm) {
+		frm.events.clear_employee_table(frm);
+	},
 	designation: function (frm) {
 		frm.events.clear_employee_table(frm);
 	},

diff --git a/hrms/payroll/doctype/payroll_entry/payroll_entry.json b/hrms/payroll/doctype/payroll_entry/payroll_entry.json
@@ -29,6 +29,7 @@
   "department",
   "column_break_21",
   "designation",
+  "grade",
   "number_of_employees",
   "section_break_24",
   "employees",
@@ -324,12 +325,18 @@
    "fieldtype": "Tab Break",
    "label": "Connections",
    "show_dashboard": 1
+  },
+  {
+   "fieldname": "grade",
+   "fieldtype": "Link",
+   "label": "Grade",
+   "options": "Employee Grade"
   }
  ],
  "icon": "fa fa-cog",
  "is_submittable": 1,
  "links": [],
- "modified": "2023-07-13 12:27:33.418702",
+ "modified": "2023-10-10 14:21:24.517349",
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Payroll Entry",

diff --git a/hrms/payroll/doctype/payroll_entry/payroll_entry.py b/hrms/payroll/doctype/payroll_entry/payroll_entry.py
@@ -149,6 +149,7 @@ def make_filters(self):
 			branch=self.branch,
 			department=self.department,
 			designation=self.designation,
+			grade=self.grade,
 			currency=self.currency,
 			start_date=self.start_date,
 			end_date=self.end_date,
@@ -1186,7 +1187,7 @@ def set_filter_conditions(query, filters, qb_object):
 	if filters.get("employees"):
 		query = query.where(qb_object.name.notin(filters.get("employees")))
 
-	for fltr_key in ["branch", "department", "designation"]:
+	for fltr_key in ["branch", "department", "designation", "grade"]:
 		if filters.get(fltr_key):
 			query = query.where(qb_object[fltr_key] == filters[fltr_key])