From 8e0bd976c3f80af123a5c45bb2ec909edd360beb Mon Sep 17 00:00:00 2001 From: Vimal Date: Tue, 6 May 2025 10:57:49 +0530 Subject: [PATCH] fix: change shipping address fetching condition (cherry picked from commit 0b4add2f2b7630ef92efe6b2b7ecbd92ac260f55) --- erpnext/accounts/party.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index ceb3a7f784f..dfceb3148da 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -903,12 +903,16 @@ def get_party_shipping_address(doctype: str, name: str) -> str | None: ["is_shipping_address", "=", 1], ["address_type", "=", "Shipping"], ], - pluck="name", - limit=1, + fields=["name", "is_shipping_address"], order_by="is_shipping_address DESC", ) - return shipping_addresses[0] if shipping_addresses else None + if shipping_addresses and shipping_addresses[0].is_shipping_address == 1: + return shipping_addresses[0].name + if len(shipping_addresses) == 1: + return shipping_addresses[0].name + else: + return None def get_partywise_advanced_payment_amount(