fix: incorrect outstanding amt validation on advance as liability
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 2611240..81ffee3 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -747,6 +747,10 @@
args["get_orders_to_be_billed"] = true;
}
+ if (frm.doc.book_advance_payments_in_separate_party_account) {
+ args["book_advance_payments_in_separate_party_account"] = true;
+ }
+
frappe.flags.allocate_payment_amount = filters['allocate_payment_amount'];
return frappe.call({
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 11c7c17..052eff3 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -256,6 +256,7 @@
"get_outstanding_invoices": True,
"get_orders_to_be_billed": True,
"vouchers": vouchers,
+ "book_advance_payments_in_separate_party_account": self.book_advance_payments_in_separate_party_account,
},
validate=True,
)
@@ -1628,11 +1629,16 @@
outstanding_invoices = []
negative_outstanding_invoices = []
+ if args.get("book_advance_payments_in_separate_party_account"):
+ party_account = get_party_account(args.get("party_type"), args.get("party"), args.get("company"))
+ else:
+ party_account = args.get("party_account")
+
if args.get("get_outstanding_invoices"):
outstanding_invoices = get_outstanding_invoices(
args.get("party_type"),
args.get("party"),
- get_party_account(args.get("party_type"), args.get("party"), args.get("company")),
+ party_account,
common_filter=common_filter,
posting_date=posting_and_due_date,
min_outstanding=args.get("outstanding_amt_greater_than"),