fix: Travis (develop) (#19140)
* fix: Travis
* fix: Syntax Error
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 59936d5..20f8737 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -12,7 +12,7 @@
from frappe.contacts.doctype.address.address import (get_address_display,
get_default_address, get_company_address)
from frappe.contacts.doctype.contact.contact import get_contact_details, get_default_contact
-from erpnext.exceptions import PartyFrozen, PartyDisabled, InvalidAccountCurrency
+from erpnext.exceptions import PartyFrozen, InvalidAccountCurrency
from erpnext.accounts.utils import get_fiscal_year
from erpnext import get_company_currency
@@ -446,9 +446,7 @@
if party_type and party_name:
if party_type in ("Customer", "Supplier"):
party = frappe.get_cached_value(party_type, party_name, ["is_frozen", "disabled"], as_dict=True)
- if party.disabled:
- frappe.throw(_("{0} {1} is disabled").format(party_type, party_name), PartyDisabled)
- elif party.get("is_frozen"):
+ if party.get("is_frozen"):
frozen_accounts_modifier = frappe.db.get_single_value( 'Accounts Settings', 'frozen_accounts_modifier')
if not frozen_accounts_modifier in frappe.get_roles():
frappe.throw(_("{0} {1} is frozen").format(party_type, party_name), PartyFrozen)
diff --git a/erpnext/buying/doctype/supplier/test_supplier.py b/erpnext/buying/doctype/supplier/test_supplier.py
index a377ec9..227a3df 100644
--- a/erpnext/buying/doctype/supplier/test_supplier.py
+++ b/erpnext/buying/doctype/supplier/test_supplier.py
@@ -5,7 +5,6 @@
import frappe, unittest
from erpnext.accounts.party import get_due_date
-from erpnext.exceptions import PartyDisabled
from frappe.test_runner import make_test_records
test_dependencies = ['Payment Term', 'Payment Terms Template']
@@ -71,7 +70,7 @@
po = create_purchase_order(do_not_save=True)
- self.assertRaises(PartyDisabled, po.save)
+ self.assertRaises(frappe.ValidationError, po.save)
frappe.db.set_value("Supplier", "_Test Supplier", "disabled", 0)
diff --git a/erpnext/exceptions.py b/erpnext/exceptions.py
index d92af5d..fb3a5cb 100644
--- a/erpnext/exceptions.py
+++ b/erpnext/exceptions.py
@@ -5,4 +5,3 @@
class PartyFrozen(frappe.ValidationError): pass
class InvalidAccountCurrency(frappe.ValidationError): pass
class InvalidCurrency(frappe.ValidationError): pass
-class PartyDisabled(frappe.ValidationError):pass
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index 87fdaa3..42c7d99 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -8,7 +8,7 @@
from erpnext.accounts.party import get_due_date
from frappe.test_runner import make_test_records
-from erpnext.exceptions import PartyFrozen, PartyDisabled
+from erpnext.exceptions import PartyFrozen
from frappe.utils import flt
from erpnext.selling.doctype.customer.customer import get_credit_limit, get_customer_outstanding
from erpnext.tests.utils import create_test_contact_and_address
@@ -178,7 +178,7 @@
so = make_sales_order(do_not_save=True)
- self.assertRaises(PartyDisabled, so.save)
+ self.assertRaises(frappe.ValidationError, so.save)
frappe.db.set_value("Customer", "_Test Customer", "disabled", 0)