commit 4bb87373dc0d3b1f839dbc1ba31a20aeafc1975c
author Anand Doshi <anand@erpnext.com> Tue Apr 22 19:50:04 2014 +0530
committer Anand Doshi <anand@erpnext.com> Tue Apr 22 19:50:08 2014 +0530
tree 60f1fd065fbde047bed020934b56acd5b2cfd932
parent 68d0b7c7ff390c843d2ad457e939e45a75c889ca

Fixed default website creation

Default website generation was creating company page twice,
which led to duplicate website route validation

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 4ac996a..fd26535 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@
     cd ./test_sites/ &&
     frappe --reinstall test_site &&
     frappe --install_app erpnext test_site --verbose &&
-    frappe --request '?cmd=erpnext.setup.page.setup_wizard.setup_wizard.setup_account&currency=USD&first_name=Test&last_name=User&company_name=Wind+Power+LLC&timezone=America/New_York&company_abbr=WP&industry=Manufacturing&country=United states&fy_start_date=2014-01-01&fy_end_date=2014-12-31&language=english&company_tagline=Testing&email=test@erpnext.com&password=test' test_site &&
+    frappe --request '?cmd=erpnext.setup.page.setup_wizard.setup_wizard.setup_account&currency=USD&first_name=Test&last_name=User&company_name=Wind+Power+LLC&timezone=America/New_York&company_abbr=WP&industry=Manufacturing&country=United States&fy_start_date=2014-01-01&fy_end_date=2014-12-31&language=english&company_tagline=Testing&email=test@erpnext.com&password=test' test_site &&
     frappe --verbose --run_tests test_site --app erpnext
 
 before_script:

erpnext/setup/page/setup_wizard/default_website.py

diff --git a/erpnext/setup/page/setup_wizard/default_website.py b/erpnext/setup/page/setup_wizard/default_website.py
index c28a1ff..d69a1a6 100644
--- a/erpnext/setup/page/setup_wizard/default_website.py
+++ b/erpnext/setup/page/setup_wizard/default_website.py
@@ -33,21 +33,6 @@
 			})
 		}).insert()
 
-		# about page
-		self.webpage = frappe.get_doc({
-			"doctype": "Web Page",
-			"title": self.company,
-			"published": 1,
-			"header": "<h1>{0}</h1>".format(self.tagline or "Headline")+\
-				'<p>'+_("This is an example website auto-generated from ERPNext")+"</p>"+\
-				'<p><a class="btn btn-primary" href="/login">Login</a></p>',
-			"description": self.company + ":" + (self.tagline or ""),
-			"css": frappe.get_template("setup/page/setup_wizard/sample_home_page.css").render(),
-			"main_section": frappe.get_template("setup/page/setup_wizard/sample_home_page.html").render({
-				"company": self.company, "tagline": (self.tagline or "")
-			})
-		}).insert()
-
 	def make_style_settings(self):
 		style_settings = frappe.get_doc("Style Settings", "Style Settings")
 		style_settings.top_bar_background = "F2F2F2"