[minor] fixed the child table field name (#9328)
* [minor] exclude Other domain from Domains
* [minor] fixed the child table field name
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 6ff4c31..8068ea6 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -403,4 +403,4 @@
erpnext.patches.v8_0.delete_bin_indexes
erpnext.patches.v8_0.move_account_head_from_account_to_warehouse_for_inventory
erpnext.patches.v8_0.change_in_words_varchar_length
-erpnext.patches.v8_0.create_domain_docs
\ No newline at end of file
+erpnext.patches.v8_0.create_domain_docs #16-05-2017
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/create_domain_docs.py b/erpnext/patches/v8_0/create_domain_docs.py
index f04a7e6..7e303c1 100644
--- a/erpnext/patches/v8_0/create_domain_docs.py
+++ b/erpnext/patches/v8_0/create_domain_docs.py
@@ -21,9 +21,9 @@
condition = ""
company = erpnext.get_default_company()
if company:
- condition = " where name='{0}'".format(company)
+ condition = " and name='{0}'".format(company)
- domains = frappe.db.sql_list("select distinct domain from `tabCompany` {0}".format(condition))
+ domains = frappe.db.sql_list("select distinct domain from `tabCompany` where domain != 'Other' {0}".format(condition))
if not domains:
return
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 93e879d..5daa4e4 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -199,7 +199,7 @@
hr_settings.save()
domain_settings = frappe.get_doc("Domain Settings")
- domain_settings.append('active_domain', dict(domain=args.domain))
+ domain_settings.append('active_domains', dict(domain=args.domain))
domain_settings.save()
def create_feed_and_todo():