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

Merge pull request #30890 from frappe/mergify/bp/develop/pr-30884

Browse Source 
fix: Ignore loan repayments made from salary slip (backport #30884)
This commit is contained in:
Deepesh Garg 2022-05-04 10:19:36 +05:30 committed by GitHub
commit 564f5b2394
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/doctype/bank_clearance/bank_clearance.py
View File

@ -118,6 +118,7 @@ class BankClearance(Document):
) )
.where(loan_repayment.docstatus == 1) .where(loan_repayment.docstatus == 1)
.where(loan_repayment.clearance_date.isnull()) .where(loan_repayment.clearance_date.isnull())
.where(loan_repayment.repay_from_salary == 0)
.where(loan_repayment.posting_date >= self.from_date) .where(loan_repayment.posting_date >= self.from_date)
.where(loan_repayment.posting_date <= self.to_date) .where(loan_repayment.posting_date <= self.to_date)
.where(loan_repayment.payment_account.isin([self.bank_account, self.account])) .where(loan_repayment.payment_account.isin([self.bank_account, self.account]))

1
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
View File

@ -467,6 +467,7 @@ def get_lr_matching_query(bank_account, amount_condition, filters):
loan_repayment.posting_date, loan_repayment.posting_date,
) )
.where(loan_repayment.docstatus == 1) .where(loan_repayment.docstatus == 1)
.where(loan_repayment.repay_from_salary == 0)
.where(loan_repayment.clearance_date.isnull()) .where(loan_repayment.clearance_date.isnull())
.where(loan_repayment.payment_account == bank_account) .where(loan_repayment.payment_account == bank_account)
) )

7
erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
View File

@ -203,7 +203,7 @@ def get_loan_entries(filters):
posting_date = (loan_doc.posting_date).as_("posting_date") posting_date = (loan_doc.posting_date).as_("posting_date")
account = loan_doc.payment_account account = loan_doc.payment_account
entries = ( query = (
frappe.qb.from_(loan_doc) frappe.qb.from_(loan_doc)
.select( .select(
ConstantColumn(doctype).as_("payment_document"), ConstantColumn(doctype).as_("payment_document"),
@ -217,9 +217,12 @@ def get_loan_entries(filters):
.where(account == filters.get("account")) .where(account == filters.get("account"))
.where(posting_date <= getdate(filters.get("report_date"))) .where(posting_date <= getdate(filters.get("report_date")))
.where(ifnull(loan_doc.clearance_date, "4000-01-01") > getdate(filters.get("report_date"))) .where(ifnull(loan_doc.clearance_date, "4000-01-01") > getdate(filters.get("report_date")))
.run(as_dict=1)
) )
if doctype == "Loan Repayment":
query.where(loan_doc.repay_from_salary == 0)
entries = query.run(as_dict=1)
loan_docs.extend(entries) loan_docs.extend(entries)
return loan_docs return loan_docs