[fix] Reviewed Chapter Doctype Modification
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index ec73df9..1bd8314 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -306,7 +306,9 @@
"icon": "fa fa-gift",
"_doctype": "Grant Application",
"link": "List/Grant Application",
- "label": _("Grant Application")
+ "label": _("Grant Application"),
+ "hidden": 1
+
},
{
"module_name": "Donor",
@@ -314,7 +316,8 @@
"icon": "fa fa-tint",
"_doctype": "Donor",
"link": "List/Donor",
- "label": _("Donor")
+ "label": _("Donor"),
+ "hidden": 1
},
{
"module_name": "Volunteer",
@@ -322,7 +325,8 @@
"icon": "fa fa-angellist",
"_doctype": "Volunteer",
"link": "List/Volunteer",
- "label": _("Volunteer")
+ "label": _("Volunteer"),
+ "hidden": 1
},
{
"module_name": "Member",
@@ -330,7 +334,8 @@
"icon": "fa fa-users",
"_doctype": "Member",
"link": "List/Member",
- "label": _("Member")
+ "label": _("Member"),
+ "hidden": 1
},
{
"module_name": "Chapter",
@@ -338,13 +343,15 @@
"icon": "fa fa-handshake-o",
"_doctype": "Chapter",
"link": "List/Chapter",
- "label": _("Chapter")
+ "label": _("Chapter"),
+ "hidden": 1
},
{
"module_name": "Non Profit",
"color": "#DE2B37",
"icon": "octicon octicon-heart",
"type": "module",
- "label": _("Non Profit")
+ "label": _("Non Profit"),
+ "hidden": 1
}
]
diff --git a/erpnext/non_profit/doctype/chapter/chapter.json b/erpnext/non_profit/doctype/chapter/chapter.json
index 718df6f..5fe88e2 100644
--- a/erpnext/non_profit/doctype/chapter/chapter.json
+++ b/erpnext/non_profit/doctype/chapter/chapter.json
@@ -3,7 +3,7 @@
"allow_guest_to_view": 1,
"allow_import": 0,
"allow_rename": 1,
- "autoname": "field:title",
+ "autoname": "prompt",
"beta": 0,
"creation": "2017-09-14 13:36:03.904702",
"custom": 0,
@@ -26,9 +26,9 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 1,
+ "in_list_view": 0,
"in_standard_filter": 0,
- "label": "Title",
+ "label": "Chapter Name",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -38,7 +38,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
@@ -80,6 +80,94 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "region",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Region",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_5",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "introduction",
"fieldtype": "Text Editor",
"hidden": 0,
@@ -140,8 +228,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "published",
- "fieldtype": "Check",
+ "fieldname": "address",
+ "fieldtype": "Text",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -149,7 +237,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Published",
+ "label": "Address",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -201,8 +289,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "region",
- "fieldtype": "Data",
+ "fieldname": "published",
+ "fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -210,7 +298,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Region",
+ "label": "Published",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -220,7 +308,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
@@ -229,10 +317,10 @@
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
- "collapsible": 0,
+ "collapsible": 1,
"columns": 0,
- "fieldname": "address",
- "fieldtype": "Text",
+ "fieldname": "chapter_members",
+ "fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -240,7 +328,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Address",
+ "label": "Chapter Members",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -298,7 +386,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-11-24 15:47:01.752772",
+ "modified": "2017-12-05 05:05:59.510432",
"modified_by": "Administrator",
"module": "Non Profit",
"name": "Chapter",
diff --git a/erpnext/non_profit/doctype/chapter_message/__init__.py b/erpnext/non_profit/doctype/chapter_message/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/non_profit/doctype/chapter_message/__init__.py
+++ /dev/null
diff --git a/erpnext/non_profit/doctype/chapter_message/chapter_message.js b/erpnext/non_profit/doctype/chapter_message/chapter_message.js
deleted file mode 100644
index 92d2753..0000000
--- a/erpnext/non_profit/doctype/chapter_message/chapter_message.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Chapter Message', {
- onload: function(frm){
- frappe.db.get_value('Chapter', {chapter_head: frappe.session.user}, 'name', function(data) {
- frm.set_value('chapter', data.name);
- });
- },
-});
diff --git a/erpnext/non_profit/doctype/chapter_message/chapter_message.json b/erpnext/non_profit/doctype/chapter_message/chapter_message.json
deleted file mode 100644
index a7bce1e..0000000
--- a/erpnext/non_profit/doctype/chapter_message/chapter_message.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2017-09-14 13:40:12.353109",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
- "fields": [
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "subject",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Subject",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "message",
- "fieldtype": "Text",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Message",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "chapter",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Chapter",
- "length": 0,
- "no_copy": 0,
- "options": "Chapter",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2017-11-24 12:30:33.976935",
- "modified_by": "Administrator",
- "module": "Non Profit",
- "name": "Chapter Message",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [
- {
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
- "write": 1
- }
- ],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "restrict_to_domain": "Non Profit",
- "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
deleted file mode 100644
index dd3b656..0000000
--- a/erpnext/non_profit/doctype/chapter_message/chapter_message.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-from frappe import _
-
-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 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]
-
- frappe.sendmail(recipients = recipients,
- sender=frappe.session.user,
- subject = self.subject,
- message = self.message,
- reference_doctype=chapter.doctype,
- reference_name=chapter.name
- )
-
-
- frappe.msgprint(_("Invitation Sent"))
-
diff --git a/erpnext/non_profit/doctype/chapter_message/test_chapter_message.js b/erpnext/non_profit/doctype/chapter_message/test_chapter_message.js
deleted file mode 100644
index bda7aa0..0000000
--- a/erpnext/non_profit/doctype/chapter_message/test_chapter_message.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/* eslint-disable */
-// rename this file from _test_[name] to test_[name] to activate
-// and remove above this line
-
-QUnit.test("test: Chapter Message", function (assert) {
- let done = assert.async();
-
- // number of asserts
- assert.expect(1);
-
- frappe.run_serially([
- // insert a new Chapter Message
- () => frappe.tests.make('Chapter Message', [
- // values to be set
- {key: 'value'}
- ]),
- () => {
- assert.equal(cur_frm.doc.key, 'value');
- },
- () => done()
- ]);
-
-});
diff --git a/erpnext/non_profit/doctype/chapter_message/test_chapter_message.py b/erpnext/non_profit/doctype/chapter_message/test_chapter_message.py
deleted file mode 100644
index 768e6f9..0000000
--- a/erpnext/non_profit/doctype/chapter_message/test_chapter_message.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import unittest
-
-class TestChapterMessage(unittest.TestCase):
- pass
diff --git a/erpnext/non_profit/doctype/member/member.js b/erpnext/non_profit/doctype/member/member.js
index 1054ca6..b6e05b8 100644
--- a/erpnext/non_profit/doctype/member/member.js
+++ b/erpnext/non_profit/doctype/member/member.js
@@ -60,7 +60,7 @@
]
},
callback: function (data) {
- frappe.model.set_value(frm.doctype,frm.docname, "expires_on", data.message.to_date);
+ frappe.model.set_value(frm.doctype,frm.docname, "membership_expiry_date", data.message.to_date);
}
});
}
diff --git a/erpnext/non_profit/doctype/member/member.json b/erpnext/non_profit/doctype/member/member.json
index 1994595..377580e 100644
--- a/erpnext/non_profit/doctype/member/member.json
+++ b/erpnext/non_profit/doctype/member/member.json
@@ -49,7 +49,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "expires_on",
+ "fieldname": "membership_expiry_date",
"fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -58,7 +58,7 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
- "label": "Expires On",
+ "label": "Membership Expiry Date",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -312,67 +312,6 @@
"search_index": 0,
"set_only_once": 0,
"unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "default_receivable_accounts",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Accounting",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "accounts",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Accounts",
- "length": 0,
- "no_copy": 0,
- "options": "Party Account",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
}
],
"has_web_view": 0,
@@ -386,7 +325,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-11-20 17:42:35.967665",
+ "modified": "2017-12-05 05:11:40.009104",
"modified_by": "Administrator",
"module": "Non Profit",
"name": "Member",