Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[minor] fixed the child table field name (#9328)

Browse Source 
* [minor] exclude Other domain from Domains

* [minor] fixed the child table field name
This commit is contained in:
Makarand Bauskar 2017-06-16 14:12:28 +05:30 committed by Rushabh Mehta
parent b1c794a4f9
commit 3d6697949c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches.txt
View File

@ -403,4 +403,4 @@ erpnext.patches.v8_0.rename_items_in_status_field_of_material_request
erpnext.patches.v8_0.delete_bin_indexes erpnext.patches.v8_0.delete_bin_indexes
erpnext.patches.v8_0.move_account_head_from_account_to_warehouse_for_inventory 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.change_in_words_varchar_length
erpnext.patches.v8_0.create_domain_docs erpnext.patches.v8_0.create_domain_docs #16-05-2017

4
erpnext/patches/v8_0/create_domain_docs.py
View File

@ -21,9 +21,9 @@ def execute():
condition = "" condition = ""
company = erpnext.get_default_company() company = erpnext.get_default_company()
if 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: if not domains:
return return

2
erpnext/setup/setup_wizard/setup_wizard.py
View File

@ -199,7 +199,7 @@ def set_defaults(args):
hr_settings.save() hr_settings.save()
domain_settings = frappe.get_doc("Domain Settings") 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() domain_settings.save()
def create_feed_and_todo(): def create_feed_and_todo():