From 0eb8bb2511ddb88154b43262a53f6f0734c3c01e Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 5 Mar 2018 11:03:27 +0530 Subject: [PATCH] [Fix] Wrong salary slips showing when click on view salary slips from payroll entry (#13152) --- erpnext/hr/doctype/payroll_entry/payroll_entry.js | 5 ++++- erpnext/hr/doctype/payroll_entry/payroll_entry.py | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.js b/erpnext/hr/doctype/payroll_entry/payroll_entry.js index cf15846f2f..4aa4141656 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry.js +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.js @@ -5,7 +5,10 @@ var in_progress = false; frappe.ui.form.on('Payroll Entry', { onload: function (frm) { - frm.doc.posting_date = frappe.datetime.nowdate(); + if (!frm.doc.posting_date) { + frm.doc.posting_date = frappe.datetime.nowdate(); + } + frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet); }, diff --git a/erpnext/hr/doctype/payroll_entry/payroll_entry.py b/erpnext/hr/doctype/payroll_entry/payroll_entry.py index 2a5b467845..e53a2a67fa 100644 --- a/erpnext/hr/doctype/payroll_entry/payroll_entry.py +++ b/erpnext/hr/doctype/payroll_entry/payroll_entry.py @@ -175,7 +175,7 @@ class PayrollEntry(Document): Get loan details from submitted salary slip based on selected criteria """ cond = self.get_filter_condition() - return frappe.db.sql(""" select eld.employee_loan_account, + return frappe.db.sql(""" select eld.employee_loan_account, eld.employee_loan, eld.interest_income_account, eld.principal_amount, eld.interest_amount, eld.total_payment from `tabSalary Slip` t1, `tabSalary Slip Loan` eld @@ -283,7 +283,12 @@ class PayrollEntry(Document): "account": data.employee_loan_account, "credit_in_account_currency": data.principal_amount }) - accounts.append({ + + if data.interest_amount and not data.interest_income_account: + frappe.throw(_("Select interest income account in employee loan {0}").format(data.employee_loan)) + + if data.interest_income_account and data.interest_amount: + accounts.append({ "account": data.interest_income_account, "credit_in_account_currency": data.interest_amount, "cost_center": self.cost_center,