Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setup wizard fixes

Browse Source
This commit is contained in:
Anand Doshi 2015-04-01 22:01:54 +05:30
parent 99d90e1f34
commit 3aaab1a39e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/setup/page/setup_wizard/setup_wizard.js
View File

@ -565,10 +565,12 @@ $.extend(erpnext.wiz, {
placeholder:__("A Product or Service")}, placeholder:__("A Product or Service")},
{fieldtype:"Select", label:__("Group"), fieldname:"item_group_" + i, {fieldtype:"Select", label:__("Group"), fieldname:"item_group_" + i,
options:[__("Products"), __("Services"), options:[__("Products"), __("Services"),
__("Raw Material"), __("Consumable"), __("Sub Assemblies")]}, __("Raw Material"), __("Consumable"), __("Sub Assemblies")],
"default": __("Products")},
{fieldtype:"Select", fieldname:"item_uom_" + i, label:__("UOM"), {fieldtype:"Select", fieldname:"item_uom_" + i, label:__("UOM"),
options:[__("Unit"), __("Nos"), __("Box"), __("Pair"), __("Kg"), __("Set"), 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_sales_item_" + i, label:__("We sell this Item"), default: 1},
{fieldtype: "Check", fieldname: "is_purchase_item_" + i, label:__("We buy this Item")}, {fieldtype: "Check", fieldname: "is_purchase_item_" + i, label:__("We buy this Item")},
{fieldtype:"Column Break"}, {fieldtype:"Column Break"},

6
erpnext/setup/page/setup_wizard/setup_wizard.py
View File

@ -11,9 +11,9 @@ from frappe.translate import (set_default_language, get_dict,
get_lang_dict, send_translations, get_language_from_code) get_lang_dict, send_translations, get_language_from_code)
from frappe.geo.country_info import get_country_info from frappe.geo.country_info import get_country_info
from frappe.utils.nestedset import get_root_of from frappe.utils.nestedset import get_root_of
from default_website import website_maker from .default_website import website_maker
import install_fixtures import install_fixtures
from welcome_emails import setup_welcome_emails from .welcome_emails import setup_welcome_emails
@frappe.whitelist() @frappe.whitelist()
def setup_account(args=None): def setup_account(args=None):
@ -74,6 +74,8 @@ def setup_account(args=None):
website_maker(args.company_name.strip(), args.company_tagline, args.name) website_maker(args.company_name.strip(), args.company_tagline, args.name)
create_logo(args) create_logo(args)
frappe.db.commit()
login_as_first_user(args) login_as_first_user(args)
setup_welcome_emails() setup_welcome_emails()