From fe0c6c8e28ff8c321a100452a924c645bd15b506 Mon Sep 17 00:00:00 2001 From: Vishal Date: Fri, 24 Nov 2017 13:14:23 +0530 Subject: [PATCH] [fix] Non Profit Domain clean up after review --- .../non_profit/doctype/chapter/chapter.json | 4 ++-- erpnext/non_profit/doctype/chapter/chapter.py | 11 +++++++++ .../chapter_message/chapter_message.json | 3 ++- .../chapter_message/chapter_message.py | 24 ++++++------------- .../doctype/membership/membership.json | 4 ++-- .../grant_application/grant_application.json | 2 +- 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/erpnext/non_profit/doctype/chapter/chapter.json b/erpnext/non_profit/doctype/chapter/chapter.json index cb9158380a7..2d159f3a857 100644 --- a/erpnext/non_profit/doctype/chapter/chapter.json +++ b/erpnext/non_profit/doctype/chapter/chapter.json @@ -189,7 +189,7 @@ "read_only": 0, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 1, + "reqd": 0, "search_index": 0, "set_only_once": 0, "unique": 0 @@ -297,7 +297,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-11-20 17:41:43.021123", + "modified": "2017-11-23 17:31:44.669507", "modified_by": "Administrator", "module": "Non Profit", "name": "Chapter", diff --git a/erpnext/non_profit/doctype/chapter/chapter.py b/erpnext/non_profit/doctype/chapter/chapter.py index 5b40e6b3bc2..efde580b833 100644 --- a/erpnext/non_profit/doctype/chapter/chapter.py +++ b/erpnext/non_profit/doctype/chapter/chapter.py @@ -5,8 +5,19 @@ from __future__ import unicode_literals import frappe from frappe.website.website_generator import WebsiteGenerator +from frappe.model.document import Document +from frappe import _ class Chapter(WebsiteGenerator): + def get_context(self, context): + context.no_cache = True + + def validate(self): + chapter_head = self.chapter_head + chapter = frappe.get_all('Chapter', filters={'published': True}, fields=['chapter_head']) + if not self.route: #pylint: disable=E0203 + self.route = 'chapter/' + self.scrub(self.name) + def enable(self): chapter = frappe.get_doc('Chapter', frappe.form_dict.name) chapter.append('members', dict(enable=self.value)) diff --git a/erpnext/non_profit/doctype/chapter_message/chapter_message.json b/erpnext/non_profit/doctype/chapter_message/chapter_message.json index 873caaa5728..a7bce1ebe3a 100644 --- a/erpnext/non_profit/doctype/chapter_message/chapter_message.json +++ b/erpnext/non_profit/doctype/chapter_message/chapter_message.json @@ -114,7 +114,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-11-20 17:43:02.485914", + "modified": "2017-11-24 12:30:33.976935", "modified_by": "Administrator", "module": "Non Profit", "name": "Chapter Message", @@ -149,6 +149,7 @@ "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", + "title_field": "subject", "track_changes": 1, "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/non_profit/doctype/chapter_message/chapter_message.py b/erpnext/non_profit/doctype/chapter_message/chapter_message.py index 991e6a3ffd5..dd3b656006c 100644 --- a/erpnext/non_profit/doctype/chapter_message/chapter_message.py +++ b/erpnext/non_profit/doctype/chapter_message/chapter_message.py @@ -11,30 +11,20 @@ class ChapterMessage(Document): def validate(self): chapter = frappe.get_doc('Chapter', self.chapter) if frappe.session.user != chapter.chapter_head: - frappe.throw(_('You are not athourize to send message for this Chapter.')) + frappe.throw(_('You are not athourized to send message for this Chapter.')) def on_update(self): chapter = frappe.get_doc('Chapter', self.chapter) recipients = [d.user for d in chapter.members] - message = self.message - message += "Chapter Title: " + self.chapter - # chapter_title = self.chapter frappe.sendmail(recipients = recipients, + sender=frappe.session.user, + subject = self.subject, message = self.message, - subject = self.subject) - # reference_doctype=self.doctype, reference_name=self.name) + reference_doctype=chapter.doctype, + reference_name=chapter.name + ) -def get_members_emails(chapterTitle): + frappe.msgprint(_("Invitation Sent")) - members_list = frappe.get_all('User', fields=['email'], - filters={'chapter.title': chapterTitle}) - - out = [] - for e in members_list: - if e.email: - # don't add if holiday - out.append(e.email) - print out - return out \ No newline at end of file diff --git a/erpnext/non_profit/doctype/membership/membership.json b/erpnext/non_profit/doctype/membership/membership.json index a346cce5fb0..b70da8be422 100644 --- a/erpnext/non_profit/doctype/membership/membership.json +++ b/erpnext/non_profit/doctype/membership/membership.json @@ -237,7 +237,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-11-20 17:42:50.809691", + "modified": "2017-11-24 13:12:13.481086", "modified_by": "Administrator", "module": "Non Profit", "name": "Membership", @@ -265,7 +265,7 @@ "write": 1 } ], - "quick_entry": 1, + "quick_entry": 0, "read_only": 0, "read_only_onload": 0, "restrict_to_domain": "Non Profit", diff --git a/erpnext/non_profit/web_form/grant_application/grant_application.json b/erpnext/non_profit/web_form/grant_application/grant_application.json index 70df81ebf9e..eccc33a62cc 100644 --- a/erpnext/non_profit/web_form/grant_application/grant_application.json +++ b/erpnext/non_profit/web_form/grant_application/grant_application.json @@ -18,7 +18,7 @@ "is_standard": 1, "login_required": 1, "max_attachment_size": 0, - "modified": "2017-10-31 13:25:40.670895", + "modified": "2017-11-23 17:16:30.181215", "modified_by": "Administrator", "module": "Non Profit", "name": "grant-application",