From ea6d754f734e8db76fa035acf30e97f3b24e7870 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Fri, 20 May 2022 08:31:37 +0530 Subject: [PATCH] fix: Loan repayment entries for payroll payable account (cherry picked from commit 3128f9603ed74d08855c367a4b75bdc76f56399b) --- .../doctype/loan_repayment/loan_repayment.py | 2 -- erpnext/payroll/doctype/payroll_entry/payroll_entry.py | 10 ++++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py index 9a43c2aec63e..d3840bfb2e25 100644 --- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py +++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py @@ -449,8 +449,6 @@ def make_gl_entries(self, cancel=0, adv_adj=0): "remarks": remarks, "cost_center": self.cost_center, "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 "", } ) ) diff --git a/erpnext/payroll/doctype/payroll_entry/payroll_entry.py b/erpnext/payroll/doctype/payroll_entry/payroll_entry.py index 60d38f4ca492..5f2af74dca68 100644 --- a/erpnext/payroll/doctype/payroll_entry/payroll_entry.py +++ b/erpnext/payroll/doctype/payroll_entry/payroll_entry.py @@ -15,6 +15,7 @@ comma_and, date_diff, flt, + get_link_to_form, getdate, ) @@ -44,6 +45,7 @@ def on_submit(self): def before_submit(self): self.validate_employee_details() + self.validate_payroll_payable_account() if self.validate_attendance: if self.validate_employee_attendance(): frappe.throw(_("Cannot Submit, Employees left to mark attendance")) @@ -65,6 +67,14 @@ def validate_employee_details(self): if len(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): frappe.delete_doc( "Salary Slip",