mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-30 18:34:48 +00:00
fix: validate party on non receivable / payable account
This commit is contained in:
@@ -13,7 +13,11 @@ import erpnext
|
|||||||
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
|
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
|
||||||
get_checks_for_pl_and_bs_accounts,
|
get_checks_for_pl_and_bs_accounts,
|
||||||
)
|
)
|
||||||
from erpnext.accounts.party import validate_party_frozen_disabled, validate_party_gle_currency
|
from erpnext.accounts.party import (
|
||||||
|
validate_account_party_type,
|
||||||
|
validate_party_frozen_disabled,
|
||||||
|
validate_party_gle_currency,
|
||||||
|
)
|
||||||
from erpnext.accounts.utils import get_account_currency, get_fiscal_year
|
from erpnext.accounts.utils import get_account_currency, get_fiscal_year
|
||||||
from erpnext.exceptions import InvalidAccountCurrency
|
from erpnext.exceptions import InvalidAccountCurrency
|
||||||
|
|
||||||
@@ -268,6 +272,7 @@ class GLEntry(Document):
|
|||||||
|
|
||||||
def validate_party(self):
|
def validate_party(self):
|
||||||
validate_party_frozen_disabled(self.party_type, self.party)
|
validate_party_frozen_disabled(self.party_type, self.party)
|
||||||
|
validate_account_party_type(self)
|
||||||
|
|
||||||
def validate_currency(self):
|
def validate_currency(self):
|
||||||
company_currency = erpnext.get_company_currency(self.company)
|
company_currency = erpnext.get_company_currency(self.company)
|
||||||
|
|||||||
@@ -764,6 +764,17 @@ def validate_party_frozen_disabled(party_type, party_name):
|
|||||||
frappe.msgprint(_("{0} {1} is not active").format(party_type, party_name), alert=True)
|
frappe.msgprint(_("{0} {1} is not active").format(party_type, party_name), alert=True)
|
||||||
|
|
||||||
|
|
||||||
|
def validate_account_party_type(self):
|
||||||
|
if self.party_type and self.party:
|
||||||
|
account_type = frappe.get_cached_value("Account", self.account, "account_type")
|
||||||
|
if account_type and (account_type not in ["Receivable", "Payable"]):
|
||||||
|
frappe.throw(
|
||||||
|
_(
|
||||||
|
"Party Type and Party can only be set for Receivable / Payable account<br><br>" "{0}"
|
||||||
|
).format(self.account)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def get_dashboard_info(party_type, party, loyalty_program=None):
|
def get_dashboard_info(party_type, party, loyalty_program=None):
|
||||||
current_fiscal_year = get_fiscal_year(nowdate(), as_dict=True)
|
current_fiscal_year = get_fiscal_year(nowdate(), as_dict=True)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user