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

[Fix] JV entry for Loan only if Loan exists

Browse Source
This commit is contained in:
Kanchan Chauhan 2017-02-28 17:42:09 +05:30
parent 8312f1cd64
commit e6254b96c4
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
erpnext/hr/doctype/process_payroll/process_payroll.py
View File

@ -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,