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

Merge pull request #31077 from deepeshgarg007/payroll_payable_party_type

Browse Source 
fix: Loan repayment entries for payroll payable account
This commit is contained in:
Deepesh Garg 2022-05-25 11:23:43 +05:30 committed by GitHub
commit e75c843dc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
View File

@ -448,8 +448,6 @@ class LoanRepayment(AccountsController):
"remarks": remarks, "remarks": remarks,
"cost_center": self.cost_center, "cost_center": self.cost_center,
"posting_date": getdate(self.posting_date), "posting_date": getdate(self.posting_date),
"party_type": self.applicant_type if self.repay_from_salary else "",
"party": self.applicant if self.repay_from_salary else "",
} }
) )
) )

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

@ -16,6 +16,7 @@ from frappe.utils import (
comma_and, comma_and,
date_diff, date_diff,
flt, flt,
get_link_to_form,
getdate, getdate,
) )
@ -45,6 +46,7 @@ class PayrollEntry(Document):
def before_submit(self): def before_submit(self):
self.validate_employee_details() self.validate_employee_details()
self.validate_payroll_payable_account()
if self.validate_attendance: if self.validate_attendance:
if self.validate_employee_attendance(): if self.validate_employee_attendance():
frappe.throw(_("Cannot Submit, Employees left to mark attendance")) frappe.throw(_("Cannot Submit, Employees left to mark attendance"))
@ -66,6 +68,14 @@ class PayrollEntry(Document):
if len(emp_with_sal_slip): if len(emp_with_sal_slip):
frappe.throw(_("Salary Slip already exists for {0}").format(comma_and(emp_with_sal_slip))) frappe.throw(_("Salary Slip already exists for {0}").format(comma_and(emp_with_sal_slip)))
def validate_payroll_payable_account(self):
if frappe.db.get_value("Account", self.payroll_payable_account, "account_type"):
frappe.throw(
_(
"Account type cannot be set for payroll payable account {0}, please remove and try again"
).format(frappe.bold(get_link_to_form("Account", self.payroll_payable_account)))
)
def on_cancel(self): def on_cancel(self):
frappe.delete_doc( frappe.delete_doc(
"Salary Slip", "Salary Slip",