Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jul 15, 2024
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion hrms/payroll/report/salary_payments_via_ecs/salary_payments_via_ecs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
]
Expand Down Expand Up @@ -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),
Expand All @@ -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":
Expand Down
Loading