Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: fixed party and party type in Accrual journal entry (#20021)

Browse Source
This commit is contained in:
Anurag Mishra 2019-12-23 15:50:29 +05:30 committed by Nabin Hait
parent 6edd3580d1
commit e6b3da0f59
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/hr/doctype/payroll_entry/payroll_entry.py
View File

@ -163,7 +163,7 @@ class PayrollEntry(Document):
""" """
cond = self.get_filter_condition() cond = self.get_filter_condition()
return frappe.db.sql(""" select eld.loan_account, eld.loan, return frappe.db.sql(""" select eld.loan_account, eld.loan,
eld.interest_income_account, eld.principal_amount, eld.interest_amount, eld.total_payment eld.interest_income_account, eld.principal_amount, eld.interest_amount, eld.total_payment,t1.employee
from from
`tabSalary Slip` t1, `tabSalary Slip Loan` eld `tabSalary Slip` t1, `tabSalary Slip Loan` eld
where where
@ -246,6 +246,7 @@ class PayrollEntry(Document):
accounts.append({ accounts.append({
"account": acc, "account": acc,
"debit_in_account_currency": flt(amount, precision), "debit_in_account_currency": flt(amount, precision),
"party_type": '',
"cost_center": self.cost_center, "cost_center": self.cost_center,
"project": self.project "project": self.project
}) })
@ -257,6 +258,7 @@ class PayrollEntry(Document):
"account": acc, "account": acc,
"credit_in_account_currency": flt(amount, precision), "credit_in_account_currency": flt(amount, precision),
"cost_center": self.cost_center, "cost_center": self.cost_center,
"party_type": '',
"project": self.project "project": self.project
}) })
@ -264,7 +266,9 @@ class PayrollEntry(Document):
for data in loan_details: for data in loan_details:
accounts.append({ accounts.append({
"account": data.loan_account, "account": data.loan_account,
"credit_in_account_currency": data.principal_amount "credit_in_account_currency": data.principal_amount,
"party_type": "Employee",
"party": data.employee
}) })
if data.interest_amount and not data.interest_income_account: if data.interest_amount and not data.interest_income_account:
@ -275,14 +279,17 @@ class PayrollEntry(Document):
"account": data.interest_income_account, "account": data.interest_income_account,
"credit_in_account_currency": data.interest_amount, "credit_in_account_currency": data.interest_amount,
"cost_center": self.cost_center, "cost_center": self.cost_center,
"project": self.project "project": self.project,
"party_type": "Employee",
"party": data.employee
}) })
payable_amount -= flt(data.total_payment, precision) payable_amount -= flt(data.total_payment, precision)
# Payable amount # Payable amount
accounts.append({ accounts.append({
"account": default_payroll_payable_account, "account": default_payroll_payable_account,
"credit_in_account_currency": flt(payable_amount, precision) "credit_in_account_currency": flt(payable_amount, precision),
"party_type": '',
}) })
journal_entry.set("accounts", accounts) journal_entry.set("accounts", accounts)
@ -546,7 +553,6 @@ def submit_salary_slips_for_employees(payroll_entry, salary_slips, publish_progr
count += 1 count += 1
if publish_progress: if publish_progress:
frappe.publish_progress(count*100/len(salary_slips), title = _("Submitting Salary Slips...")) frappe.publish_progress(count*100/len(salary_slips), title = _("Submitting Salary Slips..."))
if submitted_ss: if submitted_ss:
payroll_entry.make_accrual_jv_entry() payroll_entry.make_accrual_jv_entry()
frappe.msgprint(_("Salary Slip submitted for period from {0} to {1}") frappe.msgprint(_("Salary Slip submitted for period from {0} to {1}")