Merge branch 'master' into develop

2017-03-15 11:28:07 +05:30
parent ee7b4f2882 c1a5b348b5
commit 56f650f342
18 changed files with 193 additions and 44 deletions
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -60,7 +60,7 @@ def setup_complete(args=None):

 	if args.get("add_sample_data"):
 		try:
-			make_sample_data()
+			make_sample_data(args)
 			frappe.clear_cache()
 		except:
 			# clear message