Merge pull request #1971 from frappe/mergify/bp/version-14-hotfix/pr-…

…1966

feat(Salary Payments via ECS): add Net Pay column (backport #1966)

hrms/payroll/report/salary_payments_via_ecs/salary_payments_via_ecs.py

@@ -45,6 +45,13 @@ def get_columns(filters):
 			"options": "currency",
 			"width": 140,
 		},
+		{
+			"label": _("Net Pay"),
+			"fieldname": "net_pay",
+			"fieldtype": "Currency",
+			"options": "currency",
+			"width": 140,
+		},
 		{"label": _("Bank"), "fieldname": "bank", "fieldtype": "Data", "width": 140},
 		{"label": _("Account No"), "fieldname": "account_no", "fieldtype": "Data", "width": 140},
 	]
@@ -104,7 +111,7 @@ def get_data(filters):
 	conditions = get_conditions(filters)
 
 	entry = frappe.db.sql(
-		""" select employee, employee_name, gross_pay
+		""" select employee, employee_name, gross_pay, net_pay
 		from `tabSalary Slip`
 		where docstatus = 1 %s """
 		% (conditions),
@@ -117,6 +124,7 @@ def get_data(filters):
 			"employee_name": d.employee_name,
 			"employee": d.employee,
 			"gross_pay": d.gross_pay,
+			"net_pay": d.net_pay,
 		}
 
 		if employee_data_dict.get(d.employee).get("salary_mode") == "Bank":