From c8ac3b042bc78adc7ae78d003895a6c9d8974a5d Mon Sep 17 00:00:00 2001 From: shreyas Date: Tue, 26 Jan 2016 13:23:38 +0530 Subject: [PATCH] [Minor]Refactored code for better readability --- erpnext/accounts/party.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index 70e141b019..59a6782f58 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -311,10 +311,10 @@ def set_taxes(party, party_type, posting_date, company, customer_group=None, sup def validate_party_frozen_disabled(party, party_type): if party_type and party: - frozen_accounts_modifier = frappe.db.get_value( 'Accounts Settings', None,'frozen_accounts_modifier') - if not frozen_accounts_modifier in frappe.get_roles(): - if frappe.db.get_value(party_type, party, "is_frozen"): - frappe.throw("{0} {1} is frozen".format(party_type, party), PartyFrozen) - - if frappe.db.get_value(party_type, party, "disabled"): + party = frappe.db.get_value(party_type, party, ["is_frozen", "disabled"], as_dict=True) + if party.disabled: frappe.throw("{0} {1} is disabled".format(party_type, party), PartyDisabled) + elif party.is_frozen: + frozen_accounts_modifier = frappe.db.get_value( 'Accounts Settings', None,'frozen_accounts_modifier') + if not frozen_accounts_modifier in frappe.get_roles(): + frappe.throw("{0} {1} is frozen".format(party_type, party), PartyFrozen)