From 474d58cecf37f85959a7097c43b9bed39c0e8a05 Mon Sep 17 00:00:00 2001 From: Vishal Date: Tue, 5 Dec 2017 17:19:02 +0530 Subject: [PATCH] [fix] minor changes --- .../grant_application/grant_application.json | 3 ++- erpnext/non_profit/doctype/member/member.js | 22 ------------------- .../patches/v10_0/add_non_profit_domain.py | 1 - .../pages/non_profit/join_chapter.py | 2 +- 4 files changed, 3 insertions(+), 25 deletions(-) diff --git a/erpnext/non_profit/doctype/grant_application/grant_application.json b/erpnext/non_profit/doctype/grant_application/grant_application.json index a2a76c4f28..714f00b5f6 100644 --- a/erpnext/non_profit/doctype/grant_application/grant_application.json +++ b/erpnext/non_profit/doctype/grant_application/grant_application.json @@ -899,7 +899,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-12-05 06:08:15.602432", + "modified": "2017-12-05 06:48:14.804480", "modified_by": "Administrator", "module": "Non Profit", "name": "Grant Application", @@ -955,6 +955,7 @@ "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", + "title_field": "", "track_changes": 1, "track_seen": 0 } \ No newline at end of file diff --git a/erpnext/non_profit/doctype/member/member.js b/erpnext/non_profit/doctype/member/member.js index b6e05b8e76..c0468a7252 100644 --- a/erpnext/non_profit/doctype/member/member.js +++ b/erpnext/non_profit/doctype/member/member.js @@ -28,28 +28,6 @@ frappe.ui.form.on('Member', { frappe.contacts.clear_address_and_contact(frm); } - var email_list = frappe.utils.split_emails(v); - if (!email_list) { - // invalid email - return ''; - } else { - var invalid_email = false; - email_list.forEach(function(email) { - if (!validate_email(email)) { - frappe.msgprint(__("Invalid Email: {0}", [email])); - invalid_email = true; - } - }); - - if (invalid_email) { - // at least 1 invalid email - return ''; - } else { - // all good - return v; - } - } - frappe.call({ method:"frappe.client.get_value", args:{ diff --git a/erpnext/patches/v10_0/add_non_profit_domain.py b/erpnext/patches/v10_0/add_non_profit_domain.py index 52f6f6cc4b..ff673c56f9 100644 --- a/erpnext/patches/v10_0/add_non_profit_domain.py +++ b/erpnext/patches/v10_0/add_non_profit_domain.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import frappe -from frappe import _ def execute(): domain = 'Non Profit' diff --git a/erpnext/templates/pages/non_profit/join_chapter.py b/erpnext/templates/pages/non_profit/join_chapter.py index bc9ba6ba74..78ef053bed 100644 --- a/erpnext/templates/pages/non_profit/join_chapter.py +++ b/erpnext/templates/pages/non_profit/join_chapter.py @@ -11,7 +11,7 @@ def get_context(context): pass elif frappe.request.method=='POST': chapter.append('members', dict( - user=frappe.session.user, + user=frappe.session.user, introduction=frappe.form_dict.introduction, website_url=frappe.form_dict.website_url, enabled=1