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

Fixed Setup Wizard

Browse Source
This commit is contained in:
Anand Doshi 2014-05-13 21:02:47 +05:30
parent a8e7191b14
commit 51ba6f816b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/doctype/company/company.py
View File

@ -138,7 +138,7 @@ class Company(Document):
cc_doc.ignore_mandatory = True
cc_doc.insert()
frappe.db.set(self, "cost_center", "Main - " + self.abbr)
frappe.db.set(self, "cost_center", _("Main") + " - " + self.abbr)
def on_trash(self):
"""

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

@ -94,7 +94,7 @@ frappe.pages['setup-wizard'].onload = function(wrapper) {
{"fieldname": "last_name", "label": __("Last Name"), "fieldtype": "Data",
reqd:1},
{"fieldname": "email", "label": __("Email Id"), "fieldtype": "Data",
reqd:1, "description":"Your Login Id", "options":"Email"},
reqd:1, "description": __("Your Login Id"), "options":"Email"},
{"fieldname": "password", "label": __("Password"), "fieldtype": "Password",
reqd:1},
{fieldtype:"Attach Image", fieldname:"attach_user",

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

@ -136,10 +136,10 @@ def create_fiscal_year_and_company(args):
args["curr_fiscal_year"] = curr_fiscal_year
def create_price_lists(args):
for pl_type in ["Selling", "Buying"]:
for pl_type, pl_name in (("Selling", _("Standard Selling")), ("Buying", _("Standard Buying"))):
frappe.get_doc({
"doctype": "Price List",
"price_list_name": "Standard " + pl_type,
"price_list_name": pl_name,
"enabled": 1,
"buying": 1 if pl_type == "Buying" else 0,
"selling": 1 if pl_type == "Selling" else 0,
@ -273,7 +273,7 @@ def create_taxes(args):
frappe.get_doc({
"doctype":"Account",
"company": args.get("company_name"),
"parent_account": "Duties and Taxes - " + args.get("company_abbr"),
"parent_account": _("Duties and Taxes") + " - " + args.get("company_abbr"),
"account_name": args.get("tax_" + str(i)),
"group_or_ledger": "Ledger",
"report_type": "Balance Sheet",