Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 34df5a0..c975a31 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1 +1 @@
-__version__ = '4.21.3'
+__version__ = '4.21.4'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 7e3379c..a8a5fa0 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -4,7 +4,7 @@
app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "4.21.3"
+app_version = "4.21.4"
error_report_email = "support@erpnext.com"
diff --git a/erpnext/setup/doctype/authorization_control/authorization_control.py b/erpnext/setup/doctype/authorization_control/authorization_control.py
index fbf4b1c..b72f059 100644
--- a/erpnext/setup/doctype/authorization_control/authorization_control.py
+++ b/erpnext/setup/doctype/authorization_control/authorization_control.py
@@ -94,6 +94,9 @@
self.validate_auth_rule(doctype_name, auth_value, based_on, add_cond, company)
def validate_approving_authority(self, doctype_name,company, total, doc_obj = ''):
+ if not frappe.db.count("Authorization Rule"):
+ return
+
av_dis = 0
if doc_obj:
price_list_rate, base_rate = 0, 0
diff --git a/setup.py b/setup.py
index 80e3155..603a13e 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
import os
-version = "4.21.3"
+version = "4.21.4"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()