From 44c54f69f83e28fe205eb5f0e5dc4f161a8c0bba Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Thu, 28 Apr 2022 16:16:47 +0530 Subject: [PATCH] chore: Remove references for Student doctype --- .../doctype/payment_entry/payment_entry.js | 8 ++---- .../report/general_ledger/general_ledger.py | 2 +- .../trial_balance_for_party.py | 2 -- .../operations/install_fixtures.py | 1 - .../generators/student_admission.html | 27 ------------------- erpnext/utilities/activation.py | 1 - 6 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 erpnext/templates/generators/student_admission.html diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 403e2bdfe7..d7fae6d2a3 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -112,8 +112,6 @@ frappe.ui.form.on('Payment Entry', { var doctypes = ["Purchase Order", "Purchase Invoice", "Journal Entry"]; } else if (frm.doc.party_type == "Employee") { var doctypes = ["Expense Claim", "Journal Entry"]; - } else if (frm.doc.party_type == "Student") { - var doctypes = ["Fees"]; } else { var doctypes = ["Journal Entry"]; } @@ -755,8 +753,7 @@ frappe.ui.form.on('Payment Entry', { if( (frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") || (frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier") || - (frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee") || - (frm.doc.payment_type=="Receive" && frm.doc.party_type=="Student") + (frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee") ) { if(total_positive_outstanding > total_negative_outstanding) if (!frm.doc.paid_amount) @@ -798,8 +795,7 @@ frappe.ui.form.on('Payment Entry', { if ( (frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") || (frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier") || - (frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee") || - (frm.doc.payment_type=="Receive" && frm.doc.party_type=="Student") + (frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee") ) { if(total_positive_outstanding_including_order > paid_amount) { var remaining_outstanding = total_positive_outstanding_including_order - paid_amount; diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index 636d624506..0cbdf37e65 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -133,7 +133,7 @@ def set_account_currency(filters): else: account_currency = ( None - if filters.party_type in ["Employee", "Student", "Shareholder", "Member"] + if filters.party_type in ["Employee", "Shareholder", "Member"] else frappe.db.get_value(filters.party_type, filters.party[0], "default_currency") ) diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py index 869f6aaf94..5fcfdff6f1 100644 --- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py +++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py @@ -23,8 +23,6 @@ def execute(filters=None): def get_data(filters, show_party_name): if filters.get("party_type") in ("Customer", "Supplier", "Employee", "Member"): party_name_field = "{0}_name".format(frappe.scrub(filters.get("party_type"))) - elif filters.get("party_type") == "Student": - party_name_field = "first_name" elif filters.get("party_type") == "Shareholder": party_name_field = "title" else: diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py index 90b50a01cd..d979ad17da 100644 --- a/erpnext/setup/setup_wizard/operations/install_fixtures.py +++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py @@ -375,7 +375,6 @@ def install(country=None): {"doctype": "Party Type", "party_type": "Supplier", "account_type": "Payable"}, {"doctype": "Party Type", "party_type": "Employee", "account_type": "Payable"}, {"doctype": "Party Type", "party_type": "Shareholder", "account_type": "Payable"}, - {"doctype": "Party Type", "party_type": "Student", "account_type": "Receivable"}, {"doctype": "Opportunity Type", "name": _("Sales")}, {"doctype": "Opportunity Type", "name": _("Support")}, {"doctype": "Opportunity Type", "name": _("Maintenance")}, diff --git a/erpnext/templates/generators/student_admission.html b/erpnext/templates/generators/student_admission.html deleted file mode 100644 index 8cc58a0a1f..0000000000 --- a/erpnext/templates/generators/student_admission.html +++ /dev/null @@ -1,27 +0,0 @@ - -{% extends "templates/web.html" %} - -{% block breadcrumbs %} - {% include "templates/includes/breadcrumbs.html" %} -{% endblock %} - -{% block header %} - -

{{ title }}

-{% endblock %} - -{% block page_content %} - -{%- if introduction -%} -
{{ introduction }}
-{% endif %} - -{%- if doc.enable_admission_application -%} -

- - {{ _("Apply Now") }} -

-{% endif %} - -{% endblock %} diff --git a/erpnext/utilities/activation.py b/erpnext/utilities/activation.py index d2f6bd9322..cd7910ce43 100644 --- a/erpnext/utilities/activation.py +++ b/erpnext/utilities/activation.py @@ -37,7 +37,6 @@ def get_level(): "Sales Order": 2, "Sales Invoice": 2, "Stock Entry": 3, - "Student": 5, "Supplier": 5, "Task": 5, "User": 5,