CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-15 16:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7888 from KanchanChauhan/payroll-fix

Browse Source 
[Fix] JV entry for Employee Loan only if Loan exists
This commit is contained in:
Nabin Hait
2017-03-02 14:15:59 +05:30
committed by GitHub
parent 42bc399f2a e6254b96c4
commit a0fb3e5128
1 changed files with 12 additions and 11 deletions
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,