diff --git a/erpnext/payroll/doctype/payroll_entry/payroll_entry.py b/erpnext/payroll/doctype/payroll_entry/payroll_entry.py index 8247d41d24b..e6b1bfac4a9 100644 --- a/erpnext/payroll/doctype/payroll_entry/payroll_entry.py +++ b/erpnext/payroll/doctype/payroll_entry/payroll_entry.py @@ -722,12 +722,21 @@ def get_month_details(year, month): def get_payroll_entry_bank_entries(payroll_entry_name): journal_entries = frappe.db.sql( - "select name from `tabJournal Entry Account` " - 'where reference_type="Payroll Entry" ' - "and reference_name=%s and docstatus=1", + """ + select + je.name + from + `tabJournal Entry` je, + `tabJournal Entry Account` jea + where + je.name = jea.parent + and je.voucher_type = 'Bank Entry' + and jea.reference_type = 'Payroll Entry' + and jea.reference_name = %s + """, payroll_entry_name, - as_dict=1, - ) + as_dict=True, + ) # nosemgrep return journal_entries diff --git a/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py b/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py index d94edef1b07..21dab42b80f 100644 --- a/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py +++ b/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py @@ -133,9 +133,17 @@ class TestPayrollEntry(FrappeTestCase): payment_entry = frappe.db.sql( """ - Select ifnull(sum(je.total_debit),0) as total_debit, ifnull(sum(je.total_credit),0) as total_credit from `tabJournal Entry` je, `tabJournal Entry Account` jea - Where je.name = jea.parent - And jea.reference_name = %s + select + ifnull(sum(je.total_debit),0) as total_debit, + ifnull(sum(je.total_credit),0) as total_credit + from + `tabJournal Entry` je, + `tabJournal Entry Account` jea + Where + je.name = jea.parent + and je.voucher_type = 'Bank Entry' + and jea.reference_type = 'Payroll Entry' + and jea.reference_name = %s """, (payroll_entry.name), as_dict=1,