nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Loan repayment via Salary Slip

Browse Source 
(cherry picked from commit 2572480554)
This commit is contained in:
Deepesh Garg
2022-02-08 22:56:14 +05:30
committed by mergify-bot
parent 19e281a54f
commit 988dee04fa
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
View File

@@ -345,7 +345,7 @@ class LoanRepayment(AccountsController):
gle_map.append( gle_map.append(
self.get_gl_dict({ self.get_gl_dict({
"account": loan_details.penalty_income_account, "account": loan_details.penalty_income_account,
"against": payment_account, "against": loan_details.loan_account,
"credit": self.total_penalty_paid, "credit": self.total_penalty_paid,
"credit_in_account_currency": self.total_penalty_paid, "credit_in_account_currency": self.total_penalty_paid,
"against_voucher_type": "Loan", "against_voucher_type": "Loan",
@@ -367,7 +367,9 @@ class LoanRepayment(AccountsController):
"against_voucher": self.against_loan, "against_voucher": self.against_loan,
"remarks": remarks, "remarks": remarks,
"cost_center": self.cost_center, "cost_center": self.cost_center,
"posting_date": getdate(self.posting_date) "posting_date": getdate(self.posting_date),
"party_type": loan_details.applicant_type if self.repay_from_salary else '',
"party": loan_details.applicant if self.repay_from_salary else ''
}) })
) )

2
erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py
View File

@@ -124,7 +124,7 @@ class TestPayrollEntry(unittest.TestCase):
if not frappe.db.exists("Account", "_Test Payroll Payable - _TC"): if not frappe.db.exists("Account", "_Test Payroll Payable - _TC"):
create_account(account_name="_Test Payroll Payable", create_account(account_name="_Test Payroll Payable",
company="_Test Company", parent_account="Current Liabilities - _TC") company="_Test Company", parent_account="Current Liabilities - _TC", account_type=None)
if not frappe.db.get_value("Company", "_Test Company", "default_payroll_payable_account") or \ if not frappe.db.get_value("Company", "_Test Company", "default_payroll_payable_account") or \
frappe.db.get_value("Company", "_Test Company", "default_payroll_payable_account") != "_Test Payroll Payable - _TC": frappe.db.get_value("Company", "_Test Company", "default_payroll_payable_account") != "_Test Payroll Payable - _TC":

2
erpnext/payroll/doctype/salary_slip/test_salary_slip.py
View File

@@ -726,7 +726,7 @@ def get_salary_component_account(sal_comp, company_list=None):
}) })
sal_comp.save() sal_comp.save()
def create_account(account_name, company, parent_account): def create_account(account_name, company, parent_account, account_type=None):
company_abbr = frappe.get_cached_value('Company', company, 'abbr') company_abbr = frappe.get_cached_value('Company', company, 'abbr')
account = frappe.db.get_value("Account", account_name + " - " + company_abbr) account = frappe.db.get_value("Account", account_name + " - " + company_abbr)
if not account: if not account: