chore: Remove references for Student doctype
This commit is contained in:
parent
cc867fd949
commit
44c54f69f8
@ -112,8 +112,6 @@ frappe.ui.form.on('Payment Entry', {
|
|||||||
var doctypes = ["Purchase Order", "Purchase Invoice", "Journal Entry"];
|
var doctypes = ["Purchase Order", "Purchase Invoice", "Journal Entry"];
|
||||||
} else if (frm.doc.party_type == "Employee") {
|
} else if (frm.doc.party_type == "Employee") {
|
||||||
var doctypes = ["Expense Claim", "Journal Entry"];
|
var doctypes = ["Expense Claim", "Journal Entry"];
|
||||||
} else if (frm.doc.party_type == "Student") {
|
|
||||||
var doctypes = ["Fees"];
|
|
||||||
} else {
|
} else {
|
||||||
var doctypes = ["Journal Entry"];
|
var doctypes = ["Journal Entry"];
|
||||||
}
|
}
|
||||||
@ -755,8 +753,7 @@ frappe.ui.form.on('Payment Entry', {
|
|||||||
if(
|
if(
|
||||||
(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
|
(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=="Supplier") ||
|
||||||
(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee") ||
|
(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee")
|
||||||
(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Student")
|
|
||||||
) {
|
) {
|
||||||
if(total_positive_outstanding > total_negative_outstanding)
|
if(total_positive_outstanding > total_negative_outstanding)
|
||||||
if (!frm.doc.paid_amount)
|
if (!frm.doc.paid_amount)
|
||||||
@ -798,8 +795,7 @@ frappe.ui.form.on('Payment Entry', {
|
|||||||
if (
|
if (
|
||||||
(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
|
(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=="Supplier") ||
|
||||||
(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee") ||
|
(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Employee")
|
||||||
(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Student")
|
|
||||||
) {
|
) {
|
||||||
if(total_positive_outstanding_including_order > paid_amount) {
|
if(total_positive_outstanding_including_order > paid_amount) {
|
||||||
var remaining_outstanding = total_positive_outstanding_including_order - paid_amount;
|
var remaining_outstanding = total_positive_outstanding_including_order - paid_amount;
|
||||||
|
@ -133,7 +133,7 @@ def set_account_currency(filters):
|
|||||||
else:
|
else:
|
||||||
account_currency = (
|
account_currency = (
|
||||||
None
|
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")
|
else frappe.db.get_value(filters.party_type, filters.party[0], "default_currency")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -23,8 +23,6 @@ def execute(filters=None):
|
|||||||
def get_data(filters, show_party_name):
|
def get_data(filters, show_party_name):
|
||||||
if filters.get("party_type") in ("Customer", "Supplier", "Employee", "Member"):
|
if filters.get("party_type") in ("Customer", "Supplier", "Employee", "Member"):
|
||||||
party_name_field = "{0}_name".format(frappe.scrub(filters.get("party_type")))
|
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":
|
elif filters.get("party_type") == "Shareholder":
|
||||||
party_name_field = "title"
|
party_name_field = "title"
|
||||||
else:
|
else:
|
||||||
|
@ -375,7 +375,6 @@ def install(country=None):
|
|||||||
{"doctype": "Party Type", "party_type": "Supplier", "account_type": "Payable"},
|
{"doctype": "Party Type", "party_type": "Supplier", "account_type": "Payable"},
|
||||||
{"doctype": "Party Type", "party_type": "Employee", "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": "Shareholder", "account_type": "Payable"},
|
||||||
{"doctype": "Party Type", "party_type": "Student", "account_type": "Receivable"},
|
|
||||||
{"doctype": "Opportunity Type", "name": _("Sales")},
|
{"doctype": "Opportunity Type", "name": _("Sales")},
|
||||||
{"doctype": "Opportunity Type", "name": _("Support")},
|
{"doctype": "Opportunity Type", "name": _("Support")},
|
||||||
{"doctype": "Opportunity Type", "name": _("Maintenance")},
|
{"doctype": "Opportunity Type", "name": _("Maintenance")},
|
||||||
|
@ -1,27 +0,0 @@
|
|||||||
|
|
||||||
{% extends "templates/web.html" %}
|
|
||||||
|
|
||||||
{% block breadcrumbs %}
|
|
||||||
{% include "templates/includes/breadcrumbs.html" %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block header %}
|
|
||||||
|
|
||||||
<h1>{{ title }}</h1>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block page_content %}
|
|
||||||
|
|
||||||
{%- if introduction -%}
|
|
||||||
<div>{{ introduction }}</div>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{%- if doc.enable_admission_application -%}
|
|
||||||
<p>
|
|
||||||
<a class='btn btn-primary'
|
|
||||||
href='/student-applicant'>
|
|
||||||
{{ _("Apply Now") }}</a>
|
|
||||||
</p>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% endblock %}
|
|
@ -37,7 +37,6 @@ def get_level():
|
|||||||
"Sales Order": 2,
|
"Sales Order": 2,
|
||||||
"Sales Invoice": 2,
|
"Sales Invoice": 2,
|
||||||
"Stock Entry": 3,
|
"Stock Entry": 3,
|
||||||
"Student": 5,
|
|
||||||
"Supplier": 5,
|
"Supplier": 5,
|
||||||
"Task": 5,
|
"Task": 5,
|
||||||
"User": 5,
|
"User": 5,
|
||||||
|
Loading…
Reference in New Issue
Block a user