[Fixes] Chapter DocType (#13213)
* fetch chapter head from member doctype instead of user
* add enabled in grid view and set default as 1
diff --git a/erpnext/non_profit/doctype/chapter/templates/chapter.html b/erpnext/non_profit/doctype/chapter/templates/chapter.html
index 04a7158..0110950 100644
--- a/erpnext/non_profit/doctype/chapter/templates/chapter.html
+++ b/erpnext/non_profit/doctype/chapter/templates/chapter.html
@@ -46,17 +46,18 @@
<h3>Chapter Head</h3>
<table class="table table-bordered small" style="max-width: 500px;">
+ {% set doc = frappe.get_doc('Member',chapter_head) %}
<tr>
<td style='width: 15%'>Name</td>
- <td>{{ frappe.db.get_value('User', chapter_head, 'full_name') }}</td>
+ <td>{{ doc.member_name }}</td>
</tr>
<tr>
<td>Email</td>
- <td>{{ frappe.db.get_value('User', chapter_head, 'email') or '' }}</td>
+ <td>{{ frappe.db.get_value('User', doc.email, 'email') or '' }}</td>
</tr>
<tr>
<td>Phone</td>
- <td>{{ frappe.db.get_value('User', chapter_head, 'phone') or '' }}</td>
+ <td>{{ frappe.db.get_value('User', doc.email, 'phone') or '' }}</td>
</tr>
</table>
<h3>Address</h3>
diff --git a/erpnext/non_profit/doctype/chapter_member/chapter_member.json b/erpnext/non_profit/doctype/chapter_member/chapter_member.json
index 0b8f5a7..478bfd9 100644
--- a/erpnext/non_profit/doctype/chapter_member/chapter_member.json
+++ b/erpnext/non_profit/doctype/chapter_member/chapter_member.json
@@ -41,6 +41,7 @@
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
+ "translatable": 0,
"unique": 0
},
{
@@ -71,6 +72,7 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
+ "translatable": 0,
"unique": 0
},
{
@@ -101,6 +103,7 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
+ "translatable": 0,
"unique": 0
},
{
@@ -108,7 +111,8 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "columns": 0,
+ "columns": 2,
+ "default": "1",
"fieldname": "enabled",
"fieldtype": "Check",
"hidden": 0,
@@ -116,7 +120,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"in_standard_filter": 0,
"label": "Enabled",
"length": 0,
@@ -131,6 +135,7 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
+ "translatable": 0,
"unique": 0
},
{
@@ -161,6 +166,7 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
+ "translatable": 0,
"unique": 0
}
],
@@ -174,7 +180,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2018-01-12 12:16:10.591039",
+ "modified": "2018-03-07 05:36:51.664816",
"modified_by": "Administrator",
"module": "Non Profit",
"name": "Chapter Member",