Merge pull request #5203 from nabinhait/credit_limit_fix
[fix] Ignore closed sales order in credit limit validation
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index 5e16dd8..2eb73a3 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -28,7 +28,6 @@
{"label": __("Manufacturing"), "value": "Manufacturing"},
{"label": __("Retail"), "value": "Retail"},
{"label": __("Services"), "value": "Services"},
- {"label": __("Education"), "value": "Education"},
{"label": __("Other"), "value": "Other"},
], reqd:1},
{fieldname:'chart_of_accounts', label: __('Chart of Accounts'),
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 864d2d0..98a6019 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -426,7 +426,7 @@
# create employee for self
emp = frappe.get_doc({
"doctype": "Employee",
- "full_name": " ".join(filter(None, [args.get("first_name"), args.get("last_name")])),
+ "employee_name": " ".join(filter(None, [args.get("first_name"), args.get("last_name")])),
"user_id": frappe.session.user,
"status": "Active",
"company": args.get("company_name")
@@ -470,7 +470,7 @@
# create employee
emp = frappe.get_doc({
"doctype": "Employee",
- "full_name": fullname,
+ "employee_name": fullname,
"user_id": email,
"status": "Active",
"company": args.get("company_name")