setup wizard fixes
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js
index fa0011d..eb47e4a 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.js
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.js
@@ -565,10 +565,12 @@
placeholder:__("A Product or Service")},
{fieldtype:"Select", label:__("Group"), fieldname:"item_group_" + i,
options:[__("Products"), __("Services"),
- __("Raw Material"), __("Consumable"), __("Sub Assemblies")]},
+ __("Raw Material"), __("Consumable"), __("Sub Assemblies")],
+ "default": __("Products")},
{fieldtype:"Select", fieldname:"item_uom_" + i, label:__("UOM"),
options:[__("Unit"), __("Nos"), __("Box"), __("Pair"), __("Kg"), __("Set"),
- __("Hour"), __("Minute")]},
+ __("Hour"), __("Minute")],
+ "default": __("Unit")},
{fieldtype: "Check", fieldname: "is_sales_item_" + i, label:__("We sell this Item"), default: 1},
{fieldtype: "Check", fieldname: "is_purchase_item_" + i, label:__("We buy this Item")},
{fieldtype:"Column Break"},
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.py b/erpnext/setup/page/setup_wizard/setup_wizard.py
index 2d26fb4..11f3269 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.py
@@ -11,9 +11,9 @@
get_lang_dict, send_translations, get_language_from_code)
from frappe.geo.country_info import get_country_info
from frappe.utils.nestedset import get_root_of
-from default_website import website_maker
+from .default_website import website_maker
import install_fixtures
-from welcome_emails import setup_welcome_emails
+from .welcome_emails import setup_welcome_emails
@frappe.whitelist()
def setup_account(args=None):
@@ -74,6 +74,8 @@
website_maker(args.company_name.strip(), args.company_tagline, args.name)
create_logo(args)
+ frappe.db.commit()
+
login_as_first_user(args)
setup_welcome_emails()