From 4bb87373dc0d3b1f839dbc1ba31a20aeafc1975c Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 22 Apr 2014 19:50:04 +0530 Subject: [PATCH] Fixed default website creation Default website generation was creating company page twice, which led to duplicate website route validation --- .travis.yml | 2 +- .../setup/page/setup_wizard/default_website.py | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ac996a6120..fd26535dabd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ script: 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¤cy=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¤cy=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: diff --git a/erpnext/setup/page/setup_wizard/default_website.py b/erpnext/setup/page/setup_wizard/default_website.py index c28a1ff0ab9..d69a1a6d7ad 100644 --- a/erpnext/setup/page/setup_wizard/default_website.py +++ b/erpnext/setup/page/setup_wizard/default_website.py @@ -33,21 +33,6 @@ class website_maker(object): }) }).insert() - # about page - self.webpage = frappe.get_doc({ - "doctype": "Web Page", - "title": self.company, - "published": 1, - "header": "

{0}

".format(self.tagline or "Headline")+\ - '

'+_("This is an example website auto-generated from ERPNext")+"

"+\ - '

Login

', - "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"