diff --git a/erpnext/config/education.py b/erpnext/config/education.py deleted file mode 100644 index c37cf2b196..0000000000 --- a/erpnext/config/education.py +++ /dev/null @@ -1,192 +0,0 @@ -from frappe import _ - - -def get_data(): - return [ - { - "label": _("Student"), - "items": [ - { - "type": "doctype", - "name": "Student", - "onboard": 1, - }, - {"type": "doctype", "name": "Guardian"}, - {"type": "doctype", "name": "Student Log"}, - {"type": "doctype", "name": "Student Group"}, - ], - }, - { - "label": _("Admission"), - "items": [ - {"type": "doctype", "name": "Student Applicant"}, - {"type": "doctype", "name": "Web Academy Applicant"}, - {"type": "doctype", "name": "Student Admission"}, - {"type": "doctype", "name": "Program Enrollment"}, - ], - }, - { - "label": _("Attendance"), - "items": [ - {"type": "doctype", "name": "Student Attendance"}, - {"type": "doctype", "name": "Student Leave Application"}, - { - "type": "report", - "is_query_report": True, - "name": "Absent Student Report", - "doctype": "Student Attendance", - }, - { - "type": "report", - "is_query_report": True, - "name": "Student Batch-Wise Attendance", - "doctype": "Student Attendance", - }, - ], - }, - { - "label": _("Tools"), - "items": [ - {"type": "doctype", "name": "Student Attendance Tool"}, - {"type": "doctype", "name": "Assessment Result Tool"}, - {"type": "doctype", "name": "Student Group Creation Tool"}, - {"type": "doctype", "name": "Program Enrollment Tool"}, - {"type": "doctype", "name": "Course Scheduling Tool"}, - ], - }, - { - "label": _("Assessment"), - "items": [ - {"type": "doctype", "name": "Assessment Plan"}, - { - "type": "doctype", - "name": "Assessment Group", - "link": "Tree/Assessment Group", - }, - {"type": "doctype", "name": "Assessment Result"}, - {"type": "doctype", "name": "Assessment Criteria"}, - ], - }, - { - "label": _("Assessment Reports"), - "items": [ - { - "type": "report", - "is_query_report": True, - "name": "Course wise Assessment Report", - "doctype": "Assessment Result", - }, - { - "type": "report", - "is_query_report": True, - "name": "Final Assessment Grades", - "doctype": "Assessment Result", - }, - { - "type": "report", - "is_query_report": True, - "name": "Assessment Plan Status", - "doctype": "Assessment Plan", - }, - {"type": "doctype", "name": "Student Report Generation Tool"}, - ], - }, - { - "label": _("Fees"), - "items": [ - {"type": "doctype", "name": "Fees"}, - {"type": "doctype", "name": "Fee Schedule"}, - {"type": "doctype", "name": "Fee Structure"}, - {"type": "doctype", "name": "Fee Category"}, - ], - }, - { - "label": _("Schedule"), - "items": [ - {"type": "doctype", "name": "Course Schedule", "route": "/app/List/Course Schedule/Calendar"}, - {"type": "doctype", "name": "Course Scheduling Tool"}, - ], - }, - { - "label": _("Masters"), - "items": [ - { - "type": "doctype", - "name": "Program", - }, - { - "type": "doctype", - "name": "Course", - "onboard": 1, - }, - { - "type": "doctype", - "name": "Topic", - }, - { - "type": "doctype", - "name": "Instructor", - "onboard": 1, - }, - { - "type": "doctype", - "name": "Room", - "onboard": 1, - }, - ], - }, - { - "label": _("Content Masters"), - "items": [ - {"type": "doctype", "name": "Article"}, - {"type": "doctype", "name": "Video"}, - {"type": "doctype", "name": "Quiz"}, - ], - }, - { - "label": _("LMS Activity"), - "items": [ - {"type": "doctype", "name": "Course Enrollment"}, - {"type": "doctype", "name": "Course Activity"}, - {"type": "doctype", "name": "Quiz Activity"}, - ], - }, - { - "label": _("Settings"), - "items": [ - {"type": "doctype", "name": "Student Category"}, - {"type": "doctype", "name": "Student Batch Name"}, - { - "type": "doctype", - "name": "Grading Scale", - "onboard": 1, - }, - {"type": "doctype", "name": "Academic Term"}, - {"type": "doctype", "name": "Academic Year"}, - {"type": "doctype", "name": "Education Settings"}, - ], - }, - { - "label": _("Other Reports"), - "items": [ - { - "type": "report", - "is_query_report": True, - "name": "Student and Guardian Contact Details", - "doctype": "Program Enrollment", - }, - { - "type": "report", - "is_query_report": True, - "name": "Student Monthly Attendance Sheet", - "doctype": "Student Attendance", - }, - { - "type": "report", - "name": "Student Fee Collection", - "doctype": "Fees", - "is_query_report": True, - }, - ], - }, - ] diff --git a/erpnext/hooks.py b/erpnext/hooks.py index e1785626ee..14a2f15c17 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -79,25 +79,16 @@ calendars = [ "Leave Application", "Sales Order", "Holiday List", - "Course Schedule", ] domains = { "Distribution": "erpnext.domains.distribution", - "Education": "erpnext.domains.education", "Manufacturing": "erpnext.domains.manufacturing", "Retail": "erpnext.domains.retail", "Services": "erpnext.domains.services", } -website_generators = [ - "Item Group", - "Website Item", - "BOM", - "Sales Partner", - "Job Opening", - "Student Admission", -] +website_generators = ["Item Group", "Website Item", "BOM", "Sales Partner", "Job Opening"] website_context = { "favicon": "/assets/erpnext/images/erpnext-favicon.svg", @@ -181,7 +172,6 @@ website_route_rules = [ "defaults": {"doctype": "Address", "parents": [{"label": _("Addresses"), "route": "addresses"}]}, }, {"from_route": "/jobs", "to_route": "Job Opening"}, - {"from_route": "/admissions", "to_route": "Student Admission"}, {"from_route": "/boms", "to_route": "BOM"}, {"from_route": "/timesheets", "to_route": "Timesheet"}, {"from_route": "/material-requests", "to_route": "Material Request"}, @@ -254,14 +244,7 @@ standard_portal_menu_items = [ "reference_doctype": "Timesheet", "role": "Customer", }, - {"title": _("Fees"), "route": "/fees", "reference_doctype": "Fees", "role": "Student"}, {"title": _("Newsletter"), "route": "/newsletters", "reference_doctype": "Newsletter"}, - { - "title": _("Admission"), - "route": "/admissions", - "reference_doctype": "Student Admission", - "role": "Student", - }, { "title": _("Material Request"), "route": "/material-requests", @@ -274,7 +257,6 @@ standard_portal_menu_items = [ default_roles = [ {"role": "Customer", "doctype": "Contact", "email_field": "email_id"}, {"role": "Supplier", "doctype": "Contact", "email_field": "email_id"}, - {"role": "Student", "doctype": "Student", "email_field": "student_email_id"}, ] sounds = [ @@ -538,8 +520,6 @@ accounting_dimension_doctypes = [ "Landed Cost Item", "Asset Value Adjustment", "Loyalty Program", - "Fee Schedule", - "Fee Structure", "Stock Reconciliation", "Travel Request", "Fees", @@ -645,48 +625,6 @@ global_search_doctypes = { {"doctype": "Maintenance Visit", "index": 46}, {"doctype": "Warranty Claim", "index": 47}, ], - "Education": [ - {"doctype": "Article", "index": 1}, - {"doctype": "Video", "index": 2}, - {"doctype": "Topic", "index": 3}, - {"doctype": "Course", "index": 4}, - {"doctype": "Program", "index": 5}, - {"doctype": "Quiz", "index": 6}, - {"doctype": "Question", "index": 7}, - {"doctype": "Fee Schedule", "index": 8}, - {"doctype": "Fee Structure", "index": 9}, - {"doctype": "Fees", "index": 10}, - {"doctype": "Student Group", "index": 11}, - {"doctype": "Student", "index": 12}, - {"doctype": "Instructor", "index": 13}, - {"doctype": "Course Activity", "index": 14}, - {"doctype": "Quiz Activity", "index": 15}, - {"doctype": "Course Enrollment", "index": 16}, - {"doctype": "Program Enrollment", "index": 17}, - {"doctype": "Student Language", "index": 18}, - {"doctype": "Student Applicant", "index": 19}, - {"doctype": "Assessment Result", "index": 20}, - {"doctype": "Assessment Plan", "index": 21}, - {"doctype": "Grading Scale", "index": 22}, - {"doctype": "Guardian", "index": 23}, - {"doctype": "Student Leave Application", "index": 24}, - {"doctype": "Student Log", "index": 25}, - {"doctype": "Room", "index": 26}, - {"doctype": "Course Schedule", "index": 27}, - {"doctype": "Student Attendance", "index": 28}, - {"doctype": "Announcement", "index": 29}, - {"doctype": "Student Category", "index": 30}, - {"doctype": "Assessment Group", "index": 31}, - {"doctype": "Student Batch Name", "index": 32}, - {"doctype": "Assessment Criteria", "index": 33}, - {"doctype": "Academic Year", "index": 34}, - {"doctype": "Academic Term", "index": 35}, - {"doctype": "School House", "index": 36}, - {"doctype": "Student Admission", "index": 37}, - {"doctype": "Fee Category", "index": 38}, - {"doctype": "Assessment Code", "index": 39}, - {"doctype": "Discussion", "index": 40}, - ], } additional_timeline_content = { diff --git a/erpnext/modules.txt b/erpnext/modules.txt index c6b3159e0f..869166b939 100644 --- a/erpnext/modules.txt +++ b/erpnext/modules.txt @@ -12,7 +12,6 @@ Utilities Assets Portal Maintenance -Education Regional ERPNext Integrations Quality Management diff --git a/erpnext/patches/v11_0/set_department_for_doctypes.py b/erpnext/patches/v11_0/set_department_for_doctypes.py index 1e14b9ceb0..4900458e10 100644 --- a/erpnext/patches/v11_0/set_department_for_doctypes.py +++ b/erpnext/patches/v11_0/set_department_for_doctypes.py @@ -19,7 +19,6 @@ def execute(): "Training Event Employee", "Payroll Employee Detail", ], - "education": ["Instructor"], "projects": ["Activity Cost", "Timesheet"], "setup": ["Sales Person"], } diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index a97efffec8..6ea1343e0b 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -9,11 +9,12 @@ from frappe.desk.reportview import get_match_cond from frappe.model.document import Document from frappe.utils import add_days, flt, get_datetime, get_time, get_url, nowtime, today +from erpnext import get_default_company from erpnext.controllers.employee_boarding_controller import update_employee_boarding_status from erpnext.controllers.queries import get_filters_cond from erpnext.hr.doctype.daily_work_summary.daily_work_summary import get_users_email from erpnext.hr.doctype.holiday_list.holiday_list import is_holiday -from erpnext import get_default_company + class Project(Document): def get_feed(self): @@ -665,6 +666,7 @@ def set_project_status(project, status): project.status = status project.save() + def get_holiday_list(company=None): if not company: company = get_default_company() or frappe.get_all("Company")[0].name @@ -676,4 +678,4 @@ def get_holiday_list(company=None): frappe.bold(get_default_company()) ) ) - return holiday_list \ No newline at end of file + return holiday_list diff --git a/erpnext/public/js/erpnext.bundle.js b/erpnext/public/js/erpnext.bundle.js index 3baf66784f..3dae6d407b 100644 --- a/erpnext/public/js/erpnext.bundle.js +++ b/erpnext/public/js/erpnext.bundle.js @@ -16,7 +16,6 @@ import "./templates/item_quick_entry.html"; import "./utils/item_quick_entry"; import "./utils/customer_quick_entry"; import "./utils/supplier_quick_entry"; -import "./education/assessment_result_tool.html"; import "./call_popup/call_popup"; import "./utils/dimension_tree_filter"; import "./utils/barcode_scanner"; diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js index 83b69aebc5..2173c2d4de 100644 --- a/erpnext/public/js/setup_wizard.js +++ b/erpnext/public/js/setup_wizard.js @@ -23,7 +23,6 @@ erpnext.setup.slides_settings = [ fieldtype: 'MultiCheck', options: [ { "label": __("Distribution"), "value": "Distribution" }, - { "label": __("Education"), "value": "Education" }, { "label": __("Manufacturing"), "value": "Manufacturing" }, { "label": __("Retail"), "value": "Retail" }, { "label": __("Services"), "value": "Services" }, @@ -59,15 +58,13 @@ erpnext.setup.slides_settings = [ }, { fieldname: 'company_name', - label: frappe.setup.domains.includes('Education') ? - __('Institute Name') : __('Company Name'), + label: __('Company Name'), fieldtype: 'Data', reqd: 1 }, { fieldname: 'company_abbr', - label: frappe.setup.domains.includes('Education') ? - __('Institute Abbreviation') : __('Company Abbreviation'), + label: __('Company Abbreviation'), fieldtype: 'Data' } ], @@ -107,17 +104,12 @@ erpnext.setup.slides_settings = [ name: 'organisation', title: __("Your Organization"), icon: "fa fa-building", - // help: frappe.setup.domains.includes('Education') ? - // __('The name of the institute for which you are setting up this system.') : - // __('The name of your company for which you are setting up this system.')), fields: [ { fieldname: 'company_tagline', label: __('What does it do?'), fieldtype: 'Data', - placeholder: frappe.setup.domains.includes('Education') ? - __('e.g. "Primary School" or "University"') : - __('e.g. "Build tools for builders"'), + placeholder: __('e.g. "Build tools for builders"'), reqd: 1 }, { fieldname: 'bank_account', label: __('Bank Name'), fieldtype: 'Data', reqd: 1 }, diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py index a0056e2112..e31c12671e 100644 --- a/erpnext/setup/setup_wizard/operations/install_fixtures.py +++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py @@ -48,7 +48,6 @@ def install(country=None): {"doctype": "Domain", "domain": "Manufacturing"}, {"doctype": "Domain", "domain": "Retail"}, {"doctype": "Domain", "domain": "Services"}, - {"doctype": "Domain", "domain": "Education"}, {"doctype": "Domain", "domain": "Healthcare"}, {"doctype": "Domain", "domain": "Non Profit"}, # ensure at least an empty Address Template exists for this Country diff --git a/erpnext/setup/workspace/erpnext_settings/erpnext_settings.json b/erpnext/setup/workspace/erpnext_settings/erpnext_settings.json index c5640bc079..eeb71c7709 100644 --- a/erpnext/setup/workspace/erpnext_settings/erpnext_settings.json +++ b/erpnext/setup/workspace/erpnext_settings/erpnext_settings.json @@ -1,7 +1,7 @@ { "charts": [], "content": "[{\"type\":\"header\",\"data\":{\"text\":\"Your Shortcuts\\n\\t\\t\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\\n\\t\\t\\t\\n\\t\\t\",\"col\":12}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Projects Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Accounts Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Stock Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"HR Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Selling Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Buying Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Support Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Shopping Cart Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Portal Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Domain Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Products Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Naming Series\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Manufacturing Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Education Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Hotel Settings\",\"col\":3}},{\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"CRM Settings\",\"col\":3}}]", - "creation": "2020-03-12 14:47:51.166455", + "creation": "2022-01-27 13:14:47.349433", "docstatus": 0, "doctype": "Workspace", "for_user": "", @@ -10,7 +10,7 @@ "idx": 0, "label": "ERPNext Settings", "links": [], - "modified": "2022-01-13 19:18:59.362820", + "modified": "2022-04-28 11:42:01.043569", "modified_by": "Administrator", "module": "Setup", "name": "ERPNext Settings", @@ -90,20 +90,6 @@ "restrict_to_domain": "Manufacturing", "type": "DocType" }, - { - "icon": "education", - "label": "Education Settings", - "link_to": "Education Settings", - "restrict_to_domain": "Education", - "type": "DocType" - }, - { - "icon": "organization", - "label": "Hotel Settings", - "link_to": "Hotel Settings", - "restrict_to_domain": "Hospitality", - "type": "DocType" - }, { "icon": "setting", "label": "Domain Settings", diff --git a/erpnext/tests/ui/agriculture.txt b/erpnext/tests/ui/agriculture.txt deleted file mode 100644 index 4622bc0df3..0000000000 --- a/erpnext/tests/ui/agriculture.txt +++ /dev/null @@ -1,7 +0,0 @@ -erpnext/agriculture/doctype/land_unit/test_land_unit.js -erpnext/agriculture/doctype/fertilizer/test_fertilizer.js -erpnext/agriculture/doctype/water_analysis/test_water_analysis.js -erpnext/agriculture/doctype/disease/test_disease.js -erpnext/agriculture/doctype/soil_texture/test_soil_texture.js -erpnext/agriculture/doctype/crop/test_crop.js -erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.js \ No newline at end of file diff --git a/erpnext/tests/ui/make_fixtures.js b/erpnext/tests/ui/make_fixtures.js deleted file mode 100644 index 8c9e50884a..0000000000 --- a/erpnext/tests/ui/make_fixtures.js +++ /dev/null @@ -1,258 +0,0 @@ -$.extend(frappe.test_data, { - // "Fiscal Year": { - // "2017-18": [ - // {"year": "2017-18"}, - // {"year_start_date": "2017-04-01"}, - // {"year_end_date": "2018-03-31"}, - // ] - // }, - "Customer": { - "Test Customer 1": [ - {customer_name: "Test Customer 1"} - ], - "Test Customer 2": [ - {customer_name: "Test Customer 2"} - ], - "Test Customer 3": [ - {customer_name: "Test Customer 3"} - ], - }, - "Item": { - "Test Product 1": [ - {item_code: "Test Product 1"}, - {item_group: "Products"}, - {is_stock_item: 1}, - {standard_rate: 100}, - {opening_stock: 100}, - ], - "Test Product 2": [ - {item_code: "Test Product 2"}, - {item_group: "Products"}, - {is_stock_item: 1}, - {standard_rate: 150}, - {opening_stock: 200}, - ], - "Test Product 3": [ - {item_code: "Test Product 3"}, - {item_group: "Products"}, - {is_stock_item: 1}, - {standard_rate: 250}, - {opening_stock: 100}, - {stock_uom:'Kg'} - ], - "Test Service 1": [ - {item_code: "Test Service 1"}, - {item_group: "Services"}, - {is_stock_item: 0}, - {standard_rate: 200} - ], - "Test Service 2": [ - {item_code: "Test Service 2"}, - {item_group: "Services"}, - {is_stock_item: 0}, - {standard_rate: 300} - ] - }, - "Lead": { - "LEAD-00001": [ - {lead_name: "Test Lead 1"} - ], - "LEAD-00002": [ - {lead_name: "Test Lead 2"} - ], - "LEAD-00003": [ - {lead_name: "Test Lead 3"} - ] - }, - "Address": { - "Test1-Billing": [ - {address_title:"Test1"}, - {address_type: "Billing"}, - {address_line1: "Billing Street 1"}, - {city: "Billing City 1"}, - {links: [ - [ - {link_doctype: "Customer"}, - {link_name: "Test Customer 1"} - ] - ]} - ], - "Test1-Shipping": [ - {address_title:"Test1"}, - {address_type: "Shipping"}, - {address_line1: "Shipping Street 1"}, - {city: "Shipping City 1"}, - {links: [ - [ - {link_doctype: "Customer"}, - {link_name: "Test Customer 1"} - ] - ]} - ], - "Test1-Warehouse": [ - {address_title:"Test1"}, - {address_type: "Warehouse"}, - {address_line1: "Warehouse Street 1"}, - {city: "Warehouse City 1"}, - {links: [ - [ - {link_doctype: "Customer"}, - {link_name: "Test Customer 1"} - ] - ]} - ], - "Test2-Billing": [ - {address_title:"Test2"}, - {address_type: "Billing"}, - {address_line1: "Billing Street 2"}, - {city: "Billing City 2"}, - {links: [ - [ - {link_doctype: "Customer"}, - {link_name: "Test Customer 2"} - ] - ]} - ], - "Test2-Shipping": [ - {address_title:"Test2"}, - {address_type: "Shipping"}, - {address_line1: "Shipping Street 2"}, - {city: "Shipping City 2"}, - {links: [ - [ - {link_doctype: "Customer"}, - {link_name: "Test Customer 2"} - ] - ]} - ], - "Test2-Warehouse": [ - {address_title:"Test2"}, - {address_type: "Warehouse"}, - {address_line1: "Warehouse Street 2"}, - {city: "Warehouse City 2"}, - {links: [ - [ - {link_doctype: "Customer"}, - {link_name: "Test Customer 2"} - ] - ]} - ] - }, - "Contact": { - "Contact 1-Test Customer 1": [ - {first_name: "Contact 1"}, - {links: [ - [ - {link_doctype: "Customer"}, - {link_name: "Test Customer 1"} - ] - ]} - ], - "Contact 2-Test Customer 1": [ - {first_name: "Contact 2"}, - {links: [ - [ - {link_doctype: "Customer"}, - {link_name: "Test Customer 1"} - ] - ]} - ], - "Contact 1-Test Customer 2": [ - {first_name: "Contact 1"}, - {links: [ - [ - {link_doctype: "Customer"}, - {link_name: "Test Customer 2"} - ] - ]} - ], - "Contact 2-Test Customer 2": [ - {first_name: "Contact 2"}, - {links: [ - [ - {link_doctype: "Customer"}, - {link_name: "Test Customer 2"} - ] - ]} - ], - }, - "Price List": { - "Test-Buying-USD": [ - {price_list_name: "Test-Buying-USD"}, - {currency: "USD"}, - {buying: "1"} - ], - "Test-Buying-EUR": [ - {price_list_name: "Test-Buying-EUR"}, - {currency: "EUR"}, - {buying: "1"} - ], - "Test-Selling-USD": [ - {price_list_name: "Test-Selling-USD"}, - {currency: "USD"}, - {selling: "1"} - ], - "Test-Selling-EUR": [ - {price_list_name: "Test-Selling-EUR"}, - {currency: "EUR"}, - {selling: "1"} - ], - }, - "Terms and Conditions": { - "Test Term 1": [ - {title: "Test Term 1"} - ], - "Test Term 2": [ - {title: "Test Term 2"} - ] - }, - "Item Price": { - "ITEM-PRICE-00001": [ - {item_code: 'Test Product 1'}, - {price_list: '_Test Price List'}, - {price_list_rate: 100} - ], - "ITEM-PRICE-00002": [ - {item_code: 'Test Product 2'}, - {price_list: '_Test Price List'}, - {price_list_rate: 200} - ] - }, - "Payment Term": { - "_Test Payment Term": [ - {payment_term_name: '_Test Payment Term'}, - {due_date_based_on: 'Day(s) after invoice date'}, - {invoice_portion: 100}, - {credit_days: 0} - ] - }, - "Payment Terms Template": { - "_Test Payment Term Template UI": [ - {template_name: "_Test Payment Term Template UI"}, - {terms: [ - [ - {payment_term: '_Test Payment Term'}, - {invoice_portion: 100} - ] - ]} - ] - } -}); - - -// this is a script that creates all fixtures -// called as a test -QUnit.module('fixture'); - -QUnit.test('Make fixtures', assert => { - // create all fixtures first - assert.expect(0); - let done = assert.async(); - let tasks = []; - Object.keys(frappe.test_data).forEach(function(doctype) { - tasks.push(function() { - return frappe.tests.setup_doctype(doctype, frappe.test_data[doctype]); - }); - }); - frappe.run_serially(tasks).then(() => done()); -}); diff --git a/erpnext/tests/ui/setup_wizard.js b/erpnext/tests/ui/setup_wizard.js deleted file mode 100644 index ccff785ec9..0000000000 --- a/erpnext/tests/ui/setup_wizard.js +++ /dev/null @@ -1,47 +0,0 @@ -const path = require('path'); -const path_join = path.resolve; -const apps_path = path_join(__dirname, '..', '..', '..', '..'); -const frappe_ui_tests_path = path_join(apps_path, 'frappe', 'frappe', 'tests', 'ui'); - -const login = require(frappe_ui_tests_path + "/login.js")['Login']; -const welcome = require(frappe_ui_tests_path + "/setup_wizard.js")['Welcome']; -const region = require(frappe_ui_tests_path + "/setup_wizard.js")['Region']; -const user = require(frappe_ui_tests_path + "/setup_wizard.js")['User']; - -module.exports = { - before: browser => { - browser - .url(browser.launch_url + '/login') - .waitForElementVisible('body', 5000); - }, - 'Login': login, - 'Welcome': welcome, - 'Region': region, - 'User': user, - 'Domain': browser => { - let slide_selector = '[data-slide-name="domain"]'; - browser - .waitForElementVisible(slide_selector, 2000) - .setValue('select[data-fieldname="domain"]', "Manufacturing") - .click(slide_selector + ' .next-btn'); - }, - 'Brand': browser => { - let slide_selector = '[data-slide-name="brand"]'; - browser - .waitForElementVisible(slide_selector, 2000) - .setValue('input[data-fieldname="company_name"]', "Acme") - .click(slide_selector + " .next-btn"); - }, - 'Organisation': browser => { - let slide_selector = '[data-slide-name="organisation"]'; - browser - .waitForElementVisible(slide_selector, 2000) - .setValue('input[data-fieldname="company_tagline"]', "Build tools for Builders") - .setValue('input[data-fieldname="bank_account"]', "YNG") - .click(slide_selector + " .next-btn"); - }, - - after: browser => { - browser.end(); - }, -}; diff --git a/erpnext/tests/ui/tests.txt b/erpnext/tests/ui/tests.txt deleted file mode 100644 index 5e238e449e..0000000000 --- a/erpnext/tests/ui/tests.txt +++ /dev/null @@ -1,110 +0,0 @@ -erpnext/tests/ui/make_fixtures.js #long -erpnext/accounts/doctype/account/tests/test_account.js -erpnext/accounts/doctype/account/tests/test_make_tax_account.js -erpnext/accounts/doctype/account/tests/test_account_with_number.js -erpnext/accounts/doctype/pricing_rule/tests/test_pricing_rule.js -erpnext/accounts/doctype/sales_taxes_and_charges_template/test_sales_taxes_and_charges_template.js -erpnext/accounts/doctype/purchase_taxes_and_charges_template/test_purchase_taxes_and_charges_template.js -erpnext/accounts/doctype/shipping_rule/test_shipping_rule.js -erpnext/crm/doctype/opportunity/test_opportunity.js -erpnext/stock/doctype/item/tests/test_item.js -erpnext/selling/doctype/quotation/tests/test_quotation_with_discount_on_grand_total.js -erpnext/selling/doctype/quotation/tests/test_quotation_with_item_wise_discount.js -erpnext/selling/doctype/quotation/tests/test_quotation_with_multi_uom.js -erpnext/selling/doctype/quotation/tests/test_quotation_with_taxes_and_charges.js -erpnext/selling/doctype/quotation/tests/test_quotation_with_shipping_rule.js -erpnext/selling/doctype/quotation/tests/test_quotation.js -erpnext/selling/doctype/sales_order/tests/test_sales_order.js -erpnext/selling/doctype/sales_order/tests/test_sales_order_with_multiple_delivery_date.js -erpnext/selling/doctype/sales_order/tests/test_sales_order_with_item_wise_discount.js -erpnext/selling/doctype/sales_order/tests/test_sales_order_with_multi_uom.js -erpnext/selling/doctype/sales_order/tests/test_sales_order_with_discount_on_grand_total.js -erpnext/selling/doctype/sales_order/tests/test_sales_order_with_taxes_and_charges.js -erpnext/selling/doctype/sales_order/tests/test_sales_order_with_shipping_rule.js -erpnext/selling/doctype/sales_order/tests/test_sales_order_with_pricing_rule.js -erpnext/manufacturing/doctype/workstation/test_workstation.js -erpnext/manufacturing/doctype/operation/test_operation.js -erpnext/manufacturing/doctype/bom/test_bom.js -erpnext/projects/doctype/project/project_timesheet.js -erpnext/hr/doctype/holiday_list/test_holiday_list.js -erpnext/hr/doctype/branch/test_branch.js -erpnext/hr/doctype/leave_block_list/test_leave_block_list.js -erpnext/hr/doctype/department/test_department.js -erpnext/hr/doctype/designation/test_designation.js -erpnext/hr/doctype/employment_type/test_employment_type.js -erpnext/hr/doctype/employee/test_employee.js -erpnext/hr/doctype/employee_attendance_tool/test_employee_attendance_tool.js -erpnext/hr/doctype/attendance/test_attendance.js -erpnext/hr/doctype/leave_type/test_leave_type.js -erpnext/hr/doctype/leave_control_panel/test_leave_control_panel.js -erpnext/hr/doctype/leave_allocation/test_leave_allocation.js -erpnext/hr/doctype/leave_application/test_leave_application.js -erpnext/stock/doctype/warehouse/test_warehouse.js -erpnext/manufacturing/doctype/work_order/test_work_order.js #long -erpnext/accounts/page/pos/test_pos.js -erpnext/selling/page/point_of_sale/tests/test_point_of_sale.js -erpnext/selling/doctype/product_bundle/test_product_bundle.js -erpnext/stock/doctype/delivery_note/test_delivery_note.js -erpnext/stock/doctype/material_request/tests/test_material_request.js -erpnext/stock/doctype/material_request/tests/test_material_request_type_material_issue.js -erpnext/stock/doctype/material_request/tests/test_material_request_type_material_transfer.js -erpnext/stock/doctype/material_request/tests/test_material_request_type_manufacture.js -erpnext/stock/doctype/stock_entry/tests/test_stock_entry_for_material_issue.js -erpnext/stock/doctype/stock_entry/tests/test_stock_entry_for_material_receipt.js -erpnext/stock/doctype/stock_entry/tests/test_stock_entry_for_material_transfer.js -erpnext/hr/doctype/salary_structure/test_salary_structure.js -erpnext/hr/doctype/salary_slip/test_salary_slip.js -erpnext/hr/doctype/job_opening/test_job_opening.js -erpnext/hr/doctype/job_applicant/test_job_applicant.js -erpnext/hr/doctype/job_offer/test_job_offer.js -erpnext/hr/doctype/appraisal_template/test_appraisal_template.js -erpnext/hr/doctype/appraisal/test_appraisal.js -erpnext/hr/doctype/expense_claim_type/test_expense_claim_type.js -erpnext/hr/doctype/expense_claim/test_expense_claim.js -erpnext/hr/doctype/training_event/tests/test_training_event.js -erpnext/hr/doctype/training_result_employee/test_training_result.js -erpnext/hr/doctype/training_feedback/test_training_feedback.js -erpnext/hr/doctype/loan_type/test_loan_type.js -erpnext/hr/doctype/loan_application/test_loan_application.js -erpnext/hr/doctype/loan/test_loan.js -erpnext/buying/doctype/supplier/test_supplier.js -erpnext/buying/doctype/request_for_quotation/tests/test_request_for_quotation.js -erpnext/buying/doctype/supplier_quotation/tests/test_supplier_quotation.js -erpnext/buying/doctype/supplier_quotation/tests/test_supplier_quotation_for_taxes_and_charges.js -erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice.js -erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_payment.js -erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_payment_request.js -erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.js -erpnext/accounts/doctype/payment_entry/tests/test_payment_against_purchase_invoice.js -erpnext/buying/doctype/supplier_quotation/tests/test_supplier_quotation_for_item_wise_discount.js -erpnext/buying/doctype/purchase_order/tests/test_purchase_order.js -erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_multi_uom.js -erpnext/buying/doctype/purchase_order/tests/test_purchase_order_get_items.js -erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_discount_on_grand_total.js -erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_item_wise_discount.js -erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_taxes_and_charges.js -erpnext/buying/doctype/purchase_order/tests/test_purchase_order_receipt.js -erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.js -erpnext/accounts/doctype/journal_entry/test_journal_entry.js -erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.js -erpnext/accounts/doctype/payment_entry/tests/test_payment_entry.js -erpnext/selling/doctype/quotation/tests/test_quotation_submit_cancel_amend.js -erpnext/stock/doctype/batch/test_batch.js -erpnext/accounts/doctype/bank_reconciliation/test_bank_reconciliation.js -erpnext/stock/doctype/stock_entry/tests/test_stock_entry_for_material_receipt_for_serialize_item.js -erpnext/stock/doctype/stock_entry/tests/test_stock_entry_for_material_transfer_for_manufacture.js -erpnext/stock/doctype/stock_entry/tests/test_stock_entry_for_subcontract.js -erpnext/stock/doctype/stock_entry/tests/test_stock_entry_for_material_issue_with_serialize_item.js -erpnext/stock/doctype/stock_entry/tests/test_stock_entry_for_repack.js -erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_serialize_item.js -erpnext/accounts/doctype/payment_entry/tests/test_payment_against_invoice.js -erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_last_purchase_rate.js -erpnext/stock/doctype/item_price/test_item_price.js -erpnext/stock/doctype/delivery_note/test_delivery_note_with_margin.js -erpnext/selling/doctype/sales_order/tests/test_sales_order_with_margin.js -erpnext/selling/doctype/quotation/tests/test_quotation_with_margin.js -erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_margin.js -erpnext/hr/doctype/payroll_entry/test_set_salary_components.js -erpnext/hr/doctype/payroll_entry/test_payroll_entry.js -erpnext/accounts/doctype/pricing_rule/tests/test_pricing_rule_with_same_currency.js -erpnext/accounts/doctype/pricing_rule/tests/test_pricing_rule_with_different_currency.js \ No newline at end of file diff --git a/erpnext/tests/ui/tests2.txt b/erpnext/tests/ui/tests2.txt deleted file mode 100644 index e410a83b2e..0000000000 --- a/erpnext/tests/ui/tests2.txt +++ /dev/null @@ -1,46 +0,0 @@ -erpnext/setup/doctype/company/tests/test_company.js -erpnext/crm/doctype/lead/tests/test_lead_individual.js -erpnext/crm/doctype/lead/tests/test_lead_organization.js -erpnext/setup/doctype/company/tests/test_company_production.js -erpnext/hr/doctype/leave_block_list/test_leave_block_list.js -erpnext/hr/doctype/department/test_department.js -erpnext/hr/doctype/designation/test_designation.js -erpnext/education/doctype/academic_year/test_academic_year.js -erpnext/education/doctype/academic_term/test_academic_term.js -erpnext/education/doctype/education_settings/test_education_settings.js -erpnext/education/doctype/student_batch_name/test_student_batch_name.js -erpnext/education/doctype/student_category/test_student_category.js -erpnext/education/doctype/room/test_room.js -erpnext/education/doctype/instructor/test_instructor.js -erpnext/education/doctype/grading_scale/test_grading_scale.js -erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.js -erpnext/education/doctype/assessment_criteria/test_assessment_criteria.js -erpnext/education/doctype/course/test_course.js -erpnext/education/doctype/program/test_program.js -erpnext/education/doctype/guardian/test_guardian.js -erpnext/education/doctype/student_admission/test_student_admission.js -erpnext/education/doctype/student_applicant/tests/test_student_applicant_dummy_data.js -erpnext/education/doctype/student_applicant/tests/test_student_applicant.js -erpnext/education/doctype/student_applicant/tests/test_student_applicant_options.js -erpnext/education/doctype/student_log/test_student_log.js -erpnext/education/doctype/student_group/test_student_group.js -erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.js -erpnext/education/doctype/student_leave_application/test_student_leave_application.js -erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.js -erpnext/education/doctype/student_attendance/test_student_attendance.js -erpnext/education/doctype/assessment_group/test_assessment_group.js -erpnext/education/doctype/assessment_plan/test_assessment_plan.js -erpnext/education/doctype/assessment_result/test_assessment_result.js -erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.js -erpnext/projects/doctype/task/tests/test_task_tree.js -erpnext/restaurant/doctype/restaurant/test_restaurant.js -erpnext/restaurant/doctype/restaurant_table/test_restaurant_table.js -erpnext/restaurant/doctype/restaurant_menu/test_restaurant_menu.js -erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js -erpnext/non_profit/doctype/membership_type/test_membership_type.js -erpnext/non_profit/doctype/member/test_member.js -erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.js -erpnext/non_profit/doctype/volunteer/test_volunteer.js -erpnext/non_profit/doctype/donor_type/test_donor_type.js -erpnext/non_profit/doctype/donor/test_donor.js -erpnext/non_profit/doctype/grant_application/test_grant_application.js \ No newline at end of file diff --git a/erpnext/utilities/activation.py b/erpnext/utilities/activation.py index 43af0dc3c1..d2f6bd9322 100644 --- a/erpnext/utilities/activation.py +++ b/erpnext/utilities/activation.py @@ -136,24 +136,6 @@ def get_help_messages(): domain=("Services",), target=5, ), - frappe._dict( - doctype="Student", - title=_("Add Students"), - description=_("Students are at the heart of the system, add all your students"), - action=_("Create Student"), - route="List/Student", - domain=("Education",), - target=5, - ), - frappe._dict( - doctype="Student Batch", - title=_("Group your students in batches"), - description=_("Student Batches help you track attendance, assessments and fees for students"), - action=_("Create Student Batch"), - route="List/Student Batch", - domain=("Education",), - target=3, - ), frappe._dict( doctype="Employee", title=_("Create Employee Records"),