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

[Fixes] Chapter DocType (#13213)

Browse Source 
* fetch chapter head from member doctype instead of user

* add enabled in grid view and set default as 1
This commit is contained in:
Shreya Shah 2018-03-07 16:27:30 +05:30 committed by Nabin Hait
parent bbd9b71547
commit c3bf1fa009
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/non_profit/doctype/chapter/templates/chapter.html
View File

@ -46,17 +46,18 @@
<h3>Chapter Head</h3> <h3>Chapter Head</h3>
<table class="table table-bordered small" style="max-width: 500px;"> <table class="table table-bordered small" style="max-width: 500px;">
{% set doc = frappe.get_doc('Member',chapter_head) %}
<tr> <tr>
<td style='width: 15%'>Name</td> <td style='width: 15%'>Name</td>
<td>{{ frappe.db.get_value('User', chapter_head, 'full_name') }}</td> <td>{{ doc.member_name }}</td>
</tr> </tr>
<tr> <tr>
<td>Email</td> <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>
<tr> <tr>
<td>Phone</td> <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> </tr>
</table> </table>
<h3>Address</h3> <h3>Address</h3>

12
erpnext/non_profit/doctype/chapter_member/chapter_member.json
View File

@ -41,6 +41,7 @@
"reqd": 1, "reqd": 1,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
@ -71,6 +72,7 @@
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
@ -101,6 +103,7 @@
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
@ -108,7 +111,8 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 2,
"default": "1",
"fieldname": "enabled", "fieldname": "enabled",
"fieldtype": "Check", "fieldtype": "Check",
"hidden": 0, "hidden": 0,
@ -116,7 +120,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 1,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Enabled", "label": "Enabled",
"length": 0, "length": 0,
@ -131,6 +135,7 @@
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
@ -161,6 +166,7 @@
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
} }
], ],
@ -174,7 +180,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-01-12 12:16:10.591039", "modified": "2018-03-07 05:36:51.664816",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Non Profit", "module": "Non Profit",
"name": "Chapter Member", "name": "Chapter Member",