Merge remote-tracking branch 'frappe/develop' into v5.0

Conflicts: erpnext/__version__.py erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py erpnext/hooks.py erpnext/patches.txt erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py erpnext/stock/get_item_details.py erpnext/translations/ar.csv erpnext/translations/bs.csv erpnext/translations/ca.csv erpnext/translations/el.csv erpnext/translations/es.csv erpnext/translations/fr.csv erpnext/translations/hr.csv erpnext/translations/id.csv erpnext/translations/is.csv erpnext/translations/ja.csv erpnext/translations/nl.csv erpnext/translations/pl.csv erpnext/translations/pt-BR.csv erpnext/translations/ru.csv erpnext/translations/tr.csv erpnext/translations/zh-cn.csv erpnext/translations/zh-tw.csv setup.py
2026-08-31 15:32:27 +00:00 · 2015-02-24 18:12:17 +05:30
parent da858cc587 13b3b070e3
commit d35354cc06
84 changed files with 115 additions and 27 deletions
--- a/erpnext/setup/doctype/authorization_control/authorization_control.py
+++ b/erpnext/setup/doctype/authorization_control/authorization_control.py
@@ -94,6 +94,9 @@ class AuthorizationControl(TransactionBase):
 			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
--- a/erpnext/setup/doctype/brand/test_brand.py
+++ b/erpnext/setup/doctype/brand/test_brand.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals


 import frappe
--- a/erpnext/setup/doctype/company/test_company.py
+++ b/erpnext/setup/doctype/company/test_company.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals

 test_ignore = ["Account", "Cost Center"]

--- a/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
+++ b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals


 import frappe
--- a/erpnext/setup/doctype/customer_group/test_customer_group.py
+++ b/erpnext/setup/doctype/customer_group/test_customer_group.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals

 test_ignore = ["Price List"]

--- a/erpnext/setup/doctype/print_heading/test_print_heading.py
+++ b/erpnext/setup/doctype/print_heading/test_print_heading.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals


 import frappe
--- a/erpnext/setup/doctype/quotation_lost_reason/test_quotation_lost_reason.py
+++ b/erpnext/setup/doctype/quotation_lost_reason/test_quotation_lost_reason.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals


 import frappe
--- a/erpnext/setup/doctype/sales_partner/test_sales_partner.py
+++ b/erpnext/setup/doctype/sales_partner/test_sales_partner.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals


 import frappe
--- a/erpnext/setup/doctype/sales_person/test_sales_person.py
+++ b/erpnext/setup/doctype/sales_person/test_sales_person.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals

 test_dependencies = ["Employee"]

--- a/erpnext/setup/doctype/supplier_type/test_supplier_type.py
+++ b/erpnext/setup/doctype/supplier_type/test_supplier_type.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals


 import frappe
--- a/erpnext/setup/doctype/terms_and_conditions/test_terms_and_conditions.py
+++ b/erpnext/setup/doctype/terms_and_conditions/test_terms_and_conditions.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals


 import frappe
--- a/erpnext/setup/doctype/territory/test_territory.py
+++ b/erpnext/setup/doctype/territory/test_territory.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals


 import frappe
--- a/erpnext/setup/doctype/uom/test_uom.py
+++ b/erpnext/setup/doctype/uom/test_uom.py
@@ -1,5 +1,6 @@
 # Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals


 import frappe
--- a/erpnext/setup/page/setup_wizard/test_setup_data.py
+++ b/erpnext/setup/page/setup_wizard/test_setup_data.py