nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33028 from saurabh6790/small-fixes

Browse Source 
chore: link payroll entry reference in accrual payroll journal entry
This commit is contained in:
Deepesh Garg
2022-11-29 10:53:42 +05:30
committed by GitHub
parent 2a0d7acc2b 8b46da39ea
commit 64fda0d4b7
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/payroll/doctype/payroll_entry/payroll_entry.py
View File

@@ -346,6 +346,8 @@ class PayrollEntry(Document):
"credit_in_account_currency": flt(payable_amt, precision), "credit_in_account_currency": flt(payable_amt, precision),
"exchange_rate": flt(exchange_rate), "exchange_rate": flt(exchange_rate),
"cost_center": self.cost_center, "cost_center": self.cost_center,
"reference_type": self.doctype,
"reference_name": self.name,
}, },
accounting_dimensions, accounting_dimensions,
) )
@@ -720,12 +722,21 @@ def get_month_details(year, month):
def get_payroll_entry_bank_entries(payroll_entry_name): def get_payroll_entry_bank_entries(payroll_entry_name):
journal_entries = frappe.db.sql( journal_entries = frappe.db.sql(
"select name from `tabJournal Entry Account` " """
'where reference_type="Payroll Entry" ' select
"and reference_name=%s and docstatus=1", 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, payroll_entry_name,
as_dict=1, as_dict=True,
) ) # nosemgrep
return journal_entries return journal_entries

14
erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py
View File

@@ -133,9 +133,17 @@ class TestPayrollEntry(FrappeTestCase):
payment_entry = frappe.db.sql( 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 select
Where je.name = jea.parent ifnull(sum(je.total_debit),0) as total_debit,
And jea.reference_name = %s 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), (payroll_entry.name),
as_dict=1, as_dict=1,