From e6254b96c41154c774bdb9b72003227b54f53b74 Mon Sep 17 00:00:00 2001 From: Kanchan Chauhan Date: Tue, 28 Feb 2017 17:42:09 +0530 Subject: [PATCH] [Fix] JV entry for Loan only if Loan exists --- .../process_payroll/process_payroll.py | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py index 561ddfcf09..0ec5717b59 100644 --- a/erpnext/hr/doctype/process_payroll/process_payroll.py +++ b/erpnext/hr/doctype/process_payroll/process_payroll.py @@ -292,17 +292,18 @@ class ProcessPayroll(Document): "project": self.project }) #employee loan - account_amt_list.append({ - "account": loan_accounts.employee_loan_account, - "credit_in_account_currency": loan_amounts.total_principal_amount - }) - account_amt_list.append({ - "account": loan_accounts.interest_income_account, - "credit_in_account_currency": loan_amounts.total_interest_amount, - "cost_center": self.cost_center, - "project": self.project - }) - adjustment_amt = adjustment_amt-(loan_amounts.total_loan_repayment) + if loan_amounts.total_loan_repayment: + account_amt_list.append({ + "account": loan_accounts.employee_loan_account, + "credit_in_account_currency": loan_amounts.total_principal_amount + }) + account_amt_list.append({ + "account": loan_accounts.interest_income_account, + "credit_in_account_currency": loan_amounts.total_interest_amount, + "cost_center": self.cost_center, + "project": self.project + }) + adjustment_amt = adjustment_amt-(loan_amounts.total_loan_repayment) account_amt_list.append({ "account": default_payroll_payable_account,