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

[fix] for notification

Browse Source
This commit is contained in:
Rushabh Mehta 2018-06-11 17:20:30 +05:30
parent 62805e2101
commit 0d19744b17
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hooks.py
View File

@ -129,8 +129,6 @@ website_route_rules = [
{"from_route": "/admissions", "to_route": "Student Admission"}, {"from_route": "/admissions", "to_route": "Student Admission"},
{"from_route": "/boms", "to_route": "BOM"}, {"from_route": "/boms", "to_route": "BOM"},
{"from_route": "/timesheets", "to_route": "Timesheet"}, {"from_route": "/timesheets", "to_route": "Timesheet"},
{"from_route": "/grant-application", "to_route": "Grant Application"},
{"from_route": "/chapters", "to_route": "Chapter"},
] ]
standard_portal_menu_items = [ standard_portal_menu_items = [
@ -151,8 +149,6 @@ standard_portal_menu_items = [
{"title": _("Fees"), "route": "/fees", "reference_doctype": "Fees", "role":"Student"}, {"title": _("Fees"), "route": "/fees", "reference_doctype": "Fees", "role":"Student"},
{"title": _("Newsletter"), "route": "/newsletters", "reference_doctype": "Newsletter"}, {"title": _("Newsletter"), "route": "/newsletters", "reference_doctype": "Newsletter"},
{"title": _("Admission"), "route": "/admissions", "reference_doctype": "Student Admission"}, {"title": _("Admission"), "route": "/admissions", "reference_doctype": "Student Admission"},
{"title": _("Grant Application"), "route": "/grant-application", "reference_doctype": "Grant Application", "role": "Non Profit Portal User"},
{"title": _("Chapter"), "route": "/chapters", "reference_doctype": "Chapter"}
] ]
default_roles = [ default_roles = [

2
erpnext/non_profit/doctype/chapter/templates/chapter_row.html
View File

@ -1,6 +1,6 @@
{% if doc.published %} {% if doc.published %}
<div style="margin-bottom: 30px; max-width: 600px" class="with-border clickable"> <div style="margin-bottom: 30px; max-width: 600px" class="with-border clickable">
<a href={{ route }}> <a href={{ doc.route }}>
<h3>{{ doc.name }}</h3> <h3>{{ doc.name }}</h3>
<p> <p>
<span class="label"> Chapter Head : {{ frappe.db.get_value('User', chapter_head, 'full_name') }} </span> <span class="label"> Chapter Head : {{ frappe.db.get_value('User', chapter_head, 'full_name') }} </span>

4
erpnext/setup/setup_wizard/operations/sample_data.py
View File

@ -166,11 +166,11 @@ def import_email_alert():
email_alert.insert() email_alert.insert()
# trigger the first message! # trigger the first message!
from frappe.email.doctype.email_alert.email_alert import trigger_daily_alerts from frappe.email.doctype.notification.notification import trigger_daily_alerts
trigger_daily_alerts() trigger_daily_alerts()
def test_sample(): def test_sample():
frappe.db.sql('delete from `tabEmail Alert`') frappe.db.sql('delete from `tabNotification`')
frappe.db.sql('delete from tabProject') frappe.db.sql('delete from tabProject')
frappe.db.sql('delete from tabTask') frappe.db.sql('delete from tabTask')
make_projects('Education') make_projects('Education')