fix: handling payment entry and request for closed orders

Author: Nishka Gosalia

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -2824,6 +2824,8 @@ def get_reference_details(
 			party_field = "customer" if reference_doctype == "Sales Order" else "supplier"
 			party = ref_doc.get(party_field)
 			account = get_party_account(party_type, party, ref_doc.company)
+			if reference_doctype in ["Sales Order"]:
+				total_amount, outstanding_amount = ref_doc.get_sales_order_amounts()
 	else:
 		# Get the exchange rate based on the posting date of the ref doc.
 		exchange_rate = get_exchange_rate(party_account_currency, company_currency, ref_doc.posting_date)
@@ -2874,6 +2876,8 @@ def get_payment_entry(
 		party_amount, dt, party_account_currency, doc
 	)
 
+	if dt == "Sales Order":
+		grand_total, outstanding_amount = doc.get_sales_order_amounts()
 	# bank or cash
 	bank = get_bank_cash_account(doc, bank_account)
 

erpnext/accounts/doctype/payment_request/payment_request.py

@@ -687,7 +687,10 @@ def get_amount(ref_doc, payment_account=None):
 		if ref_doc.party_account_currency != ref_doc.currency:
 			advance_amount = flt(flt(ref_doc.advance_paid) / ref_doc.conversion_rate)
 
-		grand_total = (flt(ref_doc.rounded_total) or flt(ref_doc.grand_total)) - advance_amount
+		if dt == "Sales Order":
+			grand_total = ref_doc.get_sales_order_amounts()[0] - advance_amount
+		else:
+			grand_total = (flt(ref_doc.rounded_total) or flt(ref_doc.grand_total)) - advance_amount
 
 	elif dt in ["Sales Invoice", "Purchase Invoice"]:
 		if (

erpnext/selling/doctype/sales_order/sales_order.py

@@ -824,6 +824,15 @@ def has_unreserved_stock(self) -> bool:
 
 		return False
 
+	def get_sales_order_amounts(self):
+		for item in self.get("items"):
+			if item.is_closed == 1:
+				self.grand_total -= item.amount
+				self.base_grand_total -= item.base_amount
+
+		self.outstanding_amount = self.grand_total - self.advance_paid
+		return self.grand_total, self.outstanding_amount
+
 	@frappe.whitelist()
 	def create_stock_reservation_entries(
 		self,