schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[multicheck] Select multiple domains in setup (#11709)

Browse Source 
* [multicheck] select multiple domains in setup

* use multiple domains in make_sample_data

* revert to setting in domains child table

* domains slide validation

* update setup wizard test
This commit is contained in:
Prateeksha Singh
2017-12-06 13:28:06 +05:30
committed by Nabin Hait
parent cd477fc187
commit 7351709980
6 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/utilities/user_progress.py
View File

@@ -272,10 +272,9 @@ def get_user_progress_slides():
slides = []
slide_settings = get_slide_settings()
domain = frappe.db.get_value('Company', erpnext.get_default_company(), 'domain')
domains = frappe.get_active_domains()
for s in slide_settings:
if not s.domains or (domain and domain in s.domains):
if not s.domains or any(d in domains for d in s.domains):
s.mark_as_done_method = "erpnext.setup.doctype.setup_progress.setup_progress.set_action_completed_state"
s.done = get_action_completed_state(s.action_name) or 0
slides.append(s)