From d1311e619db233cda64c47833538c1669b3bb17e Mon Sep 17 00:00:00 2001 From: ljain112 Date: Tue, 25 Mar 2025 17:51:41 +0530 Subject: [PATCH] fix: do not use self object for setting party and party type (cherry picked from commit 80b746d4dd7958f19ad2c3d7d95311b1934aa967) --- erpnext/controllers/accounts_controller.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index e0d7e2a36df..2e90c446ade 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -443,21 +443,22 @@ class AccountsController(TransactionBase): ) def validate_party_address_and_contact(self): - party, party_type = None, None - if self.get("customer"): - party, party_type = self.customer, "Customer" + party_type, party = self.get_party() + + if not (party_type and party): + return + + if party_type == "Customer": billing_address, shipping_address = ( self.get("customer_address"), self.get("shipping_address_name"), ) self.validate_party_address(party, party_type, billing_address, shipping_address) - elif self.get("supplier"): - party, party_type = self.supplier, "Supplier" + elif party_type == "Supplier": billing_address = self.get("supplier_address") self.validate_party_address(party, party_type, billing_address) - if party and party_type: - self.validate_party_contact(party, party_type) + self.validate_party_contact(party, party_type) def validate_party_address(self, party, party_type, billing_address, shipping_address=None): if billing_address or shipping_address: