From e88f928f0fbc8f964cda6d84e96c67bb24eb509d Mon Sep 17 00:00:00 2001 From: Vishal Dhayagude Date: Mon, 15 Jan 2018 12:29:39 +0530 Subject: [PATCH 1/7] [fix] Image with name listing (#12479) --- erpnext/non_profit/doctype/donor/donor.json | 3 ++- erpnext/non_profit/doctype/member/member.json | 3 ++- erpnext/non_profit/doctype/volunteer/volunteer.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erpnext/non_profit/doctype/donor/donor.json b/erpnext/non_profit/doctype/donor/donor.json index c940bda4af..d753727c03 100644 --- a/erpnext/non_profit/doctype/donor/donor.json +++ b/erpnext/non_profit/doctype/donor/donor.json @@ -295,7 +295,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-12-05 07:02:06.690416", + "modified": "2018-01-15 09:40:41.153561", "modified_by": "Administrator", "module": "Non Profit", "name": "Donor", @@ -330,6 +330,7 @@ "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", + "title_field": "donor_name", "track_changes": 1, "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/non_profit/doctype/member/member.json b/erpnext/non_profit/doctype/member/member.json index 1c6b9fc656..0eab6ae9ad 100644 --- a/erpnext/non_profit/doctype/member/member.json +++ b/erpnext/non_profit/doctype/member/member.json @@ -325,7 +325,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-12-05 07:03:21.606732", + "modified": "2018-01-15 09:38:41.878167", "modified_by": "Administrator", "module": "Non Profit", "name": "Member", @@ -380,6 +380,7 @@ "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", + "title_field": "member_name", "track_changes": 1, "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/non_profit/doctype/volunteer/volunteer.json b/erpnext/non_profit/doctype/volunteer/volunteer.json index 703230c653..0d18bab0c7 100644 --- a/erpnext/non_profit/doctype/volunteer/volunteer.json +++ b/erpnext/non_profit/doctype/volunteer/volunteer.json @@ -506,7 +506,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-12-06 12:03:08.624579", + "modified": "2018-01-15 09:40:25.229551", "modified_by": "Administrator", "module": "Non Profit", "name": "Volunteer", @@ -540,6 +540,7 @@ "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", + "title_field": "volunteer_name", "track_changes": 1, "track_seen": 0 } \ No newline at end of file From e04aedadcdbdff5d51db6b08cc822120d4834166 Mon Sep 17 00:00:00 2001 From: Vishal Dhayagude Date: Mon, 15 Jan 2018 14:01:05 +0530 Subject: [PATCH 2/7] [fix] Add to cart issue fixed (#12474) --- erpnext/shopping_cart/cart.py | 1 - erpnext/shopping_cart/test_shopping_cart.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py index fcbb63c8ba..c3deaf238f 100644 --- a/erpnext/shopping_cart/cart.py +++ b/erpnext/shopping_cart/cart.py @@ -204,7 +204,6 @@ def _get_cart_quotation(party=None): "status": "Draft", "docstatus": 0, "__islocal": 1, - "payment_terms_template": "_Test Payment Term Template", (party.doctype.lower()): party.name }) diff --git a/erpnext/shopping_cart/test_shopping_cart.py b/erpnext/shopping_cart/test_shopping_cart.py index 5578546a1e..2aeb4a927c 100644 --- a/erpnext/shopping_cart/test_shopping_cart.py +++ b/erpnext/shopping_cart/test_shopping_cart.py @@ -9,7 +9,7 @@ from erpnext.shopping_cart.cart import _get_cart_quotation, update_cart, get_par from erpnext.tests.utils import create_test_contact_and_address -test_dependencies = ['Payment Terms Template'] +# test_dependencies = ['Payment Terms Template'] class TestShoppingCart(unittest.TestCase): """ From eec0f7fd6b63370a1e73edd3b718b213714087d4 Mon Sep 17 00:00:00 2001 From: Vishal Dhayagude Date: Mon, 15 Jan 2018 14:10:23 +0530 Subject: [PATCH 3/7] [non_profit][fix] Chapter listing and join and leave chapter issue (#12463) * [fix] Chapter listing and Join and leave chapter issue * [minor] Changes in chapter html, chapter title to chapter name --- erpnext/non_profit/doctype/chapter/chapter.py | 14 ++++++- .../doctype/chapter/templates/chapter.html | 41 +++++++++++-------- .../chapter/templates/chapter_row.html | 17 ++++++-- .../chapter_member/chapter_member.json | 32 ++++++++++++++- .../pages/non_profit/join-chapter.html | 6 +-- .../pages/non_profit/join_chapter.py | 2 +- .../pages/non_profit/leave-chapter.html | 40 ++++++++++++++---- .../pages/non_profit/leave_chapter.py | 8 ---- 8 files changed, 117 insertions(+), 43 deletions(-) diff --git a/erpnext/non_profit/doctype/chapter/chapter.py b/erpnext/non_profit/doctype/chapter/chapter.py index d484882519..33206904d6 100644 --- a/erpnext/non_profit/doctype/chapter/chapter.py +++ b/erpnext/non_profit/doctype/chapter/chapter.py @@ -35,4 +35,16 @@ def get_list_context(context): context.title = 'All Chapters' context.no_breadcrumbs = True context.order_by = 'creation desc' - context.introduction = '

All Chapters

' \ No newline at end of file + context.introduction = '

All Chapters

' + + +@frappe.whitelist() +def leave(title, user_id, leave_reason): + chapter = frappe.get_doc("Chapter", title) + for member in chapter.members: + if member.user == user_id: + member.enabled = 0 + member.leave_reason = leave_reason + chapter.save(ignore_permissions=1) + frappe.db.commit() + return "Thank you for Feedback" \ No newline at end of file diff --git a/erpnext/non_profit/doctype/chapter/templates/chapter.html b/erpnext/non_profit/doctype/chapter/templates/chapter.html index 8953481196..671a13a951 100644 --- a/erpnext/non_profit/doctype/chapter/templates/chapter.html +++ b/erpnext/non_profit/doctype/chapter/templates/chapter.html @@ -5,34 +5,39 @@

Details

{{ introduction }}

{% if meetup_embed_html %} -{{ meetup_embed_html }} + {{ meetup_embed_html }} {% endif %}

List of Members

-{% if members %} + +{% if members %} + {% set index = [1] %} {% for user in members %} - - - + + - + + + {% set __ = index.append(1) %} + {% endif %} {% endfor %}
Member Details
{{ loop.index }} -
-
{{ frappe.db.get_value('User', user.user, 'full_name') }}
-
- {% if user.website_url %} - {{ user.website_url or '' }} + {% if user.enabled == 1 %} +
{{ index|length }} +
+
{{ frappe.db.get_value('User', user.user, 'full_name') }}
+
+ {% if user.website_url %} + {{ user.website_url or '' }} + {% endif %} +
+
+ {% if user.introduction %} + {{ user.introduction }} {% endif %} +
-
- {% if user.introduction %} - {{ user.introduction }} - {% endif %} -
- -
{% else %} diff --git a/erpnext/non_profit/doctype/chapter/templates/chapter_row.html b/erpnext/non_profit/doctype/chapter/templates/chapter_row.html index 67fb0c5631..12176ca177 100644 --- a/erpnext/non_profit/doctype/chapter/templates/chapter_row.html +++ b/erpnext/non_profit/doctype/chapter/templates/chapter_row.html @@ -1,21 +1,30 @@ {% if doc.published %}
- +

{{ doc.name }}

- {{ frappe.db.get_value('User', chapter_head, 'full_name') }} + Chapter Head : {{ frappe.db.get_value('User', chapter_head, 'full_name') }} {% if members %} - Members: {{ members|length }} + {% set index = [] %} + {% for user in members %} + {% if user.enabled == 1 %} + {% set __ = index.append(1) %} + {% endif %} + {% endfor %} + Members: {{ index|length }} {% else %} Members: 0 {% endif %} - + +

{{ html2text(doc.introduction[:200]) }}{% if introduction|len > 200 %}...{% endif %}
{% endif %} + +