mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-19 23:05:12 +00:00
fix: do not use self object for setting party and party type
(cherry picked from commit 80b746d4dd)
This commit is contained in:
@@ -443,21 +443,22 @@ class AccountsController(TransactionBase):
|
|||||||
)
|
)
|
||||||
|
|
||||||
def validate_party_address_and_contact(self):
|
def validate_party_address_and_contact(self):
|
||||||
party, party_type = None, None
|
party_type, party = self.get_party()
|
||||||
if self.get("customer"):
|
|
||||||
party, party_type = self.customer, "Customer"
|
if not (party_type and party):
|
||||||
|
return
|
||||||
|
|
||||||
|
if party_type == "Customer":
|
||||||
billing_address, shipping_address = (
|
billing_address, shipping_address = (
|
||||||
self.get("customer_address"),
|
self.get("customer_address"),
|
||||||
self.get("shipping_address_name"),
|
self.get("shipping_address_name"),
|
||||||
)
|
)
|
||||||
self.validate_party_address(party, party_type, billing_address, shipping_address)
|
self.validate_party_address(party, party_type, billing_address, shipping_address)
|
||||||
elif self.get("supplier"):
|
elif party_type == "Supplier":
|
||||||
party, party_type = self.supplier, "Supplier"
|
|
||||||
billing_address = self.get("supplier_address")
|
billing_address = self.get("supplier_address")
|
||||||
self.validate_party_address(party, party_type, billing_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):
|
def validate_party_address(self, party, party_type, billing_address, shipping_address=None):
|
||||||
if billing_address or shipping_address:
|
if billing_address or shipping_address:
|
||||||
|
|||||||
Reference in New Issue
Block a user