Merge pull request #13842 from pratu16x7/hotfix
[fix] setup_website, fixes #11143
diff --git a/erpnext/setup/setup_wizard/operations/company_setup.py b/erpnext/setup/setup_wizard/operations/company_setup.py
index 7fe7f0c..7f9795b 100644
--- a/erpnext/setup/setup_wizard/operations/company_setup.py
+++ b/erpnext/setup/setup_wizard/operations/company_setup.py
@@ -113,8 +113,7 @@
"<img src='{0}' style='max-width: 40px; max-height: 25px;'> {1}".format(fileurl, args.get("company_name") ))
def create_website(args):
- if args.get('setup_website'):
- website_maker(args)
+ website_maker(args)
def get_fy_details(fy_start_date, fy_end_date):
start_year = getdate(fy_start_date).year
diff --git a/erpnext/setup/setup_wizard/operations/default_website.py b/erpnext/setup/setup_wizard/operations/default_website.py
index d137676..8ca213b 100644
--- a/erpnext/setup/setup_wizard/operations/default_website.py
+++ b/erpnext/setup/setup_wizard/operations/default_website.py
@@ -12,7 +12,7 @@
self.args = args
self.company = args.company_name
self.tagline = args.company_tagline
- self.user = args.name
+ self.user = args.get('email')
self.make_web_page()
self.make_website_settings()
self.make_blog()
@@ -50,6 +50,17 @@
website_settings.save()
def make_blog(self):
+ blog_category = frappe.get_doc({
+ "doctype": "Blog Category",
+ "category_name": "general",
+ "published": 1,
+ "title": _("General")
+ }).insert()
+
+ if not self.user:
+ # Admin setup
+ return
+
blogger = frappe.new_doc("Blogger")
user = frappe.get_doc("User", self.user)
blogger.user = self.user
@@ -58,13 +69,6 @@
blogger.avatar = user.user_image
blogger.insert()
- blog_category = frappe.get_doc({
- "doctype": "Blog Category",
- "category_name": "general",
- "published": 1,
- "title": _("General")
- }).insert()
-
frappe.get_doc({
"doctype": "Blog Post",
"title": "Welcome",