From c0d210206fb37624888d6f7b8aba92a6e7366063 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 2 Apr 2020 18:12:43 +0530
Subject: [PATCH 001/345] feat: paytm integration

---
 .../doctype/paytm_settings/__init__.py        |  0
 .../doctype/paytm_settings/paytm_settings.js  |  8 ++++
 .../paytm_settings/paytm_settings.json        | 46 +++++++++++++++++++
 .../doctype/paytm_settings/paytm_settings.py  | 10 ++++
 .../paytm_settings/test_paytm_settings.py     | 10 ++++
 5 files changed, 74 insertions(+)
 create mode 100644 frappe/integrations/doctype/paytm_settings/__init__.py
 create mode 100644 frappe/integrations/doctype/paytm_settings/paytm_settings.js
 create mode 100644 frappe/integrations/doctype/paytm_settings/paytm_settings.json
 create mode 100644 frappe/integrations/doctype/paytm_settings/paytm_settings.py
 create mode 100644 frappe/integrations/doctype/paytm_settings/test_paytm_settings.py

diff --git a/frappe/integrations/doctype/paytm_settings/__init__.py b/frappe/integrations/doctype/paytm_settings/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.js b/frappe/integrations/doctype/paytm_settings/paytm_settings.js
new file mode 100644
index 0000000000..d51a6e4a25
--- /dev/null
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Paytm Settings', {
+	// refresh: function(frm) {
+
+	// }
+});
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.json b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
new file mode 100644
index 0000000000..e57c8a192c
--- /dev/null
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
@@ -0,0 +1,46 @@
+{
+ "actions": [],
+ "creation": "2020-04-02 00:11:22.846697",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "merchant_id",
+  "merchant_key"
+ ],
+ "fields": [
+  {
+   "fieldname": "merchant_id",
+   "fieldtype": "Data",
+   "label": "Merchant ID"
+  },
+  {
+   "fieldname": "merchant_key",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Merchant Key"
+  }
+ ],
+ "issingle": 1,
+ "links": [],
+ "modified": "2020-04-02 00:11:22.846697",
+ "modified_by": "Administrator",
+ "module": "Integrations",
+ "name": "Paytm Settings",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
new file mode 100644
index 0000000000..74d51d1dcc
--- /dev/null
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class PaytmSettings(Document):
+	pass
diff --git a/frappe/integrations/doctype/paytm_settings/test_paytm_settings.py b/frappe/integrations/doctype/paytm_settings/test_paytm_settings.py
new file mode 100644
index 0000000000..77a16c82ae
--- /dev/null
+++ b/frappe/integrations/doctype/paytm_settings/test_paytm_settings.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestPaytmSettings(unittest.TestCase):
+	pass

From 8831bc6531bad3925526ea0d4e9f345cfbd89610 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Wed, 8 Apr 2020 18:49:48 +0530
Subject: [PATCH 002/345] feat: blink checkout

---
 .../doctype/paytm_settings/checksum.py        | 143 ++++++++++++++++++
 .../includes/integrations/paytm_checkout.js   |  42 +++++
 2 files changed, 185 insertions(+)
 create mode 100644 frappe/integrations/doctype/paytm_settings/checksum.py
 create mode 100644 frappe/templates/includes/integrations/paytm_checkout.js

diff --git a/frappe/integrations/doctype/paytm_settings/checksum.py b/frappe/integrations/doctype/paytm_settings/checksum.py
new file mode 100644
index 0000000000..95fb7dc164
--- /dev/null
+++ b/frappe/integrations/doctype/paytm_settings/checksum.py
@@ -0,0 +1,143 @@
+import base64
+import string
+import random
+import hashlib
+
+from Crypto.Cipher import AES
+
+
+IV = "@@@@&&&&####$$$$"
+BLOCK_SIZE = 16
+
+
+def generate_checksum(param_dict, merchant_key, salt=None):
+	params_string = __get_param_string__(param_dict)
+	salt = salt if salt else __id_generator__(4)
+	final_string = '%s|%s' % (params_string, salt)
+
+	hasher = hashlib.sha256(final_string.encode())
+	hash_string = hasher.hexdigest()
+
+	hash_string += salt
+
+	return __encode__(hash_string, IV, merchant_key)
+
+
+def generate_refund_checksum(param_dict, merchant_key, salt=None):
+	for i in param_dict:
+		if("|" in param_dict[i]):
+			param_dict = {}
+			exit()
+	params_string = __get_param_string__(param_dict)
+	salt = salt if salt else __id_generator__(4)
+	final_string = '%s|%s' % (params_string, salt)
+
+	hasher = hashlib.sha256(final_string.encode())
+	hash_string = hasher.hexdigest()
+
+	hash_string += salt
+
+	return __encode__(hash_string, IV, merchant_key)
+
+
+def generate_checksum_by_str(param_str, merchant_key, salt=None):
+	params_string = param_str
+	salt = salt if salt else __id_generator__(4)
+	final_string = '%s|%s' % (params_string, salt)
+
+	hasher = hashlib.sha256(final_string.encode())
+	hash_string = hasher.hexdigest()
+
+	hash_string += salt
+
+	return __encode__(hash_string, IV, merchant_key)
+
+
+def verify_checksum(param_dict, merchant_key, checksum):
+	# Remove checksum
+	if 'CHECKSUMHASH' in param_dict:
+		param_dict.pop('CHECKSUMHASH')
+
+	# Get salt
+	paytm_hash = __decode__(checksum, IV, merchant_key)
+	salt = paytm_hash[-4:]
+	calculated_checksum = generate_checksum(
+		param_dict, merchant_key, salt=salt)
+	return calculated_checksum == checksum
+
+
+def verify_checksum_by_str(param_str, merchant_key, checksum):
+	# Remove checksum
+	# if 'CHECKSUMHASH' in param_dict:
+		# param_dict.pop('CHECKSUMHASH')
+
+	# Get salt
+	paytm_hash = __decode__(checksum, IV, merchant_key)
+	salt = paytm_hash[-4:]
+	calculated_checksum = generate_checksum_by_str(
+		param_str, merchant_key, salt=salt)
+	return calculated_checksum == checksum
+
+
+def __id_generator__(size=6, chars=string.ascii_uppercase + string.digits + string.ascii_lowercase):
+	return ''.join(random.choice(chars) for _ in range(size))
+
+
+def __get_param_string__(params):
+	params_string = []
+	for key in sorted(params.keys()):
+		if("REFUND" in params[key] or "|" in params[key]):
+			respons_dict = {}
+			exit()
+		value = params[key]
+		params_string.append('' if value == 'null' else str(value))
+	return '|'.join(params_string)
+
+
+def __pad__(s): return s + (BLOCK_SIZE - len(s) %
+							BLOCK_SIZE) * chr(BLOCK_SIZE - len(s) % BLOCK_SIZE)
+
+
+def __unpad__(s): return s[0:-ord(s[-1])]
+
+
+def __encode__(to_encode, iv, key):
+	# Pad
+	to_encode = __pad__(to_encode)
+	# Encrypt
+	c = AES.new(key, AES.MODE_CBC, iv)
+	to_encode = c.encrypt(to_encode)
+	# Encode
+	to_encode = base64.b64encode(to_encode)
+	return to_encode.decode("UTF-8")
+
+
+def __decode__(to_decode, iv, key):
+	# Decode
+	to_decode = base64.b64decode(to_decode)
+	# Decrypt
+	c = AES.new(key, AES.MODE_CBC, iv)
+	to_decode = c.decrypt(to_decode)
+	if type(to_decode) == bytes:
+		# convert bytes array to str.
+		to_decode = to_decode.decode()
+	# remove pad
+	return __unpad__(to_decode)
+
+
+if __name__ == "__main__":
+	params = {
+		"MID": "mid",
+		"ORDER_ID": "order_id",
+		"CUST_ID": "cust_id",
+		"TXN_AMOUNT": "1",
+		"CHANNEL_ID": "WEB",
+		"INDUSTRY_TYPE_ID": "Retail",
+		"WEBSITE": "xxxxxxxxxxx"
+	}
+
+	print(verify_checksum(
+		params, 'xxxxxxxxxxxxxxxx',
+		"CD5ndX8VVjlzjWbbYoAtKQIlvtXPypQYOg0Fi2AUYKXZA5XSHiRF0FDj7vQu66S8MHx9NaDZ/uYm3WBOWHf+sDQAmTyxqUipA7i1nILlxrk="))
+
+	# print(generate_checksum(params, "xxxxxxxxxxxxxxxx"))
diff --git a/frappe/templates/includes/integrations/paytm_checkout.js b/frappe/templates/includes/integrations/paytm_checkout.js
new file mode 100644
index 0000000000..4cf070b60b
--- /dev/null
+++ b/frappe/templates/includes/integrations/paytm_checkout.js
@@ -0,0 +1,42 @@
+function onScriptLoad() {
+	console.log('inside on load')
+	var config = {
+		root: '',
+		flow: 'DEFAULT',
+		data: {
+			orderId: '{{ order_id}}',
+			token: '{{ token }}',
+			tokenType: 'TXN_TOKEN',
+			amount: '{{ amount }}'
+		},
+		handler: {
+			notifyMerchant: function(eventName, data) {
+				// notify about the state of the payment page ( invalid token , session expire , cancel transaction)
+				console.log('notifyMerchant handler function called');
+				console.log('eventName => ', eventName);
+				console.log('data => ', data);
+			},
+			transactionStatus: function transactionStatus(paymentStatus) {
+				// provide information to merchant about the payment status.
+				console.log('transaction status handler function called');
+				console.log('paymentStatus => ', paymentStatus);
+			}
+		}
+	};
+
+	$('.paytm-loading').addClass('hidden');
+	if (window.Paytm && window.Paytm.CheckoutJS) {
+		window.Paytm.CheckoutJS.onLoad(function excecuteAfterCompleteLoad() {
+			// initialze configuration using init method
+			window.Paytm.CheckoutJS.init(config)
+				.then(function onSuccess() {
+					// after successfully updating configuration, invoke Blink Checkout
+					window.Paytm.CheckoutJS.invoke();
+				})
+				.catch(function onError(error) {
+					console.log('inside the error window')
+					console.log('error => ', error);
+				});
+		});
+	}
+}

From 72e88b344033d8512651770c1f170324fa66d08d Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 10 Apr 2020 12:50:54 +0530
Subject: [PATCH 003/345] feat: create transaction token

---
 .../doctype/paytm_settings/paytm_settings.py  | 150 +++++++++++++++++-
 .../pages/integrations/paytm_checkout.html    |  26 +++
 .../pages/integrations/paytm_checkout.py      | 105 ++++++++++++
 3 files changed, 279 insertions(+), 2 deletions(-)
 create mode 100644 frappe/templates/pages/integrations/paytm_checkout.html
 create mode 100644 frappe/templates/pages/integrations/paytm_checkout.py

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index 74d51d1dcc..1f9e508460 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -3,8 +3,154 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-# import frappe
+import frappe
 from frappe.model.document import Document
+from frappe import _
+from six.moves.urllib.parse import urlencode
+from frappe.utils import get_url, call_hook_method, cint, flt
+from frappe.integrations.utils import make_get_request, make_post_request, create_request_log, create_payment_gateway
+from frappe.utils import get_request_site_address
+
+import json
+import requests
 
 class PaytmSettings(Document):
-	pass
+	supported_currencies = ["INR"]
+
+	def validate(self):
+		create_payment_gateway('Paytm')
+		call_hook_method('payment_gateway_enabled', gateway='Paytm')
+		if not self.flags.ignore_mandatory:
+			self.validate_paytm_credentails()
+
+	def validate_paytm_credentails(self):
+		if self.merchant_id and self.merchant_key:
+			pass
+			# header = {"Authorization": "Bearer {0}".format(self.get_password(fieldname="secret_key", raise_exception=False))}
+			# try:
+			# 	make_get_request(url="https://api.stripe.com/v1/charges", headers=header)
+			# except Exception:
+			# 	frappe.throw(_("Seems Publishable Key or Secret Key is wrong !!!"))
+
+	def validate_transaction_currency(self, currency):
+		if currency not in self.supported_currencies:
+			frappe.throw(_("Please select another payment method. Stripe does not support transactions in currency '{0}'").format(currency))
+
+	def get_payment_url(self, **kwargs):
+		'''Return payment url with several params'''
+		# create unique order id by making it equal to the integration request
+		integration_request = create_request_log(kwargs, "Host", "Paytm")
+		kwargs.update(dict(order_id=integration_request.name))
+
+		return get_url("./integrations/paytm_checkout?{0}".format(urlencode(kwargs)))
+
+	def create_request(self, data):
+		self.data = frappe._dict(data)
+
+		try:
+			self.integration_request = create_request_log(self.data, "Host", "Paytm")
+			return self.generate_transaction_token()
+
+		except Exception:
+			frappe.log_error(frappe.get_traceback())
+			return{
+				"redirect_to": frappe.redirect_to_message(_('Server Error'), _("It seems that there is an issue with the server's stripe configuration. In case of failure, the amount will get refunded to your account.")),
+				"status": 401
+			}
+
+	def generate_transaction_token(self):
+		import stripe
+		try:
+			charge = stripe.Charge.create(amount=cint(flt(self.data.amount)*100), currency=self.data.currency, source=self.data.stripe_token_id, description=self.data.description, receipt_email=self.data.payer_email)
+
+			if charge.captured == True:
+				self.integration_request.db_set('status', 'Completed', update_modified=False)
+				self.flags.status_changed_to = "Completed"
+
+			else:
+				frappe.log_error(charge.failure_message, 'Stripe Payment not completed')
+
+		except Exception:
+			frappe.log_error(frappe.get_traceback())
+
+		return self.finalize_request()
+
+
+	def finalize_request(self):
+		redirect_to = self.data.get('redirect_to') or None
+		redirect_message = self.data.get('redirect_message') or None
+		status = self.integration_request.status
+
+		if self.flags.status_changed_to == "Completed":
+			if self.data.reference_doctype and self.data.reference_docname:
+				custom_redirect_to = None
+				try:
+					custom_redirect_to = frappe.get_doc(self.data.reference_doctype,
+						self.data.reference_docname).run_method("on_payment_authorized", self.flags.status_changed_to)
+				except Exception:
+					frappe.log_error(frappe.get_traceback())
+
+				if custom_redirect_to:
+					redirect_to = custom_redirect_to
+
+				redirect_url = 'payment-success'
+
+			if self.redirect_url:
+				redirect_url = self.redirect_url
+				redirect_to = None
+		else:
+			redirect_url = 'payment-failed'
+
+		if redirect_to:
+			redirect_url += '?' + urlencode({'redirect_to': redirect_to})
+		if redirect_message:
+			redirect_url += '&' + urlencode({'redirect_message': redirect_message})
+
+		return {
+			"redirect_to": redirect_url,
+			"status": status
+		}
+
+def generate_transaction_token(payment_details, order_id, merchant_id, merchant_key):
+
+	# initialize a dictionary
+	paytmParams = dict()
+
+	redirect_uri = get_request_site_address(True) + "?cmd=frappe.templates.pages.integrations.paytm_checkout.get_transaction_status"
+
+	# body parameters
+	paytmParams["body"] = get_paytm_params(payment_details, order_id, merchant_id, merchant_key)
+
+	checksum = generate_checksum_by_str(json.dumps(paytmParams["body"]), merchant_key)
+
+	paytmParams["head"] = {
+		"signature"  : checksum
+	}
+
+	post_data = json.dumps(paytmParams)
+
+	url = "https://securegw-stage.paytm.in/theia/api/v1/initiateTransaction?mid={0}&orderId={1}".format(merchant_id, order_id)
+
+	response = requests.post(url, data = post_data, headers = {"Content-type": "application/json"}).json()
+	return response['body'].get('txnToken')
+
+def get_paytm_params(payment_details, order_id, merchant_id, merchant_key):
+	return {
+		"requestType" : "Payment",
+		"mid" : merchant_id,
+		"websiteName" : "WEBSTAGING",
+		"orderId" : order_id,
+		"callbackUrl" : redirect_uri,
+		"txnAmount" : {
+			"value" : flt(payment_details['amount'], 2),
+			"currency" : "INR",
+		},
+		"userInfo" : {
+			"custId" : payment_details['payer_email'],
+		},
+	}
+
+def get_gateway_controller(doctype, docname):
+	reference_doc = frappe.get_doc(doctype, docname)
+	gateway_controller = frappe.db.get_value("Payment Gateway", reference_doc.payment_gateway, "gateway_controller")
+	return gateway_controller
\ No newline at end of file
diff --git a/frappe/templates/pages/integrations/paytm_checkout.html b/frappe/templates/pages/integrations/paytm_checkout.html
new file mode 100644
index 0000000000..2aedf31d65
--- /dev/null
+++ b/frappe/templates/pages/integrations/paytm_checkout.html
@@ -0,0 +1,26 @@
+{% extends "templates/web.html" %} {% block title %} Payment {% endblock %} {%-
+block header -%}{% endblock %} {% block script %}
+<script defer
+	type="application/javascript"
+	crossorigin="anonymous"
+	src="{{ host }}/merchantpgpui/checkoutjs/merchants/{{ mid }}.js"
+	onload="onScriptLoad();"
+></script>
+<script>
+	{% include "/templates/includes/integrations/paytm_checkout.js" %}
+</script>
+{% endblock %} {%- block page_content -%}
+<div id="paytm-checkoutjs"></div>
+<p class="lead text-center centered">
+	<span class="paytm-loading">Loading Payment System</span>
+	<span class="paytm-confirming hidden">Confirming Payment</span>
+</p>
+
+{% endblock %} {% block style %}
+<style>
+	/* header,
+	footer {
+		display: none;
+	} */
+</style>
+{% endblock %}
diff --git a/frappe/templates/pages/integrations/paytm_checkout.py b/frappe/templates/pages/integrations/paytm_checkout.py
new file mode 100644
index 0000000000..a17873bc80
--- /dev/null
+++ b/frappe/templates/pages/integrations/paytm_checkout.py
@@ -0,0 +1,105 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import flt, cint
+import json
+from six import string_types
+from frappe.integrations.doctype.paytm_settings.checksum import generate_checksum_by_str
+from frappe.utils import get_request_site_address
+import requests
+
+no_cache = 1
+
+expected_keys = ('amount', 'title', 'description', 'reference_doctype', 'reference_docname',
+	'payer_name', 'payer_email')
+
+def get_context(context):
+	context.no_cache = 1
+	merchant_id, merchant_key = get_paytm_credentials()
+
+	try:
+		doc = frappe.get_doc("Integration Request", frappe.form_dict['order_id'])
+		payment_details = json.loads(doc.data)
+		context.token = generate_transaction_token(payment_details, doc.name, merchant_id, merchant_key)
+		context.order_id = doc.name
+
+
+		for key in expected_keys:
+			context[key] = payment_details[key]
+
+		context['amount'] = flt(context['amount'], 2)
+		context.host = 'https://securegw-stage.paytm.in'
+		context.mid = merchant_id
+
+	except Exception as e:
+		frappe.log_error()
+		frappe.redirect_to_message(_('Invalid Token'),
+			_('Seems token you are using is invalid!'),
+			http_status_code=400, indicator_color='red')
+
+		frappe.local.flags.redirect_location = frappe.local.response.location
+		raise frappe.Redirect
+
+def get_paytm_credentials():
+	return frappe.db.get_value("Paytm Settings", None, ['merchant_id', 'merchant_key'])
+
+@frappe.whitelist(allow_guest=True)
+def make_payment(paytm_payment_id, options, reference_doctype, reference_docname, token):
+	data = {}
+
+	if isinstance(options, string_types):
+		data = json.loads(options)
+
+	data.update({
+		"paytm_payment_id": paytm_payment_id,
+		"reference_docname": reference_docname,
+		"reference_doctype": reference_doctype,
+		"token": token
+	})
+
+	data =  frappe.get_doc("Paytm Settings").create_request(data)
+	frappe.db.commit()
+	return data
+
+def generate_transaction_token(payment_details, order_id, merchant_id, merchant_key):
+
+	# initialize a dictionary
+	paytmParams = dict()
+
+	redirect_uri = get_request_site_address(True) + "?cmd=frappe.templates.pages.integrations.paytm_checkout.get_transaction_status"
+
+	# body parameters
+	paytmParams["body"] = {
+		"requestType" : "Payment",
+		"mid" : merchant_id,
+		"websiteName" : "WEBSTAGING",
+		"orderId" : order_id,
+		"callbackUrl" : redirect_uri,
+		"txnAmount" : {
+			"value" : flt(payment_details['amount'], 2),
+			"currency" : "INR",
+		},
+		"userInfo" : {
+			"custId" : payment_details['payer_email'],
+		},
+	}
+
+	checksum = generate_checksum_by_str(json.dumps(paytmParams["body"]), merchant_key)
+
+	paytmParams["head"] = {
+		"signature"  : checksum
+	}
+
+	print(paytmParams)
+	post_data = json.dumps(paytmParams)
+
+	url = "https://securegw-stage.paytm.in/theia/api/v1/initiateTransaction?mid={0}&orderId={1}".format(merchant_id, order_id)
+
+	response = requests.post(url, data = post_data, headers = {"Content-type": "application/json"}).json()
+	return response['body'].get('txnToken')
+
+@frappe.whitelist(allow_guest=True)
+def get_transaction_status():
+	print(vars(frappe.form_dict))
\ No newline at end of file

From 3f6459edbb384d1529fe350bd93bd413c4b4f136 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 16 Apr 2020 15:48:37 +0530
Subject: [PATCH 004/345] fix: paytm integration

---
 .pylintrc                                                      | 2 --
 frappe/integrations/doctype/paytm_settings/paytm_settings.json | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 .pylintrc

diff --git a/.pylintrc b/.pylintrc
deleted file mode 100644
index c11c0ab6a3..0000000000
--- a/.pylintrc
+++ /dev/null
@@ -1,2 +0,0 @@
-disable=access-member-before-definition
-disable=no-member
\ No newline at end of file
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.json b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
index e57c8a192c..eb68f0ab79 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.json
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
@@ -17,13 +17,12 @@
   {
    "fieldname": "merchant_key",
    "fieldtype": "Data",
-   "hidden": 1,
    "label": "Merchant Key"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-04-02 00:11:22.846697",
+ "modified": "2020-04-07 19:57:24.126640",
  "modified_by": "Administrator",
  "module": "Integrations",
  "name": "Paytm Settings",

From b0a34c602d9954f9b1d77fae918ce167a2ba799e Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 16 Apr 2020 15:51:11 +0530
Subject: [PATCH 005/345] fix: initiate payment via standard checkout

---
 .../pages/integrations/paytm_checkout.html    | 47 ++++++-----
 .../pages/integrations/paytm_checkout.py      | 78 ++-----------------
 2 files changed, 33 insertions(+), 92 deletions(-)

diff --git a/frappe/templates/pages/integrations/paytm_checkout.html b/frappe/templates/pages/integrations/paytm_checkout.html
index 2aedf31d65..772e16ecb8 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.html
+++ b/frappe/templates/pages/integrations/paytm_checkout.html
@@ -1,26 +1,35 @@
-{% extends "templates/web.html" %} {% block title %} Payment {% endblock %} {%-
-block header -%}{% endblock %} {% block script %}
-<script defer
-	type="application/javascript"
-	crossorigin="anonymous"
-	src="{{ host }}/merchantpgpui/checkoutjs/merchants/{{ mid }}.js"
-	onload="onScriptLoad();"
-></script>
-<script>
-	{% include "/templates/includes/integrations/paytm_checkout.js" %}
-</script>
-{% endblock %} {%- block page_content -%}
-<div id="paytm-checkoutjs"></div>
-<p class="lead text-center centered">
-	<span class="paytm-loading">Loading Payment System</span>
-	<span class="paytm-confirming hidden">Confirming Payment</span>
-</p>
+{% extends "templates/web.html" %}
 
-{% endblock %} {% block style %}
+{% block title %} Payment {% endblock %}
+
+{%- block header -%}
+<head>
+	<title>Merchant Checkout Page</title>
+</head>
+{% endblock %}
+
+{% block script %}
+<script defer type="text/javascript">
+	document.paytm_form.submit();
+</script>
+{% endblock %}
+
+{%- block page_content -%}
+<body>
+		<center><h1>Please do not refresh this page...</h1></center>
+		<form method="post" action="{{ url }}" name="paytm_form">
+			{% for name, value in payment_details.items() %}
+				<input type="hidden" name="{{ name }}" value="{{ value }}">
+			{% endfor %}
+		</form>
+</body>
+{% endblock %}
+
+{% block style %}
 <style>
 	/* header,
 	footer {
 		display: none;
 	} */
 </style>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/frappe/templates/pages/integrations/paytm_checkout.py b/frappe/templates/pages/integrations/paytm_checkout.py
index a17873bc80..1c61d5cab4 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.py
+++ b/frappe/templates/pages/integrations/paytm_checkout.py
@@ -6,8 +6,8 @@ from frappe import _
 from frappe.utils import flt, cint
 import json
 from six import string_types
-from frappe.integrations.doctype.paytm_settings.checksum import generate_checksum_by_str
 from frappe.utils import get_request_site_address
+from frappe.integrations.doctype.paytm_settings.paytm_settings import get_paytm_params, get_paytm_config
 import requests
 
 no_cache = 1
@@ -17,21 +17,15 @@ expected_keys = ('amount', 'title', 'description', 'reference_doctype', 'referen
 
 def get_context(context):
 	context.no_cache = 1
-	merchant_id, merchant_key = get_paytm_credentials()
+	paytm_config = get_paytm_config()
 
 	try:
 		doc = frappe.get_doc("Integration Request", frappe.form_dict['order_id'])
 		payment_details = json.loads(doc.data)
-		context.token = generate_transaction_token(payment_details, doc.name, merchant_id, merchant_key)
-		context.order_id = doc.name
 
+		context.payment_details = get_paytm_params(json.loads(doc.data), doc.name, paytm_config)
 
-		for key in expected_keys:
-			context[key] = payment_details[key]
-
-		context['amount'] = flt(context['amount'], 2)
-		context.host = 'https://securegw-stage.paytm.in'
-		context.mid = merchant_id
+		context.url = paytm_config.url
 
 	except Exception as e:
 		frappe.log_error()
@@ -40,66 +34,4 @@ def get_context(context):
 			http_status_code=400, indicator_color='red')
 
 		frappe.local.flags.redirect_location = frappe.local.response.location
-		raise frappe.Redirect
-
-def get_paytm_credentials():
-	return frappe.db.get_value("Paytm Settings", None, ['merchant_id', 'merchant_key'])
-
-@frappe.whitelist(allow_guest=True)
-def make_payment(paytm_payment_id, options, reference_doctype, reference_docname, token):
-	data = {}
-
-	if isinstance(options, string_types):
-		data = json.loads(options)
-
-	data.update({
-		"paytm_payment_id": paytm_payment_id,
-		"reference_docname": reference_docname,
-		"reference_doctype": reference_doctype,
-		"token": token
-	})
-
-	data =  frappe.get_doc("Paytm Settings").create_request(data)
-	frappe.db.commit()
-	return data
-
-def generate_transaction_token(payment_details, order_id, merchant_id, merchant_key):
-
-	# initialize a dictionary
-	paytmParams = dict()
-
-	redirect_uri = get_request_site_address(True) + "?cmd=frappe.templates.pages.integrations.paytm_checkout.get_transaction_status"
-
-	# body parameters
-	paytmParams["body"] = {
-		"requestType" : "Payment",
-		"mid" : merchant_id,
-		"websiteName" : "WEBSTAGING",
-		"orderId" : order_id,
-		"callbackUrl" : redirect_uri,
-		"txnAmount" : {
-			"value" : flt(payment_details['amount'], 2),
-			"currency" : "INR",
-		},
-		"userInfo" : {
-			"custId" : payment_details['payer_email'],
-		},
-	}
-
-	checksum = generate_checksum_by_str(json.dumps(paytmParams["body"]), merchant_key)
-
-	paytmParams["head"] = {
-		"signature"  : checksum
-	}
-
-	print(paytmParams)
-	post_data = json.dumps(paytmParams)
-
-	url = "https://securegw-stage.paytm.in/theia/api/v1/initiateTransaction?mid={0}&orderId={1}".format(merchant_id, order_id)
-
-	response = requests.post(url, data = post_data, headers = {"Content-type": "application/json"}).json()
-	return response['body'].get('txnToken')
-
-@frappe.whitelist(allow_guest=True)
-def get_transaction_status():
-	print(vars(frappe.form_dict))
\ No newline at end of file
+		raise frappe.Redirect
\ No newline at end of file

From 9d71bdcd874451181c21b384be81f8e88f390500 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 16 Apr 2020 18:53:56 +0530
Subject: [PATCH 006/345] feat: add paytm config, transaction status

---
 .../paytm_settings/paytm_settings.json        |  40 +++-
 .../doctype/paytm_settings/paytm_settings.py  | 206 ++++++++++--------
 2 files changed, 148 insertions(+), 98 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.json b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
index eb68f0ab79..0540dc4948 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.json
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
@@ -6,23 +6,55 @@
  "engine": "InnoDB",
  "field_order": [
   "merchant_id",
-  "merchant_key"
+  "merchant_key",
+  "staging",
+  "column_break_4",
+  "industry_type",
+  "website"
  ],
  "fields": [
   {
    "fieldname": "merchant_id",
    "fieldtype": "Data",
-   "label": "Merchant ID"
+   "in_list_view": 1,
+   "label": "Merchant ID",
+   "reqd": 1
   },
   {
    "fieldname": "merchant_key",
+   "fieldtype": "Password",
+   "in_list_view": 1,
+   "label": "Merchant Key",
+   "reqd": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "staging",
+   "fieldtype": "Check",
+   "label": "Staging"
+  },
+  {
+   "depends_on": "eval: !doc.staging",
+   "fieldname": "industry_type",
    "fieldtype": "Data",
-   "label": "Merchant Key"
+   "label": "Industry Type",
+   "mandatory_depends_on": "eval: !doc.staging"
+  },
+  {
+   "depends_on": "eval: !doc.staging",
+   "fieldname": "website",
+   "fieldtype": "Data",
+   "label": "Website",
+   "mandatory_depends_on": "eval: !doc.staging"
+  },
+  {
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-04-07 19:57:24.126640",
+ "modified": "2020-04-16 14:16:19.687449",
  "modified_by": "Administrator",
  "module": "Integrations",
  "name": "Paytm Settings",
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index 1f9e508460..10282d34ea 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -3,16 +3,18 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
+import json
+import requests
+from six.moves.urllib.parse import urlencode
+
 import frappe
 from frappe.model.document import Document
 from frappe import _
-from six.moves.urllib.parse import urlencode
-from frappe.utils import get_url, call_hook_method, cint, flt
+from frappe.utils import get_url, call_hook_method, cint, flt, cstr
 from frappe.integrations.utils import make_get_request, make_post_request, create_request_log, create_payment_gateway
 from frappe.utils import get_request_site_address
-
-import json
-import requests
+from frappe.integrations.doctype.paytm_settings.checksum import generate_checksum, verify_checksum
+from frappe.utils.password import get_decrypted_password
 
 class PaytmSettings(Document):
 	supported_currencies = ["INR"]
@@ -44,110 +46,126 @@ class PaytmSettings(Document):
 
 		return get_url("./integrations/paytm_checkout?{0}".format(urlencode(kwargs)))
 
-	def create_request(self, data):
-		self.data = frappe._dict(data)
+def get_paytm_config():
+	''' Returns paytm config '''
 
-		try:
-			self.integration_request = create_request_log(self.data, "Host", "Paytm")
-			return self.generate_transaction_token()
+	paytm_config = frappe.db.get_singles_dict('Paytm Settings')
+	paytm_config.update(dict(merchant_key=get_decrypted_password('Paytm Settings', 'Paytm Settings', 'merchant_key')))
 
-		except Exception:
-			frappe.log_error(frappe.get_traceback())
-			return{
-				"redirect_to": frappe.redirect_to_message(_('Server Error'), _("It seems that there is an issue with the server's stripe configuration. In case of failure, the amount will get refunded to your account.")),
-				"status": 401
-			}
+	if cint(paytm_config.staging):
+		paytm_config.update(dict(
+			website="WEBSTAGING",
+			url='https://securegw-stage.paytm.in/order/process',
+			transaction_status_url='https://securegw-stage.paytm.in/order/status',
+			industry_type_id='RETAIL'
+		))
+	else:
+		paytm_config.update(dict(
+			url='https://securegw.paytm.in/order/process',
+			transaction_status_url='https://securegw.paytm.in/order/status',
+		))
+	return paytm_config
 
-	def generate_transaction_token(self):
-		import stripe
-		try:
-			charge = stripe.Charge.create(amount=cint(flt(self.data.amount)*100), currency=self.data.currency, source=self.data.stripe_token_id, description=self.data.description, receipt_email=self.data.payer_email)
-
-			if charge.captured == True:
-				self.integration_request.db_set('status', 'Completed', update_modified=False)
-				self.flags.status_changed_to = "Completed"
-
-			else:
-				frappe.log_error(charge.failure_message, 'Stripe Payment not completed')
-
-		except Exception:
-			frappe.log_error(frappe.get_traceback())
-
-		return self.finalize_request()
-
-
-	def finalize_request(self):
-		redirect_to = self.data.get('redirect_to') or None
-		redirect_message = self.data.get('redirect_message') or None
-		status = self.integration_request.status
-
-		if self.flags.status_changed_to == "Completed":
-			if self.data.reference_doctype and self.data.reference_docname:
-				custom_redirect_to = None
-				try:
-					custom_redirect_to = frappe.get_doc(self.data.reference_doctype,
-						self.data.reference_docname).run_method("on_payment_authorized", self.flags.status_changed_to)
-				except Exception:
-					frappe.log_error(frappe.get_traceback())
-
-				if custom_redirect_to:
-					redirect_to = custom_redirect_to
-
-				redirect_url = 'payment-success'
-
-			if self.redirect_url:
-				redirect_url = self.redirect_url
-				redirect_to = None
-		else:
-			redirect_url = 'payment-failed'
-
-		if redirect_to:
-			redirect_url += '?' + urlencode({'redirect_to': redirect_to})
-		if redirect_message:
-			redirect_url += '&' + urlencode({'redirect_message': redirect_message})
-
-		return {
-			"redirect_to": redirect_url,
-			"status": status
-		}
-
-def generate_transaction_token(payment_details, order_id, merchant_id, merchant_key):
+def get_paytm_params(payment_details, order_id, paytm_config):
 
 	# initialize a dictionary
-	paytmParams = dict()
+	paytm_params = dict()
+	
+	# redirect_uri = get_request_site_address(True) + "/api/method/frappe.integrations.doctype.paytm_settings.paytm_settings.get_transaction_status"
+	redirect_uri = "http://cf9b2bb1.ngrok.io/api/method/frappe.integrations.doctype.paytm_settings.paytm_settings.get_transaction_status"
 
-	redirect_uri = get_request_site_address(True) + "?cmd=frappe.templates.pages.integrations.paytm_checkout.get_transaction_status"
+	paytm_params.update({
+		"MID" : paytm_config.merchant_id,
+		"WEBSITE" : paytm_config.website,
+		"INDUSTRY_TYPE_ID" : paytm_config.industry_type_id,
+		"CHANNEL_ID" : "WEB",
+		"ORDER_ID" : order_id,
+		"CUST_ID" : payment_details['payer_email'],
+		"EMAIL" : payment_details['payer_email'],
+		"TXN_AMOUNT" : cstr(flt(payment_details['amount'], 2)),
+		"CALLBACK_URL" : redirect_uri,
+	})
 
-	# body parameters
-	paytmParams["body"] = get_paytm_params(payment_details, order_id, merchant_id, merchant_key)
+	checksum = generate_checksum(paytm_params, paytm_config.merchant_key)
 
-	checksum = generate_checksum_by_str(json.dumps(paytmParams["body"]), merchant_key)
+	paytm_params.update({
+		"CHECKSUMHASH" : checksum
+	})
 
-	paytmParams["head"] = {
-		"signature"  : checksum
-	}
+	return paytm_params
 
-	post_data = json.dumps(paytmParams)
+@frappe.whitelist(allow_guest=True)
+def verify_transaction(**kwargs):
+	'''Verify checksum for received data in the callback and then verify the transaction'''
+	paytm_config = get_paytm_config()
+	received_data = frappe._dict(kwargs)
 
-	url = "https://securegw-stage.paytm.in/theia/api/v1/initiateTransaction?mid={0}&orderId={1}".format(merchant_id, order_id)
+	print(received_data)
+	paytm_params = {}
+	for key, value in received_data.items(): 
+		if key == 'CHECKSUMHASH':
+			paytm_checksum = value
+		else:
+			paytm_params[key] = value
+
+	# Verify checksum
+	is_valid_checksum = verify_checksum(paytm_params, paytm_config.merchant_key, paytm_checksum)
+
+	if is_valid_checksum and received_data['RESPCODE'] == '01':
+		verify_transaction_status(paytm_config, received_data['ORDERID'])
+	else:
+		frappe.respond_as_web_page("Payment Failed",
+			"Transaction failed to complete. Don't worry, in case of failure amount will get refunded to your account.",
+			http_status_code=401, indicator_color='red')
+		frappe.log_error("Order unsuccessful, received data:"+received_data, 'Paytm Payment Failed')
+
+def verify_transaction_status(paytm_config, order_id):
+	'''Verify transaction completion after checksum has been verified'''
+	paytm_params=dict(
+		MID=paytm_config.merchant_id,
+		ORDERID= order_id
+	)
+
+	checksum = generate_checksum(paytm_params, paytm_config.merchant_key)
+	paytm_params["CHECKSUMHASH"] = checksum
+
+	post_data = json.dumps(paytm_params)
+	url = paytm_config.transaction_status_url
 
 	response = requests.post(url, data = post_data, headers = {"Content-type": "application/json"}).json()
-	return response['body'].get('txnToken')
+	print('transaction status response')
+	print(response)
+	finalize_request(order_id, response)
+
+def finalize_request(order_id, response):
+	request = frappe.db.get_value('Integration Request', order_id)
+	redirect_to = request.data.get('redirect_to') or None
+	redirect_message = request.data.get('redirect_message') or None
+
+	if request.flags.status_changed_to == "Completed":
+		if request.data.reference_doctype and request.data.reference_docname:
+			custom_redirect_to = None
+			try:
+				custom_redirect_to = frappe.get_doc(request.data.reference_doctype,
+					request.data.reference_docname).run_method("on_payment_authorized", request.flags.status_changed_to)
+			except Exception:
+				frappe.log_error(frappe.get_traceback())
+
+			if custom_redirect_to:
+				redirect_to = custom_redirect_to
+
+			redirect_url = 'payment-success'
+	else:
+		redirect_url = 'payment-failed'
+
+	if redirect_to:
+		redirect_url += '?' + urlencode({'redirect_to': redirect_to})
+	if redirect_message:
+		redirect_url += '&' + urlencode({'redirect_message': redirect_message})
 
-def get_paytm_params(payment_details, order_id, merchant_id, merchant_key):
 	return {
-		"requestType" : "Payment",
-		"mid" : merchant_id,
-		"websiteName" : "WEBSTAGING",
-		"orderId" : order_id,
-		"callbackUrl" : redirect_uri,
-		"txnAmount" : {
-			"value" : flt(payment_details['amount'], 2),
-			"currency" : "INR",
-		},
-		"userInfo" : {
-			"custId" : payment_details['payer_email'],
-		},
+		"redirect_to": redirect_url,
+		"status": status
 	}
 
 def get_gateway_controller(doctype, docname):

From cf5da1c787e1a24ef707d8541e26e5091421ee63 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 17 Apr 2020 10:02:54 +0530
Subject: [PATCH 007/345] fix: check for transaction success in the final stage

---
 .../doctype/paytm_settings/paytm_settings.py        | 13 ++++---------
 .../templates/pages/integrations/paytm_checkout.py  |  1 -
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index 10282d34ea..3382aeb6ed 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -100,7 +100,6 @@ def verify_transaction(**kwargs):
 	paytm_config = get_paytm_config()
 	received_data = frappe._dict(kwargs)
 
-	print(received_data)
 	paytm_params = {}
 	for key, value in received_data.items(): 
 		if key == 'CHECKSUMHASH':
@@ -133,16 +132,14 @@ def verify_transaction_status(paytm_config, order_id):
 	url = paytm_config.transaction_status_url
 
 	response = requests.post(url, data = post_data, headers = {"Content-type": "application/json"}).json()
-	print('transaction status response')
-	print(response)
 	finalize_request(order_id, response)
 
-def finalize_request(order_id, response):
+def finalize_request(order_id, transaction_response):
 	request = frappe.db.get_value('Integration Request', order_id)
 	redirect_to = request.data.get('redirect_to') or None
 	redirect_message = request.data.get('redirect_message') or None
 
-	if request.flags.status_changed_to == "Completed":
+	if transaction_response['STATUS'] == "TXN_SUCCESS":
 		if request.data.reference_doctype and request.data.reference_docname:
 			custom_redirect_to = None
 			try:
@@ -163,10 +160,8 @@ def finalize_request(order_id, response):
 	if redirect_message:
 		redirect_url += '&' + urlencode({'redirect_message': redirect_message})
 
-	return {
-		"redirect_to": redirect_url,
-		"status": status
-	}
+	frappe.local.response['type'] = 'redirect'
+	frappe.local.response['location'] = 'redirect_url'
 
 def get_gateway_controller(doctype, docname):
 	reference_doc = frappe.get_doc(doctype, docname)
diff --git a/frappe/templates/pages/integrations/paytm_checkout.py b/frappe/templates/pages/integrations/paytm_checkout.py
index 1c61d5cab4..1fa947a68f 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.py
+++ b/frappe/templates/pages/integrations/paytm_checkout.py
@@ -21,7 +21,6 @@ def get_context(context):
 
 	try:
 		doc = frappe.get_doc("Integration Request", frappe.form_dict['order_id'])
-		payment_details = json.loads(doc.data)
 
 		context.payment_details = get_paytm_params(json.loads(doc.data), doc.name, paytm_config)
 

From 0cbf937763cf96ee2fd567aba550ebf0fe29b273 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 17 Apr 2020 13:34:26 +0530
Subject: [PATCH 008/345] fix: change status of integration request on
 completion

---
 .../integrations/doctype/paytm_settings/paytm_settings.py  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index 3382aeb6ed..39a9f42aa0 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -135,7 +135,7 @@ def verify_transaction_status(paytm_config, order_id):
 	finalize_request(order_id, response)
 
 def finalize_request(order_id, transaction_response):
-	request = frappe.db.get_value('Integration Request', order_id)
+	request = frappe.get_doc('Integration Request', order_id)
 	redirect_to = request.data.get('redirect_to') or None
 	redirect_message = request.data.get('redirect_message') or None
 
@@ -144,8 +144,10 @@ def finalize_request(order_id, transaction_response):
 			custom_redirect_to = None
 			try:
 				custom_redirect_to = frappe.get_doc(request.data.reference_doctype,
-					request.data.reference_docname).run_method("on_payment_authorized", request.flags.status_changed_to)
+					request.data.reference_docname).run_method("on_payment_authorized", 'Completed')
+				request.db_set('status', 'Completed')
 			except Exception:
+				request.db_set('status', 'Failed')
 				frappe.log_error(frappe.get_traceback())
 
 			if custom_redirect_to:
@@ -153,6 +155,7 @@ def finalize_request(order_id, transaction_response):
 
 			redirect_url = 'payment-success'
 	else:
+		request.db_set('status', 'Failed')
 		redirect_url = 'payment-failed'
 
 	if redirect_to:

From 6eaefb35c7137352f19f2c7d153aa5c78d740bba Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Wed, 22 Apr 2020 11:40:08 +0530
Subject: [PATCH 009/345] fix: add finalize request to complete the transaction

---
 .../doctype/paytm_settings/paytm_settings.py  | 33 ++++++++-------
 .../includes/integrations/paytm_checkout.js   | 42 -------------------
 .../pages/integrations/paytm_checkout.html    |  4 +-
 .../pages/integrations/paytm_checkout.py      |  3 --
 .../website_theme/standard/standard.json      | 20 ---------
 5 files changed, 22 insertions(+), 80 deletions(-)
 delete mode 100644 frappe/templates/includes/integrations/paytm_checkout.js
 delete mode 100644 frappe/website/website_theme/standard/standard.json

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index 39a9f42aa0..394cd9c334 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -71,8 +71,8 @@ def get_paytm_params(payment_details, order_id, paytm_config):
 	# initialize a dictionary
 	paytm_params = dict()
 	
-	# redirect_uri = get_request_site_address(True) + "/api/method/frappe.integrations.doctype.paytm_settings.paytm_settings.get_transaction_status"
-	redirect_uri = "http://cf9b2bb1.ngrok.io/api/method/frappe.integrations.doctype.paytm_settings.paytm_settings.get_transaction_status"
+	redirect_uri = get_request_site_address(True) + "/api/method/frappe.integrations.doctype.paytm_settings.paytm_settings.verify_transaction"
+
 
 	paytm_params.update({
 		"MID" : paytm_config.merchant_id,
@@ -99,24 +99,28 @@ def verify_transaction(**kwargs):
 	'''Verify checksum for received data in the callback and then verify the transaction'''
 	paytm_config = get_paytm_config()
 	received_data = frappe._dict(kwargs)
+	is_valid_checksum = False
 
 	paytm_params = {}
 	for key, value in received_data.items(): 
 		if key == 'CHECKSUMHASH':
 			paytm_checksum = value
+		elif key == 'cmd':
+			continue
 		else:
 			paytm_params[key] = value
 
-	# Verify checksum
-	is_valid_checksum = verify_checksum(paytm_params, paytm_config.merchant_key, paytm_checksum)
+	if paytm_params and paytm_config and paytm_checksum:
+		# Verify checksum
+		is_valid_checksum = verify_checksum(paytm_params, paytm_config.merchant_key, paytm_checksum)
 
 	if is_valid_checksum and received_data['RESPCODE'] == '01':
 		verify_transaction_status(paytm_config, received_data['ORDERID'])
 	else:
 		frappe.respond_as_web_page("Payment Failed",
-			"Transaction failed to complete. Don't worry, in case of failure amount will get refunded to your account.",
+			"Transaction failed to complete. In case of any deductions, deducted amount will get refunded to your account.",
 			http_status_code=401, indicator_color='red')
-		frappe.log_error("Order unsuccessful, received data:"+received_data, 'Paytm Payment Failed')
+		frappe.log_error("Order unsuccessful. Failed Response:"+cstr(received_data), 'Paytm Payment Failed')
 
 def verify_transaction_status(paytm_config, order_id):
 	'''Verify transaction completion after checksum has been verified'''
@@ -136,15 +140,16 @@ def verify_transaction_status(paytm_config, order_id):
 
 def finalize_request(order_id, transaction_response):
 	request = frappe.get_doc('Integration Request', order_id)
-	redirect_to = request.data.get('redirect_to') or None
-	redirect_message = request.data.get('redirect_message') or None
+	transaction_data = frappe._dict(json.loads(request.data))
+	redirect_to = transaction_data.get('redirect_to') or None
+	redirect_message = transaction_data.get('redirect_message') or None
 
 	if transaction_response['STATUS'] == "TXN_SUCCESS":
-		if request.data.reference_doctype and request.data.reference_docname:
+		if transaction_data.reference_doctype and transaction_data.reference_docname:
 			custom_redirect_to = None
 			try:
-				custom_redirect_to = frappe.get_doc(request.data.reference_doctype,
-					request.data.reference_docname).run_method("on_payment_authorized", 'Completed')
+				custom_redirect_to = frappe.get_doc(transaction_data.reference_doctype,
+					transaction_data.reference_docname).run_method("on_payment_authorized", 'Completed')
 				request.db_set('status', 'Completed')
 			except Exception:
 				request.db_set('status', 'Failed')
@@ -153,10 +158,10 @@ def finalize_request(order_id, transaction_response):
 			if custom_redirect_to:
 				redirect_to = custom_redirect_to
 
-			redirect_url = 'payment-success'
+			redirect_url = '/integrations/payment-success'
 	else:
 		request.db_set('status', 'Failed')
-		redirect_url = 'payment-failed'
+		redirect_url = '/integrations/payment-failed'
 
 	if redirect_to:
 		redirect_url += '?' + urlencode({'redirect_to': redirect_to})
@@ -164,7 +169,7 @@ def finalize_request(order_id, transaction_response):
 		redirect_url += '&' + urlencode({'redirect_message': redirect_message})
 
 	frappe.local.response['type'] = 'redirect'
-	frappe.local.response['location'] = 'redirect_url'
+	frappe.local.response['location'] = redirect_url
 
 def get_gateway_controller(doctype, docname):
 	reference_doc = frappe.get_doc(doctype, docname)
diff --git a/frappe/templates/includes/integrations/paytm_checkout.js b/frappe/templates/includes/integrations/paytm_checkout.js
deleted file mode 100644
index 4cf070b60b..0000000000
--- a/frappe/templates/includes/integrations/paytm_checkout.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function onScriptLoad() {
-	console.log('inside on load')
-	var config = {
-		root: '',
-		flow: 'DEFAULT',
-		data: {
-			orderId: '{{ order_id}}',
-			token: '{{ token }}',
-			tokenType: 'TXN_TOKEN',
-			amount: '{{ amount }}'
-		},
-		handler: {
-			notifyMerchant: function(eventName, data) {
-				// notify about the state of the payment page ( invalid token , session expire , cancel transaction)
-				console.log('notifyMerchant handler function called');
-				console.log('eventName => ', eventName);
-				console.log('data => ', data);
-			},
-			transactionStatus: function transactionStatus(paymentStatus) {
-				// provide information to merchant about the payment status.
-				console.log('transaction status handler function called');
-				console.log('paymentStatus => ', paymentStatus);
-			}
-		}
-	};
-
-	$('.paytm-loading').addClass('hidden');
-	if (window.Paytm && window.Paytm.CheckoutJS) {
-		window.Paytm.CheckoutJS.onLoad(function excecuteAfterCompleteLoad() {
-			// initialze configuration using init method
-			window.Paytm.CheckoutJS.init(config)
-				.then(function onSuccess() {
-					// after successfully updating configuration, invoke Blink Checkout
-					window.Paytm.CheckoutJS.invoke();
-				})
-				.catch(function onError(error) {
-					console.log('inside the error window')
-					console.log('error => ', error);
-				});
-		});
-	}
-}
diff --git a/frappe/templates/pages/integrations/paytm_checkout.html b/frappe/templates/pages/integrations/paytm_checkout.html
index 772e16ecb8..77a2045edf 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.html
+++ b/frappe/templates/pages/integrations/paytm_checkout.html
@@ -16,12 +16,14 @@
 
 {%- block page_content -%}
 <body>
-		<center><h1>Please do not refresh this page...</h1></center>
+	<div style="margin: 30vh;">
+		<center><h2>Please do not refresh this page...</h2></center>
 		<form method="post" action="{{ url }}" name="paytm_form">
 			{% for name, value in payment_details.items() %}
 				<input type="hidden" name="{{ name }}" value="{{ value }}">
 			{% endfor %}
 		</form>
+	</div>
 </body>
 {% endblock %}
 
diff --git a/frappe/templates/pages/integrations/paytm_checkout.py b/frappe/templates/pages/integrations/paytm_checkout.py
index 1fa947a68f..5a55d02ce9 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.py
+++ b/frappe/templates/pages/integrations/paytm_checkout.py
@@ -12,9 +12,6 @@ import requests
 
 no_cache = 1
 
-expected_keys = ('amount', 'title', 'description', 'reference_doctype', 'reference_docname',
-	'payer_name', 'payer_email')
-
 def get_context(context):
 	context.no_cache = 1
 	paytm_config = get_paytm_config()
diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json
deleted file mode 100644
index a799f25425..0000000000
--- a/frappe/website/website_theme/standard/standard.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "button_gradients": 0,
- "button_rounded_corners": 1,
- "button_shadows": 0,
- "creation": "2015-02-19 13:37:33.925909",
- "custom": 0,
- "docstatus": 0,
- "doctype": "Website Theme",
- "font_properties": "300,600",
- "font_size": "",
- "idx": 27,
- "modified": "2020-04-21 02:10:31.761219",
- "modified_by": "Administrator",
- "module": "Website",
- "name": "Standard",
- "owner": "Administrator",
- "theme": "Standard",
- "theme_scss": "$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\n",
- "theme_url": "/assets/css/standard_style.css"
-}
\ No newline at end of file

From 25c9ac002290d070ab596a872faeba926f8317ad Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Wed, 22 Apr 2020 16:12:49 +0530
Subject: [PATCH 010/345] chore: remove initial validation check

---
 .../integrations/doctype/paytm_settings/checksum.py |  1 -
 .../doctype/paytm_settings/paytm_settings.py        | 13 +------------
 .../templates/pages/integrations/paytm_checkout.py  |  6 +-----
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/checksum.py b/frappe/integrations/doctype/paytm_settings/checksum.py
index 95fb7dc164..b2e67bb5ad 100644
--- a/frappe/integrations/doctype/paytm_settings/checksum.py
+++ b/frappe/integrations/doctype/paytm_settings/checksum.py
@@ -87,7 +87,6 @@ def __get_param_string__(params):
 	params_string = []
 	for key in sorted(params.keys()):
 		if("REFUND" in params[key] or "|" in params[key]):
-			respons_dict = {}
 			exit()
 		value = params[key]
 		params_string.append('' if value == 'null' else str(value))
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index 394cd9c334..ed71202ea6 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -11,7 +11,7 @@ import frappe
 from frappe.model.document import Document
 from frappe import _
 from frappe.utils import get_url, call_hook_method, cint, flt, cstr
-from frappe.integrations.utils import make_get_request, make_post_request, create_request_log, create_payment_gateway
+from frappe.integrations.utils import create_request_log, create_payment_gateway
 from frappe.utils import get_request_site_address
 from frappe.integrations.doctype.paytm_settings.checksum import generate_checksum, verify_checksum
 from frappe.utils.password import get_decrypted_password
@@ -22,17 +22,6 @@ class PaytmSettings(Document):
 	def validate(self):
 		create_payment_gateway('Paytm')
 		call_hook_method('payment_gateway_enabled', gateway='Paytm')
-		if not self.flags.ignore_mandatory:
-			self.validate_paytm_credentails()
-
-	def validate_paytm_credentails(self):
-		if self.merchant_id and self.merchant_key:
-			pass
-			# header = {"Authorization": "Bearer {0}".format(self.get_password(fieldname="secret_key", raise_exception=False))}
-			# try:
-			# 	make_get_request(url="https://api.stripe.com/v1/charges", headers=header)
-			# except Exception:
-			# 	frappe.throw(_("Seems Publishable Key or Secret Key is wrong !!!"))
 
 	def validate_transaction_currency(self, currency):
 		if currency not in self.supported_currencies:
diff --git a/frappe/templates/pages/integrations/paytm_checkout.py b/frappe/templates/pages/integrations/paytm_checkout.py
index 5a55d02ce9..3018a9d65b 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.py
+++ b/frappe/templates/pages/integrations/paytm_checkout.py
@@ -3,12 +3,8 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import flt, cint
 import json
-from six import string_types
-from frappe.utils import get_request_site_address
 from frappe.integrations.doctype.paytm_settings.paytm_settings import get_paytm_params, get_paytm_config
-import requests
 
 no_cache = 1
 
@@ -23,7 +19,7 @@ def get_context(context):
 
 		context.url = paytm_config.url
 
-	except Exception as e:
+	except Exception:
 		frappe.log_error()
 		frappe.redirect_to_message(_('Invalid Token'),
 			_('Seems token you are using is invalid!'),

From 7dbdb7c50bb37e0fa1e371032c4b2516d3089c4e Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 24 Apr 2020 11:18:35 +0530
Subject: [PATCH 011/345] fix: add pycryptodome for paytm checksum generation

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 58f923d880..2587a2eceb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -66,3 +66,4 @@ watchdog==0.8.0
 Werkzeug==0.16.1
 xlrd==1.2.0
 zxcvbn-python==4.4.24
+pycryptodome==3.9.7
\ No newline at end of file

From 7a15f6f61d121901aa08c1f0bd1c3627bda0fe34 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 24 Apr 2020 15:09:11 +0530
Subject: [PATCH 012/345] revert: add pylint and standard json again

---
 .pylintrc                                     |  2 ++
 .../website_theme/standard/standard.json      | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 .pylintrc
 create mode 100644 frappe/website/website_theme/standard/standard.json

diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 0000000000..c11c0ab6a3
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1,2 @@
+disable=access-member-before-definition
+disable=no-member
\ No newline at end of file
diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json
new file mode 100644
index 0000000000..a799f25425
--- /dev/null
+++ b/frappe/website/website_theme/standard/standard.json
@@ -0,0 +1,20 @@
+{
+ "button_gradients": 0,
+ "button_rounded_corners": 1,
+ "button_shadows": 0,
+ "creation": "2015-02-19 13:37:33.925909",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "Website Theme",
+ "font_properties": "300,600",
+ "font_size": "",
+ "idx": 27,
+ "modified": "2020-04-21 02:10:31.761219",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Standard",
+ "owner": "Administrator",
+ "theme": "Standard",
+ "theme_scss": "$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\n",
+ "theme_url": "/assets/css/standard_style.css"
+}
\ No newline at end of file

From f512fe8446f4fb8f9755099406a014ed0f04b8fd Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 7 May 2020 18:21:05 +0530
Subject: [PATCH 013/345] feat: help article feedback

---
 .../js/frappe/form/sidebar/form_sidebar.js    | 13 ++++
 .../frappe/form/templates/form_sidebar.html   |  6 +-
 frappe/public/js/frappe/utils/common.js       |  6 ++
 frappe/public/less/sidebar.less               |  3 +-
 frappe/templates/includes/feedback.html       | 29 +++++++++
 frappe/website/doctype/feedback/__init__.py   |  0
 frappe/website/doctype/feedback/feedback.js   |  8 +++
 frappe/website/doctype/feedback/feedback.json | 59 +++++++++++++++++++
 frappe/website/doctype/feedback/feedback.py   | 27 +++++++++
 .../website/doctype/feedback/test_feedback.py | 10 ++++
 .../help_article/templates/help_article.html  |  5 +-
 11 files changed, 163 insertions(+), 3 deletions(-)
 create mode 100644 frappe/templates/includes/feedback.html
 create mode 100644 frappe/website/doctype/feedback/__init__.py
 create mode 100644 frappe/website/doctype/feedback/feedback.js
 create mode 100644 frappe/website/doctype/feedback/feedback.json
 create mode 100644 frappe/website/doctype/feedback/feedback.py
 create mode 100644 frappe/website/doctype/feedback/test_feedback.py

diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
index a145e47149..9450fdc674 100644
--- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js
+++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
@@ -93,6 +93,19 @@ frappe.ui.form.Sidebar = Class.extend({
 				});
 			}
 
+			frappe.utils.get_feedback(this.frm.doc.name).then((res) => {
+				this.sidebar
+					.find(".helpful")
+					.html(
+						__("Helpful {0}", [String(res.message.helpful).bold()])
+					);
+				this.sidebar
+					.find(".not-helpful")
+					.html(
+						__("Not Helpful {0}", [String(res.message.not_helpful).bold()])
+					);
+			});
+
 			this.sidebar
 				.find(".modified-by")
 				.html(
diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html
index 30b2205bae..3e72684818 100644
--- a/frappe/public/js/frappe/form/templates/form_sidebar.html
+++ b/frappe/public/js/frappe/form/templates/form_sidebar.html
@@ -106,11 +106,15 @@
 </ul>
 <ul class="list-unstyled sidebar-menu text-muted">
 	<li class="pageview-count"></li>
+	<li class="feedback">
+		<p class="helpful"></p>
+		<p class="not-helpful"></p>
+	</li>
 	<li class="modified-by"></li>
 	<li class="created-by"></li>
 </ul>
 {% if(frappe.get_form_sidebar_extension) { %}
-    {{ frappe.get_form_sidebar_extension() }}
+	{{ frappe.get_form_sidebar_extension() }}
 {% } %}
 <ul class="list-unstyled visible-xs visible-sm">
 
diff --git a/frappe/public/js/frappe/utils/common.js b/frappe/public/js/frappe/utils/common.js
index 1cdabf23e0..2fda8ed27a 100644
--- a/frappe/public/js/frappe/utils/common.js
+++ b/frappe/public/js/frappe/utils/common.js
@@ -359,3 +359,9 @@ frappe.utils.get_page_view_count = function(route) {
 		path: route
 	});
 };
+
+frappe.utils.get_feedback = function(reference_name) {
+	return frappe.call("frappe.website.doctype.feedback.feedback.get_feedback_count", {
+		reference_name: reference_name
+	});
+};
\ No newline at end of file
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index 109b7a3209..b6ffb7e697 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -274,7 +274,8 @@ body[data-route^="Module"] .main-menu {
 
 .layout-side-section .form-sidebar {
 	.modified-by,
-	.pageview-count {
+	.pageview-count,
+	.feedback {
 		margin-bottom: 15px;
 	}
 }
diff --git a/frappe/templates/includes/feedback.html b/frappe/templates/includes/feedback.html
new file mode 100644
index 0000000000..5d10c7b159
--- /dev/null
+++ b/frappe/templates/includes/feedback.html
@@ -0,0 +1,29 @@
+<div class="feedback-view mb-4">
+	<hr />
+	<span class="text-muted small">{{ _("Helpful?") }}</span>
+	<span class="small">
+		<a class="feedback btn btn-light btn-sm" data-value="Yes">{{ _("Yes") }}</a>
+		<a class="feedback btn btn-light btn-sm" data-value="No">{{ _("No") }}</a>
+	</span>
+</div>
+
+<script>
+	frappe.ready(function() {
+		$(".feedback").click(function() {
+			let args = {
+				reference_doctype: "{{ reference_doctype or doctype }}",
+				reference_name: "{{ reference_name or name }}",
+				helpful: this.getAttribute("data-value"),
+			}
+
+			frappe.call({
+				btn: this,
+				method: "frappe.website.doctype.feedback.feedback.add_feedback",
+				args: args,
+				callback: function(r) {
+					console.log(r);
+				}
+			})
+		})
+	});
+</script>
diff --git a/frappe/website/doctype/feedback/__init__.py b/frappe/website/doctype/feedback/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/website/doctype/feedback/feedback.js b/frappe/website/doctype/feedback/feedback.js
new file mode 100644
index 0000000000..f5fa89b30e
--- /dev/null
+++ b/frappe/website/doctype/feedback/feedback.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Feedback', {
+	// refresh: function(frm) {
+
+	// }
+});
diff --git a/frappe/website/doctype/feedback/feedback.json b/frappe/website/doctype/feedback/feedback.json
new file mode 100644
index 0000000000..b04aefa462
--- /dev/null
+++ b/frappe/website/doctype/feedback/feedback.json
@@ -0,0 +1,59 @@
+{
+ "actions": [],
+ "creation": "2020-05-07 16:42:27.234652",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "reference_doctype",
+  "reference_name",
+  "helpful"
+ ],
+ "fields": [
+  {
+   "fieldname": "reference_doctype",
+   "fieldtype": "Link",
+   "label": "Reference DocType",
+   "options": "DocType"
+  },
+  {
+   "fieldname": "helpful",
+   "fieldtype": "Select",
+   "label": "Helpful",
+   "options": "Yes\nNo"
+  },
+  {
+   "fieldname": "reference_name",
+   "fieldtype": "Dynamic Link",
+   "label": "Reference Name",
+   "options": "reference_doctype",
+   "search_index": 1
+  }
+ ],
+ "in_create": 1,
+ "links": [],
+ "modified": "2020-05-07 16:53:29.211653",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Feedback",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "read_only": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/feedback.py b/frappe/website/doctype/feedback/feedback.py
new file mode 100644
index 0000000000..3b92118ec3
--- /dev/null
+++ b/frappe/website/doctype/feedback/feedback.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Feedback(Document):
+	pass
+
+@frappe.whitelist(allow_guest=True)
+def add_feedback(reference_doctype, reference_name, helpful):
+	frappe.get_doc({
+		"doctype": "Feedback",
+		"reference_doctype": reference_doctype,
+		"reference_name": reference_name,
+		"helpful": helpful
+	}).insert(ignore_permissions=True)
+
+@frappe.whitelist()
+def get_feedback_count(reference_name):
+
+	return {
+		"helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "Yes"}),
+		"not_helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "No"}),
+	}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/test_feedback.py b/frappe/website/doctype/feedback/test_feedback.py
new file mode 100644
index 0000000000..9a31738d75
--- /dev/null
+++ b/frappe/website/doctype/feedback/test_feedback.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestFeedback(unittest.TestCase):
+	pass
diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 913e6d6a92..6c59359785 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -19,6 +19,9 @@
 	<p><br><a href="/{{ category.route }}" class='text-muted small'>
 		{{ _("More articles on {0}").format(category.name) }}</a></p>
 </article>
+<div class="help-article-feedback">
+	{% include 'templates/includes/feedback.html' %}
+</div>
 <div class="help-article-comments">
 	<hr>
 	<h4>Comments</h4>
@@ -26,7 +29,7 @@
 </div>
 <script>
 frappe.ready(function() {
-    frappe.set_search_path("/kb");
+	frappe.set_search_path("/kb");
 });
 </script>
 {% endblock %}

From c3a45de794a23f96ba208add27c518765d8c9d80 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 8 May 2020 11:39:40 +0530
Subject: [PATCH 014/345] fix: feedback restrict to help article

---
 .../js/frappe/form/sidebar/form_sidebar.js    |  13 -
 .../frappe/form/templates/form_sidebar.html   |   4 -
 frappe/public/js/frappe/utils/common.js       |   6 -
 frappe/public/less/sidebar.less               |   3 +-
 frappe/templates/includes/feedback.html       |  29 -
 frappe/website/doctype/feedback/__init__.py   |   0
 frappe/website/doctype/feedback/feedback.js   |   8 -
 frappe/website/doctype/feedback/feedback.json |  59 --
 frappe/website/doctype/feedback/feedback.py   |  27 -
 .../website/doctype/feedback/test_feedback.py |  10 -
 .../doctype/help_article/help_article.js      |  15 +
 .../doctype/help_article/help_article.json    | 559 +++++-------------
 .../doctype/help_article/help_article.py      |  10 +-
 .../help_article/templates/help_article.html  |  26 +-
 14 files changed, 185 insertions(+), 584 deletions(-)
 delete mode 100644 frappe/templates/includes/feedback.html
 delete mode 100644 frappe/website/doctype/feedback/__init__.py
 delete mode 100644 frappe/website/doctype/feedback/feedback.js
 delete mode 100644 frappe/website/doctype/feedback/feedback.json
 delete mode 100644 frappe/website/doctype/feedback/feedback.py
 delete mode 100644 frappe/website/doctype/feedback/test_feedback.py

diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
index 9450fdc674..a145e47149 100644
--- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js
+++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
@@ -93,19 +93,6 @@ frappe.ui.form.Sidebar = Class.extend({
 				});
 			}
 
-			frappe.utils.get_feedback(this.frm.doc.name).then((res) => {
-				this.sidebar
-					.find(".helpful")
-					.html(
-						__("Helpful {0}", [String(res.message.helpful).bold()])
-					);
-				this.sidebar
-					.find(".not-helpful")
-					.html(
-						__("Not Helpful {0}", [String(res.message.not_helpful).bold()])
-					);
-			});
-
 			this.sidebar
 				.find(".modified-by")
 				.html(
diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html
index 3e72684818..497a6488e2 100644
--- a/frappe/public/js/frappe/form/templates/form_sidebar.html
+++ b/frappe/public/js/frappe/form/templates/form_sidebar.html
@@ -106,10 +106,6 @@
 </ul>
 <ul class="list-unstyled sidebar-menu text-muted">
 	<li class="pageview-count"></li>
-	<li class="feedback">
-		<p class="helpful"></p>
-		<p class="not-helpful"></p>
-	</li>
 	<li class="modified-by"></li>
 	<li class="created-by"></li>
 </ul>
diff --git a/frappe/public/js/frappe/utils/common.js b/frappe/public/js/frappe/utils/common.js
index 2fda8ed27a..1cdabf23e0 100644
--- a/frappe/public/js/frappe/utils/common.js
+++ b/frappe/public/js/frappe/utils/common.js
@@ -359,9 +359,3 @@ frappe.utils.get_page_view_count = function(route) {
 		path: route
 	});
 };
-
-frappe.utils.get_feedback = function(reference_name) {
-	return frappe.call("frappe.website.doctype.feedback.feedback.get_feedback_count", {
-		reference_name: reference_name
-	});
-};
\ No newline at end of file
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index b6ffb7e697..109b7a3209 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -274,8 +274,7 @@ body[data-route^="Module"] .main-menu {
 
 .layout-side-section .form-sidebar {
 	.modified-by,
-	.pageview-count,
-	.feedback {
+	.pageview-count {
 		margin-bottom: 15px;
 	}
 }
diff --git a/frappe/templates/includes/feedback.html b/frappe/templates/includes/feedback.html
deleted file mode 100644
index 5d10c7b159..0000000000
--- a/frappe/templates/includes/feedback.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="feedback-view mb-4">
-	<hr />
-	<span class="text-muted small">{{ _("Helpful?") }}</span>
-	<span class="small">
-		<a class="feedback btn btn-light btn-sm" data-value="Yes">{{ _("Yes") }}</a>
-		<a class="feedback btn btn-light btn-sm" data-value="No">{{ _("No") }}</a>
-	</span>
-</div>
-
-<script>
-	frappe.ready(function() {
-		$(".feedback").click(function() {
-			let args = {
-				reference_doctype: "{{ reference_doctype or doctype }}",
-				reference_name: "{{ reference_name or name }}",
-				helpful: this.getAttribute("data-value"),
-			}
-
-			frappe.call({
-				btn: this,
-				method: "frappe.website.doctype.feedback.feedback.add_feedback",
-				args: args,
-				callback: function(r) {
-					console.log(r);
-				}
-			})
-		})
-	});
-</script>
diff --git a/frappe/website/doctype/feedback/__init__.py b/frappe/website/doctype/feedback/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/website/doctype/feedback/feedback.js b/frappe/website/doctype/feedback/feedback.js
deleted file mode 100644
index f5fa89b30e..0000000000
--- a/frappe/website/doctype/feedback/feedback.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2020, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Feedback', {
-	// refresh: function(frm) {
-
-	// }
-});
diff --git a/frappe/website/doctype/feedback/feedback.json b/frappe/website/doctype/feedback/feedback.json
deleted file mode 100644
index b04aefa462..0000000000
--- a/frappe/website/doctype/feedback/feedback.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "actions": [],
- "creation": "2020-05-07 16:42:27.234652",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "reference_doctype",
-  "reference_name",
-  "helpful"
- ],
- "fields": [
-  {
-   "fieldname": "reference_doctype",
-   "fieldtype": "Link",
-   "label": "Reference DocType",
-   "options": "DocType"
-  },
-  {
-   "fieldname": "helpful",
-   "fieldtype": "Select",
-   "label": "Helpful",
-   "options": "Yes\nNo"
-  },
-  {
-   "fieldname": "reference_name",
-   "fieldtype": "Dynamic Link",
-   "label": "Reference Name",
-   "options": "reference_doctype",
-   "search_index": 1
-  }
- ],
- "in_create": 1,
- "links": [],
- "modified": "2020-05-07 16:53:29.211653",
- "modified_by": "Administrator",
- "module": "Website",
- "name": "Feedback",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "quick_entry": 1,
- "read_only": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/feedback.py b/frappe/website/doctype/feedback/feedback.py
deleted file mode 100644
index 3b92118ec3..0000000000
--- a/frappe/website/doctype/feedback/feedback.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class Feedback(Document):
-	pass
-
-@frappe.whitelist(allow_guest=True)
-def add_feedback(reference_doctype, reference_name, helpful):
-	frappe.get_doc({
-		"doctype": "Feedback",
-		"reference_doctype": reference_doctype,
-		"reference_name": reference_name,
-		"helpful": helpful
-	}).insert(ignore_permissions=True)
-
-@frappe.whitelist()
-def get_feedback_count(reference_name):
-
-	return {
-		"helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "Yes"}),
-		"not_helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "No"}),
-	}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/test_feedback.py b/frappe/website/doctype/feedback/test_feedback.py
deleted file mode 100644
index 9a31738d75..0000000000
--- a/frappe/website/doctype/feedback/test_feedback.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-# import frappe
-import unittest
-
-class TestFeedback(unittest.TestCase):
-	pass
diff --git a/frappe/website/doctype/help_article/help_article.js b/frappe/website/doctype/help_article/help_article.js
index c56bda8e0b..0ca92aefbd 100644
--- a/frappe/website/doctype/help_article/help_article.js
+++ b/frappe/website/doctype/help_article/help_article.js
@@ -3,6 +3,21 @@
 
 frappe.ui.form.on('Help Article', {
 	refresh: function(frm) {
+		frm.dashboard.clear_headline();
 
+		frm.dashboard.set_headline_alert(`
+			<div class="row">
+				<div class="col-md-6 col-xs-12">
+					<span class="indicator whitespace-nowrap green">
+						<span>Helpful ${frm.doc.helpful}</span>
+					</span>
+				</div>
+				<div class="col-md-6 col-xs-12">
+					<span class="indicator whitespace-nowrap red">
+						<span>Not Helpful ${frm.doc.helpful}</span>
+					</span>
+				</div>
+			</div>
+		`);
 	}
 });
diff --git a/frappe/website/doctype/help_article/help_article.json b/frappe/website/doctype/help_article/help_article.json
index 5957333724..ca659692c6 100644
--- a/frappe/website/doctype/help_article/help_article.json
+++ b/frappe/website/doctype/help_article/help_article.json
@@ -1,445 +1,158 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 1, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2014-10-30 14:25:53.780105", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
+ "actions": [],
+ "allow_guest_to_view": 1,
+ "allow_import": 1,
+ "creation": "2014-10-30 14:25:53.780105",
+ "doctype": "DocType",
+ "field_order": [
+  "title",
+  "category",
+  "published",
+  "column_break_4",
+  "author",
+  "level",
+  "section_break_7",
+  "content",
+  "likes",
+  "route",
+  "owner",
+  "feedback",
+  "helpful",
+  "cb_00",
+  "not_helpful"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Title", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Title",
+   "reqd": 1,
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "category", 
-   "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": 1, 
-   "label": "Category", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Help Category", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "category",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Category",
+   "options": "Help Category",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "published", 
-   "fieldtype": "Check", 
-   "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": "Published", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "published",
+   "fieldtype": "Check",
+   "label": "Published"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "user_fullname", 
-   "fieldname": "author", 
-   "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": "Author", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "user_fullname",
+   "fieldname": "author",
+   "fieldtype": "Data",
+   "label": "Author"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "level", 
-   "fieldtype": "Select", 
-   "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": "Level", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Beginner\nIntermediate\nExpert", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "level",
+   "fieldtype": "Select",
+   "label": "Level",
+   "options": "Beginner\nIntermediate\nExpert"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_7", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_7",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "content", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Content", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "content",
+   "fieldtype": "Text Editor",
+   "in_global_search": 1,
+   "label": "Content",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "likes", 
-   "fieldtype": "Int", 
-   "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": "Likes", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "likes",
+   "fieldtype": "Int",
+   "label": "Likes",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "route", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Route", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "route",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Route"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "user", 
-   "fieldname": "owner", 
-   "fieldtype": "Link", 
-   "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": "Owner", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "User", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
+   "default": "user",
+   "fieldname": "owner",
+   "fieldtype": "Link",
+   "label": "Owner",
+   "options": "User"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "feedback",
+   "fieldtype": "Section Break",
+   "label": "Feedback"
+  },
+  {
+   "default": "0",
+   "fieldname": "helpful",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "Helpful",
+   "read_only": 1
+  },
+  {
+   "fieldname": "cb_00",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "not_helpful",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Not Helpful",
+   "read_only": 1
   }
- ], 
- "has_web_view": 1, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-file-alt", 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_published_field": "published", 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-05-18 17:49:52.912440", 
- "modified_by": "Administrator", 
- "module": "Website", 
- "name": "Help Article", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "has_web_view": 1,
+ "icon": "icon-file-alt",
+ "is_published_field": "published",
+ "links": [],
+ "modified": "2020-05-08 10:48:19.997789",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Help Article",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Knowledge Base Editor", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "import": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Knowledge Base Editor",
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Knowledge Base Contributor", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "create": 1,
+   "read": 1,
+   "role": "Knowledge Base Contributor",
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Guest", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
+   "read": 1,
+   "role": "Guest"
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "title", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "title",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/frappe/website/doctype/help_article/help_article.py b/frappe/website/doctype/help_article/help_article.py
index 6220d0aff5..fa26cfef99 100644
--- a/frappe/website/doctype/help_article/help_article.py
+++ b/frappe/website/doctype/help_article/help_article.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.website.website_generator import WebsiteGenerator
-from frappe.utils import is_markdown, markdown
+from frappe.utils import is_markdown, markdown, cint
 from frappe.website.utils import get_comment_list
 from frappe import _
 
@@ -100,3 +100,11 @@ def clear_website_cache(path=None):
 	frappe.cache().delete_value("knowledge_base:category_sidebar")
 	frappe.cache().delete_value("knowledge_base:faq")
 
+@frappe.whitelist(allow_guest=True)
+def add_feedback(article, helpful):
+	field = "helpful"
+	if helpful == "No":
+		field = "not_helpful"
+
+	value = cint(frappe.db.get_value("Help Article", article, field))
+	frappe.db.set_value("Help Article", article, field, value+1, update_modified=False)
\ No newline at end of file
diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 6c59359785..4f71117dea 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -19,8 +19,13 @@
 	<p><br><a href="/{{ category.route }}" class='text-muted small'>
 		{{ _("More articles on {0}").format(category.name) }}</a></p>
 </article>
-<div class="help-article-feedback">
-	{% include 'templates/includes/feedback.html' %}
+<div class="help-article-feedback mb-4">
+	<hr />
+	<div class="feedback-view ">
+		<span class="text-muted small" style="margin-right: 15px;">{{ _("Was this helpful?") }}</span>
+		<button class="feedback btn btn-light btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
+		<button class="feedback btn btn-light btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
+	</div>
 </div>
 <div class="help-article-comments">
 	<hr>
@@ -30,6 +35,23 @@
 <script>
 frappe.ready(function() {
 	frappe.set_search_path("/kb");
+	$(".feedback").click(function() {
+		let args = {
+			article: "{{ reference_name or name }}",
+			helpful: this.getAttribute("data-value"),
+		}
+
+		frappe.call({
+			btn: this,
+			method: "frappe.website.doctype.help_article.help_article.add_feedback",
+			args: args,
+			callback: function(r) {
+				$(".feedback")[0].disabled = true;
+				$(".feedback")[1].disabled = true;
+				frappe.msgprint(__("Feedback Submitted."));
+			}
+		})
+	});
 });
 </script>
 {% endblock %}

From 2ea74dee36f1bbd094a7fa967fc50be26ba5e09d Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Tue, 26 May 2020 18:47:17 +0530
Subject: [PATCH 015/345] fix: check for whitelist before calling from search

search widget takes query as an input, but does not check whether the
query function that is called is whitelisted, basically allowing anyone
logged-in to call any function regardless of the whitelist.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/desk/search.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/desk/search.py b/frappe/desk/search.py
index c70b650945..1da2a3d0b5 100644
--- a/frappe/desk/search.py
+++ b/frappe/desk/search.py
@@ -6,6 +6,7 @@ from __future__ import unicode_literals
 import frappe, json
 from frappe.utils import cstr, unique, cint
 from frappe.permissions import has_permission
+from frappe.handler import is_whitelisted
 from frappe import _
 from six import string_types
 import re
@@ -74,6 +75,7 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0,
 
 	if query and query.split()[0].lower()!="select":
 		# by method
+		is_whitelisted(query)
 		frappe.response["values"] = frappe.call(query, doctype, txt,
 			searchfield, start, page_length, filters, as_dict=as_dict)
 	elif not query and doctype in standard_queries:

From c4d4fc3574dcb0f716fc8ad5edb162f171a990fe Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Tue, 26 May 2020 18:49:12 +0530
Subject: [PATCH 016/345] chore: add standard queries hooks to whitelist

standard queries are used within the search widget, and now require to
be whitelisted before they can be executed through the search widget.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/core/doctype/user/user.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 0c5ebc3ede..f571240454 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -811,6 +811,7 @@ def reset_password(user):
 		frappe.clear_messages()
 		return 'not found'
 
+@frappe.whitelist()
 def user_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 

From 8c65d3581ebb634d913cc81a02dbda60fd278c4d Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Wed, 27 May 2020 13:39:29 +0530
Subject: [PATCH 017/345] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 4f71117dea..08c8fa342d 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -48,7 +48,7 @@ frappe.ready(function() {
 			callback: function(r) {
 				$(".feedback")[0].disabled = true;
 				$(".feedback")[1].disabled = true;
-				frappe.msgprint(__("Feedback Submitted."));
+				frappe.msgprint(__("Thank you for your feedback!"));
 			}
 		})
 	});

From 0781d048d178aea71ccfdeeeb5d6caac3db42299 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 2 Jun 2020 12:33:01 +0530
Subject: [PATCH 018/345] fix: add docs link to the settings page dashboard

---
 .../integrations/doctype/paytm_settings/paytm_settings.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.js b/frappe/integrations/doctype/paytm_settings/paytm_settings.js
index d51a6e4a25..fe2ee7c952 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.js
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.js
@@ -2,7 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Paytm Settings', {
-	// refresh: function(frm) {
-
-	// }
+	refresh: function(frm) {
+		frm.dashboard.set_headline(__("For more information, {0}.", [`<a href='https://erpnext.com/docs/user/manual/en/erpnext_integration/paytm-integration'>${__('Click here')}</a>`]));
+	}
 });

From 04c070d82d3bb1df4072a52f279478487a2511cc Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 4 Jun 2020 14:38:46 +0530
Subject: [PATCH 019/345] fix: add paytm settings link to the module page

---
 frappe/config/integrations.py            | 5 +++++
 frappe/templates/includes/login/login.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/config/integrations.py b/frappe/config/integrations.py
index f41adc9ea4..a7ac20065f 100644
--- a/frappe/config/integrations.py
+++ b/frappe/config/integrations.py
@@ -27,6 +27,11 @@ def get_data():
 					"name": "Stripe Settings",
 					"description": _("Stripe payment gateway settings"),
 				},
+				{
+					"type": "doctype",
+					"name": "Paytm Settings",
+					"description": _("Paytm payment gateway settings"),
+				},
 			]
 		},
 		{
diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js
index 37b8acb328..793fcc1720 100644
--- a/frappe/templates/includes/login/login.js
+++ b/frappe/templates/includes/login/login.js
@@ -186,7 +186,7 @@ login.login_handlers = (function() {
 			} else if(data.message == 'Password Reset'){
 				window.location.href = frappe.utils.sanitise_redirect(data.redirect_to);
 			} else if(data.message=="No App") {
-				login.set_indicator("{{ _("Success") }}", 'green');
+				login.set_indicator("{{ _('Success') }}", 'green');
 				if(localStorage) {
 					var last_visited =
 						localStorage.getItem("last_visited")

From 59a1ee6a823ad6d29f4cb8951304ae67947f1941 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 4 Jun 2020 18:49:01 +0530
Subject: [PATCH 020/345] feat: date range in leaderboard

---
 frappe/desk/leaderboard.py                  | 13 +++--
 frappe/desk/page/leaderboard/leaderboard.js | 57 ++++++++++-----------
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/frappe/desk/leaderboard.py b/frappe/desk/leaderboard.py
index 1ebf32febe..e5654c853f 100644
--- a/frappe/desk/leaderboard.py
+++ b/frappe/desk/leaderboard.py
@@ -14,13 +14,16 @@ def get_leaderboards():
 	return leaderboards
 
 @frappe.whitelist()
-def get_energy_point_leaderboard(from_date, company = None, field = None, limit = None):
+def get_energy_point_leaderboard(date_range, company = None, field = None, limit = None):
+	filters = [
+		['type', '!=', 'Review'],
+	]
+	if date_range:
+		date_range = frappe.parse_json(date_range)
+		filters.append(['creation', 'between', [date_range[0], date_range[1]]])
 	energy_point_users = frappe.db.get_all('Energy Point Log',
 		fields = ['user as name', 'sum(points) as value'],
-		filters = [
-			['type', '!=', 'Review'],
-			['creation', '>', from_date]
-		],
+		filters = filters,
 		group_by = 'user',
 		order_by = 'value desc'
 	)
diff --git a/frappe/desk/page/leaderboard/leaderboard.js b/frappe/desk/page/leaderboard/leaderboard.js
index 4472a2978a..ecec7f4805 100644
--- a/frappe/desk/page/leaderboard/leaderboard.js
+++ b/frappe/desk/page/leaderboard/leaderboard.js
@@ -49,7 +49,7 @@ class Leaderboard {
 			this.timespans = [
 				"This Week", "This Month", "This Quarter", "This Year",
 				"Last Week", "Last Month", "Last Quarter", "Last Year",
-				"All Time", "Select From Date"
+				"All Time", "Select Date Range"
 			];
 
 			// for saving current selected filters
@@ -113,7 +113,7 @@ class Leaderboard {
 				return {"label": __(d), value: d };
 			})
 		);
-		this.create_from_date_field();
+		this.create_date_range_field();
 
 		this.type_select = this.page.add_select(__("Field"),
 			this.options.selected_filter.map(d => {
@@ -123,12 +123,12 @@ class Leaderboard {
 
 		this.timespan_select.on("change", (e) => {
 			this.options.selected_timespan = e.currentTarget.value;
-			if (this.options.selected_timespan === 'Select From Date') {
-				this.from_date_field.show();
+			if (this.options.selected_timespan === 'Select Date Range') {
+				this.date_range_field.show();
 			} else {
-				this.from_date_field.hide();
-				this.make_request();
+				this.date_range_field.hide();
 			}
+			this.make_request();
 		});
 
 		this.type_select.on("change", (e) => {
@@ -137,21 +137,21 @@ class Leaderboard {
 		});
 	}
 
-	create_from_date_field() {
+	create_date_range_field() {
 		let timespan_field = $(this.parent).find(`.frappe-control[data-original-title='Timespan']`);
-		this.from_date_field = $(`<div class="from-date-field"></div>`).insertAfter(timespan_field).hide();
+		this.date_range_field = $(`<div class="from-date-field"></div>`).insertAfter(timespan_field).hide();
 
 		let date_field = frappe.ui.form.make_control({
 			df: {
-				fieldtype: 'Date',
-				fieldname: 'selected_from_date',
-				placeholder: frappe.datetime.month_start(),
-				default: frappe.datetime.month_start(),
+				fieldtype: 'DateRange',
+				fieldname: 'selected_date_range',
+				placeholder: "Date Range",
+				default: [frappe.datetime.month_start(), frappe.datetime.now_date()],
 				input_class: 'input-sm',
 				reqd: 1,
 				change: () => {
-					this.selected_from_date = date_field.get_value();
-					if (this.selected_from_date) this.make_request();
+					this.selected_date_range = date_field.get_value();
+					if (this.selected_date_range) this.make_request();
 				}
 			},
 			parent: $(this.parent).find('.from-date-field'),
@@ -225,7 +225,7 @@ class Leaderboard {
 		frappe.call(
 			this.leaderboard_config[this.options.selected_doctype].method,
 			{
-				'from_date': this.get_from_date(),
+				'date_range': this.get_date_range(),
 				'company': this.options.selected_company,
 				'field': this.options.selected_filter_item,
 				'limit': this.leaderboard_limit,
@@ -375,23 +375,22 @@ class Leaderboard {
 		</li>`);
 	}
 
-	get_from_date() {
+	get_date_range() {
 		let timespan = this.options.selected_timespan.toLowerCase();
 		let current_date = frappe.datetime.now_date();
-		let get_from_date = {
-			"this week": frappe.datetime.week_start(),
-			"this month": frappe.datetime.month_start(),
-			"this quarter": frappe.datetime.quarter_start(),
-			"this year": frappe.datetime.year_start(),
-			"last week": frappe.datetime.add_days(current_date, -7),
-			"last month": frappe.datetime.add_months(current_date, -1),
-			"last quarter": frappe.datetime.add_months(current_date, -3),
-			"last year": frappe.datetime.add_months(current_date, -12),
-			"all time": "",
-			"select from date": this.selected_from_date || frappe.datetime.month_start()
+		let date_range_map = {
+			"this week": [frappe.datetime.week_start(), frappe.datetime.now_date()],
+			"this month": [frappe.datetime.month_start(), frappe.datetime.now_date()],
+			"this quarter": [frappe.datetime.quarter_start(), frappe.datetime.now_date()],
+			"this year": [frappe.datetime.year_start(), frappe.datetime.now_date()],
+			"last week": [frappe.datetime.add_days(current_date, -7), frappe.datetime.now_date()],
+			"last month": [frappe.datetime.add_months(current_date, -1), frappe.datetime.now_date()],
+			"last quarter": [frappe.datetime.add_months(current_date, -3), frappe.datetime.now_date()],
+			"last year": [frappe.datetime.add_months(current_date, -12), frappe.datetime.now_date()],
+			"all time": null,
+			"select date range": this.selected_date_range || [frappe.datetime.month_start(), frappe.datetime.now_date()]
 		}
-
-		return get_from_date[timespan];
+		return date_range_map[timespan];
 	}
 
 }

From a9a8fc953fa6a90be8718a9d5c1f9b16fa890e87 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 8 Jun 2020 17:06:48 +0530
Subject: [PATCH 021/345] fix: update the checksum logic

---
 .../doctype/paytm_settings/checksum.py        | 172 ++++++------------
 .../paytm_settings/paytm_settings.json        |  40 ++--
 .../doctype/paytm_settings/paytm_settings.py  |   8 +-
 3 files changed, 85 insertions(+), 135 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/checksum.py b/frappe/integrations/doctype/paytm_settings/checksum.py
index b2e67bb5ad..32f976ae18 100644
--- a/frappe/integrations/doctype/paytm_settings/checksum.py
+++ b/frappe/integrations/doctype/paytm_settings/checksum.py
@@ -2,141 +2,79 @@ import base64
 import string
 import random
 import hashlib
+import sys
 
 from Crypto.Cipher import AES
 
 
-IV = "@@@@&&&&####$$$$"
+iv = '@@@@&&&&####$$$$'
 BLOCK_SIZE = 16
 
+if (sys.version_info > (3, 0)):
+	__pad__ = lambda s: bytes(s + (BLOCK_SIZE - len(s) % BLOCK_SIZE) * chr(BLOCK_SIZE - len(s) % BLOCK_SIZE), 'utf-8')
+else:
+	__pad__ = lambda s: s + (BLOCK_SIZE - len(s) % BLOCK_SIZE) * chr(BLOCK_SIZE - len(s) % BLOCK_SIZE)
 
-def generate_checksum(param_dict, merchant_key, salt=None):
-	params_string = __get_param_string__(param_dict)
-	salt = salt if salt else __id_generator__(4)
-	final_string = '%s|%s' % (params_string, salt)
+__unpad__ = lambda s: s[0:-ord(s[-1])]
 
-	hasher = hashlib.sha256(final_string.encode())
-	hash_string = hasher.hexdigest()
+def encrypt(input, key):
+	input = __pad__(input)
+	c = AES.new(key.encode("utf8"), AES.MODE_CBC, iv.encode("utf8"))
+	input = c.encrypt(input)
+	input = base64.b64encode(input)
+	return input.decode("UTF-8")
 
-	hash_string += salt
+def decrypt(encrypted, key):
+	encrypted = base64.b64decode(encrypted)
+	c = AES.new(key.encode("utf8"), AES.MODE_CBC, iv.encode("utf8"))
+	param = c.decrypt(encrypted)
+	if type(param) == bytes:
+		param = param.decode()
+	return __unpad__(param)
 
-	return __encode__(hash_string, IV, merchant_key)
+def generateSignature(params, key):
+	if not type(params) is dict and not type(params) is str:
+		raise Exception("string or dict expected, " + str(type(params)) + " given")
+	if type(params) is dict:
+		params = getStringByParams(params)
+	return generateSignatureByString(params, key)
 
+def verifySignature(params, key, checksum):
+	if not type(params) is dict and not type(params) is str:
+		raise Exception("string or dict expected, " + str(type(params)) + " given")
+	if "CHECKSUMHASH" in params:
+		del params["CHECKSUMHASH"]
+		
+	if type(params) is dict:
+		params = getStringByParams(params)
+	return verifySignatureByString(params, key, checksum)
 
-def generate_refund_checksum(param_dict, merchant_key, salt=None):
-	for i in param_dict:
-		if("|" in param_dict[i]):
-			param_dict = {}
-			exit()
-	params_string = __get_param_string__(param_dict)
-	salt = salt if salt else __id_generator__(4)
-	final_string = '%s|%s' % (params_string, salt)
+def generateSignatureByString(params, key):
+	salt = generateRandomString(4)
+	return calculateChecksum(params, key, salt)
 
-	hasher = hashlib.sha256(final_string.encode())
-	hash_string = hasher.hexdigest()
-
-	hash_string += salt
-
-	return __encode__(hash_string, IV, merchant_key)
-
-
-def generate_checksum_by_str(param_str, merchant_key, salt=None):
-	params_string = param_str
-	salt = salt if salt else __id_generator__(4)
-	final_string = '%s|%s' % (params_string, salt)
-
-	hasher = hashlib.sha256(final_string.encode())
-	hash_string = hasher.hexdigest()
-
-	hash_string += salt
-
-	return __encode__(hash_string, IV, merchant_key)
-
-
-def verify_checksum(param_dict, merchant_key, checksum):
-	# Remove checksum
-	if 'CHECKSUMHASH' in param_dict:
-		param_dict.pop('CHECKSUMHASH')
-
-	# Get salt
-	paytm_hash = __decode__(checksum, IV, merchant_key)
+def verifySignatureByString(params, key, checksum):
+	paytm_hash = decrypt(checksum, key)    
 	salt = paytm_hash[-4:]
-	calculated_checksum = generate_checksum(
-		param_dict, merchant_key, salt=salt)
-	return calculated_checksum == checksum
+	return paytm_hash == calculateHash(params, salt)
 
+def generateRandomString(length):
+	chars = string.ascii_uppercase + string.digits + string.ascii_lowercase
+	return ''.join(random.choice(chars) for _ in range(length))
 
-def verify_checksum_by_str(param_str, merchant_key, checksum):
-	# Remove checksum
-	# if 'CHECKSUMHASH' in param_dict:
-		# param_dict.pop('CHECKSUMHASH')
-
-	# Get salt
-	paytm_hash = __decode__(checksum, IV, merchant_key)
-	salt = paytm_hash[-4:]
-	calculated_checksum = generate_checksum_by_str(
-		param_str, merchant_key, salt=salt)
-	return calculated_checksum == checksum
-
-
-def __id_generator__(size=6, chars=string.ascii_uppercase + string.digits + string.ascii_lowercase):
-	return ''.join(random.choice(chars) for _ in range(size))
-
-
-def __get_param_string__(params):
+def getStringByParams(params):
 	params_string = []
 	for key in sorted(params.keys()):
-		if("REFUND" in params[key] or "|" in params[key]):
-			exit()
-		value = params[key]
-		params_string.append('' if value == 'null' else str(value))
+		value = params[key] if params[key] is not None and params[key].lower() != "null" else ""
+		params_string.append(str(value))
 	return '|'.join(params_string)
 
+def calculateHash(params, salt):
+	finalString = '%s|%s' % (params, salt)
+	hasher = hashlib.sha256(finalString.encode())
+	hashString = hasher.hexdigest() + salt
+	return hashString
 
-def __pad__(s): return s + (BLOCK_SIZE - len(s) %
-							BLOCK_SIZE) * chr(BLOCK_SIZE - len(s) % BLOCK_SIZE)
-
-
-def __unpad__(s): return s[0:-ord(s[-1])]
-
-
-def __encode__(to_encode, iv, key):
-	# Pad
-	to_encode = __pad__(to_encode)
-	# Encrypt
-	c = AES.new(key, AES.MODE_CBC, iv)
-	to_encode = c.encrypt(to_encode)
-	# Encode
-	to_encode = base64.b64encode(to_encode)
-	return to_encode.decode("UTF-8")
-
-
-def __decode__(to_decode, iv, key):
-	# Decode
-	to_decode = base64.b64decode(to_decode)
-	# Decrypt
-	c = AES.new(key, AES.MODE_CBC, iv)
-	to_decode = c.decrypt(to_decode)
-	if type(to_decode) == bytes:
-		# convert bytes array to str.
-		to_decode = to_decode.decode()
-	# remove pad
-	return __unpad__(to_decode)
-
-
-if __name__ == "__main__":
-	params = {
-		"MID": "mid",
-		"ORDER_ID": "order_id",
-		"CUST_ID": "cust_id",
-		"TXN_AMOUNT": "1",
-		"CHANNEL_ID": "WEB",
-		"INDUSTRY_TYPE_ID": "Retail",
-		"WEBSITE": "xxxxxxxxxxx"
-	}
-
-	print(verify_checksum(
-		params, 'xxxxxxxxxxxxxxxx',
-		"CD5ndX8VVjlzjWbbYoAtKQIlvtXPypQYOg0Fi2AUYKXZA5XSHiRF0FDj7vQu66S8MHx9NaDZ/uYm3WBOWHf+sDQAmTyxqUipA7i1nILlxrk="))
-
-	# print(generate_checksum(params, "xxxxxxxxxxxxxxxx"))
+def calculateChecksum(params, key, salt): 
+	hashString = calculateHash(params, salt)
+	return encrypt(hashString, key)
\ No newline at end of file
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.json b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
index 0540dc4948..93fbd0df09 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.json
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
@@ -9,7 +9,7 @@
   "merchant_key",
   "staging",
   "column_break_4",
-  "industry_type",
+  "industry_type_id",
   "website"
  ],
  "fields": [
@@ -18,43 +18,55 @@
    "fieldtype": "Data",
    "in_list_view": 1,
    "label": "Merchant ID",
-   "reqd": 1
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "merchant_key",
    "fieldtype": "Password",
    "in_list_view": 1,
    "label": "Merchant Key",
-   "reqd": 1
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "default": "0",
    "fieldname": "staging",
    "fieldtype": "Check",
-   "label": "Staging"
-  },
-  {
-   "depends_on": "eval: !doc.staging",
-   "fieldname": "industry_type",
-   "fieldtype": "Data",
-   "label": "Industry Type",
-   "mandatory_depends_on": "eval: !doc.staging"
+   "label": "Staging",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "depends_on": "eval: !doc.staging",
    "fieldname": "website",
    "fieldtype": "Data",
    "label": "Website",
-   "mandatory_depends_on": "eval: !doc.staging"
+   "mandatory_depends_on": "eval: !doc.staging",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "column_break_4",
-   "fieldtype": "Column Break"
+   "fieldtype": "Column Break",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "depends_on": "eval: !doc.staging",
+   "fieldname": "industry_type_id",
+   "fieldtype": "Data",
+   "label": "Industry Type ID",
+   "mandatory_depends_on": "eval: !doc.staging",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-04-16 14:16:19.687449",
+ "modified": "2020-06-08 13:36:09.703143",
  "modified_by": "Administrator",
  "module": "Integrations",
  "name": "Paytm Settings",
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index ed71202ea6..c169a53246 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -13,7 +13,7 @@ from frappe import _
 from frappe.utils import get_url, call_hook_method, cint, flt, cstr
 from frappe.integrations.utils import create_request_log, create_payment_gateway
 from frappe.utils import get_request_site_address
-from frappe.integrations.doctype.paytm_settings.checksum import generate_checksum, verify_checksum
+from frappe.integrations.doctype.paytm_settings.checksum import generateSignature, verifySignature
 from frappe.utils.password import get_decrypted_password
 
 class PaytmSettings(Document):
@@ -75,7 +75,7 @@ def get_paytm_params(payment_details, order_id, paytm_config):
 		"CALLBACK_URL" : redirect_uri,
 	})
 
-	checksum = generate_checksum(paytm_params, paytm_config.merchant_key)
+	checksum = generateSignature(paytm_params, paytm_config.merchant_key)
 
 	paytm_params.update({
 		"CHECKSUMHASH" : checksum
@@ -101,7 +101,7 @@ def verify_transaction(**kwargs):
 
 	if paytm_params and paytm_config and paytm_checksum:
 		# Verify checksum
-		is_valid_checksum = verify_checksum(paytm_params, paytm_config.merchant_key, paytm_checksum)
+		is_valid_checksum = verifySignature(paytm_params, paytm_config.merchant_key, paytm_checksum)
 
 	if is_valid_checksum and received_data['RESPCODE'] == '01':
 		verify_transaction_status(paytm_config, received_data['ORDERID'])
@@ -118,7 +118,7 @@ def verify_transaction_status(paytm_config, order_id):
 		ORDERID= order_id
 	)
 
-	checksum = generate_checksum(paytm_params, paytm_config.merchant_key)
+	checksum = generateSignature(paytm_params, paytm_config.merchant_key)
 	paytm_params["CHECKSUMHASH"] = checksum
 
 	post_data = json.dumps(paytm_params)

From 86508e7617e9b9d448599b6298dacf83f840d136 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Mon, 15 Jun 2020 14:53:30 +0530
Subject: [PATCH 022/345] fix: change to primary for button

---
 .../help_article/templates/help_article.html       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 08c8fa342d..01271af8b9 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -23,8 +23,8 @@
 	<hr />
 	<div class="feedback-view ">
 		<span class="text-muted small" style="margin-right: 15px;">{{ _("Was this helpful?") }}</span>
-		<button class="feedback btn btn-light btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
-		<button class="feedback btn btn-light btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
+		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
+		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
 	</div>
 </div>
 <div class="help-article-comments">
@@ -41,13 +41,19 @@ frappe.ready(function() {
 			helpful: this.getAttribute("data-value"),
 		}
 
+		let disable_button = function(btn) {
+			btn.classList.remove("btn-outline-primary");
+			btn.classList.add("btn-light");
+			btn.disabled = true
+		}
+
 		frappe.call({
 			btn: this,
 			method: "frappe.website.doctype.help_article.help_article.add_feedback",
 			args: args,
 			callback: function(r) {
-				$(".feedback")[0].disabled = true;
-				$(".feedback")[1].disabled = true;
+				disable_button($(".feedback")[0]);
+				disable_button($(".feedback")[1]);
 				frappe.msgprint(__("Thank you for your feedback!"));
 			}
 		})

From a72f8088972c7154e3400e59449de5bd2c5023e5 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 18 Jun 2020 18:09:27 +0530
Subject: [PATCH 023/345] fix: make cookies more secure

* add HTTPOnly to sid, so sid will no longer be accessible through
  javascript.
* mark all cookies Secure by default over HTTPS.
* set SameSite to Strict for all cookies by default, preventing
  cross-origin cookie access.
* remove redundant publish_realtime for setting csrf_token on the
  client-side.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/auth.py                     | 21 ++++++++++++++++-----
 frappe/public/js/frappe/desk.js    |  9 ---------
 frappe/public/js/frappe/request.js |  4 ++--
 frappe/sessions.py                 |  7 -------
 frappe/website/js/website.js       |  9 ++-------
 5 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/frappe/auth.py b/frappe/auth.py
index 1353acf10f..ab3624bee8 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -333,12 +333,20 @@ class CookieManager:
 		# sid expires in 3 days
 		expires = datetime.datetime.now() + datetime.timedelta(days=3)
 		if frappe.session.sid:
-			self.cookies["sid"] = {"value": frappe.session.sid, "expires": expires}
+			self.set_cookie("sid", frappe.session.sid, expires=expires, httponly=True)
 		if frappe.session.session_country:
-			self.cookies["country"] = {"value": frappe.session.get("session_country")}
+			self.set_cookie("country", frappe.session.session_country)
 
-	def set_cookie(self, key, value, expires=None):
-		self.cookies[key] = {"value": value, "expires": expires}
+	def set_cookie(self, key, value, expires=None, secure=False, httponly=False, samesite="Strict"):
+		if not secure:
+			secure = frappe.local.request.scheme == "https"
+		self.cookies[key] = {
+			"value": value,
+			"expires": expires,
+			"secure": secure,
+			"httponly": httponly,
+			"samesite": samesite
+		}
 
 	def delete_cookie(self, to_delete):
 		if not isinstance(to_delete, (list, tuple)):
@@ -349,7 +357,10 @@ class CookieManager:
 	def flush_cookies(self, response):
 		for key, opts in self.cookies.items():
 			response.set_cookie(key, quote((opts.get("value") or "").encode('utf-8')),
-				expires=opts.get("expires"))
+				expires=opts.get("expires"),
+				secure=opts.get("secure"),
+				httponly=opts.get("httponly"),
+				samesite=opts.get("samesite"))
 
 		# expires yesterday!
 		expires = datetime.datetime.now() + datetime.timedelta(days=-1)
diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 79a78717cb..2e80dbfd85 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -101,15 +101,6 @@ frappe.Application = Class.extend({
 			frappe.ui.startup_setup_dialog.show();
 		}
 
-		// listen to csrf_update
-		frappe.realtime.on("csrf_generated", function(data) {
-			// handles the case when a user logs in again from another tab
-			// and it leads to invalid request in the current tab
-			if (data.csrf_token && data.sid===frappe.get_cookie("sid")) {
-				frappe.csrf_token = data.csrf_token;
-			}
-		});
-
 		frappe.realtime.on("version-update", function() {
 			var dialog = frappe.msgprint({
 				message:__("The application has been updated to a new version, please refresh this page"),
diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index ea4de99249..e378499f35 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -125,7 +125,7 @@ frappe.request.call = function(opts) {
 				message: __('The resource you are looking for is not available')});
 		},
 		403: function(xhr) {
-			if (frappe.get_cookie('sid')==='Guest') {
+			if (frappe.session.user === 'Guest') {
 				// session expired
 				frappe.app.handle_session_expired();
 			}
@@ -320,7 +320,7 @@ frappe.request.cleanup = function(opts, r) {
 	if(r) {
 
 		// session expired? - Guest has no business here!
-		if(r.session_expired || frappe.get_cookie("sid")==="Guest") {
+		if (r.session_expired || frappe.session.user === "Guest") {
 			frappe.app.handle_session_expired();
 			return;
 		}
diff --git a/frappe/sessions.py b/frappe/sessions.py
index d317d6caf3..7a018bb0aa 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -172,13 +172,6 @@ def generate_csrf_token():
 	frappe.local.session.data.csrf_token = frappe.generate_hash()
 	frappe.local.session_obj.update(force=True)
 
-	# send sid and csrf token to the user
-	# handles the case when a user logs in again from another tab
-	# and it leads to invalid request in the current tab
-	frappe.publish_realtime(event="csrf_generated",
-		message={"sid": frappe.local.session.sid, "csrf_token": frappe.local.session.data.csrf_token},
-		user=frappe.session.user, after_commit=True)
-
 class Session:
 	def __init__(self, user, resume=False, full_name=None, user_type=None):
 		self.sid = cstr(frappe.form_dict.get('sid') or
diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js
index b52a3fef63..f2c142fe4c 100644
--- a/frappe/website/js/website.js
+++ b/frappe/website/js/website.js
@@ -183,10 +183,6 @@ $.extend(frappe, {
 			.html('<div class="content"><i class="'+icon+' text-muted"></i><br>'
 				+text+'</div>').appendTo(document.body);
 	},
-	get_sid: function() {
-		var sid = frappe.get_cookie("sid");
-		return sid && sid !== "Guest";
-	},
 	send_message: function(opts, btn) {
 		return frappe.call({
 			type: "POST",
@@ -212,8 +208,7 @@ $.extend(frappe, {
 		});
 	},
 	render_user: function() {
-		var sid = frappe.get_cookie("sid");
-		if(sid && sid!=="Guest") {
+		if (frappe.is_user_logged_in()) {
 			$(".btn-login-area").toggle(false);
 			$(".logged-in").toggle(true);
 			$(".full-name").html(frappe.get_cookie("full_name"));
@@ -323,7 +318,7 @@ $.extend(frappe, {
 		return $(".navbar .search, .sidebar .search");
 	},
 	is_user_logged_in: function() {
-		return frappe.get_cookie("sid") && frappe.get_cookie("sid") !== "Guest";
+		return frappe.session.user !== "Guest";
 	},
 	add_switch_to_desk: function() {
 		$('.switch-to-desk').removeClass('hidden');

From a29fab70ac5653c81bda5d076a06db83789e47d0 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 18 Jun 2020 23:14:19 +0530
Subject: [PATCH 024/345] chore: improve logic for checking logged in user

frappe.session.user sometimes gets set after the function runs, so
current implementation would return undefined !== "Guest" as True,
causing Guest user to be set as a logged-in user.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/website/js/website.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js
index f2c142fe4c..cd9609cfd3 100644
--- a/frappe/website/js/website.js
+++ b/frappe/website/js/website.js
@@ -318,7 +318,7 @@ $.extend(frappe, {
 		return $(".navbar .search, .sidebar .search");
 	},
 	is_user_logged_in: function() {
-		return frappe.session.user !== "Guest";
+		return frappe.get_cookie("user_id") !== "Guest" && frappe.session.user !== "Guest";
 	},
 	add_switch_to_desk: function() {
 		$('.switch-to-desk').removeClass('hidden');

From 2afe0cdaa48c88de5ad884f180eba9b3ae2d5215 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 22 Jun 2020 09:01:37 +0530
Subject: [PATCH 025/345] fix: Column mapping

---
 .../core/doctype/data_import/data_import.js   |  4 +-
 frappe/core/doctype/data_import/importer.py   |  6 ++-
 .../js/frappe/data_import/import_preview.js   | 37 ++++++++++++++++---
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/frappe/core/doctype/data_import/data_import.js b/frappe/core/doctype/data_import/data_import.js
index 81a7bc9705..9ccf43436b 100644
--- a/frappe/core/doctype/data_import/data_import.js
+++ b/frappe/core/doctype/data_import/data_import.js
@@ -301,8 +301,8 @@ frappe.ui.form.on('Data Import', {
 				events: {
 					remap_column(changed_map) {
 						let template_options = JSON.parse(frm.doc.template_options || '{}');
-						template_options.remap_column = template_options.remap_column || {};
-						Object.assign(template_options.remap_column, changed_map);
+						template_options.column_to_field_map = template_options.column_to_field_map || {};
+						Object.assign(template_options.column_to_field_map, changed_map);
 						frm.set_value('template_options', JSON.stringify(template_options));
 						frm.save().then(() => frm.trigger('import_file'));
 					}
diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 4761652c70..09849dd5b9 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -766,8 +766,9 @@ class Header(Row):
 
 		for j, header in enumerate(row):
 			column_values = [get_item_at_index(r, j) for r in raw_data]
+			map_to_field = column_to_field_map.get(str(j))
 			column = Column(
-				j, header, self.doctype, column_values, column_to_field_map.get(header), self.seen
+				j, header, self.doctype, column_values, map_to_field, self.seen
 			)
 			self.seen.append(header)
 			self.columns.append(column)
@@ -944,6 +945,9 @@ class Column:
 		d.map_to_field = self.map_to_field
 		d.date_format = self.date_format
 		d.df = self.df
+		if hasattr(self.df, 'is_child_table_field'):
+			d.is_child_table_field = self.df.is_child_table_field
+			d.child_table_df = self.df.child_table_df
 		d.skip_import = self.skip_import
 		d.warnings = self.warnings
 		return d
diff --git a/frappe/public/js/frappe/data_import/import_preview.js b/frappe/public/js/frappe/data_import/import_preview.js
index 7cf8431456..4edcb87aeb 100644
--- a/frappe/public/js/frappe/data_import/import_preview.js
+++ b/frappe/public/js/frappe/data_import/import_preview.js
@@ -245,11 +245,12 @@ frappe.data_import.ImportPreview = class ImportPreview {
 			let fieldname;
 			if (!df) {
 				fieldname = null;
+			} else if (col.map_to_field) {
+				fieldname = col.map_to_field;
+			} else if (col.is_child_table_field) {
+				fieldname = `${col.child_table_df.fieldname}.${df.fieldname}`;
 			} else {
-				fieldname =
-					df.parent === this.doctype
-						? df.fieldname
-						: `${df.parent}:${df.fieldname}`;
+				fieldname = df.fieldname;
 			}
 			return [
 				{
@@ -272,7 +273,7 @@ frappe.data_import.ImportPreview = class ImportPreview {
 							label: __("Don't Import"),
 							value: "Don't Import"
 						}
-					].concat(column_picker_fields.get_fields_as_options()),
+					].concat(get_fields_as_options(this.doctype, column_picker_fields)),
 					default: fieldname || "Don't Import",
 					change() {
 						changed.push(i);
@@ -328,3 +329,29 @@ frappe.data_import.ImportPreview = class ImportPreview {
 		});
 	}
 };
+
+function get_fields_as_options(doctype, column_map) {
+	let keys = [doctype];
+	frappe.meta.get_table_fields(doctype).forEach(df => {
+		keys.push(df.fieldname);
+	});
+	// flatten array
+	return [].concat(
+		...keys.map(key => {
+			return column_map[key].map(df => {
+				let label = df.label;
+				let value = df.fieldname;
+				if (doctype !== key) {
+					let table_field = frappe.meta.get_docfield(doctype, key);
+					label = `${df.label} (${table_field.label})`;
+					value = `${table_field.fieldname}.${df.fieldname}`;
+				}
+				return {
+					label,
+					value,
+					description: value
+				};
+			});
+		})
+	);
+}
\ No newline at end of file

From b502bfff07da834745bde3018e4a2ebc316d3a4f Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 22 Jun 2020 09:02:07 +0530
Subject: [PATCH 026/345] fix: Serialize df manually

---
 frappe/core/doctype/data_import/importer.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 09849dd5b9..13684aaad3 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -607,7 +607,7 @@ class Row:
 				self.warnings.append(
 					{
 						"row": self.row_number,
-						"field": df.as_dict(convert_dates_to_str=True),
+						"field": df_as_json(df),
 						"message": msg,
 					}
 				)
@@ -622,7 +622,7 @@ class Row:
 				self.warnings.append(
 					{
 						"row": self.row_number,
-						"field": df.as_dict(convert_dates_to_str=True),
+						"field": df_as_json(df),
 						"message": msg,
 					}
 				)
@@ -635,7 +635,7 @@ class Row:
 					{
 						"row": self.row_number,
 						"col": col.column_number,
-						"field": df.as_dict(convert_dates_to_str=True),
+						"field": df_as_json(df),
 						"message": _("Value {0} must in {1} format").format(
 							frappe.bold(value), frappe.bold(get_user_format(col.date_format))
 						),
@@ -646,7 +646,7 @@ class Row:
 		return value
 
 	def link_exists(self, value, df):
-		key = df.options + "::" + value
+		key = df.options + "::" + cstr(value)
 		if Row.link_values_exist_map.get(key) is None:
 			Row.link_values_exist_map[key] = frappe.db.exists(df.options, value)
 		return Row.link_values_exist_map.get(key)
@@ -1117,3 +1117,13 @@ def get_user_format(date_format):
 		.replace("%m", "mm")
 		.replace("%d", "dd")
 	)
+
+def df_as_json(df):
+	return {
+		'fieldname': df.fieldname,
+		'fieldtype': df.fieldtype,
+		'label': df.label,
+		'options': df.options,
+		'parent': df.parent,
+		'default': df.default
+	}

From bbdc5e0db897f7fe7e5ce09b4a917142fe7e56be Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 22 Jun 2020 09:03:00 +0530
Subject: [PATCH 027/345] fix(exporter): Count for child table filters

- Extract count method from list_view.js for reuse
---
 .../js/frappe/data_import/data_exporter.js    |  8 +++---
 frappe/public/js/frappe/db.js                 | 26 ++++++++++++++-----
 frappe/public/js/frappe/list/list_view.js     | 24 +++--------------
 3 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/frappe/public/js/frappe/data_import/data_exporter.js b/frappe/public/js/frappe/data_import/data_exporter.js
index 735237189d..6ee4e907fc 100644
--- a/frappe/public/js/frappe/data_import/data_exporter.js
+++ b/frappe/public/js/frappe/data_import/data_exporter.js
@@ -285,11 +285,9 @@ frappe.data_import.DataExporter = class DataExporter {
 	}
 
 	get_filters() {
-		return this.filter_group.get_filters().reduce((acc, filter) => {
-			return Object.assign(acc, {
-				[filter[1]]: [filter[2], filter[3]]
-			});
-		}, {});
+		return this.filter_group.get_filters().map(filter => {
+			return filter.slice(0, 4)
+		});
 	}
 
 	get_multicheck_options(doctype, child_fieldname = null) {
diff --git a/frappe/public/js/frappe/db.js b/frappe/public/js/frappe/db.js
index 1b6fb0e438..cf716c67e5 100644
--- a/frappe/public/js/frappe/db.js
+++ b/frappe/public/js/frappe/db.js
@@ -91,12 +91,26 @@ frappe.db = {
 		});
 	},
 	count: function(doctype, args={}) {
-		return new Promise(resolve => {
-			frappe.call({
-				method: 'frappe.client.get_count',
-				type: 'GET',
-				args: Object.assign(args, { doctype })
-			}).then(r => resolve(r.message));
+		let filters = args.filters || {};
+		const with_child_table_filter = Array.isArray(filters) && filters.some(filter => {
+			return filter[0] !== doctype;
+		});
+
+		const fields = [
+			// cannot break this line as it adds extra \n's and \t's which breaks the query
+			`count(${with_child_table_filter ? 'distinct': ''} ${frappe.model.get_full_column_name('name', doctype)}) AS total_count`
+		];
+
+		return frappe.call({
+			type: 'GET',
+			method: 'frappe.desk.reportview.get',
+			args: {
+				doctype,
+				filters,
+				fields,
+			}
+		}).then(r => {
+			return r.message.values[0][0];
 		});
 	},
 	get_link_options(doctype, txt = '', filters={}) {
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 9e1ba1b9bd..8da73b0dec 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -760,26 +760,10 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		let current_count = this.data.length;
 		let count_without_children = this.data.uniqBy(d => d.name).length;
 
-		const filters = this.get_filters_for_args();
-		const with_child_table_filter = filters.some(filter => {
-			return filter[0] !== this.doctype;
-		});
-
-		const fields = [
-			// cannot break this line as it adds extra \n's and \t's which breaks the query
-			`count(${with_child_table_filter ? 'distinct': ''}${frappe.model.get_full_column_name('name', this.doctype)}) AS total_count`
-		];
-
-		return frappe.call({
-			type: 'GET',
-			method: this.method,
-			args: {
-				doctype: this.doctype,
-				filters,
-				fields,
-			}
-		}).then(r => {
-			this.total_count = r.message.values[0][0] || current_count;
+		return frappe.db.count(this.doctype, {
+			filters: this.get_filters_for_args()
+		}).then(total_count => {
+			this.total_count = total_count || current_count;
 			let str = __('{0} of {1}', [current_count, this.total_count]);
 			if (count_without_children !== current_count) {
 				str = __('{0} of {1} ({2} rows with children)', [count_without_children, this.total_count, current_count]);

From 010dbc402e4685aaf83a138c704c723a31c6c61a Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 22 Jun 2020 16:29:44 +0530
Subject: [PATCH 028/345] fix(google-calendar): reset sync token incase of
 invalid next sync token

---
 .../doctype/google_calendar/google_calendar.py    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/frappe/integrations/doctype/google_calendar/google_calendar.py b/frappe/integrations/doctype/google_calendar/google_calendar.py
index fa2eea6ce1..c43f867711 100644
--- a/frappe/integrations/doctype/google_calendar/google_calendar.py
+++ b/frappe/integrations/doctype/google_calendar/google_calendar.py
@@ -12,6 +12,7 @@ from frappe import _
 from frappe.model.document import Document
 from frappe.utils import get_request_site_address
 from googleapiclient.errors import HttpError
+from frappe.utils.password import set_encrypted_password
 from frappe.utils import add_days, get_datetime, get_weekdays, now_datetime, add_to_date, get_time_zone
 from dateutil import parser
 from datetime import datetime, timedelta
@@ -218,15 +219,23 @@ def sync_events_from_google_calendar(g_calendar, method=None, page_length=10):
 			events = google_calendar.events().list(calendarId=account.google_calendar_id, maxResults=page_length,
 				singleEvents=False, showDeleted=True, syncToken=sync_token).execute()
 		except HttpError as err:
-			frappe.throw(_("Google Calendar - Could not fetch event from Google Calendar, error code {0}.").format(err.resp.status))
+			msg = _("Google Calendar - Could not fetch event from Google Calendar, error code {0}.").format(err.resp.status)
+
+			if err.resp.status == 410:
+				set_encrypted_password("Google Calendar", account.name, "", "next_sync_token")
+				frappe.db.commit()
+				msg += _(' Sync token was invalid and has been resetted, Retry syncing.')
+				frappe.msgprint(msg, title='Invalid Sync Token', indicator='blue')
+			else:
+				frappe.throw(msg)
 
 		for event in events.get("items", []):
 			results.append(event)
 
 		if not events.get("nextPageToken"):
 			if events.get("nextSyncToken"):
-				frappe.db.set_value("Google Calendar", account.name, "next_sync_token", events.get("nextSyncToken"))
-				frappe.db.commit()
+				account.next_sync_token = events.get("nextSyncToken")
+				account.save()
 			break
 
 	for idx, event in enumerate(results):

From 25667cde1ed17deb9ee5f4cec6dac0deba6d56d7 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 22 Jun 2020 16:43:27 +0530
Subject: [PATCH 029/345] fix(google-calendar): pass page token to load the
 next set of events

---
 .../doctype/google_calendar/google_calendar.py           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frappe/integrations/doctype/google_calendar/google_calendar.py b/frappe/integrations/doctype/google_calendar/google_calendar.py
index c43f867711..d1cd62f84f 100644
--- a/frappe/integrations/doctype/google_calendar/google_calendar.py
+++ b/frappe/integrations/doctype/google_calendar/google_calendar.py
@@ -199,7 +199,7 @@ def check_google_calendar(account, google_calendar):
 	except HttpError as err:
 		frappe.throw(_("Google Calendar - Could not create Calendar for {0}, error code {1}.").format(account.name, err.resp.status))
 
-def sync_events_from_google_calendar(g_calendar, method=None, page_length=10):
+def sync_events_from_google_calendar(g_calendar, method=None):
 	"""
 		Syncs Events from Google Calendar in Framework Calendar.
 		Google Calendar returns nextSyncToken when all the events in Google Calendar are fetched.
@@ -211,13 +211,14 @@ def sync_events_from_google_calendar(g_calendar, method=None, page_length=10):
 	if not account.pull_from_google_calendar:
 		return
 
+	sync_token = account.get_password(fieldname="next_sync_token", raise_exception=False) or None
+	events = frappe._dict()
 	results = []
 	while True:
 		try:
 			# API Response listed at EOF
-			sync_token = account.get_password(fieldname="next_sync_token", raise_exception=False) or None
-			events = google_calendar.events().list(calendarId=account.google_calendar_id, maxResults=page_length,
-				singleEvents=False, showDeleted=True, syncToken=sync_token).execute()
+			events = google_calendar.events().list(calendarId=account.google_calendar_id, maxResults=2000,
+				pageToken=events.get("nextPageToken"), singleEvents=False, showDeleted=True, syncToken=sync_token).execute()
 		except HttpError as err:
 			msg = _("Google Calendar - Could not fetch event from Google Calendar, error code {0}.").format(err.resp.status)
 

From 0aceebd5507d088410354e6bf55acdc54667b816 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Wed, 24 Jun 2020 10:52:03 +0530
Subject: [PATCH 030/345] Update
 frappe/website/doctype/help_article/help_article.js

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/help_article.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/help_article.js b/frappe/website/doctype/help_article/help_article.js
index 0ca92aefbd..0a87b22e2c 100644
--- a/frappe/website/doctype/help_article/help_article.js
+++ b/frappe/website/doctype/help_article/help_article.js
@@ -14,7 +14,7 @@ frappe.ui.form.on('Help Article', {
 				</div>
 				<div class="col-md-6 col-xs-12">
 					<span class="indicator whitespace-nowrap red">
-						<span>Not Helpful ${frm.doc.helpful}</span>
+						<span>Not Helpful ${frm.doc.not_helpful}</span>
 					</span>
 				</div>
 			</div>

From aae9133594a915b19506144749674b567730b398 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Wed, 24 Jun 2020 11:15:24 +0530
Subject: [PATCH 031/345] fix: disallow access to signup page when disabled

signup page is still accessible through the URL even when the button is
not shown. this disables access to the page when signups are disabled.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/www/login.html | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/frappe/www/login.html b/frappe/www/login.html
index ebbff748ec..f1131db8cf 100644
--- a/frappe/www/login.html
+++ b/frappe/www/login.html
@@ -70,20 +70,29 @@
 </section>
 <section class='for-signup'>
 	<div class="login-content page-card" style="margin-top: 20px;">
-	<form class="form-signin form-signup hide" role="form">
-		<div class="page-card-head">
-			<span class="indicator blue" data-text="{{ _('Sign Up') }}"></span>
+	{%- if not disable_signup -%}
+		<form class="form-signin form-signup hide" role="form">
+			<div class="page-card-head">
+				<span class="indicator blue" data-text="{{ _('Sign Up') }}"></span>
+			</div>
+			<input type="text" id="signup_fullname"
+				class="form-control" placeholder="{{ _('Full Name') }}" required autofocus>
+			<input type="email" id="signup_email"
+				class="form-control" placeholder="{{ _('Email Address') }}" required>
+			<button class="btn btn-sm btn-primary btn-block btn-signup" type="submit">{{ _("Sign up") }}</button>
+		</form>
+	{%- else -%}
+		<div class='page-card-head'>
+			<span class='indicator darkgrey'>{{_("Signup Disabled")}}</span>
 		</div>
-		<input type="text" id="signup_fullname"
-			class="form-control" placeholder="{{ _('Full Name') }}" required autofocus>
-		<input type="email" id="signup_email"
-			class="form-control" placeholder="{{ _('Email Address') }}" required>
-		<button class="btn btn-sm btn-primary btn-block btn-signup" type="submit">{{ _("Sign up") }}</button>
-	</form>
+		<p class="text-center">{{_("Signups have been disabled for this website.")}}</p>
+		<div class="text-center"><a href='/' class='btn btn-primary btn-sm'>{{ _("Home") }}</a></div>
+	{%- endif -%}
 	</div>
 	<div class='form-footer'>
 		<a href="#login" class="blue">{{ _("Have an account? Login") }}</a>
 	</div>
+
 </section>
 
 <section class='for-forgot'>

From 5b828adab7d56d09d1745ff74c2870223b78d7a0 Mon Sep 17 00:00:00 2001
From: Chinmay Pai <chinmaydpai@gmail.com>
Date: Wed, 24 Jun 2020 11:31:10 +0530
Subject: [PATCH 032/345] chore: use default alignment for elements

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/www/login.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/www/login.html b/frappe/www/login.html
index f1131db8cf..d57f126022 100644
--- a/frappe/www/login.html
+++ b/frappe/www/login.html
@@ -85,8 +85,8 @@
 		<div class='page-card-head'>
 			<span class='indicator darkgrey'>{{_("Signup Disabled")}}</span>
 		</div>
-		<p class="text-center">{{_("Signups have been disabled for this website.")}}</p>
-		<div class="text-center"><a href='/' class='btn btn-primary btn-sm'>{{ _("Home") }}</a></div>
+		<p>{{_("Signups have been disabled for this website.")}}</p>
+		<div><a href='/' class='btn btn-primary btn-sm'>{{ _("Home") }}</a></div>
 	{%- endif -%}
 	</div>
 	<div class='form-footer'>

From 711f8231bc0642120d7e01f650fae050fa6c8da1 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Jun 2020 13:36:15 +0530
Subject: [PATCH 033/345] fix(patch): Drop DI Legacy if exists

- Ignore patch if already run
---
 frappe/patches.txt                              | 2 +-
 frappe/patches/v13_0/replace_old_data_import.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/frappe/patches.txt b/frappe/patches.txt
index a03d31918b..f883d2a7bb 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -289,4 +289,4 @@ execute:frappe.delete_doc("DocType", "Onboarding Slide Field")
 execute:frappe.delete_doc("DocType", "Onboarding Slide Help Link")
 frappe.patches.v13_0.update_date_filters_in_user_settings
 frappe.patches.v13_0.update_duration_options
-frappe.patches.v13_0.replace_old_data_import
+frappe.patches.v13_0.replace_old_data_import # 2020-06-24
diff --git a/frappe/patches/v13_0/replace_old_data_import.py b/frappe/patches/v13_0/replace_old_data_import.py
index 1c00ae5f34..469703e172 100644
--- a/frappe/patches/v13_0/replace_old_data_import.py
+++ b/frappe/patches/v13_0/replace_old_data_import.py
@@ -6,6 +6,10 @@ import frappe
 
 
 def execute():
+	if not frappe.db.exists("DocType", "Data Import Beta"):
+		return
+
+	frappe.db.sql("DROP TABLE IF EXISTS `tabData Import Legacy`")
 	frappe.rename_doc('DocType', 'Data Import', 'Data Import Legacy')
 	frappe.db.commit()
 	frappe.db.sql("DROP TABLE IF EXISTS `tabData Import`")

From 5e31a6886ce55d5ae3ca4e8933685316028eef70 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Jun 2020 15:06:25 +0530
Subject: [PATCH 034/345] fix: Data Exporter

- Set options as mandatory only when inserting new records
- Hide Select Mandatory button during update
---
 .../core/doctype/data_import/data_import.js   | 28 +++++------
 .../js/frappe/data_import/data_exporter.js    | 49 ++++---------------
 2 files changed, 22 insertions(+), 55 deletions(-)

diff --git a/frappe/core/doctype/data_import/data_import.js b/frappe/core/doctype/data_import/data_import.js
index 9ccf43436b..6a922618cb 100644
--- a/frappe/core/doctype/data_import/data_import.js
+++ b/frappe/core/doctype/data_import/data_import.js
@@ -102,6 +102,10 @@ frappe.ui.form.on('Data Import', {
 	},
 
 	update_primary_action(frm) {
+		if (frm.is_dirty()) {
+			frm.enable_save();
+			return;
+		}
 		frm.disable_save();
 		if (frm.doc.status !== 'Success') {
 			if (!frm.is_new() && (frm.has_import_file())) {
@@ -199,20 +203,12 @@ frappe.ui.form.on('Data Import', {
 	},
 
 	download_template(frm) {
-		if (
-			frm.data_exporter &&
-			frm.data_exporter.doctype === frm.doc.reference_doctype
-		) {
-			frm.data_exporter.exporting_for = frm.doc.import_type;
-			frm.data_exporter.dialog.show();
-		} else {
-			frappe.require('/assets/js/data_import_tools.min.js', () => {
-				frm.data_exporter = new frappe.data_import.DataExporter(
-					frm.doc.reference_doctype,
-					frm.doc.import_type
-				);
-			});
-		}
+		frappe.require('/assets/js/data_import_tools.min.js', () => {
+			frm.data_exporter = new frappe.data_import.DataExporter(
+				frm.doc.reference_doctype,
+				frm.doc.import_type
+			);
+		});
 	},
 
 	reference_doctype(frm) {
@@ -435,10 +431,10 @@ frappe.ui.form.on('Data Import', {
 						.join('');
 					let id = frappe.dom.get_unique_id();
 					html = `${messages}
-						<button class="btn btn-default btn-xs margin-top" type="button" data-toggle="collapse" data-target="#${id}" aria-expanded="false" aria-controls="${id}">
+						<button class="btn btn-default btn-xs" type="button" data-toggle="collapse" data-target="#${id}" aria-expanded="false" aria-controls="${id}" style="margin-top: 15px;">
 							${__('Show Traceback')}
 						</button>
-						<div class="collapse margin-top" id="${id}">
+						<div class="collapse" id="${id}" style="margin-top: 15px;">
 							<div class="well">
 								<pre>${log.exception}</pre>
 							</div>
diff --git a/frappe/public/js/frappe/data_import/data_exporter.js b/frappe/public/js/frappe/data_import/data_exporter.js
index 6ee4e907fc..238e916c34 100644
--- a/frappe/public/js/frappe/data_import/data_exporter.js
+++ b/frappe/public/js/frappe/data_import/data_exporter.js
@@ -13,36 +13,6 @@ frappe.data_import.DataExporter = class DataExporter {
 		this.dialog = new frappe.ui.Dialog({
 			title: __('Export Data'),
 			fields: [
-				{
-					fieldtype: 'Select',
-					fieldname: 'exporting_for',
-					label: __('Exporting For'),
-					options: [
-						{
-							label: __('Insert New Records'),
-							value: 'Insert New Records'
-						},
-						{
-							label: __('Update Existing Records'),
-							value: 'Update Existing Records'
-						}
-					],
-					change: () => {
-						let exporting_for = this.dialog.get_value('exporting_for');
-						this.dialog.set_value(
-							'export_records',
-							exporting_for === 'Insert New Records' ? 'blank_template' : 'all'
-						);
-
-						// Force ID field to be exported when updating existing records
-						let id_field = this.dialog.get_field(this.doctype).options[0];
-						if (id_field.value === 'name' && id_field.$checkbox) {
-							id_field.$checkbox
-								.find('input')
-								.prop('disabled', exporting_for === 'Update Existing Records');
-						}
-					}
-				},
 				{
 					fieldtype: 'Select',
 					fieldname: 'export_records',
@@ -65,7 +35,7 @@ frappe.data_import.DataExporter = class DataExporter {
 							value: 'blank_template'
 						}
 					],
-					default: 'blank_template',
+					default: this.exporting_for === 'Insert New Records' ? 'blank_template' : 'all',
 					change: () => {
 						this.update_record_count_message();
 					}
@@ -119,10 +89,6 @@ frappe.data_import.DataExporter = class DataExporter {
 			on_page_show: () => this.select_mandatory()
 		});
 
-		if (this.exporting_for) {
-			this.dialog.set_value('exporting_for', this.exporting_for);
-		}
-
 		this.make_filter_area();
 		this.make_select_all_buttons();
 		this.update_record_count_message();
@@ -172,15 +138,17 @@ frappe.data_import.DataExporter = class DataExporter {
 	}
 
 	make_select_all_buttons() {
+		let for_insert = this.exporting_for === 'Insert New Records';
+		let section_title = for_insert ? __('Select Fields To Insert') : __('Select Fields To Update');
 		let $select_all_buttons = $(`
 			<div>
-				<h6 class="form-section-heading uppercase">${__('Select fields to export')}</h6>
+				<h6 class="form-section-heading uppercase">${section_title}</h6>
 				<button class="btn btn-default btn-xs" data-action="select_all">
 					${__('Select All')}
 				</button>
-				<button class="btn btn-default btn-xs" data-action="select_mandatory">
+				${for_insert ? `<button class="btn btn-default btn-xs" data-action="select_mandatory">
 					${__('Select Mandatory')}
-				</button>
+				</button>`: ''}
 				<button class="btn btn-default btn-xs" data-action="unselect_all">
 					${__('Unselect All')}
 				</button>
@@ -306,6 +274,9 @@ frappe.data_import.DataExporter = class DataExporter {
 			? this.column_map[child_fieldname]
 			: this.column_map[doctype];
 
+		let is_field_mandatory = df => (df.fieldname === 'name' && !child_fieldname)
+			|| (df.reqd && this.exporting_for == 'Insert New Records')
+
 		return fields
 			.filter(df => {
 				if (autoname_field && df.fieldname === autoname_field.fieldname) {
@@ -321,7 +292,7 @@ frappe.data_import.DataExporter = class DataExporter {
 				return {
 					label,
 					value: df.fieldname,
-					danger: df.reqd,
+					danger: is_field_mandatory(df),
 					checked: false,
 					description: `${df.fieldname} ${df.reqd ? __('(Mandatory)') : ''}`
 				};

From 8d8c9a348b93226c94b12124660ae116689baf4b Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Jun 2020 15:07:23 +0530
Subject: [PATCH 035/345] fix: Data Import form

- Hide Download Template button for new doc
- Hide Refresh Google Sheet button if doc is dirty
---
 frappe/core/doctype/data_import/data_import.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/core/doctype/data_import/data_import.json b/frappe/core/doctype/data_import/data_import.json
index 177252ea22..8b1b6c4e07 100644
--- a/frappe/core/doctype/data_import/data_import.json
+++ b/frappe/core/doctype/data_import/data_import.json
@@ -119,7 +119,7 @@
   {
    "fieldname": "import_warnings_section",
    "fieldtype": "Section Break",
-   "label": "Warnings"
+   "label": "Import File Errors and Warnings"
   },
   {
    "fieldname": "import_warnings",
@@ -127,7 +127,7 @@
    "label": "Import Warnings"
   },
   {
-   "depends_on": "reference_doctype",
+   "depends_on": "eval:!doc.__islocal",
    "fieldname": "download_template",
    "fieldtype": "Button",
    "label": "Download Template"
@@ -159,7 +159,7 @@
    "label": "Import from Google Sheets"
   },
   {
-   "depends_on": "eval:doc.google_sheets_url",
+   "depends_on": "eval:doc.google_sheets_url && !doc.__unsaved",
    "fieldname": "refresh_google_sheet",
    "fieldtype": "Button",
    "label": "Refresh Google Sheet"
@@ -167,7 +167,7 @@
  ],
  "hide_toolbar": 1,
  "links": [],
- "modified": "2020-06-18 16:05:54.211034",
+ "modified": "2020-06-24 14:33:03.173876",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Data Import",

From ebc3c26f7d52d76066012737799561f80e32c636 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Jun 2020 15:09:54 +0530
Subject: [PATCH 036/345] fix: Data Import for Update

- Update doc only if changed else throw error
- Check for mandatory only for inserting
---
 frappe/core/doctype/data_import/importer.py | 84 +++++++++++++--------
 1 file changed, 51 insertions(+), 33 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 13684aaad3..11228b834b 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -16,6 +16,7 @@ from frappe.utils.xlsxutils import (
 	read_xls_file_from_attached_file,
 )
 from frappe.model import no_value_fields, table_fields as table_fieldtypes
+from frappe.core.doctype.version.version import get_diff
 
 INVALID_VALUES = ("", None)
 MAX_ROWS_IN_PREVIEW = 10
@@ -216,14 +217,22 @@ class Importer:
 	def update_record(self, doc):
 		id_field = get_id_field(self.doctype)
 		existing_doc = frappe.get_doc(self.doctype, doc.get(id_field.fieldname))
-		existing_doc.flags.updater_reference = {
-			"doctype": self.data_import.doctype,
-			"docname": self.data_import.name,
-			"label": _("via Data Import"),
-		}
-		existing_doc.update(doc)
-		existing_doc.save()
-		return existing_doc
+
+		updated_doc = frappe.get_doc(self.doctype, doc.get(id_field.fieldname))
+		updated_doc.update(doc)
+
+		if get_diff(existing_doc, updated_doc):
+			# update doc if there are changes
+			updated_doc.flags.updater_reference = {
+				"doctype": self.data_import.doctype,
+				"docname": self.data_import.name,
+				"label": _("via Data Import"),
+			}
+			updated_doc.save()
+			return updated_doc
+		else:
+			# throw if no changes
+			frappe.throw('No changes to update')
 
 	def get_eta(self, current, total, processing_time):
 		self.last_eta = getattr(self, "last_eta", 0)
@@ -306,8 +315,9 @@ class ImportFile:
 		)
 		self.column_to_field_map = self.template_options.column_to_field_map
 		self.import_type = import_type
+		self.warnings = []
 
-		self.file_doc = self.file_path = None
+		self.file_doc = self.file_path = self.google_sheets_url = None
 		if isinstance(file, frappe.string_types):
 			if frappe.db.exists("File", {"file_url": file}):
 				self.file_doc = frappe.get_doc("File", {"file_url": file})
@@ -462,38 +472,46 @@ class ImportFile:
 					parent_doc[table_df.fieldname].append(child_doc)
 
 		doc = parent_doc
-		# check if there is atleast one row for mandatory table fields
-		meta = frappe.get_meta(self.doctype)
-		mandatory_table_fields = [
-			df
-			for df in meta.fields
-			if df.fieldtype in table_fieldtypes
-			and df.reqd
-			and len(doc.get(df.fieldname, [])) == 0
-		]
-		if len(mandatory_table_fields) == 1:
-			self.warnings.append(
-				{
-					"row": first_row.row_number,
-					"message": _("There should be atleast one row for {0} table").format(
-						mandatory_table_fields[0].label
-					),
-				}
-			)
-		elif mandatory_table_fields:
-			fields_string = ", ".join([df.label for df in mandatory_table_fields])
-			message = _("There should be atleast one row for the following tables: {0}").format(
-				fields_string
-			)
-			self.warnings.append({"row": first_row.row_number, "message": message})
+
+		if self.import_type == INSERT:
+			# check if there is atleast one row for mandatory table fields
+			meta = frappe.get_meta(self.doctype)
+			mandatory_table_fields = [
+				df
+				for df in meta.fields
+				if df.fieldtype in table_fieldtypes
+				and df.reqd
+				and len(doc.get(df.fieldname, [])) == 0
+			]
+			if len(mandatory_table_fields) == 1:
+				self.warnings.append(
+					{
+						"row": first_row.row_number,
+						"message": _("There should be atleast one row for {0} table").format(
+							frappe.bold(mandatory_table_fields[0].label)
+						),
+					}
+				)
+			elif mandatory_table_fields:
+				fields_string = ", ".join([df.label for df in mandatory_table_fields])
+				message = _("There should be atleast one row for the following tables: {0}").format(
+					fields_string
+				)
+				self.warnings.append({"row": first_row.row_number, "message": message})
 
 		return doc, rows, data[len(rows) :]
 
 	def get_warnings(self):
 		warnings = []
+
+		# ImportFile warnings
+		warnings += self.warnings
+
+		# Column warnings
 		for col in self.header.columns:
 			warnings += col.warnings
 
+		# Row warnings
 		for row in self.data:
 			warnings += row.warnings
 

From f3943ed663d9849ef87bf358948aa505e9174f46 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Jun 2020 15:10:21 +0530
Subject: [PATCH 037/345] fix: Column

- Check if values exists in Link Column
---
 frappe/core/doctype/data_import/importer.py | 26 +++++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 11228b834b..6e530f93db 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -843,7 +843,7 @@ class Column:
 
 		self.meta = frappe.get_meta(doctype)
 		self.parse()
-		self.parse_date_format()
+		self.validate_values()
 
 	def parse(self):
 		header_title = self.header_title
@@ -916,10 +916,6 @@ class Column:
 		self.df = df
 		self.skip_import = skip_import
 
-	def parse_date_format(self):
-		if self.df and self.df.fieldtype in ("Date", "Time", "Datetime"):
-			self.date_format = self.guess_date_format_for_column()
-
 	def guess_date_format_for_column(self):
 		""" Guesses date format for a column by parsing all the values in the column,
 		getting the date format and then returning the one which has the maximum frequency
@@ -954,6 +950,26 @@ class Column:
 
 		return max_occurred_date_format
 
+	def validate_values(self):
+		if not self.df:
+			return
+
+		if self.df.fieldtype == 'Link':
+			# find all values that dont exist
+			values = list(set([v for v in self.column_values[1:] if v]))
+			exists = [d.name for d in frappe.db.get_all(self.df.options, filters={'name': ('in', values)})]
+			not_exists = list(set(values) - set(exists))
+			if not_exists:
+				missing_values = ', '.join(not_exists)
+				self.warnings.append({
+					'col': self.column_number,
+					'message': "The following values do not exist for {}: {}".format(self.df.options, missing_values),
+					'type': 'warning'
+				})
+		elif self.df.fieldtype in ("Date", "Time", "Datetime"):
+			# guess date format
+			self.date_format = self.guess_date_format_for_column()
+
 	def as_dict(self):
 		d = frappe._dict()
 		d.index = self.index

From 68b4591f10ed970f3cfe8215d046ff1c4d17e1f0 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Jun 2020 15:10:29 +0530
Subject: [PATCH 038/345] fix: Update yarn.lock

---
 yarn.lock | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d858972218..251aa893b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -252,18 +252,6 @@
     "@types/events" "*"
     "@types/node" "*"
 
-"@types/bunyan@*":
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.6.tgz#6527641cca30bedec5feb9ab527b7803b8000582"
-  integrity sha512-YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/color-name@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
-  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
-
 "@types/debug@^4.1.4":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
@@ -3529,7 +3517,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4.17.15, lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
+lodash@4.17.15, lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -4803,11 +4791,6 @@ prettier@^1.19.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
-pretty-hrtime@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
-  integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
-
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"

From 8343105093af811351c09d7283b4a4ab819044ac Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Jun 2020 15:18:22 +0530
Subject: [PATCH 039/345] fix: Handle empty column_to_field_map

---
 frappe/core/doctype/data_import/importer.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 6e530f93db..ec3cccc1b1 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -773,11 +773,12 @@ class Row:
 
 
 class Header(Row):
-	def __init__(self, index, row, doctype, raw_data, column_to_field_map):
+	def __init__(self, index, row, doctype, raw_data, column_to_field_map=None):
 		self.index = index
 		self.row_number = index + 1
 		self.data = row
 		self.doctype = doctype
+		column_to_field_map = column_to_field_map or frappe._dict()
 
 		self.seen = []
 		self.columns = []

From c53c0c43f4080620f69ffd7efe8809988002dd05 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Wed, 24 Jun 2020 19:45:53 +0530
Subject: [PATCH 040/345] fix: allow darkgrey indicator for disabled signup

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/templates/includes/login/login.js | 2 +-
 frappe/www/login.html                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js
index 37b8acb328..9fa22468d3 100644
--- a/frappe/templates/includes/login/login.js
+++ b/frappe/templates/includes/login/login.js
@@ -97,7 +97,7 @@ login.reset_sections = function(hide) {
 		$("section.for-forgot").toggle(false);
 		$("section.for-signup").toggle(false);
 	}
-	$('section .indicator').each(function() {
+	$('section:not(.signup-disabled) .indicator').each(function() {
 		$(this).removeClass().addClass('indicator').addClass('blue')
 			.text($(this).attr('data-text'));
 	});
diff --git a/frappe/www/login.html b/frappe/www/login.html
index d57f126022..9d00892b18 100644
--- a/frappe/www/login.html
+++ b/frappe/www/login.html
@@ -68,7 +68,7 @@
 		<a href="#forgot">{{ _("Forgot Password?") }}</a></p>
 	</div>
 </section>
-<section class='for-signup'>
+<section class='for-signup {{ "signup-disabled" if disable_signup else "" }}'>
 	<div class="login-content page-card" style="margin-top: 20px;">
 	{%- if not disable_signup -%}
 		<form class="form-signin form-signup hide" role="form">

From 3537c5610e54b9969adb04c169a6e7783152447d Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 25 Jun 2020 12:39:10 +0530
Subject: [PATCH 041/345] fix: layout for sidebar and page content wrapper

---
 frappe/public/scss/sidebar.scss |  5 +++++
 frappe/public/scss/website.scss | 10 ++++++++++
 frappe/templates/web.html       |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/frappe/public/scss/sidebar.scss b/frappe/public/scss/sidebar.scss
index d3442c2344..b13eaf2a74 100644
--- a/frappe/public/scss/sidebar.scss
+++ b/frappe/public/scss/sidebar.scss
@@ -20,6 +20,11 @@
 	}
 }
 
+// Remove top margin from frist child
+.sidebar-item:first-child a {
+	margin-top: 0rem;
+}
+
 .sidebar-item a.active {
 	color: $primary;
 	background-color: $primary-light;
diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index e03c502784..ad20a30698 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -110,6 +110,10 @@
 	color: $light;
 }
 
+.page-content-wrapper {
+	margin: 2rem 0;
+}
+
 .breadcrumb-container {
 	margin-top: 1rem;
 }
@@ -326,4 +330,10 @@ h5.modal-title {
 	left: 0;
 	width: 100%;
 	height: 100%;
+}
+
+.ellipsis {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
 }
\ No newline at end of file
diff --git a/frappe/templates/web.html b/frappe/templates/web.html
index e014ef7ace..4472fe862e 100644
--- a/frappe/templates/web.html
+++ b/frappe/templates/web.html
@@ -13,7 +13,7 @@
 	</div>
 
 	{% block page_container %}
-	<main class="{% if not full_width %}container my-5{% endif %}">
+	<main class="{% if not full_width %}container my-4{% endif %}">
 		<div class="d-flex justify-content-between align-items-center">
 			<div class="page-header">
 				{% block header %}{% endblock %}

From 5456b7a2593b7d1f76931b95eb77c077ff9cb805 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 25 Jun 2020 12:39:22 +0530
Subject: [PATCH 042/345] feat: update help article row layout

---
 frappe/public/scss/portal.scss                |  7 +++++
 frappe/public/scss/website.scss               |  1 +
 .../templates/help_article_row.html           | 26 +++++++++----------
 3 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 frappe/public/scss/portal.scss

diff --git a/frappe/public/scss/portal.scss b/frappe/public/scss/portal.scss
new file mode 100644
index 0000000000..33371d5693
--- /dev/null
+++ b/frappe/public/scss/portal.scss
@@ -0,0 +1,7 @@
+.portal-row {
+	padding: 1rem 0;
+	
+	a {
+		color: $body-color;
+	}
+}
\ No newline at end of file
diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index ad20a30698..f4cadc7802 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -8,6 +8,7 @@
 @import 'blog';
 @import 'markdown';
 @import 'sidebar';
+@import 'portal';
 @import 'doc';
 
 .container {
diff --git a/frappe/website/doctype/help_article/templates/help_article_row.html b/frappe/website/doctype/help_article/templates/help_article_row.html
index 0fecaf35e1..4cc38860c4 100644
--- a/frappe/website/doctype/help_article/templates/help_article_row.html
+++ b/frappe/website/doctype/help_article/templates/help_article_row.html
@@ -1,15 +1,15 @@
-{% set article = doc %}
-<div class="row">
-    <div class="col-sm-9">
-		<p>
-			<a class="no-underline" href="/{{ article.route }}">
-				{{ article.title }}
-			</a><br>
-		</p>
-    </div>
-	<div class="col-sm-3 indicator-column text-right">
-		<span class="help-category-label indicator-right {{ get_level_class(article.level) }}">
-            {{ article.level }}
-        </span>
+<div class="portal-row row">
+	<div class="col-sm-7">
+		<a class="no-underline" href="/{{ doc.route }}">
+			{{ doc.title }}
+		</a>
+	</div>
+	<div class="col-sm-2">
+		<span class="help-category-label indicator {{ get_level_class(doc.level) }}">
+			{{ doc.level }}
+		</span>
+	</div>
+	<div class="col-sm-3 text-right small">
+			{{ frappe.format_date(doc.creation) }}
 	</div>
 </div>

From a95003f5ce1c7373349d346490b0818d1c840f6e Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 25 Jun 2020 13:18:08 +0530
Subject: [PATCH 043/345] feat: layout fixes for help article

---
 frappe/templates/web.html                     |  2 +-
 .../help_article/templates/help_article.html  | 36 +++++++++----------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/frappe/templates/web.html b/frappe/templates/web.html
index 4472fe862e..57fefa333d 100644
--- a/frappe/templates/web.html
+++ b/frappe/templates/web.html
@@ -8,7 +8,7 @@
 	<!-- breadcrumbs -->
 	<div class="page-breadcrumbs">
 		{% block breadcrumbs %}
-		{% include 'templates/includes/breadcrumbs.html' %}
+			{% include 'templates/includes/breadcrumbs.html' %}
 		{% endblock %}
 	</div>
 
diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 913e6d6a92..de28f878a9 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -1,32 +1,28 @@
 {% extends "templates/web.html" %}
 
 {% block header %}
-<h1>{{ title }}</h1>
+<h1 itemprop="headline">{{ title }}</h1>
 {% endblock %}
 
 {% block page_content %}
-<article class="help-content" itemscope itemtype="http://schema.org/BlogPost">
-	<div class="help-article-info">
-		<p>
-			<span class="indicator {{ level_class }}">{{ level }}</span>
-		</p>
-	    <h6 class='text-muted'>By {{ author }} on {{ frappe.format_date(creation) }}</h6>
+<article itemscope itemtype="http://schema.org/BlogPost">
+	<div>
+		<h6 class='text-muted'>By {{ author }} on {{ frappe.format_date(creation) }}</h6>
+		<span class="indicator {{ level_class }}">{{ level }}</span>
 	</div>
-	<div class="longform" itemprop="articleBody" style='margin: 30px 0px;'>
-	{{ content }}
+	
+	<div class="from-markdown my-4" itemprop="articleBody">
+		{{ content }}
 	</div>
-
-	<p><br><a href="/{{ category.route }}" class='text-muted small'>
-		{{ _("More articles on {0}").format(category.name) }}</a></p>
-</article>
-<div class="help-article-comments">
 	<hr>
-	<h4>Comments</h4>
+	<a href="/{{ category.route }}">
+		{{ _("More articles on {0}").format(category.name) }}
+	</a>
+	<hr>
+</article>
+
+<div>
+	<h5>Comments</h5>
 	{% include 'templates/includes/comments/comments.html' %}
 </div>
-<script>
-frappe.ready(function() {
-    frappe.set_search_path("/kb");
-});
-</script>
 {% endblock %}

From aca8d910811c95bb1dd4f5499db636c4ea4c1760 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 25 Jun 2020 13:20:51 +0530
Subject: [PATCH 044/345] fix: breadcrumb alignment wrt to sidebar

---
 frappe/public/scss/website.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index f4cadc7802..c89641b238 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -117,6 +117,7 @@
 
 .breadcrumb-container {
 	margin-top: 1rem;
+	padding-top:  0.25rem;
 }
 
 .breadcrumb {

From baeed8f8625a11afa6ddbd89df16d486d5afe820 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 25 Jun 2020 18:20:05 +0530
Subject: [PATCH 045/345] feat: don't throw a already attached error, just
 upload it as duplicate

---
 frappe/core/doctype/file/file.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py
index 831d2ab22d..90c9df980f 100755
--- a/frappe/core/doctype/file/file.py
+++ b/frappe/core/doctype/file/file.py
@@ -182,13 +182,7 @@ class File(Document):
 			if duplicate_file:
 				duplicate_file_doc = frappe.get_cached_doc('File', duplicate_file.name)
 				if duplicate_file_doc.exists_on_disk():
-					# if it is attached to a document then throw FileAlreadyAttachedException
-					if self.attached_to_doctype and self.attached_to_name:
-						self.duplicate_entry = duplicate_file.name
-						frappe.throw(_("Same file has already been attached to the record"),
-							frappe.FileAlreadyAttachedException)
-					# else just use the url, to avoid uploading a duplicate
-					else:
+						# just use the url, to avoid uploading a duplicate
 						self.file_url = duplicate_file.file_url
 
 	def set_file_name(self):

From 2849c58ffca3535bf0eb7c4a0fcffe5c1677a853 Mon Sep 17 00:00:00 2001
From: Ernesto Ruiz <ernesto_ruiz89@hotmail.com>
Date: Thu, 25 Jun 2020 11:54:57 -0600
Subject: [PATCH 046/345] fix: Link on onboarding widget for add new record
 (fix PR#10769)

Fix broken link on onboarding widget for add new record

Fix pull request: https://github.com/frappe/frappe/pull/10769



As used on:
https://github.com/frappe/frappe/blob/a2caa8eb0459f580bc23277842633c7f2638c61d/frappe/public/js/frappe/views/treeview.js#L253

https://github.com/frappe/frappe/blob/a2caa8eb0459f580bc23277842633c7f2638c61d/frappe/public/js/frappe/views/reports/report_view.js#L1334
---
 frappe/public/js/frappe/widgets/onboarding_widget.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index 4c91994a6f..4143465591 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -136,7 +136,7 @@ export default class OnboardingWidget extends Widget {
 		if (step.is_single) {
 			route = `Form/${step.reference_document}`;
 		} else {
-			route = `Form/${step.reference_document}/__('New')+ ' ' + ${step.reference_document}`;
+			route = __(`Form/${step.reference_document}/{0} {1}`,[__('New'),__(step.reference_document)]);
 		}
 
 		let current_route = frappe.get_route();
@@ -262,7 +262,7 @@ export default class OnboardingWidget extends Widget {
 			frappe.route_hooks.after_save = callback;
 		}
 
-		frappe.set_route(`Form/${step.reference_document}/__('New')+ ' ' + ${step.reference_document}`);
+		frappe.set_route(__(`Form/${step.reference_document}/{0} {1}`,[__('New'),__(step.reference_document)]));
 	}
 
 	show_quick_entry(step) {

From 249d04420b9e32e8543c02bf8879d321747df5ba Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Fri, 26 Jun 2020 13:28:15 +0530
Subject: [PATCH 047/345] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 01271af8b9..cdd830295f 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -22,7 +22,7 @@
 <div class="help-article-feedback mb-4">
 	<hr />
 	<div class="feedback-view ">
-		<span class="text-muted small" style="margin-right: 15px;">{{ _("Was this helpful?") }}</span>
+		<span class="text-muted small mr-2">{{ _("Was this article helpful?") }}</span>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
 	</div>

From 548a5fa41640e6bf7dff1e19c011146ddfa7e65e Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 26 Jun 2020 15:38:07 +0530
Subject: [PATCH 048/345] fix: add new disabled state

---
 .../help_article/templates/help_article.html        | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index cdd830295f..a97154847b 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -25,6 +25,7 @@
 		<span class="text-muted small mr-2">{{ _("Was this article helpful?") }}</span>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
+		<button class="feedback-msg btn btn-sm disabled hide">{{ _("Thank you for your feedback!") }}</button>
 	</div>
 </div>
 <div class="help-article-comments">
@@ -41,20 +42,14 @@ frappe.ready(function() {
 			helpful: this.getAttribute("data-value"),
 		}
 
-		let disable_button = function(btn) {
-			btn.classList.remove("btn-outline-primary");
-			btn.classList.add("btn-light");
-			btn.disabled = true
-		}
-
 		frappe.call({
 			btn: this,
 			method: "frappe.website.doctype.help_article.help_article.add_feedback",
 			args: args,
 			callback: function(r) {
-				disable_button($(".feedback")[0]);
-				disable_button($(".feedback")[1]);
-				frappe.msgprint(__("Thank you for your feedback!"));
+				$(".feedback")[0].classList.add("hide");
+				$(".feedback")[1].classList.add("hide");
+				$(".feedback-msg")[0].classList.remove("hide");
 			}
 		})
 	});

From e25e6689107b65cd822b234e13428254ffd5d85c Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 26 Jun 2020 18:03:32 +0530
Subject: [PATCH 049/345] fix: only give administrator permission to create
 chart sources

---
 .../dashboard_chart_source.json               | 139 +++---------------
 .../dashboard_chart_source.py                 |   4 -
 2 files changed, 23 insertions(+), 120 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json
index 7f6532ce1f..fbe0ae94f0 100644
--- a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json
+++ b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.json
@@ -1,162 +1,69 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
+ "actions": [],
  "autoname": "field:source_name",
- "beta": 0,
  "creation": "2019-02-06 07:55:29.579840",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
- "document_type": "",
  "editable_grid": 1,
  "engine": "InnoDB",
+ "field_order": [
+  "source_name",
+  "module",
+  "timeseries"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "source_name",
    "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": "Source Name",
-   "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,
-   "translatable": 0,
    "unique": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "module",
    "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": "Module",
-   "length": 0,
-   "no_copy": 0,
    "options": "Module Def",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
+   "default": "0",
    "fieldname": "timeseries",
    "fieldtype": "Check",
-   "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": "Timeseries",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Timeseries"
   }
  ],
- "has_web_view": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2019-04-09 14:20:51.548207",
+ "links": [],
+ "modified": "2020-06-26 18:00:37.421491",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart Source",
- "name_case": "",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 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
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Administrator",
    "share": 1,
-   "submit": 0,
    "write": 1
   }
  ],
- "quick_entry": 0,
- "read_only": 0,
- "show_name_in_global_search": 0,
  "sort_field": "modified",
  "sort_order": "DESC",
- "title_field": "",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py
index de83807b4b..6685009078 100644
--- a/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py
+++ b/frappe/desk/doctype/dashboard_chart_source/dashboard_chart_source.py
@@ -18,10 +18,6 @@ def get_config(name):
 		return f.read()
 
 class DashboardChartSource(Document):
-	def validate(self):
-		if frappe.session.user != "Administrator":
-			frappe.throw(_("Only Administrator is allowed to create Dashboard Chart Sources"))
-
 	def on_update(self):
 		export_to_files(record_list=[[self.doctype, self.name]],
 			record_module=self.module, create_init=True)

From 99b0da249b7c339d5f121e4f86ba8420c122f1d4 Mon Sep 17 00:00:00 2001
From: Ernesto Ruiz <ernesto_ruiz89@hotmail.com>
Date: Fri, 26 Jun 2020 09:04:04 -0600
Subject: [PATCH 050/345] adding spaces after comma

---
 frappe/public/js/frappe/widgets/onboarding_widget.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index 4143465591..e4a5265f47 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -136,7 +136,7 @@ export default class OnboardingWidget extends Widget {
 		if (step.is_single) {
 			route = `Form/${step.reference_document}`;
 		} else {
-			route = __(`Form/${step.reference_document}/{0} {1}`,[__('New'),__(step.reference_document)]);
+			route = __(`Form/${step.reference_document}/{0} {1}`, [__('New'), __(step.reference_document)]);
 		}
 
 		let current_route = frappe.get_route();
@@ -262,7 +262,7 @@ export default class OnboardingWidget extends Widget {
 			frappe.route_hooks.after_save = callback;
 		}
 
-		frappe.set_route(__(`Form/${step.reference_document}/{0} {1}`,[__('New'),__(step.reference_document)]));
+		frappe.set_route(__(`Form/${step.reference_document}/{0} {1}`, [__('New'), __(step.reference_document)]));
 	}
 
 	show_quick_entry(step) {

From 4ce29c312029ad4f92e39c7ee89cf1350c6ac8ef Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Fri, 26 Jun 2020 22:41:29 +0530
Subject: [PATCH 051/345] fix: Notificaions on data import

---
 frappe/model/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/model/document.py b/frappe/model/document.py
index 24450f0cc6..e316bfff70 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -825,7 +825,7 @@ class Document(BaseDocument):
 
 	def run_notifications(self, method):
 		"""Run notifications for this method"""
-		if frappe.flags.in_import or frappe.flags.in_patch or frappe.flags.in_install:
+		if (frappe.flags.in_import and frappe.flags.mute_emails) or frappe.flags.in_patch or frappe.flags.in_install:
 			return
 
 		if self.flags.notifications_executed==None:

From 6dbf7a90a19e6ffcf9bfb2c42263af9a135a4ec7 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 24 Jun 2020 16:59:53 +0530
Subject: [PATCH 052/345] fix: threading of email replies where message-id is
 not returned

---
 .../doctype/email_account/email_account.py    | 37 ++++++++++++-------
 .../public/js/frappe/views/communication.js   | 23 +++++++-----
 frappe/utils/safe_exec.py                     |  1 +
 3 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index 2065f5558a..f45a99f61f 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -478,27 +478,38 @@ class EmailAccount(Document):
 
 		if self.append_to and self.sender_field:
 			if self.subject_field:
-				# try and match by subject and sender
-				# if sent by same sender with same subject,
-				# append it to old coversation
-				subject = frappe.as_unicode(strip(re.sub(r"(^\s*(fw|fwd|wg)[^:]*:|\s*(re|aw)[^:]*:\s*)*",
-					"", email.subject, 0, flags=re.IGNORECASE)))
+				if '#' in email.subject:
+					# try and match if ID is found
+					# document ID is appended to subject
+					# example "Re: Your email (#OPP-2020-2334343)"
+					parent_id = email.subject.rsplit('#', 1)[-1].strip(' ()')
+					if frappe.db.exists(self.append_to, parent_id):
+						parent = frappe._dict(name=parent_id)
 
-				parent = frappe.db.get_all(self.append_to, filters={
-					self.sender_field: email.from_email,
-					self.subject_field: ("like", "%{0}%".format(subject)),
-					"creation": (">", (get_datetime() - relativedelta(days=60)).strftime(DATE_FORMAT))
-				}, fields="name")
+				if not parent:
+					# try and match by subject and sender
+					# if sent by same sender with same subject,
+					# append it to old coversation
+					subject = frappe.as_unicode(strip(re.sub(r"(^\s*(fw|fwd|wg)[^:]*:|\s*(re|aw)[^:]*:\s*)*",
+						"", email.subject, 0, flags=re.IGNORECASE)))
+
+					parent = frappe.db.get_all(self.append_to, filters={
+						self.sender_field: email.from_email,
+						self.subject_field: ("like", "%{0}%".format(subject)),
+						"creation": (">", (get_datetime() - relativedelta(days=60)).strftime(DATE_FORMAT))
+					}, fields="name")
 
-				# match only subject field
-				# when the from_email is of a user in the system
-				# and subject is atleast 10 chars long
 				if not parent and len(subject) > 10 and is_system_user(email.from_email):
+					# match only subject field
+					# when the from_email is of a user in the system
+					# and subject is atleast 10 chars long
 					parent = frappe.db.get_all(self.append_to, filters={
 						self.subject_field: ("like", "%{0}%".format(subject)),
 						"creation": (">", (get_datetime() - relativedelta(days=60)).strftime(DATE_FORMAT))
 					}, fields="name")
 
+
+
 			if parent:
 				parent = frappe._dict(doctype=self.append_to, name=parent[0].name)
 				return parent
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 8dad5d9121..b21d46d686 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -174,16 +174,21 @@ frappe.views.CommunicationComposer = Class.extend({
 			}
 
 			if (!this.subject) {
-				if (this.frm.subject_field && this.frm.doc[this.frm.subject_field]) {
-					this.subject = __("Re: {0}", [this.frm.doc[this.frm.subject_field]]);
-				} else {
-					let title = this.frm.doc.name;
-					if(this.frm.meta.title_field && this.frm.doc[this.frm.meta.title_field]
-						&& this.frm.doc[this.frm.meta.title_field] != this.frm.doc.name) {
-						title = `${this.frm.doc[this.frm.meta.title_field]} (#${this.frm.doc.name})`;
-					}
-					this.subject = `${__(this.frm.doctype)}: ${title}`;
+				let title = this.frm.doc.name;
+				if (this.frm.meta.subject_field && this.frm.doc[this.frm.meta.subject_field]) {
+					title = this.frm.doc[this.frm.meta.subject_field];
+				} else if (this.frm.meta.title_field && this.frm.doc[this.frm.meta.title_field]) {
+					title = this.frm.doc[this.frm.meta.title_field];
 				}
+				this.subject = __("Re: {0}", [title]);
+			}
+
+			// always add an identifier to catch a reply
+			// some email clients (outlook) may not send the message id to identify
+			// the thread. So as a backup we use the name of the document as identifier
+			let identifier = `#{this.frm.doc.name}`;
+			if (!this.subject.includes(identifier)) {
+				this.subject = `{this.subject} ({identifier})`;
 			}
 		}
 
diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py
index daae75228e..826aed6082 100644
--- a/frappe/utils/safe_exec.py
+++ b/frappe/utils/safe_exec.py
@@ -69,6 +69,7 @@ def get_safe_globals():
 			get_url=frappe.utils.get_url,
 			render_template=frappe.render_template,
 			msgprint=frappe.msgprint,
+			throw=frappe.throw,
 
 			user=user,
 			get_fullname=frappe.utils.get_fullname,

From f9e9a6cdb96f359781e668234b11c7b3b24bf44d Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 24 Jun 2020 20:19:30 +0530
Subject: [PATCH 053/345] fix: add limit to like queries while searching for
 threads

---
 frappe/email/doctype/email_account/email_account.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index f45a99f61f..c4f9e30406 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -483,8 +483,8 @@ class EmailAccount(Document):
 					# document ID is appended to subject
 					# example "Re: Your email (#OPP-2020-2334343)"
 					parent_id = email.subject.rsplit('#', 1)[-1].strip(' ()')
-					if frappe.db.exists(self.append_to, parent_id):
-						parent = frappe._dict(name=parent_id)
+					parent = frappe.db.get_all(self.append_to, filters = dict(name = parent_id),
+						fields = 'name')
 
 				if not parent:
 					# try and match by subject and sender
@@ -497,7 +497,7 @@ class EmailAccount(Document):
 						self.sender_field: email.from_email,
 						self.subject_field: ("like", "%{0}%".format(subject)),
 						"creation": (">", (get_datetime() - relativedelta(days=60)).strftime(DATE_FORMAT))
-					}, fields="name")
+					}, fields = "name", limit = 1)
 
 				if not parent and len(subject) > 10 and is_system_user(email.from_email):
 					# match only subject field
@@ -506,7 +506,7 @@ class EmailAccount(Document):
 					parent = frappe.db.get_all(self.append_to, filters={
 						self.subject_field: ("like", "%{0}%".format(subject)),
 						"creation": (">", (get_datetime() - relativedelta(days=60)).strftime(DATE_FORMAT))
-					}, fields="name")
+					}, fields = "name", limit = 1)
 
 
 

From 14006d416369b26f9e310a223d42093626407812 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 25 Jun 2020 11:14:04 +0530
Subject: [PATCH 054/345] fix: check for badly formed messages and no "Re"
 prefix required for first email

---
 frappe/email/doctype/email_account/email_account.py | 5 +++--
 frappe/public/js/frappe/views/communication.js      | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index c4f9e30406..cf8c6e80c6 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -483,8 +483,9 @@ class EmailAccount(Document):
 					# document ID is appended to subject
 					# example "Re: Your email (#OPP-2020-2334343)"
 					parent_id = email.subject.rsplit('#', 1)[-1].strip(' ()')
-					parent = frappe.db.get_all(self.append_to, filters = dict(name = parent_id),
-						fields = 'name')
+					if parent_id:
+						parent = frappe.db.get_all(self.append_to, filters = dict(name = parent_id),
+							fields = 'name')
 
 				if not parent:
 					# try and match by subject and sender
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index b21d46d686..da87ab33f6 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -174,13 +174,12 @@ frappe.views.CommunicationComposer = Class.extend({
 			}
 
 			if (!this.subject) {
-				let title = this.frm.doc.name;
+				this.subject = this.frm.doc.name;
 				if (this.frm.meta.subject_field && this.frm.doc[this.frm.meta.subject_field]) {
-					title = this.frm.doc[this.frm.meta.subject_field];
+					this.subject = this.frm.doc[this.frm.meta.subject_field];
 				} else if (this.frm.meta.title_field && this.frm.doc[this.frm.meta.title_field]) {
-					title = this.frm.doc[this.frm.meta.title_field];
+					this.subject = this.frm.doc[this.frm.meta.title_field];
 				}
-				this.subject = __("Re: {0}", [title]);
 			}
 
 			// always add an identifier to catch a reply

From f341693d4032a671d3a83d02099440d19006ba89 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Sun, 28 Jun 2020 09:40:10 +0530
Subject: [PATCH 055/345] fix: subject formatting

---
 frappe/public/js/frappe/views/communication.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index da87ab33f6..53d946f75d 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -185,9 +185,9 @@ frappe.views.CommunicationComposer = Class.extend({
 			// always add an identifier to catch a reply
 			// some email clients (outlook) may not send the message id to identify
 			// the thread. So as a backup we use the name of the document as identifier
-			let identifier = `#{this.frm.doc.name}`;
+			let identifier = `#${this.frm.doc.name}`;
 			if (!this.subject.includes(identifier)) {
-				this.subject = `{this.subject} ({identifier})`;
+				this.subject = `${this.subject} (${identifier})`;
 			}
 		}
 

From bc9af7256215f8e7aa771b7bc108dbf959a78c56 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sun, 28 Jun 2020 16:25:01 +0530
Subject: [PATCH 056/345] fix: filter condition description doesn't get cleared

---
 frappe/public/js/frappe/ui/filters/edit_filter.html |  1 +
 frappe/public/js/frappe/ui/filters/filter.js        | 13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/edit_filter.html b/frappe/public/js/frappe/ui/filters/edit_filter.html
index 3908c63fa1..f6618a2107 100644
--- a/frappe/public/js/frappe/ui/filters/edit_filter.html
+++ b/frappe/public/js/frappe/ui/filters/edit_filter.html
@@ -10,6 +10,7 @@
 		</div>
 		<div class="col-sm-4 form-group">
 			<div class="filter-field"></div>
+			<div class="text-muted small filter-description"></div>
 		</div>
 		<div class="col-sm-2">
 			<div class="filter-actions">
diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index 37eab50957..a205651fd9 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -110,6 +110,8 @@ frappe.ui.Filter = class {
 			if(["in", "like", "not in", "not like"].includes(condition)) {
 				fieldtype = 'Data';
 				this.add_condition_help(condition);
+			} else {
+				this.filter_edit_area.find('.filter-description').empty();
 			}
 
 			if (['Select', 'MultiSelect'].includes(this.field.df.fieldtype) && ["in", "not in"].includes(condition)) {
@@ -331,14 +333,11 @@ frappe.ui.Filter = class {
 	}
 
 	add_condition_help(condition) {
-		let $desc = this.field.desc_area;
-		if(!$desc) {
-			$desc = $('<div class="text-muted small">').appendTo(this.field.wrapper);
-		}
-		// set description
-		$desc.html((in_list(["in", "not in"], condition)==="in"
+		const description = ["in", "not in"].includes(condition)
 			? __("values separated by commas")
-			: __("use % as wildcard"))+'</div>');
+			: __("use % as wildcard");
+
+		this.filter_edit_area.find('.filter-description').html(description);
 	}
 
 	hide_invalid_conditions(fieldtype, original_type) {

From 239f35298d3a7a3e72b34a72bddc29275edce5a1 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sun, 28 Jun 2020 16:46:56 +0530
Subject: [PATCH 057/345] style: fix formatting

---
 frappe/public/js/frappe/ui/filters/filter.js | 315 +++++++++++--------
 1 file changed, 191 insertions(+), 124 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index a205651fd9..5e41ed645e 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -13,26 +13,26 @@ frappe.ui.Filter = class {
 
 	set_conditions() {
 		this.conditions = [
-			["=", __("Equals")],
-			["!=", __("Not Equals")],
-			["like", __("Like")],
-			["not like", __("Not Like")],
-			["in", __("In")],
-			["not in", __("Not In")],
-			["is", __("Is")],
-			[">", ">"],
-			["<", "<"],
-			[">=", ">="],
-			["<=", "<="],
-			["Between", __("Between")],
-			["Timespan", __("Timespan")],
+			['=', __('Equals')],
+			['!=', __('Not Equals')],
+			['like', __('Like')],
+			['not like', __('Not Like')],
+			['in', __('In')],
+			['not in', __('Not In')],
+			['is', __('Is')],
+			['>', '>'],
+			['<', '<'],
+			['>=', '>='],
+			['<=', '<='],
+			['Between', __('Between')],
+			['Timespan', __('Timespan')],
 		];
 
 		this.nested_set_conditions = [
-			["descendants of", __("Descendants Of")],
-			["not descendants of", __("Not Descendants Of")],
-			["ancestors of", __("Ancestors Of")],
-			["not ancestors of", __("Not Ancestors Of")],
+			['descendants of', __('Descendants Of')],
+			['not descendants of', __('Not Descendants Of')],
+			['ancestors of', __('Ancestors Of')],
+			['not ancestors of', __('Not Ancestors Of')],
 		];
 
 		this.conditions.push(...this.nested_set_conditions);
@@ -42,10 +42,10 @@ frappe.ui.Filter = class {
 			Datetime: ['like', 'not like'],
 			Data: ['Between', 'Timespan'],
 			Select: ['like', 'not like', 'Between', 'Timespan'],
-			Link: ["Between", 'Timespan', '>', '<', '>=', '<='],
-			Currency: ["Between", 'Timespan'],
-			Color: ["Between", 'Timespan'],
-			Check: this.conditions.map(c => c[0]).filter(c => c !== '=')
+			Link: ['Between', 'Timespan', '>', '<', '>=', '<='],
+			Currency: ['Between', 'Timespan'],
+			Color: ['Between', 'Timespan'],
+			Check: this.conditions.map((c) => c[0]).filter((c) => c !== '='),
 		};
 	}
 
@@ -65,10 +65,11 @@ frappe.ui.Filter = class {
 	}
 
 	make() {
-		this.filter_edit_area = $(frappe.render_template("edit_filter", {
-			conditions: this.conditions
-		}))
-			.appendTo(this.parent.find('.filter-edit-area'));
+		this.filter_edit_area = $(
+			frappe.render_template('edit_filter', {
+				conditions: this.conditions,
+			})
+		).appendTo(this.parent.find('.filter-edit-area'));
 
 		this.make_select();
 		this.set_events();
@@ -82,43 +83,51 @@ frappe.ui.Filter = class {
 			filter_fields: this.filter_fields,
 			select: (doctype, fieldname) => {
 				this.set_field(doctype, fieldname);
-			}
+			},
 		});
 
-		if(this.fieldname) {
+		if (this.fieldname) {
 			this.fieldselect.set_value(this.doctype, this.fieldname);
 		}
 	}
 
 	set_events() {
-		this.filter_edit_area.find("a.remove-filter").on("click", () => {
+		this.filter_edit_area.find('a.remove-filter').on('click', () => {
 			this.remove();
 		});
 
-		this.filter_edit_area.find(".set-filter-and-run").on("click", () => {
-			this.filter_edit_area.removeClass("new-filter");
+		this.filter_edit_area.find('.set-filter-and-run').on('click', () => {
+			this.filter_edit_area.removeClass('new-filter');
 			this.on_change();
 			this.update_filter_tag();
 		});
 
 		this.filter_edit_area.find('.condition').change(() => {
-			if(!this.field) return;
+			if (!this.field) return;
 
 			let condition = this.get_condition();
 			let fieldtype = null;
 
-			if(["in", "like", "not in", "not like"].includes(condition)) {
+			if (['in', 'like', 'not in', 'not like'].includes(condition)) {
 				fieldtype = 'Data';
 				this.add_condition_help(condition);
 			} else {
 				this.filter_edit_area.find('.filter-description').empty();
 			}
 
-			if (['Select', 'MultiSelect'].includes(this.field.df.fieldtype) && ["in", "not in"].includes(condition)) {
+			if (
+				['Select', 'MultiSelect'].includes(this.field.df.fieldtype) &&
+				['in', 'not in'].includes(condition)
+			) {
 				fieldtype = 'MultiSelect';
 			}
 
-			this.set_field(this.field.df.parent, this.field.df.fieldname, fieldtype, condition);
+			this.set_field(
+				this.field.df.parent,
+				this.field.df.fieldname,
+				fieldtype,
+				condition
+			);
 		});
 	}
 
@@ -131,12 +140,12 @@ frappe.ui.Filter = class {
 	setup_state(is_new) {
 		let promise = Promise.resolve();
 		if (is_new) {
-			this.filter_edit_area.addClass("new-filter");
+			this.filter_edit_area.addClass('new-filter');
 		} else {
 			promise = this.update_filter_tag();
 		}
 
-		if(this.hidden) {
+		if (this.hidden) {
 			promise.then(() => this.$filter_tag.hide());
 		}
 	}
@@ -166,13 +175,13 @@ frappe.ui.Filter = class {
 	set_values(doctype, fieldname, condition, value) {
 		// presents given (could be via tags!)
 		if (this.set_field(doctype, fieldname) === false) {
-			return
+			return;
 		}
 
-		if(this.field.df.original_type==='Check') {
-			value = (value==1) ? 'Yes' : 'No';
+		if (this.field.df.original_type === 'Check') {
+			value = value == 1 ? 'Yes' : 'No';
 		}
-		if(condition) this.set_condition(condition, true);
+		if (condition) this.set_condition(condition, true);
 
 		// set value can be asynchronous, so update_filter_tag should happen after field is set
 		this._filter_value_set = Promise.resolve();
@@ -192,11 +201,13 @@ frappe.ui.Filter = class {
 	set_field(doctype, fieldname, fieldtype, condition) {
 		// set in fieldname (again)
 		let cur = {};
-		if(this.field) for(let k in this.field.df) cur[k] = this.field.df[k];
+		if (this.field) for (let k in this.field.df) cur[k] = this.field.df[k];
 
-		let original_docfield = (this.fieldselect.fields_by_name[doctype] || {})[fieldname];
+		let original_docfield = (this.fieldselect.fields_by_name[doctype] || {})[
+			fieldname
+		];
 
-		if(!original_docfield) {
+		if (!original_docfield) {
 			console.warn(`Field ${fieldname} is not selectable.`);
 			this.remove();
 			return false;
@@ -216,8 +227,13 @@ frappe.ui.Filter = class {
 
 		// called when condition is changed,
 		// don't change if all is well
-		if(this.field && cur.fieldname == fieldname && df.fieldtype == cur.fieldtype &&
-			df.parent == cur.parent && df.options == cur.options) {
+		if (
+			this.field &&
+			cur.fieldname == fieldname &&
+			df.fieldtype == cur.fieldtype &&
+			df.parent == cur.parent &&
+			df.options == cur.options
+		) {
 			return;
 		}
 
@@ -225,20 +241,25 @@ frappe.ui.Filter = class {
 		this.fieldselect.selected_doctype = doctype;
 		this.fieldselect.selected_fieldname = fieldname;
 
-		if (this.filters_config && this.filters_config[condition]
-				&& this.filters_config[condition].valid_for_fieldtypes.includes(df.fieldtype)) {
+		if (
+			this.filters_config &&
+			this.filters_config[condition] &&
+			this.filters_config[condition].valid_for_fieldtypes.includes(df.fieldtype)
+		) {
 			let args = {};
 			if (this.filters_config[condition].depends_on) {
 				const field_name = this.filters_config[condition].depends_on;
 				const filter_value = this.base_list.get_filter_value(field_name);
 				args[field_name] = filter_value;
 			}
-			frappe.xcall(this.filters_config[condition].get_field, args).then(field => {
-				df.fieldtype = field.fieldtype;
-				df.options = field.options;
-				df.fieldname = fieldname;
-				this.make_field(df, cur.fieldtype);
-			});
+			frappe
+				.xcall(this.filters_config[condition].get_field, args)
+				.then(field => {
+					df.fieldtype = field.fieldtype;
+					df.options = field.options;
+					df.fieldname = fieldname;
+					this.make_field(df, cur.fieldtype);
+				});
 		} else {
 			this.make_field(df, cur.fieldtype);
 		}
@@ -257,16 +278,18 @@ frappe.ui.Filter = class {
 		f.refresh();
 
 		this.field = f;
-		if(old_text && f.fieldtype===old_fieldtype) {
+		if (old_text && f.fieldtype === old_fieldtype) {
 			this.field.set_value(old_text);
 		}
 
 		// run on enter
-		$(this.field.wrapper).find(':input').keydown(e => {
-			if(e.which==13 && this.field.df.fieldtype !== 'MultiSelect') {
-				this.on_change();
-			}
-		});
+		$(this.field.wrapper)
+			.find(':input')
+			.keydown(e => {
+				if (e.which == 13 && this.field.df.fieldtype !== 'MultiSelect') {
+					this.on_change();
+				}
+			});
 	}
 
 	get_value() {
@@ -275,7 +298,7 @@ frappe.ui.Filter = class {
 			this.field.df.fieldname,
 			this.get_condition(),
 			this.get_selected_value(),
-			this.hidden
+			this.hidden,
 		];
 	}
 	get_selected_value() {
@@ -286,87 +309,101 @@ frappe.ui.Filter = class {
 		return this.filter_edit_area.find('.condition').val();
 	}
 
-	set_condition(condition, trigger_change=false) {
+	set_condition(condition, trigger_change = false) {
 		let $condition_field = this.filter_edit_area.find('.condition');
 		$condition_field.val(condition);
-		if(trigger_change) $condition_field.change();
-
+		if (trigger_change) $condition_field.change();
 	}
 
 	make_tag() {
 		if (!this.field) return;
-		this.$filter_tag = this.get_filter_tag_element()
-			.insertAfter(this.parent.find(".active-tag-filters .clear-filters"));
+		this.$filter_tag = this.get_filter_tag_element().insertAfter(
+			this.parent.find('.active-tag-filters .clear-filters')
+		);
 		this.set_filter_button_text();
 		this.bind_tag();
 	}
 
 	bind_tag() {
-		this.$filter_tag.find(".remove-filter").on("click", this.remove.bind(this));
+		this.$filter_tag.find('.remove-filter').on('click', this.remove.bind(this));
 
-		let filter_button = this.$filter_tag.find(".toggle-filter");
-		filter_button.on("click", () => {
-			filter_button.closest('.tag-filters-area').find('.filter-edit-area').show();
+		let filter_button = this.$filter_tag.find('.toggle-filter');
+		filter_button.on('click', () => {
+			filter_button
+				.closest('.tag-filters-area')
+				.find('.filter-edit-area')
+				.show();
 			this.filter_edit_area.toggle();
 		});
 	}
 
 	set_filter_button_text() {
-		this.$filter_tag.find(".toggle-filter").html(this.get_filter_button_text());
+		this.$filter_tag.find('.toggle-filter').html(this.get_filter_button_text());
 	}
 
 	get_filter_button_text() {
-		let value = this.utils.get_formatted_value(this.field, this.get_selected_value());
-		return `${__(this.field.df.label)} ${__(this.get_condition())} ${__(value)}`;
+		let value = this.utils.get_formatted_value(
+			this.field,
+			this.get_selected_value()
+		);
+		return `${__(this.field.df.label)} ${__(this.get_condition())} ${__(
+			value
+		)}`;
 	}
 
 	get_filter_tag_element() {
 		return $(`<div class="filter-tag btn-group">
 			<button class="btn btn-default btn-xs toggle-filter"
-				title="${ __("Edit Filter") }">
+				title="${__('Edit Filter')}">
 			</button>
 			<button class="btn btn-default btn-xs remove-filter"
-				title="${ __("Remove Filter") }">
+				title="${__('Remove Filter')}">
 				<i class="fa fa-remove text-muted"></i>
 			</button>
 		</div>`);
 	}
 
 	add_condition_help(condition) {
-		const description = ["in", "not in"].includes(condition)
-			? __("values separated by commas")
-			: __("use % as wildcard");
+		const description = ['in', 'not in'].includes(condition)
+			? __('values separated by commas')
+			: __('use % as wildcard');
 
 		this.filter_edit_area.find('.filter-description').html(description);
 	}
 
 	hide_invalid_conditions(fieldtype, original_type) {
-		let invalid_conditions = this.invalid_condition_map[original_type]
-			|| this.invalid_condition_map[fieldtype] || [];
+		let invalid_conditions =
+			this.invalid_condition_map[original_type] ||
+			this.invalid_condition_map[fieldtype] ||
+			[];
 
 		for (let condition of this.conditions) {
-			this.filter_edit_area.find(`.condition option[value="${condition[0]}"]`).toggle(
-				!invalid_conditions.includes(condition[0])
-			);
+			this.filter_edit_area
+				.find(`.condition option[value="${condition[0]}"]`)
+				.toggle(!invalid_conditions.includes(condition[0]));
 		}
 	}
 
 	toggle_nested_set_conditions(df) {
-		let show_condition = df.fieldtype === "Link" && frappe.boot.nested_set_doctypes.includes(df.options);
-		this.nested_set_conditions.forEach(condition => {
-			this.filter_edit_area.find(`.condition option[value="${condition[0]}"]`).toggle(show_condition);
+		let show_condition =
+			df.fieldtype === 'Link' &&
+			frappe.boot.nested_set_doctypes.includes(df.options);
+		this.nested_set_conditions.forEach((condition) => {
+			this.filter_edit_area
+				.find(`.condition option[value="${condition[0]}"]`)
+				.toggle(show_condition);
 		});
 	}
 };
 
 frappe.ui.filter_utils = {
 	get_formatted_value(field, value) {
-		if(field.df.fieldname==="docstatus") {
-			value = {0:"Draft", 1:"Submitted", 2:"Cancelled"}[value] || value;
-		} else if(field.df.original_type==="Check") {
-			value = {0:"No", 1:"Yes"}[cint(value)];
+		if (field.df.fieldname === 'docstatus') {
+			value = { 0: 'Draft', 1: 'Submitted', 2: 'Cancelled' }[value] || value;
+		} else if (field.df.original_type === 'Check') {
+			value = { 0: 'No', 1: 'Yes' }[cint(value)];
 		}
-		return frappe.format(value, field.df, {only_value: 1});
+		return frappe.format(value, field.df, { only_value: 1 });
 	},
 
 	get_selected_value(field, condition) {
@@ -381,7 +418,7 @@ frappe.ui.filter_utils = {
 		}
 
 		if (field.df.original_type == 'Check') {
-			val = (val=='Yes' ? 1 :0);
+			val = val == 'Yes' ? 1 : 0;
 		}
 
 		if (condition.indexOf('like', 'not like') !== -1) {
@@ -389,12 +426,13 @@ frappe.ui.filter_utils = {
 			if (val && !(val.startsWith('%') || val.endsWith('%'))) {
 				val = '%' + val + '%';
 			}
-		} else if (in_list(["in", "not in"], condition)) {
+		} else if (in_list(['in', 'not in'], condition)) {
 			if (val) {
-				val = val.split(',').map(v => strip(v));
+				val = val.split(',').map((v) => strip(v));
 			}
-		} if (val === '%') {
-			val = "";
+		}
+		if (val === '%') {
+			val = '';
 		}
 
 		return val;
@@ -403,7 +441,7 @@ frappe.ui.filter_utils = {
 	get_default_condition(df) {
 		if (df.fieldtype == 'Data') {
 			return 'like';
-		} else if (df.fieldtype == 'Date' || df.fieldtype == 'Datetime'){
+		} else if (df.fieldtype == 'Date' || df.fieldtype == 'Datetime') {
 			return 'Between';
 		} else {
 			return '=';
@@ -412,44 +450,73 @@ frappe.ui.filter_utils = {
 
 	set_fieldtype(df, fieldtype, condition) {
 		// reset
-		if(df.original_type)
-			df.fieldtype = df.original_type;
-		else
-			df.original_type = df.fieldtype;
+		if (df.original_type) df.fieldtype = df.original_type;
+		else df.original_type = df.fieldtype;
 
-		df.description = ''; df.reqd = 0;
+		df.description = '';
+		df.reqd = 0;
 		df.ignore_link_validation = true;
 
 		// given
-		if(fieldtype) {
+		if (fieldtype) {
 			df.fieldtype = fieldtype;
 			return;
 		}
 
 		// scrub
-		if(df.fieldname=="docstatus") {
-			df.fieldtype="Select",
-			df.options=[
-				{value:0, label:__("Draft")},
-				{value:1, label:__("Submitted")},
-				{value:2, label:__("Cancelled")}
+		if (df.fieldname == 'docstatus') {
+			df.fieldtype = 'Select',
+			df.options = [
+				{ value: 0, label: __('Draft') },
+				{ value: 1, label: __('Submitted') },
+				{ value: 2, label: __('Cancelled') },
 			];
-		} else if(df.fieldtype=='Check') {
-			df.fieldtype='Select';
-			df.options='No\nYes';
-		} else if(['Text','Small Text','Text Editor','Code','Tag','Comments',
-			'Dynamic Link','Read Only','Assign'].indexOf(df.fieldtype)!=-1) {
+		} else if (df.fieldtype == 'Check') {
+			df.fieldtype = 'Select';
+			df.options = 'No\nYes';
+		} else if (
+			[
+				'Text',
+				'Small Text',
+				'Text Editor',
+				'Code',
+				'Tag',
+				'Comments',
+				'Dynamic Link',
+				'Read Only',
+				'Assign',
+			].indexOf(df.fieldtype) != -1
+		) {
 			df.fieldtype = 'Data';
-		} else if(df.fieldtype=='Link' && ['=', '!=', 'descendants of', 'ancestors of', 'not descendants of', 'not ancestors of'].indexOf(condition)==-1) {
+		} else if (
+			df.fieldtype == 'Link' &&
+			[
+				'=',
+				'!=',
+				'descendants of',
+				'ancestors of',
+				'not descendants of',
+				'not ancestors of',
+			].indexOf(condition) == -1
+		) {
 			df.fieldtype = 'Data';
 		}
-		if(df.fieldtype==="Data" && (df.options || "").toLowerCase()==="email") {
+		if (
+			df.fieldtype === 'Data' &&
+			(df.options || '').toLowerCase() === 'email'
+		) {
 			df.options = null;
 		}
-		if(condition == "Between" && (df.fieldtype == 'Date' || df.fieldtype == 'Datetime')){
+		if (
+			condition == 'Between' &&
+			(df.fieldtype == 'Date' || df.fieldtype == 'Datetime')
+		) {
 			df.fieldtype = 'DateRange';
 		}
-		if (condition == 'Timespan' && ['Date', 'Datetime', 'DateRange', 'Select'].includes(df.fieldtype)) {
+		if (
+			condition == 'Timespan' &&
+			['Date', 'Datetime', 'DateRange', 'Select'].includes(df.fieldtype)
+		) {
 			df.fieldtype = 'Select';
 			df.options = this.get_timespan_options(['Last', 'Today', 'This', 'Next']);
 		}
@@ -465,15 +532,15 @@ frappe.ui.filter_utils = {
 
 	get_timespan_options(periods) {
 		const period_map = {
-			'Last': ['Week', 'Month', 'Quarter', '6 months', 'Year'],
-			'Today': null,
-			'This': ['Week', 'Month', 'Quarter', 'Year'],
-			'Next': ['Week', 'Month', 'Quarter', '6 months', 'Year']
+			Last: ['Week', 'Month', 'Quarter', '6 months', 'Year'],
+			Today: null,
+			This: ['Week', 'Month', 'Quarter', 'Year'],
+			Next: ['Week', 'Month', 'Quarter', '6 months', 'Year'],
 		};
 		let options = [];
-		periods.forEach(period => {
+		periods.forEach((period) => {
 			if (period_map[period]) {
-				period_map[period].forEach(p => {
+				period_map[period].forEach((p) => {
 					options.push({
 						label: __(`{0} {1}`, [period, p]),
 						value: `${period.toLowerCase()} ${p.toLowerCase()}`,
@@ -487,5 +554,5 @@ frappe.ui.filter_utils = {
 			}
 		});
 		return options;
-	}
+	},
 };

From 20815aa3491cbca3e5377f9e6fcc30f3e21e8f0f Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Tue, 30 Jun 2020 08:03:28 +0530
Subject: [PATCH 058/345] refactor: remove unnecessary code from
 get_submitted_linked_docs (#10844)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/desk/form/linked_with.py | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/frappe/desk/form/linked_with.py b/frappe/desk/form/linked_with.py
index a121e71dc8..5bae49ea95 100644
--- a/frappe/desk/form/linked_with.py
+++ b/frappe/desk/form/linked_with.py
@@ -13,7 +13,7 @@ from frappe.modules import load_doctype_module
 
 
 @frappe.whitelist()
-def get_submitted_linked_docs(doctype, name, docs=None, linked=None, visited=None):
+def get_submitted_linked_docs(doctype, name, docs=None, visited=None):
 	"""
 	Get all nested submitted linked doctype linkinfo
 
@@ -31,34 +31,27 @@ def get_submitted_linked_docs(doctype, name, docs=None, linked=None, visited=Non
 	if not docs:
 		docs = []
 
-	if not linked:
-		linked = {}
-
 	if not visited:
-		visited = []
+		visited = {}
 
-	if name in visited:
+	if doctype not in visited:
+		visited[doctype] = []
+
+	if name in visited[doctype]:
 		return
 
 	linkinfo = get_linked_doctypes(doctype)
 	linked_docs = get_linked_docs(doctype, name, linkinfo)
 
 	link_count = 0
-	visited.append(name)
-	
+	visited[doctype].append(name)
+
 	for link_doctype, link_names in linked_docs.items():
-		if link_doctype not in linked:
-			linked[link_doctype] = []
 
 		for link in link_names:
 			if link['name'] == name:
 				continue
 
-			if linked and name in linked[link_doctype]:
-				continue
-
-			linked[link_doctype].append(link['name'])
-
 			docinfo = link.update({"doctype": link_doctype})
 			validated_doc = validate_linked_doc(docinfo)
 
@@ -66,10 +59,8 @@ def get_submitted_linked_docs(doctype, name, docs=None, linked=None, visited=Non
 				continue
 
 			link_count += 1
-			if link.name in [doc.get("name") for doc in docs]:
-				continue
 
-			links = get_submitted_linked_docs(link_doctype, link.name, docs, linked, visited)
+			links = get_submitted_linked_docs(link_doctype, link.name, docs, visited)
 			if links:
 				docs.append({
 					"doctype": link_doctype,

From 9f769b980c966b70c75030770374277cb524e13c Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 30 Jun 2020 09:26:49 +0530
Subject: [PATCH 059/345] chore: Mergify configuration update (#10862)

---
 .mergify.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index b145834cc4..582bbc2ee5 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -4,8 +4,7 @@ pull_request_rules:
       - status-success=Sider
       - status-success=Semantic Pull Request
       - status-success=Travis CI - Pull Request
-      - status-success=security/snyk - package.json (frappe)
-      - status-success=security/snyk - requirements.txt (frappe)
+      - status-success=security/snyk (frappe)
       - label!=don't-merge
       - label!=squash
       - "#approved-reviews-by>=1"
@@ -17,8 +16,7 @@ pull_request_rules:
       - status-success=Sider
       - status-success=Semantic Pull Request
       - status-success=Travis CI - Pull Request
-      - status-success=security/snyk - package.json (frappe)
-      - status-success=security/snyk - requirements.txt (frappe)
+      - status-success=security/snyk (frappe)
       - label!=don't-merge
       - label=squash
       - "#approved-reviews-by>=1"

From 001a7dc59d237b5ee32b9ddab925c2d8c72b4218 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 30 Jun 2020 10:20:53 +0530
Subject: [PATCH 060/345] chore: remove whitespace from translatable string

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/integrations/doctype/google_calendar/google_calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/integrations/doctype/google_calendar/google_calendar.py b/frappe/integrations/doctype/google_calendar/google_calendar.py
index d1cd62f84f..4a9acd9e84 100644
--- a/frappe/integrations/doctype/google_calendar/google_calendar.py
+++ b/frappe/integrations/doctype/google_calendar/google_calendar.py
@@ -225,7 +225,7 @@ def sync_events_from_google_calendar(g_calendar, method=None):
 			if err.resp.status == 410:
 				set_encrypted_password("Google Calendar", account.name, "", "next_sync_token")
 				frappe.db.commit()
-				msg += _(' Sync token was invalid and has been resetted, Retry syncing.')
+				msg += ' ' +  _('Sync token was invalid and has been resetted, Retry syncing.')
 				frappe.msgprint(msg, title='Invalid Sync Token', indicator='blue')
 			else:
 				frappe.throw(msg)

From c2135f247151315bdac2549cefb2da379cbad90f Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 30 Jun 2020 10:21:23 +0530
Subject: [PATCH 061/345] fix: Missing semicolon

---
 frappe/public/js/frappe/data_import/data_exporter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/data_import/data_exporter.js b/frappe/public/js/frappe/data_import/data_exporter.js
index 238e916c34..f6af338235 100644
--- a/frappe/public/js/frappe/data_import/data_exporter.js
+++ b/frappe/public/js/frappe/data_import/data_exporter.js
@@ -254,7 +254,7 @@ frappe.data_import.DataExporter = class DataExporter {
 
 	get_filters() {
 		return this.filter_group.get_filters().map(filter => {
-			return filter.slice(0, 4)
+			return filter.slice(0, 4);
 		});
 	}
 
@@ -275,7 +275,7 @@ frappe.data_import.DataExporter = class DataExporter {
 			: this.column_map[doctype];
 
 		let is_field_mandatory = df => (df.fieldname === 'name' && !child_fieldname)
-			|| (df.reqd && this.exporting_for == 'Insert New Records')
+			|| (df.reqd && this.exporting_for == 'Insert New Records');
 
 		return fields
 			.filter(df => {

From f40364681d985338e0082566213753398f003ae4 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 30 Jun 2020 11:20:03 +0530
Subject: [PATCH 062/345] fix: delete dashboard chart source while removing app

---
 frappe/installer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/installer.py b/frappe/installer.py
index 54394d3d9a..278a81887f 100755
--- a/frappe/installer.py
+++ b/frappe/installer.py
@@ -146,8 +146,8 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False):
 				if not doctype.issingle:
 					drop_doctypes.append(doctype.name)
 
-		# remove reports, pages and web forms
-		for doctype in ("Report", "Page", "Web Form"):
+		# remove reports, pages, web forms and chart sources
+		for doctype in ("Report", "Page", "Web Form", "Dashboard Chart Source"):
 			for record in frappe.get_list(doctype, filters={"module": module_name}):
 				print("removing {0} {1}...".format(doctype, record.name))
 				if not dry_run:

From 49731e098075bcc60533d388adc785bfbafa83e4 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 30 Jun 2020 11:21:54 +0530
Subject: [PATCH 063/345] feat: remove desk page while uninstalling app

---
 frappe/installer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/installer.py b/frappe/installer.py
index 278a81887f..b89535d54b 100755
--- a/frappe/installer.py
+++ b/frappe/installer.py
@@ -146,8 +146,8 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False):
 				if not doctype.issingle:
 					drop_doctypes.append(doctype.name)
 
-		# remove reports, pages, web forms and chart sources
-		for doctype in ("Report", "Page", "Web Form", "Dashboard Chart Source"):
+		# remove desk page, reports, pages, web forms and chart sources
+		for doctype in ("Desk Page", "Report", "Page", "Web Form", "Dashboard Chart Source"):
 			for record in frappe.get_list(doctype, filters={"module": module_name}):
 				print("removing {0} {1}...".format(doctype, record.name))
 				if not dry_run:

From e2ad7543966c43158a35951462069dcd9089c5d6 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 30 Jun 2020 11:37:05 +0530
Subject: [PATCH 064/345] feat: delete all items linked with modules

---
 frappe/installer.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frappe/installer.py b/frappe/installer.py
index b89535d54b..8e02e80ae6 100755
--- a/frappe/installer.py
+++ b/frappe/installer.py
@@ -146,8 +146,12 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False):
 				if not doctype.issingle:
 					drop_doctypes.append(doctype.name)
 
+
+		linked_doctypes = frappe.get_all("DocField", filters={"fieldtype": "Link", "options": "Module Def"}, fields=['parent'])
+		doctypes_with_linked_modules = ["Desk Page", "Reports", "Pages", "Web Forms"] + [doctype.parent for doctype in linked_doctypes]
+
 		# remove desk page, reports, pages, web forms and chart sources
-		for doctype in ("Desk Page", "Report", "Page", "Web Form", "Dashboard Chart Source"):
+		for doctype in doctypes_with_linked_modules:
 			for record in frappe.get_list(doctype, filters={"module": module_name}):
 				print("removing {0} {1}...".format(doctype, record.name))
 				if not dry_run:

From e5e6c7c9fea48539c84b81bb447d852dcd7871cc Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 30 Jun 2020 12:14:48 +0530
Subject: [PATCH 065/345] fix: Extract gid from google sheets url

---
 frappe/utils/csvutils.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/frappe/utils/csvutils.py b/frappe/utils/csvutils.py
index 1d326bd1c5..f73f80582a 100644
--- a/frappe/utils/csvutils.py
+++ b/frappe/utils/csvutils.py
@@ -175,12 +175,18 @@ def getlink(doctype, name):
 	return '<a href="#Form/%(doctype)s/%(name)s">%(name)s</a>' % locals()
 
 def get_csv_content_from_google_sheets(url):
+	# https://docs.google.com/spreadsheets/d/{sheetid}}/edit#gid={gid}
 	validate_google_sheets_url(url)
-
+	# get gid, defaults to first sheet
+	if "gid=" in url:
+		gid = url.rsplit('gid=', 1)[1]
+	else:
+		gid = 0
 	# remove /edit path
 	url = url.rsplit('/edit', 1)[0]
-	# add /export path, defaults to first sheet
-	url = url + '/export?format=csv&gid=0'
+	# add /export path,
+	url = url + '/export?format=csv&gid={0}'.format(gid)
+
 	headers = {
 		'Accept': 'text/csv'
 	}

From a7017c43efbca9f9c3bcf508c799f8d3526575bc Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 30 Jun 2020 12:15:51 +0530
Subject: [PATCH 066/345] fix: maintain order of doctypes to be removed

---
 frappe/installer.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/installer.py b/frappe/installer.py
index 8e02e80ae6..d544280228 100755
--- a/frappe/installer.py
+++ b/frappe/installer.py
@@ -148,7 +148,8 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False):
 
 
 		linked_doctypes = frappe.get_all("DocField", filters={"fieldtype": "Link", "options": "Module Def"}, fields=['parent'])
-		doctypes_with_linked_modules = ["Desk Page", "Reports", "Pages", "Web Forms"] + [doctype.parent for doctype in linked_doctypes]
+		ordered_doctypes = ["Desk Page", "Reports", "Pages", "Web Forms"]
+		doctypes_with_linked_modules = ordered_doctypes + [doctype.parent for doctype in linked_doctypes if doctype.parent not in ordered_doctypes]
 
 		# remove desk page, reports, pages, web forms and chart sources
 		for doctype in doctypes_with_linked_modules:

From 45d097f6b52670140983455fd3c101e691e68abd Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 30 Jun 2020 13:13:56 +0530
Subject: [PATCH 067/345] fix(patch): Use rename_doc

---
 frappe/patches/v13_0/replace_old_data_import.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/patches/v13_0/replace_old_data_import.py b/frappe/patches/v13_0/replace_old_data_import.py
index 469703e172..f3eed6253c 100644
--- a/frappe/patches/v13_0/replace_old_data_import.py
+++ b/frappe/patches/v13_0/replace_old_data_import.py
@@ -13,6 +13,4 @@ def execute():
 	frappe.rename_doc('DocType', 'Data Import', 'Data Import Legacy')
 	frappe.db.commit()
 	frappe.db.sql("DROP TABLE IF EXISTS `tabData Import`")
-	frappe.reload_doc("core", "doctype", "data_import")
-	frappe.get_doc("DocType", "Data Import").on_update()
-	frappe.delete_doc_if_exists("DocType", "Data Import Beta")
+	frappe.rename_doc('DocType', 'Data Import Beta', 'Data Import')

From 57a1bb590498eba9c0b8ab0f05a4fb8743fab3da Mon Sep 17 00:00:00 2001
From: Felipe Orellana <1656249+DeveloperMetal@users.noreply.github.com>
Date: Thu, 25 Jun 2020 11:09:08 -0400
Subject: [PATCH 068/345] fix: Adds LOCK TABLES grant for RDS version of
 grant_all_privileges

---
 frappe/database/db_manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/database/db_manager.py b/frappe/database/db_manager.py
index 80236b2dc2..3345fce735 100644
--- a/frappe/database/db_manager.py
+++ b/frappe/database/db_manager.py
@@ -49,7 +49,7 @@ class DbManager:
 			host = self.get_current_host()
 
 		if frappe.conf.get('rds_db', 0) == 1:
-			self.db.sql("GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER, CREATE TEMPORARY TABLES, CREATE VIEW, EVENT, TRIGGER, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EXECUTE ON `%s`.* TO '%s'@'%s';" % (target, user, host))
+			self.db.sql("GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER, CREATE TEMPORARY TABLES, CREATE VIEW, EVENT, TRIGGER, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EXECUTE, LOCK TABLES ON `%s`.* TO '%s'@'%s';" % (target, user, host))
 		else:
 			self.db.sql("GRANT ALL PRIVILEGES ON `%s`.* TO '%s'@'%s';" % (target, user, host))
 

From f431042ffab4e7c2a0ed0e7f155c1088b4536171 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 30 Jun 2020 14:07:36 +0530
Subject: [PATCH 069/345] fix: dont update apps/{app}/modules.txt if called
 from uninstall operation

---
 frappe/core/doctype/module_def/module_def.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/core/doctype/module_def/module_def.py b/frappe/core/doctype/module_def/module_def.py
index 0c0e7c4f45..755cb86dbe 100644
--- a/frappe/core/doctype/module_def/module_def.py
+++ b/frappe/core/doctype/module_def/module_def.py
@@ -42,6 +42,10 @@ class ModuleDef(Document):
 
 	def on_trash(self):
 		"""Delete module name from modules.txt"""
+
+		if frappe.flags.in_uninstall:
+			return
+
 		modules = None
 		if frappe.local.module_app.get(frappe.scrub(self.name)):
 			with open(frappe.get_app_path(self.app_name, "modules.txt"), "r") as f:

From a20d3401f796b8c813271bd8cbf665a02180a265 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 30 Jun 2020 14:29:02 +0530
Subject: [PATCH 070/345] feat: add force flag to uninstall-app from site

---
 frappe/commands/site.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index 55ac05bd71..2f3d98bc3e 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -415,15 +415,16 @@ def remove_from_installed_apps(context, app):
 @click.option('--yes', '-y', help='To bypass confirmation prompt for uninstalling the app', is_flag=True, default=False, multiple=True)
 @click.option('--dry-run', help='List all doctypes that will be deleted', is_flag=True, default=False)
 @click.option('--no-backup', help='Do not backup the site', is_flag=True, default=False)
+@click.option('--force', help='Force remove app from site', is_flag=True, default=False)
 @pass_context
-def uninstall(context, app, dry_run=False, yes=False, no_backup=False):
+def uninstall(context, app, dry_run, yes, no_backup, force):
 	"Remove app and linked modules from site"
 	from frappe.installer import remove_app
 	for site in context.sites:
 		try:
 			frappe.init(site=site)
 			frappe.connect()
-			remove_app(app, dry_run, yes, no_backup)
+			remove_app(app_name=app, dry_run=dry_run, yes=yes, no_backup=no_backup, force=force)
 		finally:
 			frappe.destroy()
 	if not context.sites:

From 41520571fa0e81fcba794d1662da92a3de7e36e2 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 30 Jun 2020 14:30:03 +0530
Subject: [PATCH 071/345] fix: add verbosity during uninstallation

---
 frappe/installer.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/frappe/installer.py b/frappe/installer.py
index d544280228..c8dd1d9085 100755
--- a/frappe/installer.py
+++ b/frappe/installer.py
@@ -9,6 +9,7 @@ from __future__ import unicode_literals, print_function
 from six.moves import input
 
 import os, json, subprocess, shutil
+import click
 import frappe
 import frappe.database
 import importlib
@@ -118,12 +119,20 @@ def remove_from_installed_apps(app_name):
 		if frappe.flags.in_install:
 			post_install()
 
-def remove_app(app_name, dry_run=False, yes=False, no_backup=False):
+def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False):
 	"""Remove app and all linked to the app's module with the app from a site."""
 
+	# dont allow uninstall app if not installed unless forced
+	if not force:
+		if app_name not in frappe.get_installed_apps():
+			click.secho("App {0} not installed on Site {1}".format(app_name, frappe.local.site), fg="yellow")
+			return
+
+	print("Uninstalling App {0} from Site {1}...".format(app_name, frappe.local.site))
+
 	if not dry_run and not yes:
-		confirm = input("All doctypes (including custom), modules related to this app will be deleted. Are you sure you want to continue (y/n) ? ")
-		if confirm!="y":
+		confirm = click.confirm("All doctypes (including custom), modules related to this app will be deleted. Are you sure you want to continue?")
+		if not confirm:
 			return
 
 	if not no_backup:
@@ -171,6 +180,8 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False):
 		for doctype in set(drop_doctypes):
 			frappe.db.sql("drop table `tab{0}`".format(doctype))
 
+		click.secho("Uninstalled App {0} from Site {1}".format(app_name, frappe.local.site), fg="green")
+
 	frappe.flags.in_uninstall = False
 
 def post_install(rebuild_website=False):

From 033bfd25d2ebdb7214c63b01247c13189208f7fc Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 30 Jun 2020 14:30:43 +0530
Subject: [PATCH 072/345] fix: typos in DocTypes ordered list

---
 frappe/installer.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/installer.py b/frappe/installer.py
index c8dd1d9085..01996526be 100755
--- a/frappe/installer.py
+++ b/frappe/installer.py
@@ -157,10 +157,9 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False)
 
 
 		linked_doctypes = frappe.get_all("DocField", filters={"fieldtype": "Link", "options": "Module Def"}, fields=['parent'])
-		ordered_doctypes = ["Desk Page", "Reports", "Pages", "Web Forms"]
+		ordered_doctypes = ["Desk Page", "Report", "Page", "Web Form"]
 		doctypes_with_linked_modules = ordered_doctypes + [doctype.parent for doctype in linked_doctypes if doctype.parent not in ordered_doctypes]
 
-		# remove desk page, reports, pages, web forms and chart sources
 		for doctype in doctypes_with_linked_modules:
 			for record in frappe.get_list(doctype, filters={"module": module_name}):
 				print("removing {0} {1}...".format(doctype, record.name))

From 63cdb5f506902e460e509a83eb01f5b45561c234 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 30 Jun 2020 15:07:05 +0530
Subject: [PATCH 073/345] fix: always append start date to result

---
 .../dashboard_chart/dashboard_chart.py        | 11 +---
 .../dashboard_chart/test_dashboard_chart.py   | 55 ++++++++++++-------
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index a5c5504db2..4ad6943e0b 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -260,9 +260,7 @@ def get_result(data, timegrain, from_date, to_date):
 	start_date = getdate(from_date)
 	end_date = getdate(to_date)
 
-	result = []
-	if timegrain == 'Daily':
-		result.append([start_date, 0.0])
+	result = [[start_date, 0.0]]
 
 	while start_date < end_date:
 		next_date = get_next_expected_date(start_date, timegrain)
@@ -280,11 +278,8 @@ def get_result(data, timegrain, from_date, to_date):
 
 def get_next_expected_date(date, timegrain):
 	next_date = None
-	if timegrain=='Daily':
-		next_date = add_to_date(date, days=1)
-	else:
-		# given date is always assumed to be the period ending date
-		next_date = get_period_ending(add_to_date(date, days=1), timegrain)
+	# given date is always assumed to be the period ending date
+	next_date = get_period_ending(add_to_date(date, days=1), timegrain)
 	return getdate(next_date)
 
 def get_period_ending(date, timegrain):
diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
index 1a300e471a..5e39998e62 100644
--- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
@@ -4,13 +4,12 @@
 from __future__ import unicode_literals
 
 import unittest, frappe
-from frappe.utils import getdate, formatdate
+from frappe.utils import getdate, formatdate, get_last_day
 from frappe.desk.doctype.dashboard_chart.dashboard_chart import (get,
 	get_period_ending)
 
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
-import calendar
 
 class TestDashboardChart(unittest.TestCase):
 	def test_period_ending(self):
@@ -53,16 +52,18 @@ class TestDashboardChart(unittest.TestCase):
 
 		cur_date = datetime.now() - relativedelta(years=1)
 
-		result = get(chart_name ='Test Dashboard Chart', refresh = 1)
-		for idx in range(13):
-			month = datetime(int(cur_date.year), int(cur_date.strftime('%m')), int(calendar.monthrange(cur_date.year, cur_date.month)[1]))
+		result = get(chart_name='Test Dashboard Chart', refresh=1)
+		self.assertEqual(result.get('labels')[0], formatdate(cur_date.strftime('%Y-%m-%d')))
+
+		if formatdate(cur_date.strftime('%Y-%m-%d')) == formatdate(get_last_day(cur_date).strftime('%Y-%m-%d')):
+			cur_date += relativedelta(months=1)
+
+		for idx in range(1, 13):
+			month = get_last_day(cur_date)
 			month = formatdate(month.strftime('%Y-%m-%d'))
 			self.assertEqual(result.get('labels')[idx], month)
 			cur_date += relativedelta(months=1)
 
-		# self.assertEqual(result.get('datasets')[0].get('values')[:-1],
-		# 	[44, 28, 8, 11, 2, 6, 18, 6, 4, 5, 15, 13])
-
 		frappe.db.rollback()
 
 	def test_empty_dashboard_chart(self):
@@ -79,15 +80,20 @@ class TestDashboardChart(unittest.TestCase):
 			based_on = 'creation',
 			timespan = 'Last Year',
 			time_interval = 'Monthly',
-			filters_json = '{}',
+			filters_json = '[]',
 			timeseries = 1
 		)).insert()
 
 		cur_date = datetime.now() - relativedelta(years=1)
 
-		result = get(chart_name ='Test Empty Dashboard Chart', refresh = 1)
-		for idx in range(13):
-			month = datetime(int(cur_date.year), int(cur_date.strftime('%m')), int(calendar.monthrange(cur_date.year, cur_date.month)[1]))
+		result = get(chart_name ='Test Empty Dashboard Chart', refresh=1)
+		self.assertEqual(result.get('labels')[0], formatdate(cur_date.strftime('%Y-%m-%d')))
+
+		if formatdate(cur_date.strftime('%Y-%m-%d')) == formatdate(get_last_day(cur_date).strftime('%Y-%m-%d')):
+			cur_date += relativedelta(months=1)
+
+		for idx in range(1, 13):
+			month = get_last_day(cur_date)
 			month = formatdate(month.strftime('%Y-%m-%d'))
 			self.assertEqual(result.get('labels')[idx], month)
 			cur_date += relativedelta(months=1)
@@ -111,15 +117,20 @@ class TestDashboardChart(unittest.TestCase):
 			based_on = 'creation',
 			timespan = 'Last Year',
 			time_interval = 'Monthly',
-			filters_json = '{}',
+			filters_json = '[]',
 			timeseries = 1
 		)).insert()
 
 		cur_date = datetime.now() - relativedelta(years=1)
 
 		result = get(chart_name ='Test Empty Dashboard Chart 2', refresh = 1)
-		for idx in range(13):
-			month = datetime(int(cur_date.year), int(cur_date.strftime('%m')), int(calendar.monthrange(cur_date.year, cur_date.month)[1]))
+		self.assertEqual(result.get('labels')[0], formatdate(cur_date.strftime('%Y-%m-%d')))
+
+		if formatdate(cur_date.strftime('%Y-%m-%d')) == formatdate(get_last_day(cur_date).strftime('%Y-%m-%d')):
+			cur_date += relativedelta(months=1)
+
+		for idx in range(1, 13):
+			month = get_last_day(cur_date)
 			month = formatdate(month.strftime('%Y-%m-%d'))
 			self.assertEqual(result.get('labels')[idx], month)
 			cur_date += relativedelta(months=1)
@@ -141,7 +152,7 @@ class TestDashboardChart(unittest.TestCase):
 			chart_type = 'Group By',
 			document_type = 'ToDo',
 			group_by_based_on = 'status',
-			filters_json = '{}',
+			filters_json = '[]',
 		)).insert()
 
 		result = get(chart_name ='Test Group By Dashboard Chart', refresh = 1)
@@ -168,7 +179,7 @@ class TestDashboardChart(unittest.TestCase):
 			time_interval = 'Daily',
 			from_date = datetime(2019, 1, 6),
 			to_date = datetime(2019, 1, 11),
-			filters_json = '{}',
+			filters_json = '[]',
 			timeseries = 1
 		)).insert()
 
@@ -200,22 +211,24 @@ class TestDashboardChart(unittest.TestCase):
 			time_interval = 'Weekly',
 			from_date = datetime(2018, 12, 30),
 			to_date = datetime(2019, 1, 15),
-			filters_json = '{}',
+			filters_json = '[]',
 			timeseries = 1
 		)).insert()
 
 		result = get(chart_name ='Test Weekly Dashboard Chart', refresh = 1)
 
-		self.assertEqual(result.get('datasets')[0].get('values'), [200.0, 800.0, 0.0])
-		self.assertEqual(result.get('labels'), [formatdate('2019-01-06'), formatdate('2019-01-13'), formatdate('2019-01-20')])
+		self.assertEqual(result.get('datasets')[0].get('values'), [50.0, 300.0, 800.0, 0.0])
+		self.assertEqual(result.get('labels'), [formatdate('2018-12-30'), formatdate('2019-01-06'), formatdate('2019-01-13'), formatdate('2019-01-20')])
 
 		frappe.db.rollback()
 
 def insert_test_records():
-	create_new_communication(datetime(2019, 1, 10), 100)
+	create_new_communication(datetime(2018, 12, 30), 50)
+	create_new_communication(datetime(2019, 1, 4), 100)
 	create_new_communication(datetime(2019, 1, 6), 200)
 	create_new_communication(datetime(2019, 1, 7), 400)
 	create_new_communication(datetime(2019, 1, 8), 300)
+	create_new_communication(datetime(2019, 1, 10), 100)
 
 def create_new_communication(date, rating):
 	communication = {

From a6c68f7dc04b357c490a8cc4088dafab3ed5aae4 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 30 Jun 2020 17:38:27 +0530
Subject: [PATCH 074/345] fix: Initialize email_sent_to_any_recipient outsite
 try block (#10866)

to avoid UnboundLocalError: local variable
'email_sent_to_any_recipient' referenced before assignment
---
 frappe/email/queue.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frappe/email/queue.py b/frappe/email/queue.py
index ce512de276..8bffc108b9 100755
--- a/frappe/email/queue.py
+++ b/frappe/email/queue.py
@@ -347,7 +347,7 @@ def flush(from_test=False):
 			if not smtpserver:
 				smtpserver = SMTPServer()
 				smtpserver_dict[email.sender] = smtpserver
-				
+
 			if from_test:
 				send_one(email.name, smtpserver, auto_commit)
 			else:
@@ -390,12 +390,12 @@ def send_one(email, smtpserver=None, auto_commit=True, now=False):
 		where
 			name=%s
 		for update''', email, as_dict=True)
-	
+
 	if len(email):
 		email = email[0]
 	else:
 		return
-	
+
 	recipients_list = frappe.db.sql('''select name, recipient, status from
 		`tabEmail Queue Recipient` where parent=%s''', email.name, as_dict=1)
 
@@ -417,6 +417,8 @@ def send_one(email, smtpserver=None, auto_commit=True, now=False):
 	if email.communication:
 		frappe.get_doc('Communication', email.communication).set_delivery_status(commit=auto_commit)
 
+	email_sent_to_any_recipient = None
+
 	try:
 		message = None
 

From 124db4170c04d2dae3d570b8fd5c144c95fb3b45 Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahilkhan28297@gmail.com>
Date: Tue, 30 Jun 2020 17:52:57 +0530
Subject: [PATCH 075/345] chore: set develop version as 13.x.x

---
 frappe/hooks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/hooks.py b/frappe/hooks.py
index c207e61de5..1f209f00a2 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 app_logo_url = '/assets/frappe/images/frappe-framework-logo.png'
 
-develop_version = '12.x.x-develop'
+develop_version = '13.x.x-develop'
 
 app_email = "info@frappe.io"
 

From adadb26732c106bd37a4e0915babf09e46ef27cd Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Tue, 30 Jun 2020 17:55:25 +0530
Subject: [PATCH 076/345] chore: only validate s3 settings if enabled

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 .../doctype/s3_backup_settings/s3_backup_settings.py           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py
index 6cfd3646b2..c8b007ba7b 100755
--- a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py
+++ b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py
@@ -19,6 +19,9 @@ from botocore.exceptions import ClientError
 class S3BackupSettings(Document):
 
 	def validate(self):
+		if not self.enabled:
+			return
+
 		if not self.endpoint_url:
 			self.endpoint_url = 'https://s3.amazonaws.com'
 		conn = boto3.client(

From dc3402c5461d5941a5b47b6fc7ae2c8d3a42037d Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 1 Jul 2020 10:31:17 +0530
Subject: [PATCH 077/345] feat: Option to add custom timeline contents (#10677)

---
 frappe/desk/form/load.py                      | 12 +++++++++
 .../public/js/frappe/form/footer/timeline.js  | 20 +++++++++++---
 .../js/frappe/form/templates/timeline.html    |  4 +--
 .../frappe/form/templates/timeline_item.html  | 13 ++++++---
 frappe/public/less/form.less                  | 27 ++++++++++++++++---
 5 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index f24f33df07..cacbd3c633 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -100,6 +100,7 @@ def get_docinfo(doc=None, doctype=None, name=None):
 		"shared": frappe.share.get_users(doc.doctype, doc.name),
 		"views": get_view_logs(doc.doctype, doc.name),
 		"energy_point_logs": get_point_logs(doc.doctype, doc.name),
+		"additional_timeline_content": get_additional_timeline_content(doc.doctype, doc.name),
 		"milestones": get_milestones(doc.doctype, doc.name),
 		"is_document_followed": is_document_followed(doc.doctype, doc.name, frappe.session.user),
 		"tags": get_tags(doc.doctype, doc.name),
@@ -277,3 +278,14 @@ def get_document_email(doctype, name):
 
 def get_automatic_email_link():
 	return frappe.db.get_value("Email Account", {"enable_incoming": 1, "enable_automatic_linking": 1}, "email_id")
+
+def get_additional_timeline_content(doctype, docname):
+	contents = []
+	hooks = frappe.get_hooks().get('additional_timeline_content', {})
+	methods_for_all_doctype = hooks.get('*', [])
+	methods_for_current_doctype = hooks.get(doctype, [])
+
+	for method in methods_for_all_doctype + methods_for_current_doctype:
+		contents.extend(frappe.get_attr(method)(doctype, docname) or [])
+
+	return contents
\ No newline at end of file
diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js
index 7821a04c50..84f34d4757 100644
--- a/frappe/public/js/frappe/form/footer/timeline.js
+++ b/frappe/public/js/frappe/form/footer/timeline.js
@@ -120,9 +120,11 @@ frappe.ui.form.Timeline = class Timeline {
 	display_automatic_link_email() {
 		let docinfo = this.frm.get_docinfo();
 
-		if (docinfo.document_email){
+		if (docinfo.document_email) {
 			let link = __("Send an email to {0} to link it here", [`<b><a class="timeline-email-import-link copy-to-clipboard">${docinfo.document_email}</a></b>`]);
-			$('.timeline-email-import').html(link);
+			const email_link = $('.timeline-email-import');
+			email_link.removeClass('hide');
+			email_link.html(link);
 		}
 	}
 
@@ -180,12 +182,15 @@ frappe.ui.form.Timeline = class Timeline {
 		// append energy point logs
 		timeline = timeline.concat(this.get_energy_point_logs());
 
+		// custom contents
+		timeline = timeline.concat(this.get_additional_timeline_content());
+
 		// append milestones
 		timeline = timeline.concat(this.get_milestones());
 
 		// sort
 		timeline
-			.filter(a => a.content)
+			.filter(a => a.content || a.template)
 			.sort((b, c) => me.compare_dates(b, c))
 			.forEach(d => {
 				d.frm = me.frm;
@@ -407,7 +412,10 @@ frappe.ui.form.Timeline = class Timeline {
 				c.original_content = c.content;
 				c.content = frappe.utils.toggle_blockquote(c.content);
 			}
-			if(!frappe.utils.is_html(c.content)) {
+
+			if (c.template) {
+				c.content_html = frappe.render_template(c.template, c.template_data);
+			} else if (!frappe.utils.is_html(c.content)) {
 				c.content_html = frappe.markdown(__(c.content));
 			} else {
 				c.content_html = c.content;
@@ -529,6 +537,10 @@ frappe.ui.form.Timeline = class Timeline {
 		return energy_point_logs;
 	}
 
+	get_additional_timeline_content() {
+		return this.frm.get_docinfo().additional_timeline_content || [];
+	}
+
 	get_milestones() {
 		let milestones = this.frm.get_docinfo().milestones;
 		milestones.map(log => {
diff --git a/frappe/public/js/frappe/form/templates/timeline.html b/frappe/public/js/frappe/form/templates/timeline.html
index 5600f9384f..0a8a631142 100644
--- a/frappe/public/js/frappe/form/templates/timeline.html
+++ b/frappe/public/js/frappe/form/templates/timeline.html
@@ -17,9 +17,7 @@
 			{% } %}
 		{% } %}
 	</div>
-	<div class="timeline-email-import text-muted small">
-
-	</div>
+	<div class="timeline-email-import text-muted small hide"></div>
 	<div class="timeline-items">
 
 	</div>
diff --git a/frappe/public/js/frappe/form/templates/timeline_item.html b/frappe/public/js/frappe/form/templates/timeline_item.html
index 1442374e24..9cb8499771 100755
--- a/frappe/public/js/frappe/form/templates/timeline_item.html
+++ b/frappe/public/js/frappe/form/templates/timeline_item.html
@@ -1,4 +1,6 @@
-<div class="media timeline-item {% if (data.user_content) { %} user-content {% } else { %} notification-content {% } %} {{ data.color || "" }}"
+<div class="media timeline-item
+	{% if (data.user_content || data.template) { %} user-content {% } else { %} notification-content {% } %}
+	{% if (data.template) { %} show-indicator {% }%} {{ data.color || "" }}"
 	data-doctype="{{ data.doctype }}" data-name="{{ data.name }}" data-communication-type = "{{ data.communication_type }}">
 	{% if (data.user_content) { %}
 	<span class="pull-left avatar avatar-medium hidden-xs" style="margin-top: 1px">
@@ -186,7 +188,7 @@
 						{% } %}
 						{%= __("Liked by {0}", [data.fullname]) %}
 					</span>
-					{% } else if (data.comment_type == "Energy Points") { %}
+					{% } else if (data.comment_type == "Energy Points" || data.template) { %}
 						{{ data.content_html }}
 					{% } else { %}
 						<b title="{{ data.comment_by }}">{%= data.fullname %}</b>
@@ -200,8 +202,11 @@
 							</a>
 						{% } %}
 					{% } %}
-					<span class="text-muted commented-on" style="font-weight: normal;">
-					&ndash; {%= data.comment_on %}</span>
+					{% if (!data.template) { %}
+						<span class="text-muted commented-on" style="font-weight: normal;">
+							&ndash; {%= data.comment_on %}
+						</span>
+					{% } %}
 				</div>
 			{% } %}
 		</div>
diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less
index cd391c1f10..8d01cd6dd7 100644
--- a/frappe/public/less/form.less
+++ b/frappe/public/less/form.less
@@ -349,6 +349,9 @@ h6.uppercase, .h6.uppercase {
 	.form-section {
 		padding: 15px 7px;
 	}
+	.hide-border {
+		padding-top: 0;
+	}
 }
 
 .help ol {
@@ -573,7 +576,13 @@ h6.uppercase, .h6.uppercase {
 		margin-left: 5px;
 	}
 
-	.media-body:after, .media-body:before {
+	.media-body {
+		.left-arrow;
+	}
+}
+
+.left-arrow {
+	&::after, &::before {
 		right: 100%;
 		top: 15px;
 		border: solid transparent;
@@ -584,13 +593,13 @@ h6.uppercase, .h6.uppercase {
 		pointer-events: none;
 	}
 
-	.media-body:after {
+	&::after {
 		border-color: rgba(136, 183, 213, 0);
 		border-right-color: #fafbfc;
 		border-width: 6px;
 		margin-top: -6px;
 	}
-	.media-body:before {
+	&::before {
 		border-color: rgba(194, 225, 245, 0);
 		border-right-color: @border-color;
 		border-width: 7px;
@@ -638,6 +647,18 @@ h6.uppercase, .h6.uppercase {
 	top: 5px;
 }
 
+.timeline-item.user-content.show-indicator {
+	position: relative;
+	.media-body {
+		margin-left: 50px;
+	}
+	&::before {
+		.timeline-indicator();
+		left: 13px;
+		top: 13px;
+	}
+}
+
 .timeline-item.notification-content::before {
 	.timeline-indicator();
 }

From 8096c9e3710d35449a941ee6cc671fed79e689b4 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 1 Jul 2020 12:08:15 +0530
Subject: [PATCH 078/345] fix(permission): Show allowed rights on document for
 passed user (#10864)

---
 .../permitted_documents_for_user.py                  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
index 95a04360be..8b2d1e01fa 100644
--- a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
+++ b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
@@ -5,23 +5,23 @@ from __future__ import unicode_literals
 import frappe
 from frappe import _, throw
 import frappe.utils.user
-from frappe.permissions import check_admin_or_system_manager
+from frappe.permissions import check_admin_or_system_manager, rights
 from frappe.model import data_fieldtypes
 
 def execute(filters=None):
 	user, doctype, show_permissions = filters.get("user"), filters.get("doctype"), filters.get("show_permissions")
+
 	if not validate(user, doctype): return [], []
 
 	columns, fields = get_columns_and_fields(doctype)
 	data = frappe.get_list(doctype, fields=fields, as_list=True, user=user)
 
 	if show_permissions:
-		columns = columns + ["Read", "Write", "Create", "Delete", "Submit", "Cancel", "Amend", "Print", "Email",
-		                     "Report", "Import", "Export", "Share"]
+		columns = columns + [frappe.unscrub(right) + ':Check:80' for right in rights]
 		data = list(data)
-		for i,item in enumerate(data):
-			temp = frappe.permissions.get_doc_permissions(frappe.get_doc(doctype, item[0]), False,user)
-			data[i] = item+(temp.get("read"),temp.get("write"),temp.get("create"),temp.get("delete"),temp.get("submit"),temp.get("cancel"),temp.get("amend"),temp.get("print"),temp.get("email"),temp.get("report"),temp.get("import"),temp.get("export"),temp.get("share"),)
+		for i, doc in enumerate(data):
+			permission = frappe.permissions.get_doc_permissions(frappe.get_doc(doctype, doc[0]), user)
+			data[i] = doc + tuple(permission.get(right) for right in rights)
 
 	return columns, data
 

From d2c4b170a855bcfebd65a497d7b7770969468d36 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Wed, 1 Jul 2020 21:07:41 +0530
Subject: [PATCH 079/345] fix: get_attr before checking for whitelist

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/desk/search.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/search.py b/frappe/desk/search.py
index e29b1bd227..b4b54b4b6e 100644
--- a/frappe/desk/search.py
+++ b/frappe/desk/search.py
@@ -75,9 +75,17 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0,
 
 	if query and query.split()[0].lower()!="select":
 		# by method
-		is_whitelisted(query)
-		frappe.response["values"] = frappe.call(query, doctype, txt,
-			searchfield, start, page_length, filters, as_dict=as_dict)
+		try:
+			is_whitelisted(frappe.get_attr(query))
+			frappe.response["values"] = frappe.call(query, doctype, txt,
+				searchfield, start, page_length, filters, as_dict=as_dict)
+		except Exception as e:
+			if frappe.local.conf.developer_mode:
+				raise e
+			else:
+				frappe.respond_as_web_page(title='Invalid Method', html='Method not found',
+				indicator_color='red', http_status_code=404)
+			return
 	elif not query and doctype in standard_queries:
 		# from standard queries
 		search_widget(doctype, txt, standard_queries[doctype][0],

From c1615446bdd3ccb16a75a824f1abe555a7c2434c Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 2 Jul 2020 11:54:14 +0530
Subject: [PATCH 080/345] fix: whitelist auto repeat query function

---
 frappe/automation/doctype/auto_repeat/auto_repeat.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py
index c447c55727..ca4f86f210 100644
--- a/frappe/automation/doctype/auto_repeat/auto_repeat.py
+++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py
@@ -372,7 +372,8 @@ def make_auto_repeat(doctype, docname, frequency = 'Daily', start_date = None, e
 	doc.save()
 	return doc
 
-#method for reference_doctype filter
+# method for reference_doctype filter
+@frappe.whitelist()
 def get_auto_repeat_doctypes(doctype, txt, searchfield, start, page_len, filters):
 	res = frappe.db.get_all('Property Setter', {
 		'property': 'allow_auto_repeat',

From 8ddfd2344d6c7d8be3855d317602de2b7d2f8888 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 2 Jul 2020 12:53:16 +0530
Subject: [PATCH 081/345] chore: add search queries to whitelist

these functions are called through search widget and need to be
whitelisted to work

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/address_and_contact.py     | 1 +
 frappe/contacts/doctype/address/address.py | 3 ++-
 frappe/contacts/doctype/contact/contact.py | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/contacts/address_and_contact.py b/frappe/contacts/address_and_contact.py
index 5a004f153b..51f13fb1a1 100644
--- a/frappe/contacts/address_and_contact.py
+++ b/frappe/contacts/address_and_contact.py
@@ -146,6 +146,7 @@ def delete_contact_and_address(doctype, docname):
 			if len(doc.links)==1:
 				doc.delete()
 
+@frappe.whitelist()
 def filter_dynamic_link_doctypes(doctype, txt, searchfield, start, page_len, filters):
 	if not txt: txt = ""
 
diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index b85d578353..79bdb42931 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -230,6 +230,7 @@ def get_company_address(company):
 
 	return ret
 
+@frappe.whitelist()
 def address_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
@@ -289,4 +290,4 @@ def get_condensed_address(doc):
 	return ", ".join([doc.get(d) for d in fields if doc.get(d)])
 
 def update_preferred_address(address, field):
-	frappe.db.set_value('Address', address, field, 0)
\ No newline at end of file
+	frappe.db.set_value('Address', address, field, 0)
diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 4cf209541c..598e186ee8 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -182,6 +182,7 @@ def update_contact(doc, method):
 		contact.flags.ignore_mandatory = True
 		contact.save(ignore_permissions=True)
 
+@frappe.whitelist()
 def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 

From 1390b1c627b59c3b15aa6b57ff71021792b2bb65 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 2 Jul 2020 17:43:32 +0530
Subject: [PATCH 082/345] fix: limit commenting to logged in accounts

* do not allow users not logged in to comment
* add an hourly limit of 20 comments per user
* add better checks for urls and email

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 .../templates/includes/comments/comments.html | 70 +++++++------------
 .../templates/includes/comments/comments.py   | 55 +++++++++------
 frappe/website/doctype/web_form/web_form.py   |  6 +-
 3 files changed, 61 insertions(+), 70 deletions(-)

diff --git a/frappe/templates/includes/comments/comments.html b/frappe/templates/includes/comments/comments.html
index ef53effe53..87241ed075 100644
--- a/frappe/templates/includes/comments/comments.html
+++ b/frappe/templates/includes/comments/comments.html
@@ -9,10 +9,10 @@
 	{% endif %}
 
 	<div itemscope itemtype="http://schema.org/UserComments" id="comment-list">
-        {% for comment in comment_list %}
-        <div class="my-3">
-            {% include "templates/includes/comments/comment.html" %}
-        </div>
+		{% for comment in comment_list %}
+		<div class="my-3">
+			{% include "templates/includes/comments/comment.html" %}
+		</div>
 		{% endfor %}
 	</div>
 </div>
@@ -25,26 +25,22 @@
 
 	<div class="comment-form-wrapper">
 		<a class="add-comment btn btn-light btn-sm">{{ _("Add Comment") }}</a>
-			<div style="display: none;" id="comment-form">
+		<div style="display: none;" id="comment-form">
 			<p>{{ _("Leave a Comment") }}</p>
 			<div class="alert" style="display:none;"></div>
 			<form>
 				<fieldset>
-					<div class="row {% if _login_required %} hidden {% endif %}"
-						style="margin-bottom: 15px;">
+					<div class="row" style="margin-bottom: 15px;">
 						<div class="col-sm-6">
-							<input class="form-control comment_by" name="comment_by"
-								placeholder="{{ _("Your Name") }}" type="text">
+							<input class="form-control comment_by" name="comment_by" placeholder="{{ _("Your Name") }}" type="text">
 						</div>
 						<div class="col-sm-6">
-							<input class="form-control comment_email" name="comment_email"
-								placeholder="{{ _("Your Email Address") }}" type="email">
+							<input class="form-control comment_email" name="comment_email" placeholder="{{ _("Your Email Address") }}" type="email">
 						</div>
 					</div>
 					<p><textarea class="form-control" name="comment" rows=10
-						placeholder="{{ _("Comment") }}"></textarea></p>
-                        <button class="btn btn-primary btn-sm" id="submit-comment" style="margin-top:10px">
-                            {{ _("Submit") }}</button>
+				       placeholder="{{ _("Comment") }}"></textarea></p>
+					<button class="btn btn-primary btn-sm" id="submit-comment" style="margin-top:10px">{{ _("Submit") }}</button>
 				</fieldset>
 			</form>
 		</div>
@@ -53,13 +49,9 @@
 {% endif %}
 <script>
 	frappe.ready(function() {
-		var login_required = {{ login_required and 1 or 0 }};
-
-		if (login_required && !frappe.is_user_logged_in()) {
+		if (!frappe.is_user_logged_in()) {
 			$(".login-required, .comment-form-wrapper").toggleClass("hidden");
-		}
-
-		if(frappe.is_user_logged_in()) {
+		} else {
 			$('input.comment_by').prop("disabled", true);
 			$('input.comment_email').prop("disabled", true);
 		}
@@ -75,18 +67,18 @@
 		}
 		$(".add-comment").click(function() {
 			$(this).toggle(false);
-		 	$("#comment-form").toggle();
-            var full_name = "", user_id = "";
-            if(frappe.is_user_logged_in()) {
-                full_name = frappe.get_cookie("full_name");
-                user_id = frappe.get_cookie("user_id");
-                if(user_id != "Guest") {
-        			$("[name='comment_email']").val(user_id);
-        			$("[name='comment_by']").val(full_name);
-                }
-            }
+			$("#comment-form").toggle();
+			var full_name = "", user_id = "";
+			if(frappe.is_user_logged_in()) {
+				full_name = frappe.get_cookie("full_name");
+				user_id = frappe.get_cookie("user_id");
+				if(user_id != "Guest") {
+					$("[name='comment_email']").val(user_id);
+					$("[name='comment_by']").val(full_name);
+				}
+			}
 			$("#comment-form textarea").val("");
-			})
+		})
 
 		$("#submit-comment").click(function() {
 			var args = {
@@ -99,13 +91,8 @@
 				route: "{{ pathname }}",
 			}
 
-			if(!args.comment_by || !args.comment_email || !args.comment) {
-				frappe.msgprint("{{ _("All fields are necessary to submit the comment.") }}");
-				return false;
-			}
-
-			if (args.comment_email!=='Administrator' && !validate_email(args.comment_email)) {
-				frappe.msgprint("{{ _("Please enter a valid email address.") }}");
+			if(!args.comment) {
+				frappe.msgprint("{{ _("Please add a valid comment.") }}");
 				return false;
 			}
 
@@ -121,15 +108,12 @@
 					} else {
 						if (r.message) {
 							$(r.message).appendTo("#comment-list");
-						} else {
-							// probably spam
-							frappe.msgprint('{{ _("Thank you for your comment. It will be published after approval") }}');
+							$(".add-comment").text(__("Add Another Comment"));
 						}
 						$(".no-comment, .add-comment").toggle(false);
 						$("#comment-form").toggle();
+						$(".add-comment").toggle();
 					}
-					$(".add-comment").text(__("Add Another Comment"));
-					$(".add-comment").toggle();
 				}
 			})
 
diff --git a/frappe/templates/includes/comments/comments.py b/frappe/templates/includes/comments/comments.py
index b5a366e63f..f58201ebdd 100644
--- a/frappe/templates/includes/comments/comments.py
+++ b/frappe/templates/includes/comments/comments.py
@@ -3,29 +3,45 @@
 from __future__ import unicode_literals
 
 import frappe
-import frappe.utils
+import re
 from frappe.website.render import clear_cache
+from frappe.utils import add_to_date, now
 
 from frappe import _
 
-@frappe.whitelist(allow_guest=True)
+@frappe.whitelist()
 def add_comment(comment, comment_email, comment_by, reference_doctype, reference_name, route):
 	doc = frappe.get_doc(reference_doctype, reference_name)
 
-	if len(comment) < 10:
-		frappe.msgprint(_('Comment Should be atleast 10 characters'))
-		return ''
+	if not comment.strip() or len(comment) < 10:
+		frappe.msgprint(_('Your comment should be atleast 10 characters long'))
+		return False
 
-	blacklist = ['http://', 'https://', '@gmail.com']
+	url_regex = re.compile(r"http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+", re.IGNORECASE)
+	email_regex = re.compile(r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)", re.IGNORECASE)
 
-	if any([b in comment for b in blacklist]):
+	if url_regex.match(comment) or email_regex.match(comment):
 		frappe.msgprint(_('Comments cannot have links or email addresses'))
-		return ''
+		return False
+
+	if not comment_email == frappe.session.user:
+		frappe.msgprint(_('Please comment as the logged in user'))
+		return False
+
+	comments_count = frappe.db.count("Comment", {
+		"comment_type": "Comment",
+		"comment_email": frappe.session.user,
+		"creation": (">", add_to_date(now(), hours=-1))
+	})
+
+	if comments_count > 20:
+		frappe.msgprint(_('Hourly comment limit reached for: {0}').format(frappe.bold(frappe.session.user)))
+		return False
 
 	comment = doc.add_comment(
-		text = comment,
-		comment_email = comment_email,
-		comment_by = comment_by)
+		text=comment,
+		comment_email=comment_email,
+		comment_by=comment_by)
 
 	comment.db_set('published', 1)
 
@@ -40,18 +56,13 @@ def add_comment(comment, comment_email, comment_by, reference_doctype, reference
 
 	# notify creator
 	frappe.sendmail(
-		recipients = frappe.db.get_value('User', doc.owner, 'email') or doc.owner,
-		subject = _('New Comment on {0}: {1}').format(doc.doctype, doc.name),
-		message = content,
+		recipients=frappe.db.get_value('User', doc.owner, 'email') or doc.owner,
+		subject=_('New Comment on {0}: {1}').format(doc.doctype, doc.name),
+		message=content,
 		reference_doctype=doc.doctype,
 		reference_name=doc.name
 	)
 
-	if comment.published:
-		# revert with template if all clear (no backlinks)
-		template = frappe.get_template("templates/includes/comments/comment.html")
-
-		return template.render({"comment": comment.as_dict()})
-
-	else:
-		return ''
+	# revert with template if all clear (no backlinks)
+	template = frappe.get_template("templates/includes/comments/comment.html")
+	return template.render({"comment": comment.as_dict()})
diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py
index 4fc3c99037..a3867f1396 100644
--- a/frappe/website/doctype/web_form/web_form.py
+++ b/frappe/website/doctype/web_form/web_form.py
@@ -122,10 +122,6 @@ def get_context(context):
 		'''Build context to render the `web_form.html` template'''
 		self.set_web_form_module()
 
-		context._login_required = False
-		if self.login_required and frappe.session.user == "Guest":
-			context._login_required = True
-
 		doc, delimeter = make_route_string(frappe.form_dict)
 		context.doc = doc
 		context.delimeter = delimeter
@@ -142,7 +138,7 @@ def get_context(context):
 		if self.is_standard:
 			self.use_meta_fields()
 
-		if not context._login_required:
+		if not frappe.session.user == "Guest":
 			if self.allow_edit:
 				if self.allow_multiple:
 					if not frappe.form_dict.name and not frappe.form_dict.new:

From 109c7a1ce8f763422d732a3a8d655b4719f2ef5e Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 2 Jul 2020 19:18:13 +0530
Subject: [PATCH 083/345] fix: remove comment length restriction and explicitly
 set user

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/templates/includes/comments/comments.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/frappe/templates/includes/comments/comments.py b/frappe/templates/includes/comments/comments.py
index f58201ebdd..abee98f9b4 100644
--- a/frappe/templates/includes/comments/comments.py
+++ b/frappe/templates/includes/comments/comments.py
@@ -13,8 +13,8 @@ from frappe import _
 def add_comment(comment, comment_email, comment_by, reference_doctype, reference_name, route):
 	doc = frappe.get_doc(reference_doctype, reference_name)
 
-	if not comment.strip() or len(comment) < 10:
-		frappe.msgprint(_('Your comment should be atleast 10 characters long'))
+	if not comment.strip():
+		frappe.msgprint(_('The comment cannot be empty'))
 		return False
 
 	url_regex = re.compile(r"http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+", re.IGNORECASE)
@@ -25,8 +25,7 @@ def add_comment(comment, comment_email, comment_by, reference_doctype, reference
 		return False
 
 	if not comment_email == frappe.session.user:
-		frappe.msgprint(_('Please comment as the logged in user'))
-		return False
+		comment_email = frappe.session.user
 
 	comments_count = frappe.db.count("Comment", {
 		"comment_type": "Comment",

From 491be746c8bc25ea03f18049dae23a9a1ecb70ef Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 2 Jul 2020 19:28:08 +0530
Subject: [PATCH 084/345] chore: add client-side empty comment validation

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/templates/includes/comments/comments.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/templates/includes/comments/comments.html b/frappe/templates/includes/comments/comments.html
index 87241ed075..ffd09523af 100644
--- a/frappe/templates/includes/comments/comments.html
+++ b/frappe/templates/includes/comments/comments.html
@@ -91,7 +91,7 @@
 				route: "{{ pathname }}",
 			}
 
-			if(!args.comment) {
+			if(!args.comment || !args.comment.trim()) {
 				frappe.msgprint("{{ _("Please add a valid comment.") }}");
 				return false;
 			}

From e952a3f72b93657793ba8ab92b75486520ff21eb Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Fri, 3 Jul 2020 10:52:10 +0530
Subject: [PATCH 085/345] fix: escape unwanted tags before displaying printview

prevents xss on the printview page

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/www/printview.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/www/printview.py b/frappe/www/printview.py
index 4853bf1cb9..545e5d581d 100644
--- a/frappe/www/printview.py
+++ b/frappe/www/printview.py
@@ -8,7 +8,7 @@ from frappe import _
 
 from frappe.modules import get_doc_path
 from frappe.core.doctype.access_log.access_log import make_access_log
-from frappe.utils import cint, strip_html
+from frappe.utils import cint, sanitize_html, strip_html
 from six import string_types
 
 no_cache = 1
@@ -20,9 +20,9 @@ def get_context(context):
 	"""Build context for print"""
 	if not ((frappe.form_dict.doctype and frappe.form_dict.name) or frappe.form_dict.doc):
 		return {
-			"body": """<h1>Error</h1>
+			"body": sanitize_html("""<h1>Error</h1>
 				<p>Parameters doctype and name required</p>
-				<pre>%s</pre>""" % repr(frappe.form_dict)
+				<pre>%s</pre>""" % repr(frappe.form_dict))
 		}
 
 	if frappe.form_dict.doc:

From 002dfec30dfd36d76392ebb0d01c90218a44eb98 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Fri, 3 Jul 2020 10:59:00 +0530
Subject: [PATCH 086/345] refactor: Use current_date variable

---
 frappe/desk/page/leaderboard/leaderboard.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/frappe/desk/page/leaderboard/leaderboard.js b/frappe/desk/page/leaderboard/leaderboard.js
index ecec7f4805..189949ac68 100644
--- a/frappe/desk/page/leaderboard/leaderboard.js
+++ b/frappe/desk/page/leaderboard/leaderboard.js
@@ -379,16 +379,16 @@ class Leaderboard {
 		let timespan = this.options.selected_timespan.toLowerCase();
 		let current_date = frappe.datetime.now_date();
 		let date_range_map = {
-			"this week": [frappe.datetime.week_start(), frappe.datetime.now_date()],
-			"this month": [frappe.datetime.month_start(), frappe.datetime.now_date()],
-			"this quarter": [frappe.datetime.quarter_start(), frappe.datetime.now_date()],
-			"this year": [frappe.datetime.year_start(), frappe.datetime.now_date()],
-			"last week": [frappe.datetime.add_days(current_date, -7), frappe.datetime.now_date()],
-			"last month": [frappe.datetime.add_months(current_date, -1), frappe.datetime.now_date()],
-			"last quarter": [frappe.datetime.add_months(current_date, -3), frappe.datetime.now_date()],
-			"last year": [frappe.datetime.add_months(current_date, -12), frappe.datetime.now_date()],
+			"this week": [frappe.datetime.week_start(), current_date],
+			"this month": [frappe.datetime.month_start(), current_date],
+			"this quarter": [frappe.datetime.quarter_start(), current_date],
+			"this year": [frappe.datetime.year_start(), current_date],
+			"last week": [frappe.datetime.add_days(current_date, -7), current_date],
+			"last month": [frappe.datetime.add_months(current_date, -1), current_date],
+			"last quarter": [frappe.datetime.add_months(current_date, -3), current_date],
+			"last year": [frappe.datetime.add_months(current_date, -12), current_date],
 			"all time": null,
-			"select date range": this.selected_date_range || [frappe.datetime.month_start(), frappe.datetime.now_date()]
+			"select date range": this.selected_date_range || [frappe.datetime.month_start(), current_date]
 		}
 		return date_range_map[timespan];
 	}

From 09112389c2fe5a6b00d0dc8399d82e8cea6140b1 Mon Sep 17 00:00:00 2001
From: Helkyd <hcesar@gmail.com>
Date: Fri, 3 Jul 2020 06:42:44 +0100
Subject: [PATCH 087/345] fix(patch): reload_and_rename_view_log.py (#10890)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/patches/v11_0/reload_and_rename_view_log.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/patches/v11_0/reload_and_rename_view_log.py b/frappe/patches/v11_0/reload_and_rename_view_log.py
index 611de79a3c..12c71b746f 100644
--- a/frappe/patches/v11_0/reload_and_rename_view_log.py
+++ b/frappe/patches/v11_0/reload_and_rename_view_log.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
-	if frappe.db.exists('DocType', 'View log'):
+	if frappe.db.table_exists('View log'):
 		# for mac users direct renaming would not work since mysql for mac saves table name in lower case
 		# so while renaming `tabView log` to `tabView Log` we get "Table 'tabView Log' already exists" error
 		# more info https://stackoverflow.com/a/44753093/5955589 ,

From eb833ed20654c8d50fc741e1c00a73678719cb79 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Fri, 3 Jul 2020 11:32:12 +0530
Subject: [PATCH 088/345] revert: "fix: show label for table fields" (#10897)

---
 frappe/templates/print_formats/standard_macros.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html
index c330bc7619..07ef577aa7 100644
--- a/frappe/templates/print_formats/standard_macros.html
+++ b/frappe/templates/print_formats/standard_macros.html
@@ -35,7 +35,6 @@
 		{%- set visible_columns = get_visible_columns(doc.get(df.fieldname),
 			table_meta, df) -%}
 		<div {{ fieldmeta(df) }}>
-			<label>{{ _(df.label) }}</label>
 			<table class="table table-bordered table-condensed">
 				<thead>
 					<tr>
@@ -96,7 +95,7 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}"
 {%- macro render_text_field(df, doc) -%}
 {%- if doc.get(df.fieldname) != None -%}
 <div style="padding: 10px 0px" {{ fieldmeta(df) }}>
-	{%- if df.fieldtype in ("Text", "Code", "Long Text", "Text Editor") %}<label>{{ _(df.label) }}</label>{%- endif %}
+	{%- if df.fieldtype in ("Text", "Code", "Long Text") %}<label>{{ _(df.label) }}</label>{%- endif %}
 	{%- if df.fieldtype=="Code" %}
 		<pre class="value">{{ doc.get(df.fieldname) }}</pre>
 	{% else -%}

From e4f852bfc8b93d2171d26e793e676c781e6cbb3b Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Fri, 3 Jul 2020 11:39:57 +0530
Subject: [PATCH 089/345] fix: sanitize name before user sign up

do not allow html characters in name validation

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/core/doctype/user/user.py         | 4 ++--
 frappe/templates/includes/login/login.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index fc58f66bfc..64bff32189 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals, print_function
 import frappe
 from frappe.model.document import Document
-from frappe.utils import cint, flt, has_gravatar, format_datetime, now_datetime, get_formatted_email, today
+from frappe.utils import cint, flt, has_gravatar, escape_html, format_datetime, now_datetime, get_formatted_email, today
 from frappe import throw, msgprint, _
 from frappe.utils.password import update_password as _update_password
 from frappe.desk.notifications import clear_notifications
@@ -770,7 +770,7 @@ def sign_up(email, full_name, redirect_to):
 		user = frappe.get_doc({
 			"doctype":"User",
 			"email": email,
-			"first_name": full_name,
+			"first_name": escape_html(full_name),
 			"enabled": 1,
 			"new_password": random_string(10),
 			"user_type": "Website User"
diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js
index 37b8acb328..5316b485dc 100644
--- a/frappe/templates/includes/login/login.js
+++ b/frappe/templates/includes/login/login.js
@@ -34,7 +34,7 @@ login.bind_events = function() {
 		args.cmd = "frappe.core.doctype.user.user.sign_up";
 		args.email = ($("#signup_email").val() || "").trim();
 		args.redirect_to = frappe.utils.sanitise_redirect(frappe.utils.get_url_arg("redirect-to"));
-		args.full_name = ($("#signup_fullname").val() || "").trim();
+		args.full_name = frappe.utils.xss_sanitise(($("#signup_fullname").val() || "").trim());
 		if(!args.email || !validate_email(args.email) || !args.full_name) {
 			login.set_indicator('{{ _("Valid email and name required") }}', 'red');
 			return false;

From 9f51831791b634ef86766fe0251255ebe191fcd5 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 3 Jul 2020 11:09:31 +0530
Subject: [PATCH 090/345] fix: only render header if columns exist

---
 frappe/public/js/frappe/list/list_view.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 8da73b0dec..36634c1ff5 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -528,6 +528,10 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 	}
 
 	get_header_html() {
+		if (!this.columns) {
+			return;
+		}
+
 		const subject_field = this.columns[0].df;
 		let subject_html = `
 			<input class="level-item list-check-all hidden-xs" type="checkbox" title="${__("Select All")}">

From 6149fd6d25e2ff21a60c24cd8525ba6034660b08 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Fri, 3 Jul 2020 13:09:25 +0530
Subject: [PATCH 091/345] fix: frappe patch travis failed

---
 frappe/patches.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/patches.txt b/frappe/patches.txt
index f883d2a7bb..6c4c75aca9 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -19,6 +19,7 @@ execute:frappe.reload_doc('core', 'doctype', 'module_def') #2017-09-22
 execute:frappe.reload_doc('core', 'doctype', 'version') #2017-04-01
 execute:frappe.reload_doc('email', 'doctype', 'document_follow')
 execute:frappe.reload_doc('core', 'doctype', 'communication_link') #2019-10-02
+execute:frappe.reload_doc('core', 'doctype', 'has_role')
 execute:frappe.reload_doc('core', 'doctype', 'communication') #2019-10-02
 frappe.patches.v11_0.replicate_old_user_permissions
 frappe.patches.v11_0.reload_and_rename_view_log #2019-01-03

From c2c6d9fa7fcabb0316a84ced916abb3fd4129828 Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Fri, 3 Jul 2020 14:10:44 +0530
Subject: [PATCH 092/345] fix: Duplicate Name Error Message on saving document

---
 frappe/desk/form/save.py      | 3 +--
 frappe/model/base_document.py | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/form/save.py b/frappe/desk/form/save.py
index 694b44b907..6afe201089 100644
--- a/frappe/desk/form/save.py
+++ b/frappe/desk/form/save.py
@@ -21,8 +21,7 @@ def savedocs(doc, action):
 			try:
 				doc.save()
 			except frappe.NameError as e:
-				doctype, name, original_exception = e if isinstance(e, tuple) else (doc.doctype or "", doc.name or "", None)
-				frappe.msgprint(frappe._("{0} {1} already exists").format(doctype, name))
+				# Duplicate Error message already shown on db_insert
 				raise
 
 		# update recent documents
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index d7028870f4..c7ef7890b4 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -334,7 +334,7 @@ class BaseDocument(object):
 					self.db_insert()
 					return
 
-				frappe.msgprint(_("Duplicate name {0} {1}").format(self.doctype, self.name))
+				frappe.msgprint(_("{0} {1} already exists").format(self.doctype, frappe.bold(self.name)), title=_("Duplicate Name"), indicator="red")
 				raise frappe.DuplicateEntryError(self.doctype, self.name, e)
 
 			elif frappe.db.is_unique_key_violation(e):

From f4fa2c10a352a900a3b9c7c4ff1b8ad0707999d2 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Fri, 3 Jul 2020 18:10:43 +0530
Subject: [PATCH 093/345] fix: ignore no_copy for auto repeat document creation

---
 frappe/automation/doctype/auto_repeat/auto_repeat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py
index ca4f86f210..a946fcc81c 100644
--- a/frappe/automation/doctype/auto_repeat/auto_repeat.py
+++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py
@@ -146,7 +146,7 @@ class AutoRepeat(Document):
 
 	def make_new_document(self):
 		reference_doc = frappe.get_doc(self.reference_doctype, self.reference_document)
-		new_doc = frappe.copy_doc(reference_doc, ignore_no_copy = False)
+		new_doc = frappe.copy_doc(reference_doc)
 		self.update_doc(new_doc, reference_doc)
 		new_doc.insert(ignore_permissions = True)
 

From 5fedab29e748130e2983700d0633bc1bc30639e0 Mon Sep 17 00:00:00 2001
From: michellealva <michelle.alva95@gmail.com>
Date: Sat, 4 Jul 2020 12:08:32 +0530
Subject: [PATCH 094/345] fix: grammatical changes in website onboarding

---
 frappe/website/module_onboarding/website/website.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/website/module_onboarding/website/website.json b/frappe/website/module_onboarding/website/website.json
index c010d27eea..187bf86bb2 100644
--- a/frappe/website/module_onboarding/website/website.json
+++ b/frappe/website/module_onboarding/website/website.json
@@ -10,7 +10,7 @@
  "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/website",
  "idx": 0,
  "is_complete": 0,
- "modified": "2020-05-28 13:51:57.535269",
+ "modified": "2020-07-04 13:51:57.535269",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Website",
@@ -33,7 +33,7 @@
   }
  ],
  "subtitle": "Blogs, website view tracking, and more.",
- "success_message": "Yayy! Your website is all setup!",
- "title": "Let's Setup Your Website",
+ "success_message": "Yayy! Your website is all set up!",
+ "title": "Let's Set Up Your Website",
  "user_can_dismiss": 1
 }
\ No newline at end of file

From 5e1f83ef39b5e992c1ba52e6551d893a25ab3300 Mon Sep 17 00:00:00 2001
From: michellealva <michelle.alva95@gmail.com>
Date: Sat, 4 Jul 2020 12:50:46 +0530
Subject: [PATCH 095/345] fix: some more grammatical fixes

---
 frappe/website/module_onboarding/website/website.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/website/module_onboarding/website/website.json b/frappe/website/module_onboarding/website/website.json
index 187bf86bb2..92c2351d32 100644
--- a/frappe/website/module_onboarding/website/website.json
+++ b/frappe/website/module_onboarding/website/website.json
@@ -32,8 +32,8 @@
    "step": "Web Page Tour"
   }
  ],
- "subtitle": "Blogs, website view tracking, and more.",
- "success_message": "Yayy! Your website is all set up!",
+ "subtitle": "Blogs, Website View Tracking, and more.",
+ "success_message": "Yayy! Your Website is all set up!",
  "title": "Let's Set Up Your Website",
  "user_can_dismiss": 1
 }
\ No newline at end of file

From 0d0734cde79c7f5d20ffd1cfd405741c00ab73eb Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Sun, 5 Jul 2020 02:04:25 +0530
Subject: [PATCH 096/345] fix(webform): filter initial list records

---
 .../js/frappe/web_form/web_form_list.js       | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/frappe/public/js/frappe/web_form/web_form_list.js b/frappe/public/js/frappe/web_form/web_form_list.js
index ec20838dee..21eed52e5e 100644
--- a/frappe/public/js/frappe/web_form/web_form_list.js
+++ b/frappe/public/js/frappe/web_form/web_form_list.js
@@ -7,16 +7,15 @@ export default class WebFormList {
 		Object.assign(this, opts);
 		frappe.web_form_list = this;
 		this.wrapper = document.getElementById("datatable");
-		this.refresh();
 		this.make_actions();
 		this.make_filters();
-		$('.link-btn').remove()
+		$('.link-btn').remove();
 	}
 
 	refresh() {
 		if (this.table) {
 			Array.from(this.table.tBodies).forEach(tbody => tbody.remove());
-			let check = document.getElementById('select-all')
+			let check = document.getElementById('select-all');
 			check.checked = false;
 		}
 		this.rows = [];
@@ -32,8 +31,8 @@ export default class WebFormList {
 	}
 
 	make_filters() {
-		this.filters = {}
-		this.filter_input = []
+		this.filters = {};
+		this.filter_input = [];
 		const filter_area = document.getElementById('list-filters');
 
 		frappe.call('frappe.website.doctype.web_form.web_form.get_web_form_filters', {
@@ -41,9 +40,10 @@ export default class WebFormList {
 		}).then(response => {
 			let fields = response.message;
 			fields.forEach(field => {
-				let col = document.createElement('div.col-sm-4')
-				col.classList.add('col', 'col-sm-3')
-				filter_area.appendChild(col)
+				let col = document.createElement('div.col-sm-4');
+				col.classList.add('col', 'col-sm-3');
+				filter_area.appendChild(col);
+				if (field.default) this.add_filter(field.fieldname, field.default, field.fieldtype);
 
 				let input = frappe.ui.form.make_control({
 					df: {
@@ -54,27 +54,27 @@ export default class WebFormList {
 						label: __(field.label),
 						onchange: (event) => {
 							$('#more').remove();
-							this.add_filter(field.fieldname, input.value, field.fieldtype)
+							this.add_filter(field.fieldname, input.value, field.fieldtype);
+							this.refresh();
 						}
 					},
 					parent: col,
 					value: field.default,
 					render_input: 1,
-				})
-				this.filter_input.push(input)
-			})
-		})
+				});
+				this.filter_input.push(input);
+			});
+			this.refresh();
+		});
 	}
 
 	add_filter(field, value, fieldtype) {
 		if (!value) {
-			delete this.filters[field]
+			delete this.filters[field];
+		} else {
+			if (fieldtype === 'Data') value = ['like', value + '%'];
+			Object.assign(this.filters, Object.fromEntries([[field, value]]));
 		}
-		else {
-			if (fieldtype === 'Data') value = ['like', value + '%']
-			Object.assign(this.filters, Object.fromEntries([[field, value]]))
-		}
-		this.refresh();
 	}
 
 	get_list_view_fields() {
@@ -106,13 +106,13 @@ export default class WebFormList {
 	}
 
 	more() {
-		this.web_list_start += this.page_length
+		this.web_list_start += this.page_length;
 		this.fetch_data().then((res) => {
 			if (res.message.length === 0) {
-				frappe.msgprint(__("No more items to display"))
+				frappe.msgprint(__("No more items to display"));
 			}
-			this.append_rows(res.message)
-		})
+			this.append_rows(res.message);
+		});
 
 	}
 
@@ -125,7 +125,7 @@ export default class WebFormList {
 			};
 		});
 
-		if (! this.table) {
+		if (!this.table) {
 			this.table = document.createElement("table");
 			this.table.classList.add("table");
 			this.make_table_head();

From 4ce70e2bcf42928f4863ce1858e3a618cb112422 Mon Sep 17 00:00:00 2001
From: AminovE99 <32329685+AminovE99@users.noreply.github.com>
Date: Mon, 6 Jul 2020 08:45:34 +0300
Subject: [PATCH 097/345] fix(sendmail): 'frappe' not defined (#10799)

* :lipstick: Add frappe library

Signed-off-by: Emil <amionv99@gmail.com>

* :lipstick: directly import

Co-authored-by: gavin <gavin18d@gmail.com>

Co-authored-by: gavin <gavin18d@gmail.com>
(cherry picked from commit 6b9c92baf48c0671516727cb43761fc56a6dd12a)
---
 frappe/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index f35409fa48..d644d2a473 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -490,7 +490,8 @@ def sendmail(recipients=[], sender="", subject="No Subject", message="No Message
 	message = content or message
 
 	if as_markdown:
-		message = frappe.utils.md_to_html(message)
+		from frappe.utils import md_to_html
+		message = md_to_html(message)
 
 	if not delayed:
 		now = True

From 9ce9d396697ea80b36c4c8697eb43d285046f925 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 6 Jul 2020 11:37:37 +0530
Subject: [PATCH 098/345] fix: custom seen function for inbox view

---
 frappe/public/js/frappe/list/list_view.js         |  6 ++++--
 frappe/public/js/frappe/views/inbox/inbox_view.js | 11 ++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 8da73b0dec..5e95521c04 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -795,8 +795,10 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		let heart_class = liked_by.includes(user) ?
 			'liked-by' : 'text-extra-muted not-liked';
 
-		const seen = JSON.parse(doc._seen || '[]')
-			.includes(user) ? '' : 'bold';
+		const seen = this.get_seen
+			? this.get_seen(doc)
+			: JSON.parse(doc._seen || '[]')
+				.includes(user) ? '' : 'bold';
 
 		let subject_html = `
 			<input class="level-item list-row-checkbox hidden-xs" type="checkbox" data-name="${escape(doc.name)}">
diff --git a/frappe/public/js/frappe/views/inbox/inbox_view.js b/frappe/public/js/frappe/views/inbox/inbox_view.js
index f80b07751e..5bde09b4f9 100644
--- a/frappe/public/js/frappe/views/inbox/inbox_view.js
+++ b/frappe/public/js/frappe/views/inbox/inbox_view.js
@@ -48,6 +48,7 @@ frappe.views.InboxView = class InboxView extends frappe.views.ListView {
 		this.email_account = frappe.get_route()[3];
 		this.page_title = this.email_account;
 		this.filters = this.get_inbox_filters();
+		this.get_seen = (doc) => this.set_seen(doc);
 	}
 
 	setup_columns() {
@@ -69,6 +70,14 @@ frappe.views.InboxView = class InboxView extends frappe.views.ListView {
 		});
 	}
 
+	set_seen(doc) {
+		const seen =
+			Boolean(doc.seen) || JSON.parse(doc._seen || '[]').includes(frappe.session.user)
+				? ''
+				: 'bold';
+		return seen;
+	}
+
 	get is_sent_emails() {
 		const f = this.filter_area.get()
 			.find(filter => filter[1] === 'sent_or_received');
@@ -77,7 +86,7 @@ frappe.views.InboxView = class InboxView extends frappe.views.ListView {
 
 	render_header() {
 		this.$result.find('.list-row-head').remove();
-		this.$result.prepend(this.get_header_html());		
+		this.$result.prepend(this.get_header_html());
 	}
 
 	render() {

From a5ed59bb4e59f5cdde5eb0cae7448c7c3904bd45 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 6 Jul 2020 12:08:34 +0530
Subject: [PATCH 099/345] fix: Do not check for orphaned states in new
 workflows

---
 frappe/workflow/doctype/workflow/workflow.js | 1 +
 frappe/workflow/doctype/workflow/workflow.py | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/workflow/doctype/workflow/workflow.js b/frappe/workflow/doctype/workflow/workflow.js
index aba6f6fe48..6ebba89e58 100644
--- a/frappe/workflow/doctype/workflow/workflow.js
+++ b/frappe/workflow/doctype/workflow/workflow.js
@@ -96,6 +96,7 @@ frappe.ui.form.on("Workflow", {
 		});
 	},
 	get_orphaned_states_and_count: function(frm) {
+		if (frm.is_new()) return;
 		let states_list = [];
 		frm.doc.states.map(state => states_list.push(state.state));
 		return frappe.xcall('frappe.workflow.doctype.workflow.workflow.get_workflow_state_count', {
diff --git a/frappe/workflow/doctype/workflow/workflow.py b/frappe/workflow/doctype/workflow/workflow.py
index 553f21dbab..b4d7293fed 100644
--- a/frappe/workflow/doctype/workflow/workflow.py
+++ b/frappe/workflow/doctype/workflow/workflow.py
@@ -119,7 +119,9 @@ def get_workflow_state_count(doctype, workflow_state_field, states):
 	result = frappe.get_all(
 		doctype,
 		fields=[workflow_state_field, 'count(*) as count', 'docstatus'],
-		filters = {'workflow_state': ['not in', states]},
+		filters = {
+			workflow_state_field: ['not in', states]
+		},
 		group_by = workflow_state_field
 	)
 	return [r for r in result if r[workflow_state_field]]

From 3aa3832bd3b5e0fb339c05615cb3eeb2de64ff58 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 4 Jun 2020 16:01:49 +0530
Subject: [PATCH 100/345] feat: sync dashboards from json files

---
 frappe/desk/doctype/dashboard/dashboard.js    |  14 ++
 frappe/desk/doctype/dashboard/dashboard.json  |  27 +++-
 frappe/desk/doctype/dashboard/dashboard.py    |  28 ++++
 .../dashboard_chart/dashboard_chart.js        |  13 +-
 .../dashboard_chart/dashboard_chart.json      |  15 +-
 .../dashboard_chart/dashboard_chart.py        |   6 +-
 .../desk/doctype/number_card/number_card.js   |   3 +
 .../desk/doctype/number_card/number_card.json |  10 +-
 .../desk/doctype/number_card/number_card.py   |   3 +
 frappe/modules/export_file.py                 |  12 +-
 frappe/public/js/frappe/form/form.js          |   9 ++
 frappe/utils/dashboard.py                     | 128 +++++++++++++-----
 12 files changed, 217 insertions(+), 51 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js
index 609e943995..cf06d91c4d 100644
--- a/frappe/desk/doctype/dashboard/dashboard.js
+++ b/frappe/desk/doctype/dashboard/dashboard.js
@@ -5,6 +5,20 @@ frappe.ui.form.on('Dashboard', {
 	refresh: function(frm) {
 		frm.add_custom_button(__("Show Dashboard"), () => frappe.set_route('dashboard', frm.doc.name));
 
+		if (!frappe.boot.developer_mode) {
+			frm.disable_form();
+		} else {
+			frm.add_custom_button(__("Export"), () => {
+				frappe.call({
+					method: 'frappe.desk.doctype.dashboard.dashboard.export_dashboard',
+					freeze: true,
+					args: {
+						doc: frm.doc
+					}
+				});
+			});
+		}
+
 		frm.set_query("chart", "charts", function() {
 			return {
 				filters: {
diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index c0e2bddcf8..6093ac037a 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -8,6 +8,8 @@
  "field_order": [
   "dashboard_name",
   "is_default",
+  "is_standard",
+  "module",
   "charts",
   "chart_options",
   "cards"
@@ -35,21 +37,34 @@
    "reqd": 1
   },
   {
-    "description": "Set Default Options for all charts on this Dashboard (Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"])",
-    "fieldname": "chart_options",
-    "fieldtype": "Code",
-    "label": "Chart Options",
-    "options": "JSON"
+   "description": "Set Default Options for all charts on this Dashboard (Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"])",
+   "fieldname": "chart_options",
+   "fieldtype": "Code",
+   "label": "Chart Options",
+   "options": "JSON"
   },
   {
    "fieldname": "cards",
    "fieldtype": "Table",
    "label": "Cards",
    "options": "Number Card Link"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_standard",
+   "fieldtype": "Check",
+   "label": "Is Standard",
+   "read_only": 1
+  },
+  {
+   "fieldname": "module",
+   "fieldtype": "Link",
+   "label": "Module",
+   "options": "Module Def"
   }
  ],
  "links": [],
- "modified": "2020-04-29 13:26:37.362482",
+ "modified": "2020-05-26 18:31:10.062311",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index af0c48d9c6..4fc0c89544 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -4,9 +4,11 @@
 
 from __future__ import unicode_literals
 from frappe.model.document import Document
+from frappe.modules.export_file import export_to_files
 import frappe
 from frappe import _
 import json
+from frappe.utils.dashboard import create_filters_file_after_export
 
 class Dashboard(Document):
 	def on_update(self):
@@ -16,6 +18,8 @@ class Dashboard(Document):
 				tabDashboard set is_default = 0 where name != %s''', self.name)
 
 	def validate(self):
+		if not frappe.conf.developer_mode and self.is_standard:
+			frappe.throw('Cannot edit Standard Dashboards')
 		self.validate_custom_options()
 
 	def validate_custom_options(self):
@@ -25,6 +29,30 @@ class Dashboard(Document):
 			except ValueError as error:
 				frappe.throw(_("Invalid json added in the custom options: {0}").format(error))
 
+@frappe.whitelist()
+def export_dashboard(doc):
+	doc = frappe._dict(frappe.parse_json(doc))
+	card_count = 0
+	chart_count = 0
+
+	if not doc.module:
+		frappe.msgprint(_('Please set Module'))
+
+	if frappe.conf.developer_mode and doc.module:
+		export_to_files(record_list=[['Dashboard', doc.name, doc.module + ' Dashboard']], record_module=doc.module,)
+		record_list = []
+		for chart in doc.charts:
+			record_list.append(['Dashboard Chart', chart.get('chart'), 'Dashboard Charts'])
+			chart_count+=1
+		for card in doc.cards:
+			record_list.append(['Number Card', card.get('card'), 'Number Cards'])
+			card_count+=1
+
+		export_to_files(record_list=record_list, record_module=doc.module)
+		frappe.msgprint(_('Successfully exported <b>{chart_count} Charts</b> and <b>{card_count} Cards</b>').format(chart_count=chart_count, card_count=card_count))
+
+		create_filters_file_after_export(module_name=doc.module.lower(), dashboard_name=doc.name)
+
 @frappe.whitelist()
 def get_permitted_charts(dashboard_name):
 	permitted_charts = []
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index a10d3d96f2..a24526957d 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -12,6 +12,11 @@ frappe.ui.form.on('Dashboard Chart', {
 
 	refresh: function(frm) {
 		frm.chart_filters = null;
+
+		if (!frappe.boot.developer_mode && frm.doc.is_standard) {
+			frm.disable_form();
+		}
+
 		frm.add_custom_button('Add Chart to Dashboard', () => {
 			const d = new frappe.ui.Dialog({
 				title: __('Add to Dashboard'),
@@ -240,11 +245,11 @@ frappe.ui.form.on('Dashboard Chart', {
 	show_filters: function(frm) {
 		frm.chart_filters = [];
 		frappe.dashboard_utils.get_filters_for_chart_type(frm.doc).then(filters => {
-				if (filters) {
-					frm.chart_filters = filters;
-				}
+			if (filters) {
+				frm.chart_filters = filters;
+			}
 
-				frm.trigger('render_filters_table');
+			frm.trigger('render_filters_table');
 		});
 	},
 
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 4bab76337f..1e67b56574 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -22,6 +22,7 @@
   "aggregate_function_based_on",
   "number_of_groups",
   "column_break_6",
+  "is_standard",
   "is_public",
   "heatmap_year",
   "timespan",
@@ -33,9 +34,9 @@
   "filters_section",
   "filters_json",
   "chart_options_section",
-  "color",
-  "column_break_2",
   "custom_options",
+  "column_break_2",
+  "color",
   "section_break_10",
   "last_synced_on"
  ],
@@ -235,10 +236,18 @@
    "fieldname": "heatmap_year",
    "fieldtype": "Select",
    "label": "Year"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_standard",
+   "fieldtype": "Check",
+   "label": "Is Standard",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
  "links": [],
- "modified": "2020-05-16 15:03:02.455395",
+ "modified": "2020-06-04 15:59:52.046492",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 4ad6943e0b..a50d51955b 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -80,7 +80,9 @@ def get(chart_name = None, chart = None, no_cache = None, filters = None, from_d
 			to_date = get_datetime(chart.to_date)
 
 	timegrain = time_interval or chart.time_interval
-	filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json) or []
+	filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json)
+	if not filters:
+		filters = []
 
 	# don't include cancelled documents
 	filters.append([chart.document_type, 'docstatus', '<', 2, False])
@@ -349,6 +351,8 @@ class DashboardChart(Document):
 		frappe.cache().delete_key('chart-data:{}'.format(self.name))
 
 	def validate(self):
+		if not frappe.conf.developer_mode and self.is_standard:
+			frappe.throw('Cannot edit Standard charts')
 		if self.chart_type != 'Custom' and self.chart_type != 'Report':
 			self.check_required_field()
 			self.check_document_type()
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 184fe5e6cb..56f1231760 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -3,6 +3,9 @@
 
 frappe.ui.form.on('Number Card', {
 	refresh: function(frm) {
+		if (!frappe.boot.developer_mode && frm.doc.is_standard) {
+			frm.disable_form();
+		}
 		frm.set_df_property("filters_section", "hidden", 1);
 		frm.trigger('set_options');
 		frm.trigger('render_filters_table');
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index ec6a1e9190..f911737e8e 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -10,6 +10,7 @@
   "aggregate_function_based_on",
   "column_break_2",
   "document_type",
+  "is_standard",
   "is_public",
   "stats_section",
   "show_percentage_stats",
@@ -95,10 +96,17 @@
    "fieldname": "stats_section",
    "fieldtype": "Section Break",
    "label": "Stats"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_standard",
+   "fieldtype": "Check",
+   "label": "Is Standard",
+   "read_only": 1
   }
  ],
  "links": [],
- "modified": "2020-05-06 19:47:57.753574",
+ "modified": "2020-05-26 17:30:41.248436",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index c4a427c4e0..b57913dfac 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -67,6 +67,9 @@ def get_result(doc, to_date=None):
 
 	filters = frappe.parse_json(doc.filters_json)
 
+	if not filters:
+			filters = []
+
 	if to_date:
 		filters.append([doc.document_type, 'creation', '<', to_date, False])
 
diff --git a/frappe/modules/export_file.py b/frappe/modules/export_file.py
index b904132530..4b22c82105 100644
--- a/frappe/modules/export_file.py
+++ b/frappe/modules/export_file.py
@@ -12,16 +12,17 @@ def export_doc(doc):
 
 def export_to_files(record_list=None, record_module=None, verbose=0, create_init=None):
 	"""
-		Export record_list to files. record_list is a list of lists ([doctype],[docname] )  ,
+		Export record_list to files. record_list is a list of lists ([doctype, docname, folder name],)  ,
 	"""
 	if frappe.flags.in_import:
 		return
 
 	if record_list:
 		for record in record_list:
-			write_document_file(frappe.get_doc(record[0], record[1]), record_module, create_init=create_init)
+			folder_name = record[2] if len(record) == 3 else None
+			write_document_file(frappe.get_doc(record[0], record[1]), record_module, create_init=create_init, folder_name=folder_name)
 
-def write_document_file(doc, record_module=None, create_init=True):
+def write_document_file(doc, record_module=None, create_init=True, folder_name=None):
 	newdoc = doc.as_dict(no_nulls=True)
 	doc.run_method("before_export", newdoc)
 
@@ -35,7 +36,10 @@ def write_document_file(doc, record_module=None, create_init=True):
 	module = record_module or get_module_name(doc)
 
 	# create folder
-	folder = create_folder(module, doc.doctype, doc.name, create_init)
+	if folder_name:
+		folder = create_folder(module, folder_name, doc.name, create_init)
+	else:
+		folder = create_folder(module, doc.doctype, doc.name, create_init)
 
 	# write the data file
 	fname = scrub(doc.name)
diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index ebe94b4cdb..2e41246cbd 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -842,6 +842,15 @@ frappe.ui.form.Form = class FrappeForm {
 		this.page.clear_primary_action();
 	}
 
+	disable_form() {
+		this.set_read_only();
+		this.fields
+			.forEach((field) => {
+				this.set_df_property(field.df.fieldname, "read_only", "1");
+			});
+		this.disable_save();
+	}
+
 	handle_save_fail(btn, on_error) {
 		$(btn).prop('disabled', false);
 		if (on_error) {
diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index b7023427e2..55e9e89464 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -6,6 +6,9 @@ from frappe import _
 from functools import wraps
 from frappe.utils import add_to_date, cint, get_link_to_form
 from frappe.modules.import_file import import_doc
+import os
+from os.path import isfile, join
+import ast
 
 
 def cache_source(function):
@@ -74,6 +77,18 @@ def get_from_date_from_timespan(to_date, timespan):
 	return add_to_date(to_date, years=years, months=months, days=days,
 		as_datetime=True)
 
+def create_filters_file_after_export(module_name, dashboard_name):
+	dashboard_path = frappe.get_module_path(\
+		module_name,\
+		"{module_name}_dashboard".format(module_name=module_name),\
+		"{dashboard}".format(dashboard=dashboard_name)\
+	)
+	charts_path = frappe.get_module_path(module_name, "dashboard charts")
+	create_filters_file(charts_path, dashboard_path, 'dashboard_chart_filters')
+	cards_path = frappe.get_module_path(module_name, "number cards")
+	create_filters_file(cards_path, dashboard_path, 'number_card_filters')
+
+
 def sync_dashboards(app=None):
 	"""Import, overwrite fixtures from `[app]/fixtures`"""
 	if not cint(frappe.db.get_single_value('System Settings', 'setup_complete')):
@@ -86,39 +101,88 @@ def sync_dashboards(app=None):
 	for app_name in apps:
 		print("Updating Dashboard for {app}".format(app=app_name))
 		for module_name in frappe.local.app_modules.get(app_name) or []:
-			config = get_config(app_name, module_name)
-			if config:
-				frappe.flags.in_import = True
-				try:
-					make_records(config.charts, "Dashboard Chart")
-					make_records(config.number_cards, "Number Card")
-					make_records(config.dashboards, "Dashboard")
-				except Exception as e:
-					frappe.log_error(e, _("Dashboard Import Error"))
-				finally:
-					frappe.flags.in_import = False
+			frappe.flags.in_import = True
+			setup_dashboards_from_file(app_name, module_name)
+			frappe.flags.in_import = False
 
-def make_records(config, doctype):
-	if not config:
-		return
+def setup_dashboards_from_file(app, module):
+	dashboards_path = frappe.get_module_path(module, "{module}_dashboard".format(module=module))
+	chart_filters = {}
+	card_filters = {}
+	if os.path.isdir(dashboards_path):
+		for fname in os.listdir(dashboards_path):
+			dashboard_path = dashboards_path + '/{}'.format(fname)
+			if os.path.isdir(dashboard_path):
+				if fname == '__pycache__':
+					continue
 
+				# create records for all dashboards in the module
+				make_records(dashboards_path)
+				chart_filters.update(get_filters(app, module, fname, 'dashboard_chart_filters'))
+				card_filters.update(get_filters(app, module, fname, 'number_card_filters'))
+
+		charts_path = frappe.get_module_path(module, "dashboard charts")
+		cards_path = frappe.get_module_path(module, "number cards")
+		make_records(charts_path, chart_filters)
+		make_records(cards_path, card_filters)
+
+def get_filters(app, module, dashboard, filters_file):
+	module_name = '{app}.{module}.{module}_dashboard.{dashboard}.{filters_file}'.format(
+		app=app,
+		module=module,
+		dashboard=dashboard,
+		filters_file=filters_file
+	)
 	try:
-		for item in config:
-			item["doctype"] = doctype
-			import_doc(item)
-			frappe.db.commit()
-	except frappe.DuplicateEntryError:
-		pass
+		module = frappe.get_module(module_name)
+		filters = getattr(module, 'get_filters')()
+		return filters
+	except ModuleNotFoundError:
+		frappe.throw('No Dashboard filters file created')
 
-def get_config(app, module):
-	try:
-		module_dashboards = frappe.get_module('{app}.{module}.dashboard_fixtures'.format(app=app, module=module))
-		if hasattr(module_dashboards, 'get_data'):
-			return frappe._dict(module_dashboards.get_data())
-		return None
-	except ImportError:
-		return None
-	except Exception as e:
-		print(_("Failed to import dashboard fixtures for module {module}").format(module=module))
-		frappe.log_error(e, _("Dashboard Fixture Import Error"))
-		return None
+def create_filters_file(doc_folder_path, dashboard_path, fname):
+	filters_dict = get_filters_dict(doc_folder_path)
+	file_path = '{dashboard_path}/{fname}.py'.format(dashboard_path=dashboard_path, fname=fname)
+
+	with open(file_path, "w") as f:
+		f.write('''import frappe\n
+def get_filters():\n\treturn\\
+''')
+		f.write(frappe.as_json(filters_dict, indent='\t'))
+
+
+def get_filters_dict(path):
+	filters_list = []
+	for fname in os.listdir(path):
+		try:
+			doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
+			doc_name = doc_dict['name']
+			filters = frappe.parse_json(doc_dict.get('filters_json'))
+			if isinstance(filters, list):
+				for f in filters:
+					if len(f) == 5:
+						f[4] = cint(f)
+			doc_filter = '''"{doc_name}": {filters}'''.format(doc_name=doc_name, filters=filters)
+			filters_list.append(doc_filter)
+		except FileNotFoundError:
+			frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
+			pass
+
+	filters_dict = ast.literal_eval('{' + ', '.join(filters_list) + '}')
+	return filters_dict
+
+def make_records(path, filters=None):
+	for fname in os.listdir(path):
+		if os.path.isdir(join(path, fname)):
+			if fname == '__pycache__':
+				continue
+			try:
+				doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
+				doc_name = doc_dict['name']
+				doc_dict['is_standard'] = 1
+				if filters:
+					doc_dict['filters_json'] = frappe.as_json(filters[doc_name])
+				import_doc(doc_dict)
+			except FileNotFoundError as e:
+				frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
+				pass

From cd457b335d6f3e7f74bf436eca697fc567cd56ec Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 4 Jun 2020 16:11:37 +0530
Subject: [PATCH 101/345] fix: hide custom options section

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index a24526957d..77728b6ad9 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -14,6 +14,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.chart_filters = null;
 
 		if (!frappe.boot.developer_mode && frm.doc.is_standard) {
+			frm.set_df_property('chart_options_section', 'hidden', 1);
 			frm.disable_form();
 		}
 

From 38fe804a1102b9322941a162e1f845dfd2b1a777 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 4 Jun 2020 16:14:04 +0530
Subject: [PATCH 102/345] fix: remove unused imports, variables

---
 frappe/utils/dashboard.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index 55e9e89464..edbaefaace 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -7,7 +7,7 @@ from functools import wraps
 from frappe.utils import add_to_date, cint, get_link_to_form
 from frappe.modules.import_file import import_doc
 import os
-from os.path import isfile, join
+from os.path import join
 import ast
 
 
@@ -183,6 +183,6 @@ def make_records(path, filters=None):
 				if filters:
 					doc_dict['filters_json'] = frappe.as_json(filters[doc_name])
 				import_doc(doc_dict)
-			except FileNotFoundError as e:
-				frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
+			except FileNotFoundError:
+				frappe.log_error(message=frappe.get_traceback(), title="Dashboard Sync")
 				pass

From 481c838b9b79359a7f6c440e12d8c80002829211 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 8 Jun 2020 20:00:22 +0530
Subject: [PATCH 103/345] refactor: refactor dashboard sync - sync charts,
 cards, dashboards on update - set dynamic filters in form

---
 frappe/desk/doctype/dashboard/dashboard.js    |  16 +-
 frappe/desk/doctype/dashboard/dashboard.json  |   7 +-
 frappe/desk/doctype/dashboard/dashboard.py    |  42 ++---
 .../dashboard_chart/dashboard_chart.js        | 153 ++++++++++++++++++
 .../dashboard_chart/dashboard_chart.json      |  32 +++-
 .../dashboard_chart/dashboard_chart.py        |   4 +
 .../desk/doctype/number_card/number_card.json |  18 ++-
 .../desk/doctype/number_card/number_card.py   |   5 +
 .../public/js/frappe/widgets/chart_widget.js  |  45 +++++-
 frappe/utils/dashboard.py                     |  65 +-------
 10 files changed, 282 insertions(+), 105 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js
index cf06d91c4d..9be6b55d53 100644
--- a/frappe/desk/doctype/dashboard/dashboard.js
+++ b/frappe/desk/doctype/dashboard/dashboard.js
@@ -7,22 +7,13 @@ frappe.ui.form.on('Dashboard', {
 
 		if (!frappe.boot.developer_mode) {
 			frm.disable_form();
-		} else {
-			frm.add_custom_button(__("Export"), () => {
-				frappe.call({
-					method: 'frappe.desk.doctype.dashboard.dashboard.export_dashboard',
-					freeze: true,
-					args: {
-						doc: frm.doc
-					}
-				});
-			});
 		}
 
 		frm.set_query("chart", "charts", function() {
 			return {
 				filters: {
-					is_public: 1
+					is_public: 1,
+					is_standard: 1,
 				}
 			};
 		});
@@ -30,7 +21,8 @@ frappe.ui.form.on('Dashboard', {
 		frm.set_query("card", "cards", function() {
 			return {
 				filters: {
-					is_public: 1
+					is_public: 1,
+					is_standard: 1,
 				}
 			};
 		});
diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index 6093ac037a..232ca6b1f0 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -53,18 +53,19 @@
    "default": "0",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard",
-   "read_only": 1
+   "label": "Is Standard"
   },
   {
+   "depends_on": "eval: doc.is_standard",
    "fieldname": "module",
    "fieldtype": "Link",
    "label": "Module",
+   "mandatory_depends_on": "eval: doc.is_standard",
    "options": "Module Def"
   }
  ],
  "links": [],
- "modified": "2020-05-26 18:31:10.062311",
+ "modified": "2020-06-08 19:16:02.997796",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index 4fc0c89544..a7afde38c2 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -8,7 +8,6 @@ from frappe.modules.export_file import export_to_files
 import frappe
 from frappe import _
 import json
-from frappe.utils.dashboard import create_filters_file_after_export
 
 class Dashboard(Document):
 	def on_update(self):
@@ -17,6 +16,9 @@ class Dashboard(Document):
 			frappe.db.sql('''update
 				tabDashboard set is_default = 0 where name != %s''', self.name)
 
+		if frappe.conf.developer_mode and self.is_standard:
+			export_to_files(record_list=[['Dashboard', self.name, self.module + ' Dashboard']], record_module=self.module)
+
 	def validate(self):
 		if not frappe.conf.developer_mode and self.is_standard:
 			frappe.throw('Cannot edit Standard Dashboards')
@@ -29,29 +31,29 @@ class Dashboard(Document):
 			except ValueError as error:
 				frappe.throw(_("Invalid json added in the custom options: {0}").format(error))
 
-@frappe.whitelist()
-def export_dashboard(doc):
-	doc = frappe._dict(frappe.parse_json(doc))
-	card_count = 0
-	chart_count = 0
+# @frappe.whitelist()
+# def export_dashboard(doc):
+# 	doc = frappe._dict(frappe.parse_json(doc))
+# 	card_count = 0
+# 	chart_count = 0
 
-	if not doc.module:
-		frappe.msgprint(_('Please set Module'))
+# 	if not doc.module:
+# 		frappe.msgprint(_('Please set Module'))
 
-	if frappe.conf.developer_mode and doc.module:
-		export_to_files(record_list=[['Dashboard', doc.name, doc.module + ' Dashboard']], record_module=doc.module,)
-		record_list = []
-		for chart in doc.charts:
-			record_list.append(['Dashboard Chart', chart.get('chart'), 'Dashboard Charts'])
-			chart_count+=1
-		for card in doc.cards:
-			record_list.append(['Number Card', card.get('card'), 'Number Cards'])
-			card_count+=1
+# 	if frappe.conf.developer_mode and doc.module:
+# 		export_to_files(record_list=[['Dashboard', doc.name, doc.module + ' Dashboard']], record_module=doc.module,)
+# 		record_list = []
+# 		for chart in doc.charts:
+# 			record_list.append(['Dashboard Chart', chart.get('chart'), 'Dashboard Charts'])
+# 			chart_count+=1
+# 		for card in doc.cards:
+# 			record_list.append(['Number Card', card.get('card'), 'Number Cards'])
+# 			card_count+=1
 
-		export_to_files(record_list=record_list, record_module=doc.module)
-		frappe.msgprint(_('Successfully exported <b>{chart_count} Charts</b> and <b>{card_count} Cards</b>').format(chart_count=chart_count, card_count=card_count))
+# 		export_to_files(record_list=record_list, record_module=doc.module)
+# 		frappe.msgprint(_('Successfully exported <b>{chart_count} Charts</b> and <b>{card_count} Cards</b>').format(chart_count=chart_count, card_count=card_count))
 
-		create_filters_file_after_export(module_name=doc.module.lower(), dashboard_name=doc.name)
+# 		create_filters_file_after_export(module_name=doc.module.lower(), dashboard_name=doc.name)
 
 @frappe.whitelist()
 def get_permitted_charts(dashboard_name):
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 77728b6ad9..b445ca9bf7 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -9,6 +9,31 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.add_fetch('source', 'timeseries', 'timeseries');
 	},
 
+	before_save: function(frm) {
+		let dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
+		let static_filters = JSON.parse(frm.doc.filters_json || 'null');
+		console.log(dynamic_filters, static_filters);
+		if (dynamic_filters) {
+			if ($.isArray(static_filters)) {
+				static_filters = static_filters.filter(static_filter => {
+					for (let dynamic_filter of dynamic_filters) {
+						if (static_filter[0] == dynamic_filter[0]
+							&& static_filter[1] == dynamic_filter[1]) {
+								return false;
+						}
+					};
+					return true;
+				});
+			} else {
+				for (let key of Object.keys(dynamic_filters)) {
+					delete static_filters[key];
+				}
+			}
+		}
+
+		frm.set_value('filters_json', JSON.stringify(static_filters));
+		frm.trigger('show_filters');
+	},
 
 	refresh: function(frm) {
 		frm.chart_filters = null;
@@ -55,6 +80,8 @@ frappe.ui.form.on('Dashboard Chart', {
 		});
 
 		frm.set_df_property("filters_section", "hidden", 1);
+		frm.set_df_property("dynamic_filters_section", "hidden", 1);
+
 		frm.trigger('set_time_series');
 		frm.set_query('document_type', function() {
 			return {
@@ -72,6 +99,16 @@ frappe.ui.form.on('Dashboard Chart', {
 		if (!frappe.boot.developer_mode) {
 			frm.set_df_property("custom_options", "hidden", 1);
 		}
+
+		if (frappe.boot.developer_mode && frm.doc.is_standard) {
+			frm.trigger('render_dynamic_filters_table');
+		}
+	},
+
+	is_standard: function(frm) {
+		if (frappe.boot.developer_mode && frm.doc.is_standard) {
+			frm.trigger('render_dynamic_filters_table');
+		}
 	},
 
 	source: function(frm) {
@@ -384,4 +421,120 @@ frappe.ui.form.on('Dashboard Chart', {
 		});
 	},
 
+	render_dynamic_filters_table(frm) {
+		frm.set_df_property("dynamic_filters_section", "hidden", 0);
+
+		let is_document_type = frm.doc.chart_type !== 'Report'
+			&& frm.doc.chart_type !== 'Custom';
+
+		let wrapper = $(frm.get_field('dynamic_filters_json').wrapper).empty();
+
+		frm.dynamic_filter_table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
+			<thead>
+				<tr>
+					<th style="width: 33%">${__('Filter')}</th>
+					<th style="width: 33%">${__('Condition')}</th>
+					<th>${__('Value')}</th>
+				</tr>
+			</thead>
+			<tbody></tbody>
+		</table>`).appendTo(wrapper);
+
+		frm.dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
+
+		frm.trigger('set_dynamic_filters_in_table');
+
+		let filters = JSON.parse(frm.doc.filters_json);
+		let fields = [];
+
+		if (is_document_type) {
+			filters.forEach(f => {
+				if (f[2] == '=') {
+					fields.push({
+						label: `${f[1]} (${f[0]})`,
+						fieldname: f[0] + ':' + f[1],
+						fieldtype: 'Data',
+					});
+				}
+			});
+		} else {
+			for (let key of Object.keys(filters)) {
+				fields.push({
+					label: key,
+					fieldname: key,
+					fieldtype: 'Data',
+				});
+			}
+		}
+
+		let dialog_values;
+		frm.dynamic_filter_table.on('click', () => {
+			let dialog = new frappe.ui.Dialog({
+				title: __('Set Dynamic Filters'),
+				fields: fields,
+				primary_action: () => {
+					let values = dialog.get_values();
+					if (values) {
+						dialog.hide();
+						let dynamic_filters = [];
+						for (let key of Object.keys(values)) {
+							if (is_document_type) {
+								let [doctype, fieldname] = key.split(':');
+								dynamic_filters.push([doctype, fieldname, '=', values[key]]);
+							}
+						}
+
+						if (is_document_type) {
+							dialog_values = values;
+							frm.set_value('dynamic_filters_json', JSON.stringify(dynamic_filters));
+						} else {
+							dialog_values = frm.dynamic_filters;
+							frm.set_value('dynamic_filters_json', JSON.stringify(values));
+						}
+						frm.set_value('filters_json', JSON.stringify(filters));
+						frm.trigger('set_dynamic_filters_in_table');
+					}
+				},
+				primary_action_label: "Set"
+			});
+
+			dialog.show();
+			dialog.set_values(dialog_values);
+		});
+	},
+
+	set_dynamic_filters_in_table: function(frm) {
+		frm.dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
+		if (!frm.dynamic_filters) {
+			const filter_row = $(`<tr><td colspan="3" class="text-muted text-center">
+				${__("Click to Set Dynamic Filters")}</td></tr>`);
+			frm.dynamic_filter_table.find('tbody').html(filter_row);
+		} else {
+			let filter_rows = '';
+			if ($.isArray(frm.dynamic_filters)) {
+				frm.dynamic_filters.forEach(filter => {
+					filter_rows +=
+						`<tr>
+							<td>${filter[1]}</td>
+							<td>${filter[2] || ""}</td>
+							<td>${filter[3]}</td>
+						</tr>`
+				});
+			} else {
+				let condition = '=';
+				for (let [key, val] of Object.entries(frm.dynamic_filters)) {
+					filter_rows +=
+						`<tr>
+							<td>${key}</td>
+							<td>${condition}</td>
+							<td>${val || ""}</td>
+						</tr>`
+					;
+				}
+			}
+
+			frm.dynamic_filter_table.find('tbody').html(filter_rows);
+		}
+	}
+
 });
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 1e67b56574..deb70e464d 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -7,6 +7,8 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "is_standard",
+  "module",
   "chart_name",
   "chart_type",
   "report_name",
@@ -22,7 +24,6 @@
   "aggregate_function_based_on",
   "number_of_groups",
   "column_break_6",
-  "is_standard",
   "is_public",
   "heatmap_year",
   "timespan",
@@ -33,6 +34,8 @@
   "type",
   "filters_section",
   "filters_json",
+  "dynamic_filters_section",
+  "dynamic_filters_json",
   "chart_options_section",
   "custom_options",
   "column_break_2",
@@ -244,10 +247,35 @@
    "label": "Is Standard",
    "show_days": 1,
    "show_seconds": 1
+  },
+  {
+   "depends_on": "eval: doc.is_standard",
+   "fieldname": "module",
+   "fieldtype": "Link",
+   "label": "Module",
+   "mandatory_depends_on": "eval: doc.is_standard",
+   "options": "Module Def",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "fieldname": "dynamic_filters_json",
+   "fieldtype": "Code",
+   "label": "Dynamic Filters JSON",
+   "options": "JSON",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "fieldname": "dynamic_filters_section",
+   "fieldtype": "Section Break",
+   "label": "Dynamic Filters",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
  "links": [],
- "modified": "2020-06-04 15:59:52.046492",
+ "modified": "2020-06-08 19:43:12.000511",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index a50d51955b..70aece3ee7 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -13,6 +13,7 @@ from frappe.utils import nowdate, add_to_date, getdate, get_last_day, formatdate
 from frappe.model.naming import append_number_if_name_exists
 from frappe.boot import get_allowed_reports
 from frappe.model.document import Document
+from frappe.modules.export_file import export_to_files
 
 
 def get_permission_query_conditions(user):
@@ -349,6 +350,9 @@ class DashboardChart(Document):
 
 	def on_update(self):
 		frappe.cache().delete_key('chart-data:{}'.format(self.name))
+		if frappe.conf.developer_mode and self.is_standard:
+			export_to_files(record_list=[['Dashboard Chart', self.name]], record_module=self.module)
+
 
 	def validate(self):
 		if not frappe.conf.developer_mode and self.is_standard:
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index f911737e8e..7dca736bc8 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -5,12 +5,13 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "is_standard",
+  "module",
   "label",
   "function",
   "aggregate_function_based_on",
   "column_break_2",
   "document_type",
-  "is_standard",
   "is_public",
   "stats_section",
   "show_percentage_stats",
@@ -101,12 +102,21 @@
    "default": "0",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard",
-   "read_only": 1
+   "label": "Is Standard"
+  },
+  {
+   "depends_on": "eval: doc.is_standard",
+   "fieldname": "module",
+   "fieldtype": "Link",
+   "label": "Module",
+   "mandatory_depends_on": "eval: doc.is_standard",
+   "options": "Module Def",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
  "links": [],
- "modified": "2020-05-26 17:30:41.248436",
+ "modified": "2020-06-08 13:15:58.741945",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index b57913dfac..2f5cfb561c 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -7,6 +7,7 @@ import frappe
 from frappe.model.document import Document
 from frappe.utils import cint
 from frappe.model.naming import append_number_if_name_exists
+from frappe.modules.export_file import export_to_files
 
 class NumberCard(Document):
 	def autoname(self):
@@ -16,6 +17,10 @@ class NumberCard(Document):
 		if frappe.db.exists("Number Card", self.name):
 			self.name = append_number_if_name_exists('Number Card', self.name)
 
+	def on_update(self):
+		if frappe.conf.developer_mode and self.is_standard:
+			export_to_files(record_list=[['Number Card', self.name]], record_module=self.module)
+
 def get_permission_query_conditions(user=None):
 	if not user:
 		user = frappe.session.user
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 8a0eca9eaf..e31df3825b 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -412,10 +412,13 @@ export default class ChartWidget extends Widget {
 		}
 
 		dialog.show();
-		//Set query report object so that it can be used while fetching filter values in the report
-		frappe.query_report = new frappe.views.QueryReport({'filters': dialog.fields_list});
-		frappe.query_reports[this.chart_doc.report_name].onload
-				&& frappe.query_reports[this.chart_doc.report_name].onload(frappe.query_report);
+
+		if (this.chart_doc.chart_type == 'Report') {
+			//Set query report object so that it can be used while fetching filter values in the report
+			frappe.query_report = new frappe.views.QueryReport({'filters': dialog.fields_list});
+			frappe.query_reports[this.chart_doc.report_name].onload
+					&& frappe.query_reports[this.chart_doc.report_name].onload(frappe.query_report);
+		}
 		dialog.set_values(this.filters);
 	}
 
@@ -636,7 +639,7 @@ export default class ChartWidget extends Widget {
 
 	set_chart_filters() {
 		let user_saved_filters = this.chart_settings.filters || null;
-		let chart_saved_filters = JSON.parse(this.chart_doc.filters_json || "null");
+		let chart_saved_filters = this.get_all_chart_filters();
 
 		if (this.chart_doc.chart_type == 'Report') {
 			return frappe.dashboard_utils
@@ -652,6 +655,38 @@ export default class ChartWidget extends Widget {
 		}
 	}
 
+	get_all_chart_filters() {
+		let filters = JSON.parse(this.chart_doc.filters_json || "null");
+		let dynamic_filters = JSON.parse(this.chart_doc.dynamic_filters_json || "null");
+
+		if (!dynamic_filters) {
+			return filters;
+		}
+
+		if ($.isArray(dynamic_filters)) {
+			dynamic_filters.forEach(f => {
+				try {
+					f[3] = eval(f[3]);
+				} catch (e) {
+					frappe.throw(__(`Invalid expression set in filter ${f[1]} (${f[0]})`));
+				}
+			});
+			filters = [...filters, ...dynamic_filters];
+		} else {
+			for (let key of Object.keys(dynamic_filters)) {
+				try {
+					const val = eval(dynamic_filters[key]);
+					dynamic_filters[key] = val;
+				} catch (e) {
+					frappe.throw(__(`Invalid expression set in filter ${key}`));
+				}
+			}
+			Object.assign(filters, dynamic_filters);
+		}
+
+		return filters;
+	}
+
 	update_default_date_filters(report_filters, chart_filters) {
 		report_filters.map(f => {
 			if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index edbaefaace..a0b315e431 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -102,13 +102,11 @@ def sync_dashboards(app=None):
 		print("Updating Dashboard for {app}".format(app=app_name))
 		for module_name in frappe.local.app_modules.get(app_name) or []:
 			frappe.flags.in_import = True
-			setup_dashboards_from_file(app_name, module_name)
+			make_records_in_module(app_name, module_name)
 			frappe.flags.in_import = False
 
-def setup_dashboards_from_file(app, module):
+def make_records_in_module(app, module):
 	dashboards_path = frappe.get_module_path(module, "{module}_dashboard".format(module=module))
-	chart_filters = {}
-	card_filters = {}
 	if os.path.isdir(dashboards_path):
 		for fname in os.listdir(dashboards_path):
 			dashboard_path = dashboards_path + '/{}'.format(fname)
@@ -118,58 +116,11 @@ def setup_dashboards_from_file(app, module):
 
 				# create records for all dashboards in the module
 				make_records(dashboards_path)
-				chart_filters.update(get_filters(app, module, fname, 'dashboard_chart_filters'))
-				card_filters.update(get_filters(app, module, fname, 'number_card_filters'))
 
-		charts_path = frappe.get_module_path(module, "dashboard charts")
-		cards_path = frappe.get_module_path(module, "number cards")
-		make_records(charts_path, chart_filters)
-		make_records(cards_path, card_filters)
-
-def get_filters(app, module, dashboard, filters_file):
-	module_name = '{app}.{module}.{module}_dashboard.{dashboard}.{filters_file}'.format(
-		app=app,
-		module=module,
-		dashboard=dashboard,
-		filters_file=filters_file
-	)
-	try:
-		module = frappe.get_module(module_name)
-		filters = getattr(module, 'get_filters')()
-		return filters
-	except ModuleNotFoundError:
-		frappe.throw('No Dashboard filters file created')
-
-def create_filters_file(doc_folder_path, dashboard_path, fname):
-	filters_dict = get_filters_dict(doc_folder_path)
-	file_path = '{dashboard_path}/{fname}.py'.format(dashboard_path=dashboard_path, fname=fname)
-
-	with open(file_path, "w") as f:
-		f.write('''import frappe\n
-def get_filters():\n\treturn\\
-''')
-		f.write(frappe.as_json(filters_dict, indent='\t'))
-
-
-def get_filters_dict(path):
-	filters_list = []
-	for fname in os.listdir(path):
-		try:
-			doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
-			doc_name = doc_dict['name']
-			filters = frappe.parse_json(doc_dict.get('filters_json'))
-			if isinstance(filters, list):
-				for f in filters:
-					if len(f) == 5:
-						f[4] = cint(f)
-			doc_filter = '''"{doc_name}": {filters}'''.format(doc_name=doc_name, filters=filters)
-			filters_list.append(doc_filter)
-		except FileNotFoundError:
-			frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
-			pass
-
-	filters_dict = ast.literal_eval('{' + ', '.join(filters_list) + '}')
-	return filters_dict
+		charts_path = frappe.get_module_path(module, "dashboard chart")
+		cards_path = frappe.get_module_path(module, "number card")
+		make_records(charts_path)
+		make_records(cards_path)
 
 def make_records(path, filters=None):
 	for fname in os.listdir(path):
@@ -178,10 +129,6 @@ def make_records(path, filters=None):
 				continue
 			try:
 				doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
-				doc_name = doc_dict['name']
-				doc_dict['is_standard'] = 1
-				if filters:
-					doc_dict['filters_json'] = frappe.as_json(filters[doc_name])
 				import_doc(doc_dict)
 			except FileNotFoundError:
 				frappe.log_error(message=frappe.get_traceback(), title="Dashboard Sync")

From 43c8b476b18bc73276519ecdfcfe68960af8f4c6 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 8 Jun 2020 20:06:56 +0530
Subject: [PATCH 104/345] fix: formatting fixes

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index b445ca9bf7..a0306bb64c 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -12,16 +12,15 @@ frappe.ui.form.on('Dashboard Chart', {
 	before_save: function(frm) {
 		let dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
 		let static_filters = JSON.parse(frm.doc.filters_json || 'null');
-		console.log(dynamic_filters, static_filters);
 		if (dynamic_filters) {
 			if ($.isArray(static_filters)) {
 				static_filters = static_filters.filter(static_filter => {
 					for (let dynamic_filter of dynamic_filters) {
 						if (static_filter[0] == dynamic_filter[0]
 							&& static_filter[1] == dynamic_filter[1]) {
-								return false;
+							return false;
 						}
-					};
+					}
 					return true;
 				});
 			} else {
@@ -518,7 +517,7 @@ frappe.ui.form.on('Dashboard Chart', {
 							<td>${filter[1]}</td>
 							<td>${filter[2] || ""}</td>
 							<td>${filter[3]}</td>
-						</tr>`
+						</tr>`;
 				});
 			} else {
 				let condition = '=';

From 5b0d05b6d3ed99d86272c6ceb3bb0c77e7493a75 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 8 Jun 2020 20:07:50 +0530
Subject: [PATCH 105/345] fix: remove ununsed imports, functions

---
 frappe/utils/dashboard.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index a0b315e431..07142f6ece 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -8,7 +8,6 @@ from frappe.utils import add_to_date, cint, get_link_to_form
 from frappe.modules.import_file import import_doc
 import os
 from os.path import join
-import ast
 
 
 def cache_source(function):
@@ -77,18 +76,6 @@ def get_from_date_from_timespan(to_date, timespan):
 	return add_to_date(to_date, years=years, months=months, days=days,
 		as_datetime=True)
 
-def create_filters_file_after_export(module_name, dashboard_name):
-	dashboard_path = frappe.get_module_path(\
-		module_name,\
-		"{module_name}_dashboard".format(module_name=module_name),\
-		"{dashboard}".format(dashboard=dashboard_name)\
-	)
-	charts_path = frappe.get_module_path(module_name, "dashboard charts")
-	create_filters_file(charts_path, dashboard_path, 'dashboard_chart_filters')
-	cards_path = frappe.get_module_path(module_name, "number cards")
-	create_filters_file(cards_path, dashboard_path, 'number_card_filters')
-
-
 def sync_dashboards(app=None):
 	"""Import, overwrite fixtures from `[app]/fixtures`"""
 	if not cint(frappe.db.get_single_value('System Settings', 'setup_complete')):

From 3954bacabbf00db1e28ede1309839c2de011693b Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 8 Jun 2020 20:11:37 +0530
Subject: [PATCH 106/345] fix: remove commented out code

---
 frappe/desk/doctype/dashboard/dashboard.py | 24 ----------------------
 1 file changed, 24 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index a7afde38c2..78e8eb60f3 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -31,30 +31,6 @@ class Dashboard(Document):
 			except ValueError as error:
 				frappe.throw(_("Invalid json added in the custom options: {0}").format(error))
 
-# @frappe.whitelist()
-# def export_dashboard(doc):
-# 	doc = frappe._dict(frappe.parse_json(doc))
-# 	card_count = 0
-# 	chart_count = 0
-
-# 	if not doc.module:
-# 		frappe.msgprint(_('Please set Module'))
-
-# 	if frappe.conf.developer_mode and doc.module:
-# 		export_to_files(record_list=[['Dashboard', doc.name, doc.module + ' Dashboard']], record_module=doc.module,)
-# 		record_list = []
-# 		for chart in doc.charts:
-# 			record_list.append(['Dashboard Chart', chart.get('chart'), 'Dashboard Charts'])
-# 			chart_count+=1
-# 		for card in doc.cards:
-# 			record_list.append(['Number Card', card.get('card'), 'Number Cards'])
-# 			card_count+=1
-
-# 		export_to_files(record_list=record_list, record_module=doc.module)
-# 		frappe.msgprint(_('Successfully exported <b>{chart_count} Charts</b> and <b>{card_count} Cards</b>').format(chart_count=chart_count, card_count=card_count))
-
-# 		create_filters_file_after_export(module_name=doc.module.lower(), dashboard_name=doc.name)
-
 @frappe.whitelist()
 def get_permitted_charts(dashboard_name):
 	permitted_charts = []

From dc0a47b49b4d73f5defa2f13e506e39b20659314 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 9 Jun 2020 13:13:11 +0530
Subject: [PATCH 107/345] fix: trigger dynamic filters when filters are set

---
 .../dashboard_chart/dashboard_chart.js        | 66 ++++++++++++-------
 .../public/js/frappe/utils/dashboard_utils.js |  2 +-
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index a0306bb64c..6f5fb4ec59 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -99,14 +99,13 @@ frappe.ui.form.on('Dashboard Chart', {
 			frm.set_df_property("custom_options", "hidden", 1);
 		}
 
-		if (frappe.boot.developer_mode && frm.doc.is_standard) {
-			frm.trigger('render_dynamic_filters_table');
-		}
 	},
 
 	is_standard: function(frm) {
 		if (frappe.boot.developer_mode && frm.doc.is_standard) {
 			frm.trigger('render_dynamic_filters_table');
+		} else {
+			frm.set_df_property("dynamic_filters_section", "hidden", 1);
 		}
 	},
 
@@ -153,6 +152,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.set_value('based_on', '');
 		frm.set_value('value_based_on', '');
 		frm.set_value('filters_json', '[]');
+		frm.set_value('dynamic_filters_json', '[]');
 		frm.trigger('update_options');
 	},
 
@@ -161,6 +161,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.set_value('y_axis', []);
 		frm.set_df_property('x_field', 'options', []);
 		frm.set_value('filters_json', '{}');
+		frm.set_value('dynamic_filters_json', '{}');
 		frm.trigger('set_chart_report_filters');
 	},
 
@@ -188,7 +189,7 @@ frappe.ui.form.on('Dashboard Chart', {
 	},
 
 	set_chart_field_options: function(frm) {
-		let filters = frm.doc.filters_json.length > 2? JSON.parse(frm.doc.filters_json): null;
+		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
 		frappe.xcall(
 			'frappe.desk.query_report.run',
 			{
@@ -285,8 +286,11 @@ frappe.ui.form.on('Dashboard Chart', {
 			if (filters) {
 				frm.chart_filters = filters;
 			}
-
 			frm.trigger('render_filters_table');
+
+			if (frappe.boot.developer_mode && frm.doc.is_standard) {
+				frm.trigger('render_dynamic_filters_table');
+			}
 		});
 	},
 
@@ -439,15 +443,25 @@ frappe.ui.form.on('Dashboard Chart', {
 			<tbody></tbody>
 		</table>`).appendTo(wrapper);
 
-		frm.dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
+		frm.dynamic_filters = frm.doc.dynamic_filters_json && frm.doc.dynamic_filters_json.length > 2
+			? JSON.parse(frm.doc.dynamic_filters_json)
+			: null;
 
 		frm.trigger('set_dynamic_filters_in_table');
 
-		let filters = JSON.parse(frm.doc.filters_json);
+		let filters = JSON.parse(frm.doc.filters_json || '[]');
 		let fields = [];
 
 		if (is_document_type) {
+			if (frm.dynamic_filters) {
+				filters = [...filters, ...frm.dynamic_filters];
+			}
 			filters.forEach(f => {
+				for (let field of fields) {
+					if (field.fieldname == f[0] + ':' + f[1]) {
+						return;
+					}
+				}
 				if (f[2] == '=') {
 					fields.push({
 						label: `${f[1]} (${f[0]})`,
@@ -457,6 +471,7 @@ frappe.ui.form.on('Dashboard Chart', {
 				}
 			});
 		} else {
+			filters = {...frm.dynamic_filters, ...filters};
 			for (let key of Object.keys(filters)) {
 				fields.push({
 					label: key,
@@ -473,26 +488,24 @@ frappe.ui.form.on('Dashboard Chart', {
 				fields: fields,
 				primary_action: () => {
 					let values = dialog.get_values();
-					if (values) {
-						dialog.hide();
-						let dynamic_filters = [];
-						for (let key of Object.keys(values)) {
-							if (is_document_type) {
-								let [doctype, fieldname] = key.split(':');
-								dynamic_filters.push([doctype, fieldname, '=', values[key]]);
-							}
-						}
-
+					dialog.hide();
+					let dynamic_filters = [];
+					for (let key of Object.keys(values)) {
 						if (is_document_type) {
-							dialog_values = values;
-							frm.set_value('dynamic_filters_json', JSON.stringify(dynamic_filters));
-						} else {
-							dialog_values = frm.dynamic_filters;
-							frm.set_value('dynamic_filters_json', JSON.stringify(values));
+							let [doctype, fieldname] = key.split(':');
+							dynamic_filters.push([doctype, fieldname, '=', values[key]]);
 						}
-						frm.set_value('filters_json', JSON.stringify(filters));
-						frm.trigger('set_dynamic_filters_in_table');
 					}
+
+					if (is_document_type) {
+						dialog_values = values;
+						frm.set_value('dynamic_filters_json', dynamic_filters);
+					} else {
+						dialog_values = frm.dynamic_filters;
+						frm.set_value('dynamic_filters_json', JSON.stringify(values));
+					}
+					frm.set_value('filters_json', JSON.stringify(filters));
+					frm.trigger('set_dynamic_filters_in_table');
 				},
 				primary_action_label: "Set"
 			});
@@ -503,7 +516,10 @@ frappe.ui.form.on('Dashboard Chart', {
 	},
 
 	set_dynamic_filters_in_table: function(frm) {
-		frm.dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
+		frm.dynamic_filters =  frm.doc.dynamic_filters_json && frm.doc.dynamic_filters_json.length > 2
+			? JSON.parse(frm.doc.dynamic_filters_json)
+			: null;
+
 		if (!frm.dynamic_filters) {
 			const filter_row = $(`<tr><td colspan="3" class="text-muted text-center">
 				${__("Click to Set Dynamic Filters")}</td></tr>`);
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index d1621a3e15..dfeee2e010 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -47,7 +47,7 @@ frappe.dashboard_utils = {
 				frappe.dom.eval(config);
 				return frappe.dashboards.chart_sources[chart.source].filters;
 			});
-		} else if (chart.chart_type === 'Report') {
+		} else if (chart.chart_type === 'Report' && chart.report_name) {
 			return frappe.report_utils.get_report_filters(chart.report_name).then(filters => {
 				return filters;
 			});

From 7c5ef8b5a68168bfb005f983e9ae8f3d46cf8bf3 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 9 Jun 2020 13:14:58 +0530
Subject: [PATCH 108/345] fix: increase width of filter value column

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 6f5fb4ec59..aaa04c6ffb 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -435,8 +435,8 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.dynamic_filter_table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
 			<thead>
 				<tr>
-					<th style="width: 33%">${__('Filter')}</th>
-					<th style="width: 33%">${__('Condition')}</th>
+					<th style="width: 20%">${__('Filter')}</th>
+					<th style="width: 20%">${__('Condition')}</th>
 					<th>${__('Value')}</th>
 				</tr>
 			</thead>

From 9f9c97603c3954a91499d60cba65e60578354017 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 9 Jun 2020 14:22:00 +0530
Subject: [PATCH 109/345] feat: dynamic filters for number cards

---
 .../dashboard_chart/dashboard_chart.js        |  22 +--
 .../desk/doctype/number_card/number_card.js   | 140 +++++++++++++++---
 .../desk/doctype/number_card/number_card.json |  26 +++-
 .../public/js/frappe/utils/dashboard_utils.js |  22 +++
 4 files changed, 168 insertions(+), 42 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index aaa04c6ffb..ac2a15ee0a 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -12,23 +12,8 @@ frappe.ui.form.on('Dashboard Chart', {
 	before_save: function(frm) {
 		let dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
 		let static_filters = JSON.parse(frm.doc.filters_json || 'null');
-		if (dynamic_filters) {
-			if ($.isArray(static_filters)) {
-				static_filters = static_filters.filter(static_filter => {
-					for (let dynamic_filter of dynamic_filters) {
-						if (static_filter[0] == dynamic_filter[0]
-							&& static_filter[1] == dynamic_filter[1]) {
-							return false;
-						}
-					}
-					return true;
-				});
-			} else {
-				for (let key of Object.keys(dynamic_filters)) {
-					delete static_filters[key];
-				}
-			}
-		}
+		static_filters =
+			frappe.dashboard_utils.remove_common_static_filter_values(static_filters, dynamic_filters);
 
 		frm.set_value('filters_json', JSON.stringify(static_filters));
 		frm.trigger('show_filters');
@@ -499,12 +484,11 @@ frappe.ui.form.on('Dashboard Chart', {
 
 					if (is_document_type) {
 						dialog_values = values;
-						frm.set_value('dynamic_filters_json', dynamic_filters);
+						frm.set_value('dynamic_filters_json', JSON.stringify(dynamic_filters));
 					} else {
 						dialog_values = frm.dynamic_filters;
 						frm.set_value('dynamic_filters_json', JSON.stringify(values));
 					}
-					frm.set_value('filters_json', JSON.stringify(filters));
 					frm.trigger('set_dynamic_filters_in_table');
 				},
 				primary_action_label: "Set"
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 56f1231760..ccabf5a823 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -7,8 +7,28 @@ frappe.ui.form.on('Number Card', {
 			frm.disable_form();
 		}
 		frm.set_df_property("filters_section", "hidden", 1);
+		frm.set_df_property("dynamic_filters_section", "hidden", 1);
 		frm.trigger('set_options');
 		frm.trigger('render_filters_table');
+		frm.trigger('render_dynamic_filters_table');
+	},
+
+	before_save: function(frm) {
+		let dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
+		let static_filters = JSON.parse(frm.doc.filters_json || 'null');
+		static_filters =
+			frappe.dashboard_utils.remove_common_static_filter_values(static_filters, dynamic_filters);
+
+		frm.set_value('filters_json', JSON.stringify(static_filters));
+		frm.trigger('render_filters_table');
+	},
+
+	is_standard: function(frm) {
+		if (frappe.boot.developer_mode && frm.doc.is_standard) {
+			frm.trigger('render_dynamic_filters_table');
+		} else {
+			frm.set_df_property("dynamic_filters_section", "hidden", 1);
+		}
 	},
 
 	document_type: function(frm) {
@@ -20,6 +40,7 @@ frappe.ui.form.on('Number Card', {
 			};
 		});
 		frm.set_value('filters_json', '[]');
+		frm.set_value('dynamic_filters_json', '[]');
 		frm.set_value('aggregate_function_based_on', '');
 		frm.trigger('set_options');
 	},
@@ -50,7 +71,7 @@ frappe.ui.form.on('Number Card', {
 		frm.set_df_property("filters_section", "hidden", 0);
 
 		let wrapper = $(frm.get_field('filters_json').wrapper).empty();
-		frm.filter_table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
+		let table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
 			<thead>
 				<tr>
 					<th style="width: 33%">${__('Filter')}</th>
@@ -63,9 +84,9 @@ frappe.ui.form.on('Number Card', {
 
 		frm.filters = JSON.parse(frm.doc.filters_json || '[]');
 
-		frm.trigger('set_filters_in_table');
+		set_filters_in_table(frm.filters, table);
 
-		frm.filter_table.on('click', () => {
+		table.on('click', () => {
 			let dialog = new frappe.ui.Dialog({
 				title: __('Set Filters'),
 				fields: [{
@@ -78,7 +99,8 @@ frappe.ui.form.on('Number Card', {
 						this.hide();
 						frm.filters = frm.filter_group.get_filters();
 						frm.set_value('filters_json', JSON.stringify(frm.filters));
-						frm.trigger('set_filters_in_table');
+						set_filters_in_table(frm.filters, table);
+						frm.trigger('render_dynamic_filters_table');
 					}
 				},
 				primary_action_label: "Set"
@@ -100,23 +122,97 @@ frappe.ui.form.on('Number Card', {
 
 	},
 
-	set_filters_in_table: function(frm) {
-		if (!frm.filters.length) {
-			const filter_row = $(`<tr><td colspan="3" class="text-muted text-center">
-				${__("Click to Set Filters")}</td></tr>`);
-			frm.filter_table.find('tbody').html(filter_row);
-		} else {
-			let filter_rows = '';
-			frm.filters.forEach(filter => {
-				filter_rows +=
-					`<tr>
-						<td>${filter[1]}</td>
-						<td>${filter[2] || ""}</td>
-						<td>${filter[3]}</td>
-					</tr>`;
-
-			});
-			frm.filter_table.find('tbody').html(filter_rows);
+	render_dynamic_filters_table: function(frm) {
+		if (!frappe.boot.developer_mode || !frm.doc.is_standard) {
+			return;
 		}
-	}
+		let wrapper = $(frm.get_field('dynamic_filters_json').wrapper).empty();
+
+		frm.set_df_property("dynamic_filters_section", "hidden", 0);
+
+		let table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
+			<thead>
+				<tr>
+					<th style="width: 20%">${__('Filter')}</th>
+					<th style="width: 20%">${__('Condition')}</th>
+					<th>${__('Value')}</th>
+				</tr>
+			</thead>
+			<tbody></tbody>
+		</table>`).appendTo(wrapper);
+
+		frm.dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || '[]');
+
+		set_filters_in_table(frm.dynamic_filters, table);
+
+		let filters = JSON.parse(frm.doc.filters_json || '[]');
+		let fields = [];
+
+		if (frm.dynamic_filters.length) {
+			filters = [...filters, ...frm.dynamic_filters];
+		}
+
+		filters.forEach(f => {
+			for (let field of fields) {
+				if (field.fieldname == f[0] + ':' + f[1]) {
+					return;
+				}
+			}
+			if (f[2] == '=') {
+				fields.push({
+					label: `${f[1]} (${f[0]})`,
+					fieldname: f[0] + ':' + f[1],
+					fieldtype: 'Data',
+				});
+			}
+		});
+
+		table.on('click', () => {
+			let dialog = new frappe.ui.Dialog({
+				title: __('Set Filters'),
+				fields: fields,
+				primary_action: () => {
+					let values = dialog.get_values();
+					if (values) {
+						dialog.hide();
+						let dynamic_filters = [];
+						for (let key of Object.keys(values)) {
+							let [doctype, fieldname] = key.split(':');
+							dynamic_filters.push([doctype, fieldname, '=', values[key]]);
+						}
+
+						frm.set_value('dynamic_filters_json', JSON.stringify(dynamic_filters));
+						frm.dynamic_filters = dynamic_filters;
+						set_filters_in_table(frm.dynamic_filters, table);
+					}
+				},
+				primary_action_label: "Set"
+			});
+
+			dialog.show();
+			dialog.set_values(filters);
+		});
+
+	},
+
 });
+
+function set_filters_in_table(filters, table) {
+	if (!filters.length) {
+		const filter_row = $(`<tr><td colspan="3" class="text-muted text-center">
+			${__("Click to Set Filters")}</td></tr>`);
+		table.find('tbody').html(filter_row);
+	} else {
+		let filter_rows = '';
+		filters.forEach(filter => {
+			filter_rows +=
+				`<tr>
+					<td>${filter[1]}</td>
+					<td>${filter[2] || ""}</td>
+					<td>${filter[3]}</td>
+				</tr>`;
+
+		});
+		table.find('tbody').html(filter_rows);
+	}
+}
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index 7dca736bc8..3d42b340d1 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -18,6 +18,9 @@
   "stats_time_interval",
   "filters_section",
   "filters_json",
+  "dynamic_filters_section",
+  "dynamic_filters_json",
+  "section_break_16",
   "color"
  ],
  "fields": [
@@ -113,10 +116,31 @@
    "options": "Module Def",
    "show_days": 1,
    "show_seconds": 1
+  },
+  {
+   "fieldname": "dynamic_filters_json",
+   "fieldtype": "Code",
+   "label": "Dynamic Filters JSON",
+   "options": "JSON",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "fieldname": "section_break_16",
+   "fieldtype": "Section Break",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "fieldname": "dynamic_filters_section",
+   "fieldtype": "Section Break",
+   "label": "Dynamic Filters Section",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
  "links": [],
- "modified": "2020-06-08 13:15:58.741945",
+ "modified": "2020-06-09 14:17:53.145201",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index dfeee2e010..f737c6ad12 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -97,6 +97,28 @@ frappe.dashboard_utils = {
 
 	get_year(date_str) {
 		return date_str.substring(0, date_str.indexOf('-'));
+	},
+
+	remove_common_static_filter_values(static_filters, dynamic_filters) {
+		if (dynamic_filters) {
+			if ($.isArray(static_filters)) {
+				static_filters = static_filters.filter(static_filter => {
+					for (let dynamic_filter of dynamic_filters) {
+						if (static_filter[0] == dynamic_filter[0]
+							&& static_filter[1] == dynamic_filter[1]) {
+							return false;
+						}
+					}
+					return true;
+				});
+			} else {
+				for (let key of Object.keys(dynamic_filters)) {
+					delete static_filters[key];
+				}
+			}
+		}
+
+		return static_filters;
 	}
 
 };
\ No newline at end of file

From fa4dc48b33981c26f1d4e3b9a8afdc143ac3f886 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 9 Jun 2020 14:39:03 +0530
Subject: [PATCH 110/345] fix: description for dynamic filters

---
 .../doctype/dashboard_chart/dashboard_chart.js    | 15 ++++++++++++++-
 frappe/desk/doctype/number_card/number_card.js    | 15 ++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index ac2a15ee0a..812622d33c 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -435,7 +435,20 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.trigger('set_dynamic_filters_in_table');
 
 		let filters = JSON.parse(frm.doc.filters_json || '[]');
-		let fields = [];
+		let fields = [
+			{
+				fieldtype: 'HTML',
+				fieldname: 'description',
+				options:
+					`<div>
+						<p>Set dynamic filter values in JavaScript for the required fields here.
+						</p>
+						<p>Ex:
+							<code>frappe.defaults.get_user_default("Company")</code>
+						</p>
+					</div>`
+			}
+		];
 
 		if (is_document_type) {
 			if (frm.dynamic_filters) {
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index ccabf5a823..d7abe57e2a 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -146,7 +146,20 @@ frappe.ui.form.on('Number Card', {
 		set_filters_in_table(frm.dynamic_filters, table);
 
 		let filters = JSON.parse(frm.doc.filters_json || '[]');
-		let fields = [];
+		let fields = [
+			{
+				fieldtype: 'HTML',
+				fieldname: 'description',
+				options:
+					`<div>
+						<p>Set dynamic filter values in JavaScript for the required fields here.
+						</p>
+						<p>Ex:
+							<code>frappe.defaults.get_user_default("Company")</code>
+						</p>
+					</div>`
+			}
+		];
 
 		if (frm.dynamic_filters.length) {
 			filters = [...filters, ...frm.dynamic_filters];

From 6f83e81d6f62e6695ff66c96f5fce4f1a22644ad Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 6 Jul 2020 12:17:05 +0530
Subject: [PATCH 111/345] fix: error name

---
 frappe/utils/dashboard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index 07142f6ece..c4fef37575 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -118,5 +118,5 @@ def make_records(path, filters=None):
 				doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
 				import_doc(doc_dict)
 			except FileNotFoundError:
-				frappe.log_error(message=frappe.get_traceback(), title="Dashboard Sync")
+				frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
 				pass

From 7bbf4ef7db581b3b6759726e4e49776d61511a4e Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Mon, 6 Jul 2020 12:39:29 +0530
Subject: [PATCH 112/345] refactor: fix grammar (#10930)

---
 frappe/website/module_onboarding/website/website.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/website/module_onboarding/website/website.json b/frappe/website/module_onboarding/website/website.json
index 92c2351d32..4ed2fd9807 100644
--- a/frappe/website/module_onboarding/website/website.json
+++ b/frappe/website/module_onboarding/website/website.json
@@ -33,7 +33,7 @@
   }
  ],
  "subtitle": "Blogs, Website View Tracking, and more.",
- "success_message": "Yayy! Your Website is all set up!",
+ "success_message": "Yayy! Your website is all set up!",
  "title": "Let's Set Up Your Website",
  "user_can_dismiss": 1
-}
\ No newline at end of file
+}

From fc8bd551c7b541cd26be14277c22047b8356576e Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 6 Jul 2020 12:35:35 +0530
Subject: [PATCH 113/345] fix(patch): patch to set _assign for docs with closed
 todos

---
 frappe/patches.txt                            |  3 ++-
 .../v12_0/set_correct_assign_value_in_docs.py | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 frappe/patches/v12_0/set_correct_assign_value_in_docs.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index 6c4c75aca9..7a996956dd 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -264,6 +264,7 @@ frappe.patches.v11_0.make_all_prepared_report_attachments_private #2019-11-26
 frappe.patches.v12_0.setup_email_linking
 frappe.patches.v12_0.fix_home_settings_for_all_users
 frappe.patches.v12_0.change_existing_dashboard_chart_filters
+frappe.patches.v12_0.set_correct_assign_value_in_docs
 execute:frappe.delete_doc("Test Runner")
 execute:frappe.delete_doc_if_exists('DocType', 'Google Maps Settings')
 execute:frappe.db.set_default('desktop:home_page', 'workspace')
@@ -290,4 +291,4 @@ execute:frappe.delete_doc("DocType", "Onboarding Slide Field")
 execute:frappe.delete_doc("DocType", "Onboarding Slide Help Link")
 frappe.patches.v13_0.update_date_filters_in_user_settings
 frappe.patches.v13_0.update_duration_options
-frappe.patches.v13_0.replace_old_data_import # 2020-06-24
+frappe.patches.v13_0.replace_old_data_import # 2020-06-24
\ No newline at end of file
diff --git a/frappe/patches/v12_0/set_correct_assign_value_in_docs.py b/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
new file mode 100644
index 0000000000..420a294b8e
--- /dev/null
+++ b/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
@@ -0,0 +1,20 @@
+import frappe
+
+def execute():
+	frappe.reload_doc('desk', 'doctype', 'todo')
+
+	closed_todos = frappe.get_all(
+		'ToDo',
+		fields = ['name', 'reference_type', 'reference_name', 'owner'],
+		filters = {
+			'status': 'Closed'
+		}
+	)
+
+	for doc in closed_todos:
+		if doc.reference_type and doc.reference_name:
+			assignments = frappe.db.get_value(doc.reference_type, doc.reference_name, '_assign')
+			assignments = frappe.parse_json(assignments) or []
+			if isinstance(assignments, list) and doc.owner not in assignments:
+				assignments.append(doc.owner)
+				frappe.db.set_value(doc.reference_type, doc.reference_name, '_assign', frappe.as_json(assignments))

From 785ff483886e231beb229a5db31b0f25606910ce Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 6 Jul 2020 22:40:10 +0530
Subject: [PATCH 114/345] fix: Cast name values to string for link checking

---
 frappe/core/doctype/data_import/importer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index ec3cccc1b1..cff9fc275b 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -957,7 +957,7 @@ class Column:
 
 		if self.df.fieldtype == 'Link':
 			# find all values that dont exist
-			values = list(set([v for v in self.column_values[1:] if v]))
+			values = list(set([cstr(v) for v in self.column_values[1:] if v]))
 			exists = [d.name for d in frappe.db.get_all(self.df.options, filters={'name': ('in', values)})]
 			not_exists = list(set(values) - set(exists))
 			if not_exists:

From a71f9cdb886ebecdc6059b27d515e39c5d619c01 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 6 Jul 2020 22:40:47 +0530
Subject: [PATCH 115/345] fix: Strip spaces from label for column matching

---
 frappe/core/doctype/data_import/importer.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index cff9fc275b..f1d0422458 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -1060,6 +1060,7 @@ def build_fields_dict_for_column_matching(parent_doctype):
 		# other fields
 		fields = get_standard_fields(doctype) + frappe.get_meta(doctype).fields
 		for df in fields:
+			label = (df.label or '').strip()
 			fieldtype = df.fieldtype or "Data"
 			parent = df.parent or parent_doctype
 			if fieldtype not in no_value_fields:
@@ -1068,12 +1069,12 @@ def build_fields_dict_for_column_matching(parent_doctype):
 					# Label
 					# label
 					# Label (label)
-					if not out.get(df.label):
+					if not out.get(label):
 						# if Label is already set, don't set it again
 						# in case of duplicate column headers
-						out[df.label] = df
+						out[label] = df
 					out[df.fieldname] = df
-					label_with_fieldname = "{0} ({1})".format(df.label, df.fieldname)
+					label_with_fieldname = "{0} ({1})".format(label, df.fieldname)
 					out[label_with_fieldname] = df
 				else:
 					# in case there are multiple table fields with the same doctype
@@ -1084,7 +1085,7 @@ def build_fields_dict_for_column_matching(parent_doctype):
 						"fields", {"fieldtype": ["in", table_fieldtypes], "options": parent}
 					)
 					for table_field in table_fields:
-						by_label = "{0} ({1})".format(df.label, table_field.label)
+						by_label = "{0} ({1})".format(label, table_field.label)
 						by_fieldname = "{0}.{1}".format(table_field.fieldname, df.fieldname)
 
 						# create a new df object to avoid mutation problems

From e70f7fa706fa7fc851fcb67f0bb17c114b9f8749 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 6 Jul 2020 22:54:49 +0530
Subject: [PATCH 116/345] fix: Show message if URL without gid is errored

---
 frappe/utils/csvutils.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frappe/utils/csvutils.py b/frappe/utils/csvutils.py
index f73f80582a..9bda61ee8d 100644
--- a/frappe/utils/csvutils.py
+++ b/frappe/utils/csvutils.py
@@ -191,7 +191,6 @@ def get_csv_content_from_google_sheets(url):
 		'Accept': 'text/csv'
 	}
 	response = requests.get(url, headers=headers)
-	response.raise_for_status()
 
 	if response.ok:
 		# if it returns html, it couldn't find the CSV content
@@ -202,6 +201,11 @@ def get_csv_content_from_google_sheets(url):
 				title=_("Invalid URL")
 			)
 		return response.content
+	elif response.status_code == 400:
+		frappe.throw(_('Google Sheets URL must end with "gid={number}". Copy and paste the URL from the browser address bar and try again.'),
+			title=_("Incorrect URL"))
+	else:
+		response.raise_for_status()
 
 def validate_google_sheets_url(url):
 	if "docs.google.com/spreadsheets" not in url:

From 974f00c771b02eed37650fe21bbc5c7ede58c1c2 Mon Sep 17 00:00:00 2001
From: Afshan <afshan13k@gmail.com>
Date: Tue, 7 Jul 2020 12:45:46 +0530
Subject: [PATCH 117/345] fix: showing a clear message to user about error

---
 frappe/database/mariadb/schema.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/database/mariadb/schema.py b/frappe/database/mariadb/schema.py
index e806e8e415..4bbecd2a2e 100644
--- a/frappe/database/mariadb/schema.py
+++ b/frappe/database/mariadb/schema.py
@@ -82,5 +82,7 @@ class MariaDBTable(DBTable):
 				fieldname = str(e).split("'")[-2]
 				frappe.throw(_("{0} field cannot be set as unique in {1}, as there are non-unique existing values").format(
 					fieldname, self.table_name))
+			elif e.args[0]==1067:
+				frappe.throw(str(e.args[1]))
 			else:
 				raise e

From ccaa607b2bb78af88d819e01f547c47e7a9fd4a5 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 7 Jul 2020 12:56:07 +0530
Subject: [PATCH 118/345] fix: use get_seen_class as class method

---
 frappe/public/js/frappe/list/list_view.js         | 11 +++++++----
 frappe/public/js/frappe/views/inbox/inbox_view.js |  3 +--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 5e95521c04..f6611287a7 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -784,6 +784,12 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		return '#Form/' + this.doctype + '/' + docname;
 	}
 
+	get_seen_class(doc) {
+		return JSON.parse(doc._seen || '[]').includes(frappe.session.user)
+			? ''
+			: 'bold';
+	}
+
 	get_subject_html(doc) {
 		let user = frappe.session.user;
 		let subject_field = this.columns[0].df;
@@ -795,10 +801,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		let heart_class = liked_by.includes(user) ?
 			'liked-by' : 'text-extra-muted not-liked';
 
-		const seen = this.get_seen
-			? this.get_seen(doc)
-			: JSON.parse(doc._seen || '[]')
-				.includes(user) ? '' : 'bold';
+		const seen = this.get_seen_class(doc);
 
 		let subject_html = `
 			<input class="level-item list-row-checkbox hidden-xs" type="checkbox" data-name="${escape(doc.name)}">
diff --git a/frappe/public/js/frappe/views/inbox/inbox_view.js b/frappe/public/js/frappe/views/inbox/inbox_view.js
index 5bde09b4f9..1085e93e6c 100644
--- a/frappe/public/js/frappe/views/inbox/inbox_view.js
+++ b/frappe/public/js/frappe/views/inbox/inbox_view.js
@@ -48,7 +48,6 @@ frappe.views.InboxView = class InboxView extends frappe.views.ListView {
 		this.email_account = frappe.get_route()[3];
 		this.page_title = this.email_account;
 		this.filters = this.get_inbox_filters();
-		this.get_seen = (doc) => this.set_seen(doc);
 	}
 
 	setup_columns() {
@@ -70,7 +69,7 @@ frappe.views.InboxView = class InboxView extends frappe.views.ListView {
 		});
 	}
 
-	set_seen(doc) {
+	get_seen_class(doc) {
 		const seen =
 			Boolean(doc.seen) || JSON.parse(doc._seen || '[]').includes(frappe.session.user)
 				? ''

From 338151a7e5e067ec3e566025b1c99b04621432e3 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Tue, 7 Jul 2020 11:22:37 +0530
Subject: [PATCH 119/345] fix: correctly format sql query

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/contact/contact.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 598e186ee8..e340c7e2d0 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -205,14 +205,14 @@ def contact_query(doctype, txt, searchfield, start, page_len, filters):
 			`tabDynamic Link`.parenttype = 'Contact' and
 			`tabDynamic Link`.link_doctype = %(link_doctype)s and
 			`tabDynamic Link`.link_name = %(link_name)s and
-			`tabContact`.`{key}` like %(txt)s
-			{mcond}
+			`tabContact`.`%(key)s` like %(txt)s
+			%(mcond)s
 		order by
 			if(locate(%(_txt)s, `tabContact`.name), locate(%(_txt)s, `tabContact`.name), 99999),
 			`tabContact`.idx desc, `tabContact`.name
-		limit %(start)s, %(page_len)s """.format(
-			mcond=get_match_cond(doctype),
-			key=searchfield), {
+		limit %(start)s, %(page_len)s """, {
+			'mcond': get_match_cond(doctype),
+			'key': searchfield,
 			'txt': '%' + txt + '%',
 			'_txt': txt.replace("%", ""),
 			'start': start,

From 599055e58d51adf3e9cbdb25a6b6a46d0bfdf0dd Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 7 Jul 2020 13:05:55 +0530
Subject: [PATCH 120/345] chore: Update readme logo

---
 .github/frappe-framework-logo.png | Bin 5053 -> 0 bytes
 .github/frappe-framework-logo.svg |   4 ++++
 README.md                         |   6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)
 delete mode 100644 .github/frappe-framework-logo.png
 create mode 100644 .github/frappe-framework-logo.svg

diff --git a/.github/frappe-framework-logo.png b/.github/frappe-framework-logo.png
deleted file mode 100644
index 5049078a460b834a07ec893b6554b26cfaf38c17..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5053
zcmciGWmHt(-UslRVL-Y;x}-Z4=~h5sL>dVPBm`+`qy+?#Zlt9CFmyLFAl)Dcj0{7H
zlyt}dcf3A#t>=07yt-@cbM{*M#M-~}Vt@AcMC(G-NeCGT0RRArriPjxwjca+;NxM>
zl_piW*bZ#3tfLG7)W#EGtZ)GUDo;%{WdmQ}UXH9QlR9k#EbB8MF?ll7TMR%#U$g-&
z)=*SyV(-l?gTo%+OOubzgPFB-Imj*fC{z(Wlo<B7QIa_=>yKQbmNGS<WNJ3YlC#|0
zeMCp8`mX=!Cp^6CjQw)6<w|6Ac~#-8Eadh1XpH2x_sBnH&&%4T%7ry&Q=c{ZXeUK|
z<j9|m#>|qVNbVi0!B`{CQRDi7Qrih8&9^7NZmTlpE}hHNn^UH}_*^Xn!u<;Txx5a)
z@Gd3zsq)R}_B`P^4tS{e_BO{vQ>L%9x=Y-60#$zH@rCE8{TW7M-ys^_Rn*?@rYV1U
z6L6hfELXu3;C9drv#+ebDzSB%g9YYnEk)R@3~g`c5!Lfkv+eAZcpp6uyf@W?5O{a`
zTRaf2rHAgc#@keW5jEGcs3vxO+`Q~qX<WKYH?zp=AJOs(;TAC^<Ch^Qr0{!W7Di>N
zL!8haERmO0vX}<K{QTU1=-Uqdk~!cHsZ_jezlmD<B%J&Esp9QX8MwbmtY52h`Z=ps
ze#LS}kh37n#^70>+jU>MUHz<q2t89FZ$u+=P*^wm;f09c&f*-rD(~i$wYK_HFRc@N
zM^G76Q{X)E%1D)6!53PE3Ht0E`z$X4KT}eNJHPSwN@v#d0E|g@Zbx&rd|X^yRfmlH
zve+=#u)1MdQBY{ST1Z5MtcIZ_jID>B$%Q|5%-qf6^_Ba{!j#?3wL_t01RYZi6)<~I
za=l!Zob7e6;quY&)Gw6Ow-xmZ3GmK&@XZEtvWjWR9Lngli;CRHH4~IeSYv4l4!Bh|
zkB<q_-2BR%N4CF!Bb_Vlzisx4dIPaE7=D$rf9E_7;hP%p`!VxDsNDT#i|;J%M~ADn
zjoWK9qLv$yFLIdB1sAJawRs?v%b3ut(XlZ+$4s!{ji}VFEL@%R;PqnM2K%wMtU40{
zD2Hz||EcgvHJbyGpFVRPh3J4DqV+zv@MsxLy3oD@(Is+5m0(h3Nlm3dSlPYK&A}a4
zX#Xe8x|e?77#hD%K5aKa!Nc?+yB0k$cfi@%?#_G|PI1WC*6*;5`%3H10|O>227aKe
zopq<AhpJO^u!<KM(_5*ppKrtIAK0y@hCsfSf3Spar6L`3)h()%S}$k87IU5cv6-@5
z=;39Dbgxn_0Y!-vcEmZ;2G1C^Di?Zm+3+7@J-o{^?(0cDgW&0^B!ZUX=KedLiBH>d
zHIR0=gp{qUOj*B%myfu4fBQ#>qlJu4aNSM1%M((mg4ZM#=B)~d36P4`K5HpwvJ4Vz
z{b%t(NxZ71FwNUMa~>e&AOj&m7+3=;1+-L-e6wOisX-vBWI~|<B?jUR(n(=Hfa%yO
za5zOH0XR0qOgE1}#N=~8N;=gLpg11sEeFuk2op|c7ZoB9+&(-|@<SI7J1}d<tt~4E
zs=^3Sf~UR-qySm9qvJrOrtH`vJ<dLMSr!mSdk)5QvDNFfj_{Vs27mC?IZ1Zl)D?*7
zViHuc0*zxVBK)~*;Sz(ER&C$K{IRbhS*ZV0il$@_Zc&GnVII8e1BFhA*bF$f)pD<p
z*iUxQ<#Y#6ix>RqH+@z}t=@$5Qyefyg82BAT4$39kyd*IAd)2_j~PNfn(|P2YF1#L
z7#Ye>lHl24L=oya7-!nb&35A@Ei4ifRqM>2@w4rpyJKXMKc2K)3Z;dql&g&&KBD?@
zxIz)~V&w&Enz9aU5=h}FC|%A<z-c^w4~*Y%FF%1lco60Rq2Yj{jae7jp!hi?{|r6p
zBkHn5Jf6>b9S*;Ngh09U*%y1nONYtlkIIB`V|1M;3r5j9G)}ul>0x^wr+YbU$zJEV
z{>nK$mcn9H%0JI8^-ulq?OneLB$@|Nltb84TwH@r5CB-N06squs-i&W_OgPyp;d=1
zJ(QGP3QDmX@>QJQ`jtYMPMNc+3(lP?w${V<7uxJzR2w7BZ&>7j-*;U1<n)&#D4CYN
z=vIsOA$0_OZh!dGzjZV7TKnCYSi#MJzhO3GfK-tuq<H)-L3Q})C%@P`9?KI<k1}kA
zn~{{9mfNY|0Wp@rt32u7&UtifQUJo1GW;SVMyB!xRx7~HtMycG(vIQN)23|;UL|0&
z(9yzT0#ywavufFaFYJuG+M|8h=wn^CZpiu_)m<w8$V?mL$G5USQ24uA<L$55eU|V|
z?4ps@d6N>_Tu7%`SfD4XGLat&-=v6GA6LUCEWsuGIR)61GqLUasMY;nGS#9>DNmle
z_~1CAU-C%LNKV>X`2K3$_BGMtBjm#Q*<_HzPlKMqn!sFGaksMvP00QNBxxhOTsZiU
zuZOVHqkcR&!U+xGR092%8wCY=FlK3d6+bdUU39mfcG_d%o&bb~jV}9qx3Wz{Ng*+>
zQp`YgH3zAeBj#pif37n!nstj-4|sX(;dw3yk&5vT>Ur-SC!k$c*sjlNQzMLTv+YJ~
z9qp*~EHD8`(A1HldwaR6Rlnd^o-SV3bT={id)nkC8YqljGvjigW}N5B3bB5%Q!F?W
z9GDLWJ1xdO7O)@*#Pd6Vn_ph5?dcBI$8RUhniCxyzP$DyT(*>CW@fhV^YZVaDu<Tb
z<$WnW_JA-wJ^jvGDK}h1W)wm!(r)>MRCI&iM+Kr&W@|5+o0o3dQFJ^>DVa4piXLoA
zY~P0j)D=q(chIQ>xpB)=i0(|KO?%S1asyg?%9<S!gQs86p-ks<b@~%$H{mS`DSvGM
zWo3$T=SpvN7YH+Siy3y#4&}I5O^|AI49f==l3pk&u&lNO<8J<&22~BJu#7Qdo;$u5
zO!oI~8J_}Nn>W)OVXbicAGAdLO~i4B2i(_0L1hdFMa)8&Wup(aZsycN5K(AmX|kpA
zH0@D|OcB67ZUgkjLEAh-UqIN<9?4%@8bz7kNMtguDgmOT<{?U_HO`OBwp3=@8%6V$
z1<@Ifw5_G2px152Q7S5#2(e6qT6y@9cH27i7gh(M(SbhF4NF{t{OaU-zL~o|Y0H8(
zDW}Hz4E{e#ib?GXCWS}-p=#V#8DMH#t=yEpwnwxMeaAR*te!Lr70DlKwyioo|8bI6
zyolGNiQN~aP3Qfz$#E~f-JO-N${wT&Sh6Io&#sfL%DSmH8uOG-lr#o40p@9p{nk`&
zO%GU;z-AqN98lSi9JkqFsi6VV&o%nE$aj0JX`eXv*wgg(HPiN3<)xlj0Fe;mWIcU5
zYffDX5OG3`R8n6JcDc8X640;22jXcwVj8lZXNLo7dsEAd-T`omIO1%?cFCb3^DDy!
z0xBUuJqq<YI&XYYrCm4MavJuK@t9zPB0*)EUK(TLOEB)YL^0@x@tAIzVb_v6_r6(P
zom<m#Q|Je>5{7@*WZ|A#&vb2HRubyW!CZ$w4}$ublVHC_@E)hmy~L;l*2-eVUIN**
zC$|eQ+aB5pwtzE_jHMI{_t_yi>|<G>&Pg9TfYD-*4T^amvCjmfotG<DQR0QS!^al6
z(+cyOdu;8OM&nxS=#)}O!wlvLJGC!|^vr!FTH!Jt@!Ts-wB&#lOC$^K)2JDhx&t*-
z%VaQ@*c~m=M;;C#MQei$r!_?<_OkRVTOQ_?@P4{F@{&)^2OFs@f(UB9&1REw?CvjV
z5GzUcf))V=KBYdCT->Kl*S4&VG90ENMu>~(^C;yz6#V$whGDNhknY3*;shx)C_@EK
z1lLEKg-J_pQ3yXN@Ge~R8y=$R-)5-)F{6yY>CzxQtWozdrSg;Cu8!Xt$pGyxUVKie
z?O`Z_BMYBjWp}^w?QV#>kUVLg$Sa>vl?vz$=5WS@5jL;MNnWu2r6Ytapo&e37!p)n
zGKW4v*t8VqDGB2+tGK}>=W83Jy78jUk;A7eU^u_6<ocN>nlOncRN`65_clJ{<Nfqs
zis5hmmmmruxBnx^z=kC7f~48-Vbu%9pS{uO{I{>O9L*eY`q=BUxF+KcmG-YP3pE~1
zq_{S7X>4^1Ln)aCeA#{lZ*DDeS$v{nn<v5=B2{d}C?Rja$Dm)FgH!Dh*jc&l15Nbe
zMK?WCFk|%i{6?J9k)r+W?mZe7*DID)Lzi=8`LiZ!!UPQTeW1#OXtGm#qHA90Wmk&(
zU7__VM&O7IlJ@FdZb9feO7N15?tCf`EVS--4@%MWA4g&+-&y~4B<0Zmt8s?6Pd1){
zcanrNj>TNDc|es6i}!J3C-MI=By%7r0zsqF1$G)V?@CT|wfz#cm749f-S9E>XEJ~w
z;lJBjxY4dQkK(N9u6ZM?1YRd%hFMJA%K?b_4tv+xK(Q05%LN8xqs$t*X?#CBt#+tf
zBWFdy8Fbdac`Du}tFC9?*Q5k6&d^i$Ij<z+!2L`c6%ix8qe(k^hdu#1f>2J~`XDl9
z2P?B2e!q<RVw~{MDMYA%p9>*8g-d<)T*P*P5%%5Z(^GDMBI1Q}_eUc%!*AjvbZG0*
zRrDf(&Y;9MoVS01MJ#-bMO|Ip*fJ;gm+t);5?997b%uzMkrA9zM>Jtrz14dJP!xZ@
z$+_?z3J?CwA&e&cC3TK()7pC4?`N0=*Hfhsr51?>0rlpo8X>B?d#GJoX{sU2sMh9a
zg8>Mi@}gdGD)&7CM|%I<wlsI|`VMZ5OOmwLK<Rrs?zm|CxJgr7bd{90hM}vMN2%F-
z{hIk-I^HTIJPm(FtZ3O$VHEh@L4~^ha(f*>=07t(8raJd(rordt8vyGUH|3-E)CKo
z3@5|tb$Q25sGpfw8e#?5c`E2W9UgofJ1wBGsDd(xnj&y}@^ZE3({uMSIiyjHynG6v
za)VsDnifb9lN_P-K|r@xr<yInJ5E>%O;zY<`t7bgi%b9!y)9mp1e!%WEO??Qo4gK!
zqlO|@ekeOf5Sa5xC$qn$9+Q#C3NmGtDK7AF!3K(W`i=GSKU|D3En>Ow`&u!~uE1Ev
z`Q{iFjSbGbeO`umGcxhHhPz$f4vLtZhS;_ZaeYQVX#rJSlLhpPh5LQW(Q>ulUW(+m
zi*Ie2_U*rJKHKr<*n>~WE*a9V?>#=L_-<6w@+Q3dkQPP=@zKMpj7@&KT4gj_%W?zx
z>~y<z9@-Ff;#yZben!S<(5pjrv+wzU;G6dI$DkYR;*Y7dAE&^opoZqm+KLC@d|?gP
zWCCLS07E`U|37ZXuU}=osT1L`H@0<4eJX8`G5m-CzPwd&vGa)PD6j)2PFGxLzkxIs
z+aL>G3om=D{g|wN7CZ4+N_m(Sro~wbcp;leYKpDKf?oTiBGMSwg&6|BPw9t$>3)%S
z=;UP-Nmvsz00Wxv-}GaH2B5@z5NvEaIrR3VLKy7dPa4^s>~x=eFt<-;ubplR?B)`5
zaZ@mAZASx(51j8L3;uz1L_v_3?`dh%j+*RPHRoe(yC<O5ycvLLOHuBi?>>)y$x5&f
zu{<G?8A3GFL*>^_!730HYdt}D6Os2U?!MA=t@B5JIt#=XyY#iAFtYyF5%@Nq6|dZ^
zKnEh2Sezp>LBsY67R`00yO6%)xEdPCE75zV&)>eYItpALliQ=jW|3vNbV!Jjz3N1n
z*QII}O;{eW(`f+-NPIFbp?<Ut9vf<SFiza3bU_s~)~F0M=25Ci;*)f?l0I-4DQ%;k
zSBlX1!uk?Q(<0C-Mt1WjgV=hMPRlCm?e5E;av0>O@GdC?mn)F1?2;I9-1`Gbrx$Pk
z1KuSRW-C0@fA$ToGD7zd1uJ`C@MV%PYeXrEoJks1+;{l^PV$jvj}HR4(YlsePxJeu
z$cOruCEV?Q6>;^83%IV#vEOdj4J&N#fTr@HT&!EK6osR-0A2)t6)~;mmZ2JME-7m&
zj`XLfpvH;+i^%(Ii4CMP0i{Sq%=}>BBA8POs|)IObZWxhIs^^iMVEwSK6jR4ET<+(
zpB@i2ZtX%Do%ZtAk>Y-D8nl0{3gL%DstH-&J$Il=AdG*QKz7LAeC0gLs}KR=RHXY8
zIz~B>F6&6G++SM$|4Ad#i+?WMPiU_1E7wkj<<2Rz#pg%Jxq=1t&}E<^S!Io8<pqM(
z2T2+hE}No9ew_z2B}<LPq47EE+DN5zFU^+|h6BC(b@P^yo@V8cRKkO;wv^_$#9qG$
yzC5`q@*^&&>gLg2+}rMZr+)%TT#3H@MR4+!Bys<!1`GCo96<9CM6F5%8ul+M2WVLU

diff --git a/.github/frappe-framework-logo.svg b/.github/frappe-framework-logo.svg
new file mode 100644
index 0000000000..ba04ebf264
--- /dev/null
+++ b/.github/frappe-framework-logo.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 1082 125" fill="none" xmlns="http://www.w3.org/2000/svg">
+	<path d="M1 56.284v67.508h26.904V79.368l47.902-.04V56.248L1 56.284zM82.994 1H1.034v23.043h81.96V1z" fill="#3C88F7"/>
+	<path d="M216.735 75.269V53.233h-52.897V22.505h61.849V.469H138v122.509h25.838v-47.71h52.897zM285.477 59.096c2.645 0 5.29.404 7.731 1.415l3.052-26.281c-2.441-.607-4.883-1.01-7.934-1.01-11.8.201-19.125 6.67-25.635 22.439.61-3.639.814-7.48.814-11.321v-9.3h-23.193v87.94h25.227V72.64c5.697-12.13 15.056-13.544 19.938-13.544zM380.301 125c4.476 0 9.359-1.011 13.428-4.043l-2.442-17.184c-.813.404-1.627.607-2.645.607-2.644 0-4.272-2.426-4.272-6.672v-32.75c0-23.652-16.276-31.739-39.266-31.739-23.193 0-38.655 10.715-41.3 30.728l22.583 1.213c1.22-8.49 7.12-12.533 17.09-12.533 9.358 0 15.869 4.65 15.869 13.949v5.458h-16.683c-26.245 0-41.097 8.895-41.097 27.898 0 18.397 14.648 25.068 31.128 25.068 15.462 0 24.007-6.671 28.89-15.364C363.211 121.563 372.163 125 380.301 125zm-20.752-39.22c0 14.759-10.579 21.228-19.735 21.228-7.324 0-12.41-3.033-12.41-9.704 0-8.086 6.917-11.523 18.107-11.523h14.038zM449.522 55.255c9.562 0 15.055 5.862 15.055 19.003v48.72h25.228V69.001c3.458-8.895 9.358-13.746 16.683-13.746 10.172 0 15.055 5.862 15.055 19.003v48.72h25.228v-54.38c0-24.462-11.8-35.379-32.145-35.379-11.8 0-22.38 5.054-29.297 15.97-4.476-11.118-13.021-15.97-26.856-15.97-13.02 0-22.379 5.66-28.076 17.184.204-2.022.204-3.841.204-5.863V35.04h-23.193v87.939h25.227V69.406c3.459-9.097 8.952-14.151 16.887-14.151zM606.579 125c22.583 0 39.062-8.491 44.148-29.111l-24.21-2.224c-2.442 7.48-8.749 11.725-18.311 11.725-12.614 0-19.531-7.277-20.548-21.429l64.087-.202c.203-2.224.203-4.245.203-6.469 0-28.505-15.462-44.07-43.131-44.07-29.297 0-47.201 18.8-47.201 46.496 0 28.909 17.09 45.284 44.963 45.284zm1.831-72.98c10.783 0 17.09 6.065 17.903 17.184h-37.841c2.441-11.928 9.765-17.184 19.938-17.184zM751.095 122.978h34.18l24.414-87.94H782.63l-15.056 63.479h-1.831l-17.089-63.478h-28.89l-17.497 63.478h-2.035l-15.055-63.478h-27.669l24.617 87.939h34.383l16.48-61.456h1.831l16.276 61.456zM814.935 79.918c0 28.303 16.276 45.082 45.98 45.082 31.535 0 48.828-17.992 48.828-46.093 0-27.898-16.073-45.688-45.573-45.688-31.738 0-49.235 18.599-49.235 46.7zm26.652-.606c0-16.173 8.545-26.079 21.566-26.079 12.614 0 19.938 9.906 19.938 26.079 0 15.768-8.341 25.876-20.955 25.876-12.818 0-20.549-10.108-20.549-25.876zM971.128 59.096c2.645 0 5.289.404 7.731 1.415l3.052-26.281c-2.442-.607-4.883-1.01-7.935-1.01-11.8.201-19.124 6.67-25.635 22.439.611-3.639.814-7.48.814-11.321v-9.3h-23.193v87.94h25.228V72.64c5.696-12.13 15.055-13.544 19.938-13.544zM1070.4 125c3.46 0 7.33-.404 10.79-1.819l-1.83-21.227c-.82.202-1.63.404-3.26.404-4.27 0-7.12-2.224-11.39-7.682l-16.48-21.833L1082 35.039h-27.67l-34.18 36.793h-.61V1.5h-25.227v121.478h25.227v-20.62l10.78-12.534 14.45 19.61c8.95 12.938 15.87 15.566 25.63 15.566z" fill="#000"/>
+</svg>
diff --git a/README.md b/README.md
index 7545249610..1f59376f48 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 <div align="center">
-    <img src=".github/frappe-framework-logo.png" height="150">
     <h1>
+        <br>
         <a href="https://frappeframework.com">
-            frappe
+            <img src=".github/frappe-framework-logo.svg" height="50">
         </a>
     </h1>
     <h3>
-        a web framework with <a href="https://www.youtube.com/watch?v=LOjk3m0wTwg">"batteries included"
+        a web framework with <a href="https://www.youtube.com/watch?v=LOjk3m0wTwg">"batteries included"</a>
     </h3>
     <h5>
         it's pronounced - <em>fra-pay</em>

From 56ca4cc1baebd4cb68c9621187c11ce895831e15 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 7 Jul 2020 13:18:10 +0530
Subject: [PATCH 121/345] fix: group todos by reference type and name

---
 .../v12_0/set_correct_assign_value_in_docs.py | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/frappe/patches/v12_0/set_correct_assign_value_in_docs.py b/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
index 420a294b8e..55b0c89ab8 100644
--- a/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
+++ b/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
@@ -3,18 +3,25 @@ import frappe
 def execute():
 	frappe.reload_doc('desk', 'doctype', 'todo')
 
-	closed_todos = frappe.get_all(
-		'ToDo',
-		fields = ['name', 'reference_type', 'reference_name', 'owner'],
-		filters = {
-			'status': 'Closed'
-		}
-	)
+	if frappe.db.db_type == 'mariadb':
+		fields = 'name, reference_type, reference_name, group_concat(distinct owner) as owner'
+	else:
+		fields = 'name, reference_type, reference_name, string_agg(distinct owner, ",") as owner'
+
+	closed_todos = frappe.db.sql('''
+		SELECT
+			{fields}
+		FROM
+			`tabTodo`
+		WHERE
+			reference_type != '' and reference_name != '' and
+			status = 'Closed'
+		GROUP BY
+			reference_type, reference_name
+	'''.format(fields=fields), as_dict=True)
 
 	for doc in closed_todos:
-		if doc.reference_type and doc.reference_name:
-			assignments = frappe.db.get_value(doc.reference_type, doc.reference_name, '_assign')
-			assignments = frappe.parse_json(assignments) or []
-			if isinstance(assignments, list) and doc.owner not in assignments:
-				assignments.append(doc.owner)
-				frappe.db.set_value(doc.reference_type, doc.reference_name, '_assign', frappe.as_json(assignments))
+		assignments = frappe.db.get_value(doc.reference_type, doc.reference_name, '_assign')
+		assignments = frappe.parse_json(assignments) or []
+		unique_assignments = list(set(doc.owner.split(',') + assignments))
+		frappe.db.set_value(doc.reference_type, doc.reference_name, '_assign', frappe.as_json(unique_assignments))

From 55d1df52490df90ecfff9766f89a473a4c9391fe Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Tue, 7 Jul 2020 13:57:34 +0530
Subject: [PATCH 122/345] refactor: remove unnecessary translate

---
 frappe/public/js/frappe/widgets/onboarding_widget.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index e4a5265f47..3aab701858 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -136,7 +136,7 @@ export default class OnboardingWidget extends Widget {
 		if (step.is_single) {
 			route = `Form/${step.reference_document}`;
 		} else {
-			route = __(`Form/${step.reference_document}/{0} {1}`, [__('New'), __(step.reference_document)]);
+			route = `Form/${step.reference_document}/{__('New')} {__(step.reference_document)}`;
 		}
 
 		let current_route = frappe.get_route();
@@ -262,7 +262,7 @@ export default class OnboardingWidget extends Widget {
 			frappe.route_hooks.after_save = callback;
 		}
 
-		frappe.set_route(__(`Form/${step.reference_document}/{0} {1}`, [__('New'), __(step.reference_document)]));
+		frappe.set_route(`Form/${step.reference_document}/{__('New')} {__(step.reference_document)}`);
 	}
 
 	show_quick_entry(step) {

From f89978baac6e93ab27df123f28ac3adac105d8ae Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Tue, 7 Jul 2020 13:58:18 +0530
Subject: [PATCH 123/345] fix: template literals syntax

---
 frappe/public/js/frappe/widgets/onboarding_widget.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index 3aab701858..9b4c9973e2 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -136,7 +136,7 @@ export default class OnboardingWidget extends Widget {
 		if (step.is_single) {
 			route = `Form/${step.reference_document}`;
 		} else {
-			route = `Form/${step.reference_document}/{__('New')} {__(step.reference_document)}`;
+			route = `Form/${step.reference_document}/${__('New')} ${__(step.reference_document)}`;
 		}
 
 		let current_route = frappe.get_route();
@@ -262,7 +262,7 @@ export default class OnboardingWidget extends Widget {
 			frappe.route_hooks.after_save = callback;
 		}
 
-		frappe.set_route(`Form/${step.reference_document}/{__('New')} {__(step.reference_document)}`);
+		frappe.set_route(`Form/${step.reference_document}/${__('New')} ${__(step.reference_document)}`);
 	}
 
 	show_quick_entry(step) {

From b7e0d92a516036a2285e4085a50e2c1cb4025d75 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 7 Jul 2020 14:16:52 +0530
Subject: [PATCH 124/345] fix: better code

---
 .../v12_0/set_correct_assign_value_in_docs.py | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/frappe/patches/v12_0/set_correct_assign_value_in_docs.py b/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
index 55b0c89ab8..a9ce2da128 100644
--- a/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
+++ b/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
@@ -3,25 +3,29 @@ import frappe
 def execute():
 	frappe.reload_doc('desk', 'doctype', 'todo')
 
-	if frappe.db.db_type == 'mariadb':
-		fields = 'name, reference_type, reference_name, group_concat(distinct owner) as owner'
-	else:
-		fields = 'name, reference_type, reference_name, string_agg(distinct owner, ",") as owner'
-
-	closed_todos = frappe.db.sql('''
+	query = '''
 		SELECT
-			{fields}
+			name, reference_type, reference_name, {} as assignees
 		FROM
 			`tabTodo`
 		WHERE
-			reference_type != '' and reference_name != '' and
-			status = 'Closed'
+			not reference_type IS NULL and not reference_name IS NULL
 		GROUP BY
 			reference_type, reference_name
-	'''.format(fields=fields), as_dict=True)
+	'''
 
-	for doc in closed_todos:
-		assignments = frappe.db.get_value(doc.reference_type, doc.reference_name, '_assign')
-		assignments = frappe.parse_json(assignments) or []
-		unique_assignments = list(set(doc.owner.split(',') + assignments))
-		frappe.db.set_value(doc.reference_type, doc.reference_name, '_assign', frappe.as_json(unique_assignments))
+	assignments = frappe.db.multisql({
+		'mariadb': query.format('GROUP_CONCAT(DISTINCT `owner`)'),
+		'postgres': query.format('STRING_AGG(DISTINCT "owner", ",")')
+	}, as_dict=True)
+
+	for doc in assignments:
+		assignments = doc.assignees.split(',')
+		print('assignments', assignments)
+		frappe.db.set_value(
+			doc.reference_type,
+			doc.reference_name,
+			'_assign',
+			frappe.as_json(assignments),
+			update_modified=False
+		)

From f1f8d0a7224709e4bbaf9eb9f99b5b427121f5b8 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Tue, 7 Jul 2020 14:59:28 +0530
Subject: [PATCH 125/345] fix: use search instead of match to find url and
 email

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/templates/includes/comments/comments.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/templates/includes/comments/comments.py b/frappe/templates/includes/comments/comments.py
index abee98f9b4..5b1509aa60 100644
--- a/frappe/templates/includes/comments/comments.py
+++ b/frappe/templates/includes/comments/comments.py
@@ -20,7 +20,7 @@ def add_comment(comment, comment_email, comment_by, reference_doctype, reference
 	url_regex = re.compile(r"http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+", re.IGNORECASE)
 	email_regex = re.compile(r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)", re.IGNORECASE)
 
-	if url_regex.match(comment) or email_regex.match(comment):
+	if url_regex.search(comment) or email_regex.search(comment):
 		frappe.msgprint(_('Comments cannot have links or email addresses'))
 		return False
 

From 79dfe7e0d47d177afe24411b8e4c4ce6976d32f8 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 7 Jul 2020 19:14:14 +0530
Subject: [PATCH 126/345] fix: render_list in kanban view

---
 frappe/public/js/frappe/list/list_view.js           | 2 +-
 frappe/public/js/frappe/views/kanban/kanban_view.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 36634c1ff5..b8239b170a 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -1150,7 +1150,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 					});
 					this.toggle_result_area();
 					this.render_list();
-					if (this.$checks.length) {
+					if (this.$checks && this.$checks.length) {
 						this.set_rows_as_checked();
 					}
 				});
diff --git a/frappe/public/js/frappe/views/kanban/kanban_view.js b/frappe/public/js/frappe/views/kanban/kanban_view.js
index 4b6792330f..4acde8042c 100644
--- a/frappe/public/js/frappe/views/kanban/kanban_view.js
+++ b/frappe/public/js/frappe/views/kanban/kanban_view.js
@@ -73,6 +73,10 @@ frappe.views.KanbanView = class KanbanView extends frappe.views.ListView {
 		});
 	}
 
+	render_list() {
+
+	}
+
 	on_filter_change() {
 		if (JSON.stringify(this.board.filters_array) !== JSON.stringify(this.filter_area.get())) {
 			this.page.set_indicator(__('Not Saved'), 'orange');

From 241062aa0b1bad4948318ea3b3d99f19479a99db Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 7 Jul 2020 23:22:09 +0530
Subject: [PATCH 127/345] feat: update frappe charts

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 3167db9e13..d6bb3ccda4 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "driver.js": "^0.9.8",
     "express": "^4.17.1",
     "fast-deep-equal": "^2.0.1",
-    "frappe-charts": "^1.3.2",
+    "frappe-charts": "^1.5.1",
     "frappe-datatable": "^1.15.1",
     "frappe-gantt": "^0.5.0",
     "fuse.js": "^3.4.6",
diff --git a/yarn.lock b/yarn.lock
index 45a33c5d42..e8f0f40d09 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2333,10 +2333,10 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-frappe-charts@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-1.3.2.tgz#28b26637f03efeb86a07a2a9180c0ef2d5f52c56"
-  integrity sha512-9VscidL7TUxgnI8dM+s0WIphnthUsDwnknHFnUH1zsISWzuw1FEUd2v29cn+E1+eNlD1a0bNBd+rJPtMdMnnvQ==
+frappe-charts@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-1.5.1.tgz#77b9e61400b1657d4ca2eb2202053e3a4d18d54b"
+  integrity sha512-Cvj6IyDkiH6LKw558A8syJUmkQSdNVnfC+WAzDaAtOfs+u2nST6HExA6JUZMaHU4+VJhC2PWwyRjRNw3B5FaUQ==
 
 frappe-datatable@^1.15.1:
   version "1.15.1"

From 74222a0e4bb868f3491de11ebb341fafccb43031 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 8 Jul 2020 11:26:01 +0530
Subject: [PATCH 128/345] fix(install-app): Handle all exceptions thrown

---
 frappe/commands/site.py | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index 0f51f21104..530a662886 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -201,16 +201,31 @@ def _reinstall(site, admin_password=None, mariadb_root_username=None, mariadb_ro
 def install_app(context, apps):
 	"Install a new app to site, supports multiple apps"
 	from frappe.installer import install_app as _install_app
+	exit_code = 0
+
+	if not context.sites:
+		raise SiteNotSpecifiedError
+
 	for site in context.sites:
 		frappe.init(site=site)
 		frappe.connect()
-		try:
-			for app in apps:
+
+		for app in apps:
+			try:
 				_install_app(app, verbose=context.verbose)
-		finally:
-			frappe.destroy()
-	if not context.sites:
-		raise SiteNotSpecifiedError
+			except frappe.IncompatibleApp as err:
+				err_msg = ":\n{}".format(err) if str(err) else ""
+				print("App {} is Incompatible with Site {}{}".format(app, site, err_msg))
+				exit_code = 1
+			except Exception as err:
+				err_msg = ":\n{}".format(err if str(err) else frappe.get_traceback())
+				print("An error occurred while installing {}{}".format(app, err_msg))
+				exit_code = 1
+
+		frappe.destroy()
+
+	sys.exit(exit_code)
+
 
 @click.command('list-apps')
 @pass_context

From 1fbec2c8a62e296a6f1170b1358f7b2077b2e673 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Wed, 8 Jul 2020 12:22:37 +0530
Subject: [PATCH 129/345] fix: prevent rendering arbitrary html

prevents xss inside:

* awesome bar
* base template

the base template rendering issue causes site-wide xss, which can be
prevented by html-escaping the canonical url that is placed inside <head>

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/public/js/frappe/ui/toolbar/awesome_bar.js | 2 +-
 frappe/website/context.py                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
index 3e59986928..e11adcfb66 100644
--- a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
+++ b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
@@ -228,7 +228,7 @@ frappe.search.AwesomeBar = Class.extend({
 		}
 
 		this.options.push({
-			label: __("Search for '{0}'", [txt.bold()]),
+			label: __("Search for '{0}'", [frappe.utils.xss_sanitise(txt).bold()]),
 			value: __("Search for '{0}'", [txt]),
 			match: txt,
 			index: 100,
diff --git a/frappe/website/context.py b/frappe/website/context.py
index abb4cc7f7e..ec56489c66 100644
--- a/frappe/website/context.py
+++ b/frappe/website/context.py
@@ -25,7 +25,7 @@ def get_context(path, args=None):
 		context["path"] = path
 		scheme = 'http'
 
-	context.canonical = scheme + '://' + frappe.local.site + '/' + context.path
+	context.canonical = scheme + '://' + frappe.local.site + '/' + frappe.utils.escape_html(context.path)
 	context.route = context.path
 	context = build_context(context)
 

From 1c2b06829c597d2287b7546b1a28661be44735c6 Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Wed, 8 Jul 2020 12:37:15 +0530
Subject: [PATCH 130/345] fix: Remove unnecessary try catch

- Try catch only caught name errors that handle themselves wherever they occur
- Catching a well handled exception to raise it again is pointless
---
 frappe/desk/form/save.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frappe/desk/form/save.py b/frappe/desk/form/save.py
index 6afe201089..cae1bf5c77 100644
--- a/frappe/desk/form/save.py
+++ b/frappe/desk/form/save.py
@@ -18,11 +18,7 @@ def savedocs(doc, action):
 		if doc.docstatus==1:
 			doc.submit()
 		else:
-			try:
-				doc.save()
-			except frappe.NameError as e:
-				# Duplicate Error message already shown on db_insert
-				raise
+			doc.save()
 
 		# update recent documents
 		run_onload(doc)

From 1cce4f9bed49f5e871d8b84b1556b44f298f6b6f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Wed, 8 Jul 2020 14:32:38 +0530
Subject: [PATCH 131/345] feat: hide sidebar if user has no permissions for any
 items (#10840)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/boot.py                                |   2 +-
 frappe/cache_manager.py                       |   2 +-
 frappe/core/doctype/file/file.json            |   7 +-
 frappe/desk/desktop.py                        | 103 +++++++++++++-----
 .../public/js/frappe/views/desktop/desktop.js |  19 ++--
 5 files changed, 91 insertions(+), 42 deletions(-)

diff --git a/frappe/boot.py b/frappe/boot.py
index 8862ce3c61..b552d7d703 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -107,7 +107,7 @@ def load_desktop_data(bootinfo):
 	from frappe.config import get_modules_from_all_apps_for_user
 	from frappe.desk.desktop import get_desk_sidebar_items
 	bootinfo.allowed_modules = get_modules_from_all_apps_for_user()
-	bootinfo.allowed_workspaces = get_desk_sidebar_items(True)
+	bootinfo.allowed_workspaces = get_desk_sidebar_items(flatten=True, cache=False)
 	bootinfo.module_page_map = get_controller("Desk Page").get_module_page_map()
 	bootinfo.dashboards = frappe.get_all("Dashboard")
 
diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py
index 92d12289c6..97b6c235b5 100644
--- a/frappe/cache_manager.py
+++ b/frappe/cache_manager.py
@@ -21,7 +21,7 @@ global_cache_keys = ("app_hooks", "installed_apps",
 user_cache_keys = ("bootinfo", "user_recent", "roles", "user_doc", "lang",
 		"defaults", "user_permissions", "home_page", "linked_with",
 		"desktop_icons", 'portal_menu_items', 'user_perm_can_read',
-		"has_role:Page", "has_role:Report")
+		"has_role:Page", "has_role:Report", "desk_sidebar_items")
 
 doctype_cache_keys = ("meta", "form_meta", "table_columns", "last_modified",
 		"linked_doctypes", 'notifications', 'workflow' ,'energy_point_rule_map', 'data_import_column_header_map')
diff --git a/frappe/core/doctype/file/file.json b/frappe/core/doctype/file/file.json
index d9ab504db7..3008e27aa0 100644
--- a/frappe/core/doctype/file/file.json
+++ b/frappe/core/doctype/file/file.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "creation": "2012-12-12 11:19:22",
  "doctype": "DocType",
@@ -63,7 +64,8 @@
    "fieldname": "is_home_folder",
    "fieldtype": "Check",
    "hidden": 1,
-   "label": "Is Home Folder"
+   "label": "Is Home Folder",
+   "search_index": 1
   },
   {
    "default": "0",
@@ -172,7 +174,8 @@
  ],
  "icon": "fa fa-file",
  "idx": 1,
- "modified": "2019-08-30 19:46:20.796453",
+ "links": [],
+ "modified": "2020-06-28 12:21:30.772386",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "File",
diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index 142c103c68..68b57a93d4 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -29,31 +29,56 @@ def handle_not_exist(fn):
 
 
 class Workspace:
-	def __init__(self, page_name):
+	def __init__(self, page_name, minimal=False):
 		self.page_name = page_name
 		self.extended_cards = []
 		self.extended_charts = []
 		self.extended_shortcuts = []
 
 		self.user = frappe.get_user()
-		self.allowed_modules = self.get_cached_value('user_allowed_modules', self.get_allowed_modules)
+		self.allowed_modules = self.get_cached('user_allowed_modules', self.get_allowed_modules)
+
 		self.doc = self.get_page_for_user()
 
 		if self.doc.module not in self.allowed_modules:
 			raise frappe.PermissionError
 
-		self.can_read = self.get_cached_value('user_perm_can_read', self.get_can_read_items)
+		self.can_read = self.get_cached('user_perm_can_read', self.get_can_read_items)
 
 		self.allowed_pages = get_allowed_pages(cache=True)
 		self.allowed_reports = get_allowed_reports(cache=True)
-		self.onboarding_doc = self.get_onboarding_doc()
-		self.onboarding = None
-
-		self.table_counts = get_table_with_counts()
+		
+		if not minimal:
+			self.onboarding_doc = self.get_onboarding_doc()
+			self.onboarding = None
+		
+			self.table_counts = get_table_with_counts()
 		self.restricted_doctypes = frappe.cache().get_value("domain_restricted_doctypes") or build_domain_restriced_doctype_cache()
 		self.restricted_pages = frappe.cache().get_value("domain_restricted_pages") or build_domain_restriced_page_cache()
 
-	def get_cached_value(self, cache_key, fallback_fn):
+	def is_page_allowed(self):
+		cards = self.doc.cards + get_custom_reports_and_doctypes(self.doc.module) + self.extended_cards
+		shortcuts = self.doc.shortcuts + self.extended_shortcuts
+		
+		for section in cards:
+			links = loads(section.links) if isinstance(section.links, string_types) else section.links
+			for item in links:
+				if self.is_item_allowed(item.get('name'), item.get('type')):
+					return True
+
+		def _in_active_domains(item):
+			if not item.restrict_to_domain:
+				return True
+			else:
+				return item.restrict_to_domain in frappe.get_active_domains()
+
+		for item in shortcuts:
+			if self.is_item_allowed(item.link_to, item.type) and _in_active_domains(item):
+				return True
+
+		return False
+
+	def get_cached(self, cache_key, fallback_fn):
 		_cache = frappe.cache()
 
 		value = _cache.get_value(cache_key, user=frappe.session.user)
@@ -83,12 +108,12 @@ class Workspace:
 			'extends': self.page_name,
 			'for_user': frappe.session.user
 		}
-		pages = frappe.get_list("Desk Page", filters=filters)
+		pages = frappe.get_all("Desk Page", filters=filters, limit=1)
 		if pages:
-			return frappe.get_doc("Desk Page", pages[0])
+			return frappe.get_cached_doc("Desk Page", pages[0])
 
 		self.get_pages_to_extend()
-		return frappe.get_doc("Desk Page", self.page_name)
+		return frappe.get_cached_doc("Desk Page", self.page_name)
 
 	def get_onboarding_doc(self):
 		# Check if onboarding is enabled
@@ -123,7 +148,7 @@ class Workspace:
 			'module': ['in', self.allowed_modules]
 		})
 
-		pages = [frappe.get_doc("Desk Page", page['name']) for page in pages]
+		pages = [frappe.get_cached_doc("Desk Page", page['name']) for page in pages]
 
 		for page in pages:
 			self.extended_cards = self.extended_cards + page.cards
@@ -170,6 +195,7 @@ class Workspace:
 				'docs_url': self.onboarding_doc.documentation_url,
 				'items': self.get_onboarding_steps()
 			}
+	
 	@handle_not_exist
 	def get_cards(self):
 		cards = self.doc.cards
@@ -323,25 +349,44 @@ def get_desktop_page(page):
 	}
 
 @frappe.whitelist()
-def get_desk_sidebar_items(flatten=False):
+def get_desk_sidebar_items(flatten=False, cache=True):
 	"""Get list of sidebar items for desk
 	"""
-	# don't get domain restricted pages
-	blocked_modules = frappe.get_doc('User', frappe.session.user).get_blocked_modules()
+	pages = []
+	_cache = frappe.cache()
+	if cache:
+		pages = _cache.get_value("desk_sidebar_items", user=frappe.session.user)
+	
+	if not pages or not cache:
+		# don't get domain restricted pages
+		blocked_modules = frappe.get_doc('User', frappe.session.user).get_blocked_modules()
 
-	filters = {
-		'restrict_to_domain': ['in', frappe.get_active_domains()],
-		'extends_another_page': 0,
-		'for_user': '',
-		'module': ['not in', blocked_modules]
-	}
+		filters = {
+			'restrict_to_domain': ['in', frappe.get_active_domains()],
+			'extends_another_page': 0,
+			'for_user': '',
+			'module': ['not in', blocked_modules]
+		}
 
-	if not frappe.local.conf.developer_mode:
-		filters['developer_mode_only'] = '0'
+		if not frappe.local.conf.developer_mode:
+			filters['developer_mode_only'] = '0'
+
+		# pages sorted based on pinned to top and then by name
+		order_by = "pin_to_top desc, pin_to_bottom asc, name asc"
+		all_pages = frappe.get_all("Desk Page", fields=["name", "category"], filters=filters, order_by=order_by, ignore_permissions=True)
+		pages = []
+		
+		# Filter Page based on Permission
+		for page in all_pages:
+			try:
+				wspace = Workspace(page.get('name'), True)
+				if wspace.is_page_allowed():
+					pages.append(page)
+			except frappe.PermissionError:
+				pass
+
+		_cache.set_value("desk_sidebar_items", pages, frappe.session.user)
 
-	# pages sorted based on pinned to top and then by name
-	order_by = "pin_to_top desc, pin_to_bottom asc, name asc"
-	pages = frappe.get_all("Desk Page", fields=["name", "category"], filters=filters, order_by=order_by, ignore_permissions=True)
 	if flatten:
 		return pages
 
@@ -375,7 +420,7 @@ def get_custom_reports_and_doctypes(module):
 	]
 
 def get_custom_doctype_list(module):
-	doctypes =  frappe.get_list("DocType", fields=["name"], filters={"custom": 1, "istable": 0, "module": module}, order_by="name", ignore_permissions=True)
+	doctypes =  frappe.get_all("DocType", fields=["name"], filters={"custom": 1, "istable": 0, "module": module}, order_by="name")
 
 	out = []
 	for d in doctypes:
@@ -390,9 +435,9 @@ def get_custom_doctype_list(module):
 
 def get_custom_report_list(module):
 	"""Returns list on new style reports for modules."""
-	reports =  frappe.get_list("Report", fields=["name", "ref_doctype", "report_type"], filters=
+	reports =  frappe.get_all("Report", fields=["name", "ref_doctype", "report_type"], filters=
 		{"is_standard": "No", "disabled": 0, "module": module},
-		order_by="name", ignore_permissions=True)
+		order_by="name")
 
 	out = []
 	for r in reports:
diff --git a/frappe/public/js/frappe/views/desktop/desktop.js b/frappe/public/js/frappe/views/desktop/desktop.js
index acc49c79a4..0974a6c9f5 100644
--- a/frappe/public/js/frappe/views/desktop/desktop.js
+++ b/frappe/public/js/frappe/views/desktop/desktop.js
@@ -53,7 +53,7 @@ export default class Desktop {
 			.call("frappe.desk.desktop.get_desk_sidebar_items")
 			.then(response => {
 				if (response.message) {
-					this.desktop_settings = response.message;
+					this.sidebar_configuration = response.message;
 				} else {
 					frappe.throw({
 						title: __("Couldn't Load Desk"),
@@ -71,10 +71,11 @@ export default class Desktop {
 
 	make_sidebar() {
 		const get_sidebar_item = function(item) {
-			return $(`<a href="${"desk#workspace/" +
-				item.name}" class="sidebar-item ${
-				item.selected ? "selected" : ""
-			}">
+			return $(`<a href="${"desk#workspace/" + item.name}"
+					class="sidebar-item 
+						${item.selected ? " selected" : ""}
+						${item.hidden ? "hidden" : ""}
+					">
 					<span>${item.label || item.name}</span>
 				</div>`);
 		};
@@ -105,9 +106,9 @@ export default class Desktop {
 		};
 
 		this.sidebar_categories.forEach(category => {
-			if (this.desktop_settings.hasOwnProperty(category)) {
+			if (this.sidebar_configuration.hasOwnProperty(category)) {
 				make_category_title(category);
-				this.desktop_settings[category].forEach(item => {
+				this.sidebar_configuration[category].forEach(item => {
 					make_sidebar_category_item(item);
 				});
 			}
@@ -139,8 +140,8 @@ export default class Desktop {
 	}
 
 	get_page_to_show() {
-		const default_page = this.desktop_settings
-			? this.desktop_settings["Modules"][0].name
+		const default_page = this.sidebar_configuration
+			? this.sidebar_configuration["Modules"][0].name
 			: frappe.boot.allowed_workspaces[0].name;
 
 		let page =

From eea401950800faa1c2c50c56db93d94272fd11b9 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 8 Jul 2020 19:42:32 +0530
Subject: [PATCH 132/345] fix: use coalesce

---
 frappe/patches/v12_0/set_correct_assign_value_in_docs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/patches/v12_0/set_correct_assign_value_in_docs.py b/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
index a9ce2da128..78927f8acb 100644
--- a/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
+++ b/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
@@ -9,7 +9,8 @@ def execute():
 		FROM
 			`tabTodo`
 		WHERE
-			not reference_type IS NULL and not reference_name IS NULL
+			COALESCE(reference_type, '') != '' and
+			COALESCE(reference_name, '') != ''
 		GROUP BY
 			reference_type, reference_name
 	'''
@@ -21,7 +22,6 @@ def execute():
 
 	for doc in assignments:
 		assignments = doc.assignees.split(',')
-		print('assignments', assignments)
 		frappe.db.set_value(
 			doc.reference_type,
 			doc.reference_name,

From 1372f717c64346662101f0c615357192a1af1083 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 8 Jul 2020 22:41:10 +0530
Subject: [PATCH 133/345] fix: fix table name typo

---
 frappe/patches/v12_0/set_correct_assign_value_in_docs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/patches/v12_0/set_correct_assign_value_in_docs.py b/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
index 78927f8acb..d3f97af50b 100644
--- a/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
+++ b/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
@@ -7,7 +7,7 @@ def execute():
 		SELECT
 			name, reference_type, reference_name, {} as assignees
 		FROM
-			`tabTodo`
+			`tabToDo`
 		WHERE
 			COALESCE(reference_type, '') != '' and
 			COALESCE(reference_name, '') != ''

From 2cab29466c24abc3a7c2a4f484d765b8722def88 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 8 Jul 2020 22:43:47 +0530
Subject: [PATCH 134/345] fix(File):  Update all file docs that point to the
 same file on url update (#10953)

Co-authored-by: prssanna <prssud@gmail.com>
---
 frappe/core/doctype/file/file.py              | 35 +++++++++++++----
 frappe/core/doctype/file/test_file.py         | 33 ++++++++++++++++
 frappe/patches.txt                            |  1 +
 .../patches/v12_0/set_correct_url_in_files.py | 39 +++++++++++++++++++
 4 files changed, 100 insertions(+), 8 deletions(-)
 create mode 100644 frappe/patches/v12_0/set_correct_url_in_files.py

diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py
index 90c9df980f..1748c60020 100755
--- a/frappe/core/doctype/file/file.py
+++ b/frappe/core/doctype/file/file.py
@@ -100,26 +100,26 @@ class File(Document):
 				self.validate_file()
 			self.generate_content_hash()
 
-		self.validate_url()
-
 		if frappe.db.exists('File', {'name': self.name, 'is_folder': 0}):
 			old_file_url = self.file_url
 			if not self.is_folder and (self.is_private != self.db_get('is_private')):
 				private_files = frappe.get_site_path('private', 'files')
 				public_files = frappe.get_site_path('public', 'files')
 
+				file_name = self.file_url.split('/')[-1]
 				if not self.is_private:
-					shutil.move(os.path.join(private_files, self.file_name),
-						os.path.join(public_files, self.file_name))
+					shutil.move(os.path.join(private_files, file_name),
+						os.path.join(public_files, file_name))
 
-					self.file_url = "/files/{0}".format(self.file_name)
+					self.file_url = "/files/{0}".format(file_name)
 
 				else:
-					shutil.move(os.path.join(public_files, self.file_name),
-						os.path.join(private_files, self.file_name))
+					shutil.move(os.path.join(public_files, file_name),
+						os.path.join(private_files, file_name))
 
-					self.file_url = "/private/files/{0}".format(self.file_name)
+					self.file_url = "/private/files/{0}".format(file_name)
 
+				update_existing_file_docs(self)
 
 			# update documents image url with new file url
 			if self.attached_to_doctype and self.attached_to_name:
@@ -135,6 +135,8 @@ class File(Document):
 					frappe.db.set_value(self.attached_to_doctype, self.attached_to_name,
 						self.attached_to_field, self.file_url)
 
+		self.validate_url()
+
 		if self.file_url and (self.is_private != self.file_url.startswith('/private')):
 			frappe.throw(_('Invalid file URL. Please contact System Administrator.'))
 
@@ -903,3 +905,20 @@ def get_files_in_folder(folder):
 		{ 'folder': folder },
 		['name', 'file_name', 'file_url', 'is_folder', 'modified']
 	)
+
+def update_existing_file_docs(doc):
+	# Update is private and file url of all file docs that point to the same file
+	frappe.db.sql("""
+		UPDATE `tabFile`
+		SET
+			file_url = %(file_url)s,
+			is_private = %(is_private)s
+		WHERE
+			content_hash = %(content_hash)s
+			and name != %(file_name)s
+	""", dict(
+		file_url=doc.file_url,
+		is_private=doc.is_private,
+		content_hash=doc.content_hash,
+		file_name=doc.name
+	))
diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py
index cc9628ed5b..ec4f97bf67 100644
--- a/frappe/core/doctype/file/test_file.py
+++ b/frappe/core/doctype/file/test_file.py
@@ -294,4 +294,37 @@ class TestFile(unittest.TestCase):
 		folder = frappe.get_doc("File", "Home/Test Folder 1/Test Folder 3")
 		self.assertRaises(frappe.ValidationError, folder.delete)
 
+	def test_same_file_url_update(self):
+		attached_to_doctype1, attached_to_docname1 = make_test_doc()
+		attached_to_doctype2, attached_to_docname2 = make_test_doc()
+
+		file1 = frappe.get_doc({
+			"doctype": "File",
+			"file_name": 'file1.txt',
+			"attached_to_doctype": attached_to_doctype1,
+			"attached_to_name": attached_to_docname1,
+			"is_private": 1,
+			"content": test_content1}).insert()
+
+		file2 = frappe.get_doc({
+			"doctype": "File",
+			"file_name": 'file2.txt',
+			"attached_to_doctype": attached_to_doctype2,
+			"attached_to_name": attached_to_docname2,
+			"is_private": 1,
+			"content": test_content1}).insert()
+
+		self.assertEqual(file1.is_private, file2.is_private, 1)
+		self.assertEqual(file1.file_url, file2.file_url)
+		self.assertTrue(os.path.exists(file1.get_full_path()))
+
+		file1.is_private = 0
+		file1.save()
+
+		file2 = frappe.get_doc('File', file2.name)
+
+		self.assertEqual(file1.is_private, file2.is_private, 0)
+		self.assertEqual(file1.file_url, file2.file_url)
+		self.assertTrue(os.path.exists(file2.get_full_path()))
+
 
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 7a996956dd..cfcbc1ceba 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -274,6 +274,7 @@ execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Account')
 execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Settings')
 frappe.patches.v12_0.remove_parent_and_parenttype_from_print_formats
 execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders()
+frappe.patches.v12_0.set_correct_url_in_files
 frappe.patches.v13_0.website_theme_custom_scss
 frappe.patches.v13_0.set_existing_dashboard_charts_as_public
 frappe.patches.v13_0.set_path_for_homepage_in_web_page_view
diff --git a/frappe/patches/v12_0/set_correct_url_in_files.py b/frappe/patches/v12_0/set_correct_url_in_files.py
new file mode 100644
index 0000000000..4f820c1b24
--- /dev/null
+++ b/frappe/patches/v12_0/set_correct_url_in_files.py
@@ -0,0 +1,39 @@
+import frappe
+import os
+
+def execute():
+	files = frappe.get_all('File',
+		fields = ['name', 'file_name', 'file_url'],
+		filters = {
+			'is_folder': 0,
+			'file_url': ['!=', ''],
+		})
+
+	private_file_path = frappe.get_site_path('private', 'files')
+	public_file_path = frappe.get_site_path('public', 'files')
+
+	for file in files:
+		file_path = file.file_url
+		file_name = file_path.split('/')[-1]
+		
+		if not file_path.startswith(('/private/', '/files/')):
+			continue
+
+		file_is_private = file_path.startswith('/private/files/')
+		full_path = frappe.utils.get_files_path(file_name, is_private=file_is_private)
+
+		if not os.path.exists(full_path):
+			if file_is_private:
+				public_file_url = os.path.join(public_file_path, file_name)
+				if os.path.exists(public_file_url):
+					frappe.db.set_value('File', file.name, {
+						'file_url': '/files/{0}'.format(file_name),
+						'is_private': 0
+					})
+			else:
+				private_file_url = os.path.join(private_file_path, file_name)
+				if os.path.exists(private_file_url):
+					frappe.db.set_value('File', file.name, {
+						'file_url': '/private/files/{0}'.format(file_name),
+						'is_private': 1
+					})

From 36d1b5f0150799a08b5ca39c5efd35040e3a899d Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 9 Jul 2020 12:27:39 +0530
Subject: [PATCH 135/345] fix: check if field exists in meta before executing
 query

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/contact/contact.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index e340c7e2d0..4af4362aff 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -186,6 +186,9 @@ def update_contact(doc, method):
 def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
+	if not frappe.get_meta("Contact").get_field(searchfield):
+		return {}
+
 	link_doctype = filters.pop('link_doctype')
 	link_name = filters.pop('link_name')
 
@@ -205,14 +208,12 @@ def contact_query(doctype, txt, searchfield, start, page_len, filters):
 			`tabDynamic Link`.parenttype = 'Contact' and
 			`tabDynamic Link`.link_doctype = %(link_doctype)s and
 			`tabDynamic Link`.link_name = %(link_name)s and
-			`tabContact`.`%(key)s` like %(txt)s
-			%(mcond)s
+			`tabContact`.`{key}` like %(txt)s
+			{mcond}
 		order by
 			if(locate(%(_txt)s, `tabContact`.name), locate(%(_txt)s, `tabContact`.name), 99999),
 			`tabContact`.idx desc, `tabContact`.name
-		limit %(start)s, %(page_len)s """, {
-			'mcond': get_match_cond(doctype),
-			'key': searchfield,
+		limit %(start)s, %(page_len)s """.format(mcond=get_match_cond(doctype), key=searchfield), {
 			'txt': '%' + txt + '%',
 			'_txt': txt.replace("%", ""),
 			'start': start,

From ef3b50152c00eaa21f1310b7da7bcc27fec9cc9a Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 9 Jul 2020 13:27:08 +0530
Subject: [PATCH 136/345] fix: simplify sync dashboards code

---
 frappe/utils/dashboard.py | 39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index c4fef37575..fd8f8cea7b 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -94,29 +94,22 @@ def sync_dashboards(app=None):
 
 def make_records_in_module(app, module):
 	dashboards_path = frappe.get_module_path(module, "{module}_dashboard".format(module=module))
-	if os.path.isdir(dashboards_path):
-		for fname in os.listdir(dashboards_path):
-			dashboard_path = dashboards_path + '/{}'.format(fname)
-			if os.path.isdir(dashboard_path):
-				if fname == '__pycache__':
-					continue
+	charts_path = frappe.get_module_path(module, "dashboard chart")
+	cards_path = frappe.get_module_path(module, "number card")
 
-				# create records for all dashboards in the module
-				make_records(dashboards_path)
-
-		charts_path = frappe.get_module_path(module, "dashboard chart")
-		cards_path = frappe.get_module_path(module, "number card")
-		make_records(charts_path)
-		make_records(cards_path)
+	paths = [dashboards_path, charts_path, cards_path]
+	for path in paths:
+		make_records(path)
 
 def make_records(path, filters=None):
-	for fname in os.listdir(path):
-		if os.path.isdir(join(path, fname)):
-			if fname == '__pycache__':
-				continue
-			try:
-				doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
-				import_doc(doc_dict)
-			except FileNotFoundError:
-				frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
-				pass
+	if os.path.isdir(path):
+		for fname in os.listdir(path):
+			if os.path.isdir(join(path, fname)):
+				if fname == '__pycache__':
+					continue
+				try:
+					doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
+					import_doc(doc_dict)
+				except FileNotFoundError:
+					frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
+					pass

From 354ae3ea31c663be55d6c0a98937f212d4b35838 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 9 Jul 2020 13:48:05 +0530
Subject: [PATCH 137/345] fix: Set default date format if not found

---
 frappe/core/doctype/data_import/importer.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index f1d0422458..619b083685 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -970,6 +970,13 @@ class Column:
 		elif self.df.fieldtype in ("Date", "Time", "Datetime"):
 			# guess date format
 			self.date_format = self.guess_date_format_for_column()
+			if not self.date_format:
+				self.date_format = '%Y-%m-%d'
+				self.warnings.append({
+					'col': self.column_number,
+					'message': _("Date format could not determined from the values in this column. Defaulting to yyyy-mm-dd."),
+					'type': 'info'
+				})
 
 	def as_dict(self):
 		d = frappe._dict()

From 4fe233827e058a6a07426021f381fa6eb7d90fde Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 9 Jul 2020 13:48:37 +0530
Subject: [PATCH 138/345] fix: Dont use df method in case df is a dict

---
 frappe/core/doctype/data_import/importer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 619b083685..24c0516484 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -618,7 +618,7 @@ class Row:
 	def validate_value(self, value, col):
 		df = col.df
 		if df.fieldtype == "Select":
-			select_options = df.get_select_options()
+			select_options = [d for d in (df.options or '').split('\n') if d]
 			if select_options and value not in select_options:
 				options_string = ", ".join([frappe.bold(d) for d in select_options])
 				msg = _("Value must be one of {0}").format(options_string)

From 6e336fa10eb2f74c261b5d82719f1e250e5e5e8f Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 9 Jul 2020 13:48:57 +0530
Subject: [PATCH 139/345] fix: Set status before import

---
 frappe/core/doctype/data_import/importer.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 24c0516484..c37b80c9f5 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -59,6 +59,7 @@ class Importer:
 		frappe.flags.in_import = True
 		frappe.flags.mute_emails = self.data_import.mute_emails
 
+		self.data_import.db_set("status", "Pending")
 		self.data_import.db_set("template_warnings", "")
 
 	def import_data(self):

From 89d2c064a9eeba3f0d27cab9270a638a7226bfbd Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 9 Jul 2020 13:49:49 +0530
Subject: [PATCH 140/345] fix: Guess more date formats

Can guess the following formats now:
- 7 May 2020
- 1 Jan 2020
---
 frappe/utils/data.py | 66 ++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/frappe/utils/data.py b/frappe/utils/data.py
index 4870c2d7ba..07bd2e840a 100644
--- a/frappe/utils/data.py
+++ b/frappe/utils/data.py
@@ -1258,6 +1258,8 @@ def guess_date_format(date_string):
 		r"%d.%m.%y",
 		r"%m.%d.%y",
 		r"%y.%m.%d",
+		r"%d %b %Y",
+		r"%d %B %Y",
 	]
 
 	TIME_FORMATS = [
@@ -1269,41 +1271,45 @@ def guess_date_format(date_string):
 		r"%I:%M %p",
 	]
 
-	date_string = date_string.strip()
+	def _get_date_format(date_str):
+		for f in DATE_FORMATS:
+			try:
+				# if date is parsed without any exception
+				# capture the date format
+				datetime.datetime.strptime(date_str, f)
+				return f
+			except ValueError:
+				pass
 
-	_date = None
-	_time = None
-
-	if " " in date_string:
-		_date, _time = date_string.split(" ", 1)
-	else:
-		_date = date_string
-
-	date_format = None
-	time_format = None
-
-	for f in DATE_FORMATS:
-		try:
-			# if date is parsed without any exception
-			# capture the date format
-			datetime.datetime.strptime(_date, f)
-			date_format = f
-			break
-		except ValueError:
-			pass
-
-	if _time:
+	def _get_time_format(time_str):
 		for f in TIME_FORMATS:
 			try:
 				# if time is parsed without any exception
 				# capture the time format
-				datetime.datetime.strptime(_time, f)
-				time_format = f
-				break
+				datetime.datetime.strptime(time_str, f)
+				return f
 			except ValueError:
 				pass
 
-	full_format = date_format
-	if time_format:
-		full_format += " " + time_format
-	return full_format
+	date_format = None
+	time_format = None
+	date_string = date_string.strip()
+
+	# check if date format can be guessed
+	date_format = _get_date_format(date_string)
+	if date_format:
+		return date_format
+
+	# date_string doesnt look like date, it can have a time part too
+	# split the date string into date and time parts
+	_date = None
+	_time = None
+
+	if " " in date_string:
+		date_str, time_str = date_string.split(" ", 1)
+
+		date_format = _get_date_format(date_str) or ''
+		time_format = _get_time_format(time_str) or ''
+
+		if date_format and time_format:
+			return (date_format + ' ' + time_format).strip()

From 4eb4563de5dbf3f88d7698cd8fd78a4b9e4ed4b8 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 9 Jul 2020 13:57:09 +0530
Subject: [PATCH 141/345] fix: remove unused variables

---
 frappe/utils/data.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frappe/utils/data.py b/frappe/utils/data.py
index 07bd2e840a..d1b409d1fc 100644
--- a/frappe/utils/data.py
+++ b/frappe/utils/data.py
@@ -1302,9 +1302,6 @@ def guess_date_format(date_string):
 
 	# date_string doesnt look like date, it can have a time part too
 	# split the date string into date and time parts
-	_date = None
-	_time = None
-
 	if " " in date_string:
 		date_str, time_str = date_string.split(" ", 1)
 

From f9bf0c1951cd069981ad78c0fa64077e0fcbaf66 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 9 Jul 2020 20:11:01 +0530
Subject: [PATCH 142/345] fix: remove Frappe Cloud migrator logic from frappe

---
 .../integrations/frappe_providers/__init__.py |   2 +-
 .../frappe_providers/frappecloud.py           | 418 +-----------------
 requirements.txt                              |   1 -
 3 files changed, 16 insertions(+), 405 deletions(-)

diff --git a/frappe/integrations/frappe_providers/__init__.py b/frappe/integrations/frappe_providers/__init__.py
index 887e191e16..161937a936 100644
--- a/frappe/integrations/frappe_providers/__init__.py
+++ b/frappe/integrations/frappe_providers/__init__.py
@@ -7,7 +7,7 @@ from frappe.integrations.frappe_providers.frappecloud import frappecloud_migrato
 
 def migrate_to(local_site, frappe_provider):
 	if frappe_provider in ("frappe.cloud", "frappecloud.com"):
-		return frappecloud_migrator(local_site, frappe_provider)
+		return frappecloud_migrator(local_site)
 	else:
 		print("{} is not supported yet".format(frappe_provider))
 		sys.exit(1)
diff --git a/frappe/integrations/frappe_providers/frappecloud.py b/frappe/integrations/frappe_providers/frappecloud.py
index 16bc09d9bf..6aeef5dc7b 100644
--- a/frappe/integrations/frappe_providers/frappecloud.py
+++ b/frappe/integrations/frappe_providers/frappecloud.py
@@ -1,412 +1,24 @@
-# imports - standard imports
-import getpass
-import json
-import os
-import re
-import sys
-
-# imports - third party imports
 import click
-from html2text import html2text
 import requests
-from tenacity import retry, stop_after_attempt, wait_fixed
-
-# imports - module imports
+from six import PY3
+from html2text import html2text
 import frappe
-import frappe.utils.backups
-from frappe.utils import get_installed_apps_info
-from frappe.utils.commands import render_table, add_line_after, add_line_before
 
 
-# TODO: check upgrade compatibility
-
-
-def render_actions_table():
-	actions_table = [["#", "Action"]]
-	actions = []
-
-	for n, action in enumerate(migrator_actions):
-		actions_table.append([n+1, action["title"]])
-		actions.append(action["fn"])
-
-	render_table(actions_table)
-	return actions
-
-
-def render_site_table(sites_info):
-	sites_table = [["#", "Site Name", "Status"]]
-	available_sites = []
-
-	for n, site_data in enumerate(sites_info):
-		name, status = site_data["name"], site_data["status"]
-		if status in ("Active", "Broken"):
-			sites_table.append([n + 1, name, status])
-			available_sites.append(name)
-
-	render_table(sites_table)
-	return available_sites
-
-
-def render_teams_table(teams):
-	teams_table = [["#", "Team"]]
-
-	for n, team in enumerate(teams):
-		teams_table.append([n+1, team])
-
-	render_table(teams_table)
-
-
-def render_plan_table(plans_list):
-	plans_table = [["Plan", "CPU Time"]]
-	visible_headers = ["name", "cpu_time_per_day"]
-
-	for plan in plans_list:
-		plan, cpu_time = [plan[header] for header in visible_headers]
-		plans_table.append([plan, "{} hour{}/day".format(cpu_time, "" if cpu_time < 2 else "s")])
-
-	render_table(plans_table)
-
-
-def render_group_table(app_groups):
-	# title row
-	app_groups_table = [["#", "App Group", "Apps"]]
-
-	# all rows
-	for idx, app_group in enumerate(app_groups):
-		apps_list = ", ".join(["{}:{}".format(app["scrubbed"], app["branch"]) for app in app_group["apps"]])
-		row = [idx + 1, app_group["name"], apps_list]
-		app_groups_table.append(row)
-
-	render_table(app_groups_table)
-
-
-def handle_request_failure(request=None, message=None, traceback=True, exit_code=1):
-	message = message or "Request failed with error code {}".format(request.status_code)
-	response = html2text(request.text) if traceback else ""
-
-	print("{0}{1}".format(message, "\n" + response))
-	sys.exit(exit_code)
-
-
-@add_line_after
-def select_primary_action():
-	actions = render_actions_table()
-	idx = click.prompt("What do you want to do?", type=click.IntRange(1, len(actions))) - 1
-
-	return actions[idx]
-
-
-@add_line_after
-def select_site():
-	get_all_sites_request = session.post(all_site_url, headers={
-		"accept": "application/json",
-		"accept-encoding": "gzip, deflate, br",
-		"content-type": "application/json; charset=utf-8"
-	})
-
-	if get_all_sites_request.ok:
-		all_sites = get_all_sites_request.json()["message"]
-		available_sites = render_site_table(all_sites)
-
-		while True:
-			selected_site = click.prompt("Name of the site you want to restore to", type=str).strip()
-			if selected_site in available_sites:
-				return selected_site
-			else:
-				print("Site {} does not exist. Try again ❌".format(selected_site))
-	else:
-		print("Couldn't retrive sites list...Try again later")
-		sys.exit(1)
-
-
-@add_line_before
-def select_team(session):
-	# get team options
-	account_details_sc = session.post(account_details_url)
-	if account_details_sc.ok:
-		account_details = account_details_sc.json()["message"]
-		available_teams = account_details["teams"]
-
-	# ask if they want to select, go ahead with if only one exists
-	if len(available_teams) == 1:
-		team = available_teams[0]
-	else:
-		render_teams_table(available_teams)
-		idx = click.prompt("Select Team", type=click.IntRange(1, len(available_teams))) - 1
-		team = available_teams[idx]
-
-	print("Team '{}' set for current session".format(team))
-
-	return team
-
-
-@retry(stop=stop_after_attempt(5))
-def get_new_site_options():
-	site_options_sc = session.post(options_url)
-
-	if site_options_sc.ok:
-		site_options = site_options_sc.json()["message"]
-		return site_options
-	else:
-		print("Couldn't retrive New site information: {}".format(site_options_sc.status_code))
-
-
-def is_valid_subdomain(subdomain):
-	if len(subdomain) < 5:
-		print("Subdomain too short. Use 5 or more characters")
-		return False
-	matched = re.match("^[a-z0-9][a-z0-9-]*[a-z0-9]$", subdomain)
-	if matched:
-		return True
-	print("Subdomain contains invalid characters. Use lowercase characters, numbers and hyphens")
-
-
-@retry(stop=stop_after_attempt(5))
-def is_subdomain_available(subdomain):
-	res = session.post(site_exists_url, {"subdomain": subdomain})
-	if res.ok:
-		available = not res.json()["message"]
-		if not available:
-			print("Subdomain already exists! Try another one")
-
-		return available
-
-
-@add_line_after
-def choose_plan(plans_list):
-	print("{} plans available".format(len(plans_list)))
-	available_plans = [plan["name"] for plan in plans_list]
-	render_plan_table(plans_list)
-
-	while True:
-		input_plan = click.prompt("Select Plan").strip()
-		if input_plan in available_plans:
-			print("{} Plan selected ✅".format(input_plan))
-			return input_plan
-		else:
-			print("Invalid Selection ❌")
-
-
-@add_line_after
-def check_app_compat(available_group):
-	is_compat = True
-	incompatible_apps, filtered_apps, branch_msgs = [], [], []
-	existing_group = [(app["app_name"], app["branch"]) for app in get_installed_apps_info()]
-	print("Checking availability of existing app group")
-
-	for (app, branch) in existing_group:
-		info = [ (a["name"], a["branch"]) for a in available_group["apps"] if a["scrubbed"] == app ]
-		if info:
-			app_title, available_branch = info[0]
-
-			if branch != available_branch:
-				print("⚠️  App {}:{} => {}".format(app, branch, available_branch))
-				branch_msgs.append([app, branch, available_branch])
-				filtered_apps.append(app_title)
-				is_compat = False
-
-			else:
-				print("✅ App {}:{}".format(app, branch))
-				filtered_apps.append(app_title)
-
-		else:
-			incompatible_apps.append(app)
-			print("❌ App {}:{}".format(app, branch))
-			is_compat = False
-
-	start_msg = "\nSelecting this group will "
-	incompatible_apps = ("\n\nDrop the following apps:\n" + "\n".join(incompatible_apps)) if incompatible_apps else ""
-	branch_change = ("\n\nUpgrade the following apps:\n" + "\n".join(["{}: {} => {}".format(*x) for x in branch_msgs])) if branch_msgs else ""
-	changes = (incompatible_apps + branch_change) or "be perfect for you :)"
-	warning_message = start_msg + changes
-	print(warning_message)
-
-	return is_compat, filtered_apps
-
-
-@add_line_after
-def filter_apps(app_groups):
-	render_group_table(app_groups)
-
-	while True:
-		app_group_index = click.prompt("Select App Group Number", type=int) - 1
-		try:
-			if app_group_index == -1:
-				raise IndexError
-			selected_group = app_groups[app_group_index]
-		except IndexError:
-			print("Invalid Selection ❌")
-			continue
-
-		is_compat, filtered_apps = check_app_compat(selected_group)
-
-		if is_compat or click.confirm("Continue anyway?"):
-			print("App Group {} selected! ✅".format(selected_group["name"]))
-			break
-
-	return selected_group["name"], filtered_apps
-
-
-@add_line_after
-def get_subdomain(domain):
-	while True:
-		subdomain = click.prompt("Enter subdomain").strip()
-		if is_valid_subdomain(subdomain) and is_subdomain_available(subdomain):
-			print("Site Domain: {}.{}".format(subdomain, domain))
-			return subdomain
-
-
-@retry(stop=stop_after_attempt(2), wait=wait_fixed(5))
-def upload_backup_file(file_type, file_path):
-	return session.post(files_url, data={}, files={
-		"file": open(file_path, "rb"),
-		"is_private": 1,
-		"folder": "Home",
-		"method": "press.api.site.upload_backup",
-		"type": file_type
-	})
-
-
-@add_line_after
-def upload_backup(local_site):
-	# take backup
-	files_session = {}
-	print("Taking backup for site {}".format(local_site))
-	odb = frappe.utils.backups.new_backup(ignore_files=False, force=True)
-
-	# upload files
-	for x, (file_type, file_path) in enumerate([
-				("database", odb.backup_path_db),
-				("public", odb.backup_path_files),
-				("private", odb.backup_path_private_files)
-			]):
-		file_name = file_path.split(os.sep)[-1]
-
-		print("Uploading {} file: {} ({}/3)".format(file_type, file_name, x+1))
-		file_upload_response = upload_backup_file(file_type, file_path)
-
-		if file_upload_response.ok:
-			files_session[file_type] = file_upload_response.json()["message"]
-		else:
-			print("Upload failed for: {}".format(file_path))
-
-	files_uploaded = { k: v["file_url"] for k, v in files_session.items() }
-	print("Uploaded backup files! ✅")
-
-	return files_uploaded
-
-
-def new_site(local_site):
-	# get new site options
-	site_options = get_new_site_options()
-
-	# set preferences from site options
-	subdomain = get_subdomain(site_options["domain"])
-	plan = choose_plan(site_options["plans"])
-
-	app_groups = site_options["groups"]
-	selected_group, filtered_apps = filter_apps(app_groups)
-	files_uploaded = upload_backup(local_site)
-
-	# push to frappe_cloud
-	payload = json.dumps({
-		"site": {
-			"apps": filtered_apps,
-			"files": files_uploaded,
-			"group": selected_group,
-			"name": subdomain,
-			"plan": plan
-		}
-	})
-
-	session.headers.update({"Content-Type": "application/json; charset=utf-8"})
-	site_creation_request = session.post(upload_url, payload)
-
-	if site_creation_request.ok:
-		site_url = site_creation_request.json()["message"]
-		print("Your site {} is being migrated ✨".format(local_site))
-		print("View your site dashboard at {}/dashboard/#/sites/{}".format(remote_site, site_url))
-		print("Your site URL: {}".format(site_url))
-	else:
-		handle_request_failure(site_creation_request)
-
-
-def restore_site(local_site):
-	# get list of existing sites they can restore
-	selected_site = select_site()
-
-	# TODO: check if they can restore it
-
-	click.confirm("This is an irreversible action. Are you sure you want to continue?", abort=True)
-
-	# backup site
-	files_uploaded = upload_backup(local_site)
-
-	# push to frappe_cloud
-	payload = json.dumps({
-		"name": selected_site,
-		"files": files_uploaded
-	})
-	headers = {"Content-Type": "application/json; charset=utf-8"}
-	site_restore_request = session.post(restore_site_url, payload, headers=headers)
-
-	if site_restore_request.ok:
-		print("Your site {0} is being restored on {1} ✨".format(local_site, selected_site))
-		print("View your site dashboard at {}/dashboard/#/sites/{}".format(remote_site, selected_site))
-		print("Your site URL: {}".format(selected_site))
-	else:
-		handle_request_failure(site_restore_request)
-
-
-@add_line_after
-def create_session():
-	print("Frappe Cloud credentials @ {}".format(remote_site))
-
-	# take user input from STDIN
-	username = click.prompt("Username").strip()
-	password = getpass.unix_getpass()
-
-	auth_credentials = {"usr": username, "pwd": password}
-
-	session = requests.Session()
-	login_sc = session.post(login_url, auth_credentials)
-
-	if login_sc.ok:
-		print("Authorization Successful! ✅")
-		team = select_team(session)
-		session.headers.update({
-			"X-Press-Team": team,
-			"Connection": "keep-alive"
-		})
-		return session
-	else:
-		handle_request_failure(message="Authorization Failed with Error Code {}".format(login_sc.status_code), traceback=False)
-
-
-def frappecloud_migrator(local_site, frappecloud_site):
-	global login_url, upload_url, files_url, options_url, site_exists_url, restore_site_url, account_details_url, all_site_url
-	global session, migrator_actions, remote_site
-
+def frappecloud_migrator(local_site):
+	print("Retreiving Migrator...")
 	remote_site = frappe.conf.frappecloud_url or "frappecloud.com"
+	request_url = "https://{}/api/method/press.api.script".format(remote_site)
+	request = requests.get(request_url)
 
-	login_url = "https://{}/api/method/login".format(remote_site)
-	upload_url = "https://{}/api/method/press.api.site.new".format(remote_site)
-	files_url = "https://{}/api/method/upload_file".format(remote_site)
-	options_url = "https://{}/api/method/press.api.site.options_for_new".format(remote_site)
-	site_exists_url = "https://{}/api/method/press.api.site.exists".format(remote_site)
-	account_details_url = "https://{}/api/method/press.api.account.get".format(remote_site)
-	all_site_url = "https://{}/api/method/press.api.site.all".format(remote_site)
-	restore_site_url = "https://{}/api/method/press.api.site.restore".format(remote_site)
+	if request.status_code / 100 != 2:
+		print("Request exitted with Status Code: {}\nPayload: {}".format(request.status_code, html2text(request.text)))
+		click.secho("Some errors occured while recovering the migration script. Please contact us @ Frappe Cloud if this issue persists", fg="yellow")
+		return
 
-	migrator_actions = [
-		{ "title": "Create a new site", "fn": new_site },
-		{ "title": "Restore to an existing site", "fn": restore_site }
-	]
+	script_contents = request.json()["message"]
 
-	# get credentials + auth user + start session
-	session = create_session()
-
-	# available actions defined in migrator_actions
-	primary_action = select_primary_action()
-
-	primary_action(local_site)
+	if PY3:
+		exec(script_contents)
+	else:
+		execfile(script_contents)
diff --git a/requirements.txt b/requirements.txt
index 2d38f12faf..0d01886f05 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -59,7 +59,6 @@ semantic-version==2.8.4
 six==1.14.0
 sqlparse==0.2.4
 stripe==2.40.0
-tenacity==6.2.0
 terminaltables==3.1.0
 unittest-xml-reporting==2.5.2
 urllib3==1.25.8

From d2c913331ec1a5bd669f97ae154614d0a9524dfb Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 10 Jul 2020 00:14:09 +0530
Subject: [PATCH 143/345] fix(google-drive): fetch basename for backup

---
 .../doctype/google_drive/google_drive.py             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frappe/integrations/doctype/google_drive/google_drive.py b/frappe/integrations/doctype/google_drive/google_drive.py
index 0c28e95a24..c110694dff 100644
--- a/frappe/integrations/doctype/google_drive/google_drive.py
+++ b/frappe/integrations/doctype/google_drive/google_drive.py
@@ -189,10 +189,10 @@ def upload_system_backup_to_google_drive():
 	if frappe.flags.create_new_backup:
 		set_progress(1, "Backing up Data.")
 		backup = new_backup()
-		fileurl_backup = os.path.basename(backup.backup_path_db)
-		fileurl_site_config = os.path.basename(backup.site_config_backup_path)
-		fileurl_public_files = os.path.basename(backup.backup_path_files)
-		fileurl_private_files = os.path.basename(backup.backup_path_private_files)
+		fileurl_backup = backup.backup_path_db
+		fileurl_site_config = backup.site_config_backup_path
+		fileurl_public_files = backup.backup_path_files
+		fileurl_private_files = backup.backup_path_private_files
 	else:
 		fileurl_backup, fileurl_site_config, fileurl_public_files, fileurl_private_files = get_latest_backup_file(with_files=True)
 
@@ -208,7 +208,7 @@ def upload_system_backup_to_google_drive():
 		try:
 			media = MediaFileUpload(get_absolute_path(filename=fileurl), mimetype="application/gzip", resumable=True)
 		except IOError as e:
-			frappe.throw(_("Google Drive - Could not locate locate - {0}").format(e))
+			frappe.throw(_("Google Drive - Could not locate - {0}").format(e))
 
 		try:
 			set_progress(2, "Uploading backup to Google Drive.")
@@ -232,7 +232,7 @@ def weekly_backup():
 		upload_system_backup_to_google_drive()
 
 def get_absolute_path(filename):
-	file_path = os.path.join(get_backups_path()[2:], filename)
+	file_path = os.path.join(get_backups_path()[2:], os.path.basename(filename))
 	return "{0}/sites/{1}".format(get_bench_path(), file_path)
 
 def set_progress(progress, message):

From 517752c4d41d8c0fd804129f9d30a2e3a253f9f2 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 10 Jul 2020 11:14:03 +0530
Subject: [PATCH 144/345] fix: PY2 compatibility change

---
 frappe/integrations/frappe_providers/frappecloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/integrations/frappe_providers/frappecloud.py b/frappe/integrations/frappe_providers/frappecloud.py
index 6aeef5dc7b..f53b3c3e23 100644
--- a/frappe/integrations/frappe_providers/frappecloud.py
+++ b/frappe/integrations/frappe_providers/frappecloud.py
@@ -21,4 +21,4 @@ def frappecloud_migrator(local_site):
 	if PY3:
 		exec(script_contents)
 	else:
-		execfile(script_contents)
+		exec script_contents

From 6f51b12fe414236668a6741d96e7206256c0cbf9 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 10 Jul 2020 12:03:00 +0530
Subject: [PATCH 145/345] fix: run file directly instead of using exec

---
 .../frappe_providers/frappecloud.py           | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/frappe/integrations/frappe_providers/frappecloud.py b/frappe/integrations/frappe_providers/frappecloud.py
index f53b3c3e23..a5be7beb15 100644
--- a/frappe/integrations/frappe_providers/frappecloud.py
+++ b/frappe/integrations/frappe_providers/frappecloud.py
@@ -1,14 +1,14 @@
 import click
 import requests
-from six import PY3
 from html2text import html2text
+
 import frappe
 
 
 def frappecloud_migrator(local_site):
-	print("Retreiving Migrator...")
+	print("Retreiving Site Migrator...")
 	remote_site = frappe.conf.frappecloud_url or "frappecloud.com"
-	request_url = "https://{}/api/method/press.api.script".format(remote_site)
+	request_url = "http://{}/api/method/press.api.script".format("gavin.frappe.cloud:8000")
 	request = requests.get(request_url)
 
 	if request.status_code / 100 != 2:
@@ -18,7 +18,12 @@ def frappecloud_migrator(local_site):
 
 	script_contents = request.json()["message"]
 
-	if PY3:
-		exec(script_contents)
-	else:
-		exec script_contents
+	import tempfile
+	import os
+	import sys
+
+	py = sys.executable
+	script = tempfile.NamedTemporaryFile(mode="w")
+	script.write(script_contents)
+	print("Site Migrator stored at {}".format(script.name))
+	os.execv(py, [py, script.name, local_site])

From 7e223f3f3ab1ce2620560366ea761d7b4b4e692a Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 10 Jul 2020 12:08:41 +0530
Subject: [PATCH 146/345] fix: typo

---
 frappe/integrations/frappe_providers/frappecloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/integrations/frappe_providers/frappecloud.py b/frappe/integrations/frappe_providers/frappecloud.py
index a5be7beb15..b506788b48 100644
--- a/frappe/integrations/frappe_providers/frappecloud.py
+++ b/frappe/integrations/frappe_providers/frappecloud.py
@@ -8,7 +8,7 @@ import frappe
 def frappecloud_migrator(local_site):
 	print("Retreiving Site Migrator...")
 	remote_site = frappe.conf.frappecloud_url or "frappecloud.com"
-	request_url = "http://{}/api/method/press.api.script".format("gavin.frappe.cloud:8000")
+	request_url = "https://{}/api/method/press.api.script".format(remote_site)
 	request = requests.get(request_url)
 
 	if request.status_code / 100 != 2:

From b66be7795dfad92a65df0d79d19b5882b984e76c Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 10 Jul 2020 16:11:16 +0530
Subject: [PATCH 147/345] feat: allow user to set doctype or report only once

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 4bab76337f..05c7fb2cec 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -67,7 +67,8 @@
    "fieldname": "document_type",
    "fieldtype": "Link",
    "label": "Document Type",
-   "options": "DocType"
+   "options": "DocType",
+   "set_only_once": 1
   },
   {
    "depends_on": "eval: doc.timeseries && ['Count', 'Sum', 'Average'].includes(doc.chart_type)",
@@ -200,7 +201,8 @@
    "fieldname": "report_name",
    "fieldtype": "Link",
    "label": "Report Name",
-   "options": "Report"
+   "options": "Report",
+   "set_only_once": 1
   },
   {
    "default": "0",
@@ -238,7 +240,7 @@
   }
  ],
  "links": [],
- "modified": "2020-05-16 15:03:02.455395",
+ "modified": "2020-07-10 16:09:47.102062",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",

From daa479434a05b02d516e57d989d9ea4d60d49a52 Mon Sep 17 00:00:00 2001
From: Michelle Alva <50285544+michellealva@users.noreply.github.com>
Date: Fri, 10 Jul 2020 19:05:48 +0530
Subject: [PATCH 148/345] fix: update success message (#10950)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/website/module_onboarding/website/website.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/frappe/website/module_onboarding/website/website.json b/frappe/website/module_onboarding/website/website.json
index 4ed2fd9807..7a7cc41012 100644
--- a/frappe/website/module_onboarding/website/website.json
+++ b/frappe/website/module_onboarding/website/website.json
@@ -10,7 +10,7 @@
  "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/website",
  "idx": 0,
  "is_complete": 0,
- "modified": "2020-07-04 13:51:57.535269",
+ "modified": "2020-07-08 14:06:24.785922",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Website",
@@ -33,7 +33,6 @@
   }
  ],
  "subtitle": "Blogs, Website View Tracking, and more.",
- "success_message": "Yayy! Your website is all set up!",
- "title": "Let's Set Up Your Website",
- "user_can_dismiss": 1
+ "success_message": "Your website is all set up!",
+ "title": "Let's Set Up Your Website."
 }

From e30161b222ec94ccf3c22f0e6e6affe42ed9dbbf Mon Sep 17 00:00:00 2001
From: Chinmay Pai <chinmaydpai@gmail.com>
Date: Fri, 10 Jul 2020 19:25:06 +0530
Subject: [PATCH 149/345] fix: disallow global variable access through sql
 (#10875)

* fix: disallow global variable access through sql

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
Co-authored-by: Sahil Khan <sahilkhan28297@gmail.com>

* chore: add test for sql disallowed variable access

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: Sahil Khan <sahilkhan28297@gmail.com>
---
 frappe/model/db_query.py      | 14 +++++++++-----
 frappe/tests/test_db_query.py |  3 +++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 19517aa4a1..ac87b1d907 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -203,7 +203,7 @@ class DatabaseQuery(object):
 	def sanitize_fields(self):
 		'''
 			regex : ^.*[,();].*
-			purpose : The regex will look for malicious patterns like `,`, '(', ')', ';' in each
+			purpose : The regex will look for malicious patterns like `,`, '(', ')', '@', ;' in each
 					field which may leads to sql injection.
 			example :
 				field = "`DocType`.`issingle`, version()"
@@ -211,11 +211,11 @@ class DatabaseQuery(object):
 			the system will filter out this field.
 		'''
 
-		sub_query_regex = re.compile("^.*[,();].*")
-		blacklisted_keywords = ['select', 'create', 'insert', 'delete', 'drop', 'update', 'case']
+		sub_query_regex = re.compile("^.*[,();@].*")
+		blacklisted_keywords = ['select', 'create', 'insert', 'delete', 'drop', 'update', 'case', 'show']
 		blacklisted_functions = ['concat', 'concat_ws', 'if', 'ifnull', 'nullif', 'coalesce',
 			'connection_id', 'current_user', 'database', 'last_insert_id', 'session_user',
-			'system_user', 'user', 'version']
+			'system_user', 'user', 'version', 'global']
 
 		def _raise_exception():
 			frappe.throw(_('Use of sub-query or function is restricted'), frappe.DataError)
@@ -238,6 +238,10 @@ class DatabaseQuery(object):
 				if any("{0}(".format(keyword) in field.lower() for keyword in blacklisted_functions):
 					_raise_exception()
 
+				if '@' in field.lower():
+					# prevent access to global variables
+					_raise_exception()
+
 			if re.compile(r"[0-9a-zA-Z]+\s*'").match(field):
 				_raise_exception()
 
@@ -854,4 +858,4 @@ def get_date_range(operator, value):
 
 	timespan = period_map[operator] + ' ' + timespan_map[value] if operator != 'timespan' else value
 
-	return get_timespan_date_range(timespan)
\ No newline at end of file
+	return get_timespan_date_range(timespan)
diff --git a/frappe/tests/test_db_query.py b/frappe/tests/test_db_query.py
index f4855965f0..32d50037cc 100644
--- a/frappe/tests/test_db_query.py
+++ b/frappe/tests/test_db_query.py
@@ -167,6 +167,9 @@ class TestReportview(unittest.TestCase):
 		self.assertRaises(frappe.DataError, DatabaseQuery("DocType").execute,
 			fields=["name", "1' UNION SELECT * FROM __Auth --"],limit_start=0, limit_page_length=1)
 
+		self.assertRaises(frappe.DataError, DatabaseQuery("DocType").execute,
+			fields=["@@version"], limit_start=0, limit_page_length=1)
+
 		data = DatabaseQuery("DocType").execute(fields=["count(`name`) as count"],
 			limit_start=0, limit_page_length=1)
 		self.assertTrue('count' in data[0])

From 0474044ec2e510dd1f033ab4e05a63dd11752648 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Fri, 10 Jul 2020 19:33:50 +0530
Subject: [PATCH 150/345] fix: Initialize git repository after creating app

---
 frappe/utils/boilerplate.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py
index 96ed3303ed..ff4356e56d 100755
--- a/frappe/utils/boilerplate.py
+++ b/frappe/utils/boilerplate.py
@@ -98,7 +98,13 @@ def make_boilerplate(dest, app_name):
 	with open(os.path.join(dest, hooks.app_name, hooks.app_name, "config", "docs.py"), "w") as f:
 		f.write(frappe.as_unicode(docs_template.format(**hooks)))
 
-	print("'{app}' created at {path}".format(app=app_name, path=os.path.join(dest, app_name)))
+	# initialize git
+	app_directory = os.path.join(dest, hooks.app_name)
+	frappe.commands.popen('git init', cwd=app_directory)
+	frappe.commands.popen('git add .', cwd=app_directory)
+	frappe.commands.popen('git commit -m "Initialize app"', cwd=app_directory)
+
+	print("'{app}' created at {path}".format(app=app_name, path=app_directory))
 
 
 manifest_template = """include MANIFEST.in

From 2220cb969bc973ca0dc4e0848e49a2f66d76eb15 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Fri, 10 Jul 2020 20:33:11 +0530
Subject: [PATCH 151/345] fix: Datetime field description

---
 frappe/public/js/frappe/form/controls/datetime.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/datetime.js b/frappe/public/js/frappe/form/controls/datetime.js
index b487be6eca..f44591ddcb 100644
--- a/frappe/public/js/frappe/form/controls/datetime.js
+++ b/frappe/public/js/frappe/form/controls/datetime.js
@@ -20,8 +20,6 @@ frappe.ui.form.ControlDatetime = frappe.ui.form.ControlDate.extend({
 		if (!frappe.datetime.is_timezone_same()) {
 			if (!description) {
 				this.df.description = time_zone;
-			} else if (!description.includes(time_zone)) {
-				this.df.description += '<br>' + time_zone;
 			}
 		}
 		this._super();

From ef5befadc9d35ae64ee52b56755e8ea07a1a732c Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 10 Jul 2020 21:29:25 +0530
Subject: [PATCH 152/345] fix(Report): remove fields if they don't exist (bp
 #10915) (#10972)

Co-authored-by: prssanna <prssud@gmail.com>
---
 frappe/public/js/frappe/list/base_list.js            | 7 +++++--
 frappe/public/js/frappe/views/reports/report_view.js | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index b94257106e..bbe2fa2f95 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -109,9 +109,10 @@ frappe.views.BaseList = class BaseList {
 		this.fields = this.fields.uniqBy(f => f[0] + f[1]);
 	}
 
-	_add_field(fieldname) {
+	_add_field(fieldname, doctype) {
 		if (!fieldname) return;
-		let doctype = this.doctype;
+
+		if (!doctype) doctype = this.doctype;
 
 		if (typeof fieldname === 'object') {
 			// df is passed
@@ -120,6 +121,8 @@ frappe.views.BaseList = class BaseList {
 			doctype = df.parent;
 		}
 
+		if (!this.fields) this.fields = [];
+
 		const is_valid_field = frappe.model.std_fields_list.includes(fieldname)
 			|| frappe.meta.has_field(doctype, fieldname)
 			|| fieldname === '_seen';
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 5475c302b7..9e7e5cbdd6 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -646,11 +646,13 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 
 	set_fields() {
 		if (this.report_name && this.report_doc.json.fields) {
-			this.fields = this.report_doc.json.fields.slice();
+			let fields = this.report_doc.json.fields.slice();
+			fields.forEach(f => this._add_field(f[0], f[1]));
 			return;
 		} else if (this.view_user_settings.fields) {
 			// get from user_settings
-			this.fields = this.view_user_settings.fields;
+			let fields = this.view_user_settings.fields;
+			fields.forEach(f => this._add_field(f[0], f[1]));
 			return;
 		}
 

From ce2b02a0c38a0799631f7877b4651dd54901a9d4 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 4 Jun 2020 16:01:49 +0530
Subject: [PATCH 153/345] feat: sync dashboards from json files

---
 frappe/desk/doctype/dashboard/dashboard.js    |  14 ++
 frappe/desk/doctype/dashboard/dashboard.json  |  27 +++-
 frappe/desk/doctype/dashboard/dashboard.py    |  28 ++++
 .../dashboard_chart/dashboard_chart.js        |  13 +-
 .../dashboard_chart/dashboard_chart.json      |  15 +-
 .../dashboard_chart/dashboard_chart.py        |   6 +-
 .../desk/doctype/number_card/number_card.js   |   3 +
 .../desk/doctype/number_card/number_card.json |  10 +-
 .../desk/doctype/number_card/number_card.py   |   3 +
 frappe/modules/export_file.py                 |  12 +-
 frappe/public/js/frappe/form/form.js          |   9 ++
 frappe/utils/dashboard.py                     | 128 +++++++++++++-----
 12 files changed, 217 insertions(+), 51 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js
index 609e943995..cf06d91c4d 100644
--- a/frappe/desk/doctype/dashboard/dashboard.js
+++ b/frappe/desk/doctype/dashboard/dashboard.js
@@ -5,6 +5,20 @@ frappe.ui.form.on('Dashboard', {
 	refresh: function(frm) {
 		frm.add_custom_button(__("Show Dashboard"), () => frappe.set_route('dashboard', frm.doc.name));
 
+		if (!frappe.boot.developer_mode) {
+			frm.disable_form();
+		} else {
+			frm.add_custom_button(__("Export"), () => {
+				frappe.call({
+					method: 'frappe.desk.doctype.dashboard.dashboard.export_dashboard',
+					freeze: true,
+					args: {
+						doc: frm.doc
+					}
+				});
+			});
+		}
+
 		frm.set_query("chart", "charts", function() {
 			return {
 				filters: {
diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index c0e2bddcf8..6093ac037a 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -8,6 +8,8 @@
  "field_order": [
   "dashboard_name",
   "is_default",
+  "is_standard",
+  "module",
   "charts",
   "chart_options",
   "cards"
@@ -35,21 +37,34 @@
    "reqd": 1
   },
   {
-    "description": "Set Default Options for all charts on this Dashboard (Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"])",
-    "fieldname": "chart_options",
-    "fieldtype": "Code",
-    "label": "Chart Options",
-    "options": "JSON"
+   "description": "Set Default Options for all charts on this Dashboard (Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"])",
+   "fieldname": "chart_options",
+   "fieldtype": "Code",
+   "label": "Chart Options",
+   "options": "JSON"
   },
   {
    "fieldname": "cards",
    "fieldtype": "Table",
    "label": "Cards",
    "options": "Number Card Link"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_standard",
+   "fieldtype": "Check",
+   "label": "Is Standard",
+   "read_only": 1
+  },
+  {
+   "fieldname": "module",
+   "fieldtype": "Link",
+   "label": "Module",
+   "options": "Module Def"
   }
  ],
  "links": [],
- "modified": "2020-04-29 13:26:37.362482",
+ "modified": "2020-05-26 18:31:10.062311",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index af0c48d9c6..4fc0c89544 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -4,9 +4,11 @@
 
 from __future__ import unicode_literals
 from frappe.model.document import Document
+from frappe.modules.export_file import export_to_files
 import frappe
 from frappe import _
 import json
+from frappe.utils.dashboard import create_filters_file_after_export
 
 class Dashboard(Document):
 	def on_update(self):
@@ -16,6 +18,8 @@ class Dashboard(Document):
 				tabDashboard set is_default = 0 where name != %s''', self.name)
 
 	def validate(self):
+		if not frappe.conf.developer_mode and self.is_standard:
+			frappe.throw('Cannot edit Standard Dashboards')
 		self.validate_custom_options()
 
 	def validate_custom_options(self):
@@ -25,6 +29,30 @@ class Dashboard(Document):
 			except ValueError as error:
 				frappe.throw(_("Invalid json added in the custom options: {0}").format(error))
 
+@frappe.whitelist()
+def export_dashboard(doc):
+	doc = frappe._dict(frappe.parse_json(doc))
+	card_count = 0
+	chart_count = 0
+
+	if not doc.module:
+		frappe.msgprint(_('Please set Module'))
+
+	if frappe.conf.developer_mode and doc.module:
+		export_to_files(record_list=[['Dashboard', doc.name, doc.module + ' Dashboard']], record_module=doc.module,)
+		record_list = []
+		for chart in doc.charts:
+			record_list.append(['Dashboard Chart', chart.get('chart'), 'Dashboard Charts'])
+			chart_count+=1
+		for card in doc.cards:
+			record_list.append(['Number Card', card.get('card'), 'Number Cards'])
+			card_count+=1
+
+		export_to_files(record_list=record_list, record_module=doc.module)
+		frappe.msgprint(_('Successfully exported <b>{chart_count} Charts</b> and <b>{card_count} Cards</b>').format(chart_count=chart_count, card_count=card_count))
+
+		create_filters_file_after_export(module_name=doc.module.lower(), dashboard_name=doc.name)
+
 @frappe.whitelist()
 def get_permitted_charts(dashboard_name):
 	permitted_charts = []
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index a10d3d96f2..a24526957d 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -12,6 +12,11 @@ frappe.ui.form.on('Dashboard Chart', {
 
 	refresh: function(frm) {
 		frm.chart_filters = null;
+
+		if (!frappe.boot.developer_mode && frm.doc.is_standard) {
+			frm.disable_form();
+		}
+
 		frm.add_custom_button('Add Chart to Dashboard', () => {
 			const d = new frappe.ui.Dialog({
 				title: __('Add to Dashboard'),
@@ -240,11 +245,11 @@ frappe.ui.form.on('Dashboard Chart', {
 	show_filters: function(frm) {
 		frm.chart_filters = [];
 		frappe.dashboard_utils.get_filters_for_chart_type(frm.doc).then(filters => {
-				if (filters) {
-					frm.chart_filters = filters;
-				}
+			if (filters) {
+				frm.chart_filters = filters;
+			}
 
-				frm.trigger('render_filters_table');
+			frm.trigger('render_filters_table');
 		});
 	},
 
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 4bab76337f..1e67b56574 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -22,6 +22,7 @@
   "aggregate_function_based_on",
   "number_of_groups",
   "column_break_6",
+  "is_standard",
   "is_public",
   "heatmap_year",
   "timespan",
@@ -33,9 +34,9 @@
   "filters_section",
   "filters_json",
   "chart_options_section",
-  "color",
-  "column_break_2",
   "custom_options",
+  "column_break_2",
+  "color",
   "section_break_10",
   "last_synced_on"
  ],
@@ -235,10 +236,18 @@
    "fieldname": "heatmap_year",
    "fieldtype": "Select",
    "label": "Year"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_standard",
+   "fieldtype": "Check",
+   "label": "Is Standard",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
  "links": [],
- "modified": "2020-05-16 15:03:02.455395",
+ "modified": "2020-06-04 15:59:52.046492",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 4ad6943e0b..a50d51955b 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -80,7 +80,9 @@ def get(chart_name = None, chart = None, no_cache = None, filters = None, from_d
 			to_date = get_datetime(chart.to_date)
 
 	timegrain = time_interval or chart.time_interval
-	filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json) or []
+	filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json)
+	if not filters:
+		filters = []
 
 	# don't include cancelled documents
 	filters.append([chart.document_type, 'docstatus', '<', 2, False])
@@ -349,6 +351,8 @@ class DashboardChart(Document):
 		frappe.cache().delete_key('chart-data:{}'.format(self.name))
 
 	def validate(self):
+		if not frappe.conf.developer_mode and self.is_standard:
+			frappe.throw('Cannot edit Standard charts')
 		if self.chart_type != 'Custom' and self.chart_type != 'Report':
 			self.check_required_field()
 			self.check_document_type()
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 184fe5e6cb..56f1231760 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -3,6 +3,9 @@
 
 frappe.ui.form.on('Number Card', {
 	refresh: function(frm) {
+		if (!frappe.boot.developer_mode && frm.doc.is_standard) {
+			frm.disable_form();
+		}
 		frm.set_df_property("filters_section", "hidden", 1);
 		frm.trigger('set_options');
 		frm.trigger('render_filters_table');
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index ec6a1e9190..f911737e8e 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -10,6 +10,7 @@
   "aggregate_function_based_on",
   "column_break_2",
   "document_type",
+  "is_standard",
   "is_public",
   "stats_section",
   "show_percentage_stats",
@@ -95,10 +96,17 @@
    "fieldname": "stats_section",
    "fieldtype": "Section Break",
    "label": "Stats"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_standard",
+   "fieldtype": "Check",
+   "label": "Is Standard",
+   "read_only": 1
   }
  ],
  "links": [],
- "modified": "2020-05-06 19:47:57.753574",
+ "modified": "2020-05-26 17:30:41.248436",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index c4a427c4e0..b57913dfac 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -67,6 +67,9 @@ def get_result(doc, to_date=None):
 
 	filters = frappe.parse_json(doc.filters_json)
 
+	if not filters:
+			filters = []
+
 	if to_date:
 		filters.append([doc.document_type, 'creation', '<', to_date, False])
 
diff --git a/frappe/modules/export_file.py b/frappe/modules/export_file.py
index b904132530..4b22c82105 100644
--- a/frappe/modules/export_file.py
+++ b/frappe/modules/export_file.py
@@ -12,16 +12,17 @@ def export_doc(doc):
 
 def export_to_files(record_list=None, record_module=None, verbose=0, create_init=None):
 	"""
-		Export record_list to files. record_list is a list of lists ([doctype],[docname] )  ,
+		Export record_list to files. record_list is a list of lists ([doctype, docname, folder name],)  ,
 	"""
 	if frappe.flags.in_import:
 		return
 
 	if record_list:
 		for record in record_list:
-			write_document_file(frappe.get_doc(record[0], record[1]), record_module, create_init=create_init)
+			folder_name = record[2] if len(record) == 3 else None
+			write_document_file(frappe.get_doc(record[0], record[1]), record_module, create_init=create_init, folder_name=folder_name)
 
-def write_document_file(doc, record_module=None, create_init=True):
+def write_document_file(doc, record_module=None, create_init=True, folder_name=None):
 	newdoc = doc.as_dict(no_nulls=True)
 	doc.run_method("before_export", newdoc)
 
@@ -35,7 +36,10 @@ def write_document_file(doc, record_module=None, create_init=True):
 	module = record_module or get_module_name(doc)
 
 	# create folder
-	folder = create_folder(module, doc.doctype, doc.name, create_init)
+	if folder_name:
+		folder = create_folder(module, folder_name, doc.name, create_init)
+	else:
+		folder = create_folder(module, doc.doctype, doc.name, create_init)
 
 	# write the data file
 	fname = scrub(doc.name)
diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index ebe94b4cdb..2e41246cbd 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -842,6 +842,15 @@ frappe.ui.form.Form = class FrappeForm {
 		this.page.clear_primary_action();
 	}
 
+	disable_form() {
+		this.set_read_only();
+		this.fields
+			.forEach((field) => {
+				this.set_df_property(field.df.fieldname, "read_only", "1");
+			});
+		this.disable_save();
+	}
+
 	handle_save_fail(btn, on_error) {
 		$(btn).prop('disabled', false);
 		if (on_error) {
diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index b7023427e2..55e9e89464 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -6,6 +6,9 @@ from frappe import _
 from functools import wraps
 from frappe.utils import add_to_date, cint, get_link_to_form
 from frappe.modules.import_file import import_doc
+import os
+from os.path import isfile, join
+import ast
 
 
 def cache_source(function):
@@ -74,6 +77,18 @@ def get_from_date_from_timespan(to_date, timespan):
 	return add_to_date(to_date, years=years, months=months, days=days,
 		as_datetime=True)
 
+def create_filters_file_after_export(module_name, dashboard_name):
+	dashboard_path = frappe.get_module_path(\
+		module_name,\
+		"{module_name}_dashboard".format(module_name=module_name),\
+		"{dashboard}".format(dashboard=dashboard_name)\
+	)
+	charts_path = frappe.get_module_path(module_name, "dashboard charts")
+	create_filters_file(charts_path, dashboard_path, 'dashboard_chart_filters')
+	cards_path = frappe.get_module_path(module_name, "number cards")
+	create_filters_file(cards_path, dashboard_path, 'number_card_filters')
+
+
 def sync_dashboards(app=None):
 	"""Import, overwrite fixtures from `[app]/fixtures`"""
 	if not cint(frappe.db.get_single_value('System Settings', 'setup_complete')):
@@ -86,39 +101,88 @@ def sync_dashboards(app=None):
 	for app_name in apps:
 		print("Updating Dashboard for {app}".format(app=app_name))
 		for module_name in frappe.local.app_modules.get(app_name) or []:
-			config = get_config(app_name, module_name)
-			if config:
-				frappe.flags.in_import = True
-				try:
-					make_records(config.charts, "Dashboard Chart")
-					make_records(config.number_cards, "Number Card")
-					make_records(config.dashboards, "Dashboard")
-				except Exception as e:
-					frappe.log_error(e, _("Dashboard Import Error"))
-				finally:
-					frappe.flags.in_import = False
+			frappe.flags.in_import = True
+			setup_dashboards_from_file(app_name, module_name)
+			frappe.flags.in_import = False
 
-def make_records(config, doctype):
-	if not config:
-		return
+def setup_dashboards_from_file(app, module):
+	dashboards_path = frappe.get_module_path(module, "{module}_dashboard".format(module=module))
+	chart_filters = {}
+	card_filters = {}
+	if os.path.isdir(dashboards_path):
+		for fname in os.listdir(dashboards_path):
+			dashboard_path = dashboards_path + '/{}'.format(fname)
+			if os.path.isdir(dashboard_path):
+				if fname == '__pycache__':
+					continue
 
+				# create records for all dashboards in the module
+				make_records(dashboards_path)
+				chart_filters.update(get_filters(app, module, fname, 'dashboard_chart_filters'))
+				card_filters.update(get_filters(app, module, fname, 'number_card_filters'))
+
+		charts_path = frappe.get_module_path(module, "dashboard charts")
+		cards_path = frappe.get_module_path(module, "number cards")
+		make_records(charts_path, chart_filters)
+		make_records(cards_path, card_filters)
+
+def get_filters(app, module, dashboard, filters_file):
+	module_name = '{app}.{module}.{module}_dashboard.{dashboard}.{filters_file}'.format(
+		app=app,
+		module=module,
+		dashboard=dashboard,
+		filters_file=filters_file
+	)
 	try:
-		for item in config:
-			item["doctype"] = doctype
-			import_doc(item)
-			frappe.db.commit()
-	except frappe.DuplicateEntryError:
-		pass
+		module = frappe.get_module(module_name)
+		filters = getattr(module, 'get_filters')()
+		return filters
+	except ModuleNotFoundError:
+		frappe.throw('No Dashboard filters file created')
 
-def get_config(app, module):
-	try:
-		module_dashboards = frappe.get_module('{app}.{module}.dashboard_fixtures'.format(app=app, module=module))
-		if hasattr(module_dashboards, 'get_data'):
-			return frappe._dict(module_dashboards.get_data())
-		return None
-	except ImportError:
-		return None
-	except Exception as e:
-		print(_("Failed to import dashboard fixtures for module {module}").format(module=module))
-		frappe.log_error(e, _("Dashboard Fixture Import Error"))
-		return None
+def create_filters_file(doc_folder_path, dashboard_path, fname):
+	filters_dict = get_filters_dict(doc_folder_path)
+	file_path = '{dashboard_path}/{fname}.py'.format(dashboard_path=dashboard_path, fname=fname)
+
+	with open(file_path, "w") as f:
+		f.write('''import frappe\n
+def get_filters():\n\treturn\\
+''')
+		f.write(frappe.as_json(filters_dict, indent='\t'))
+
+
+def get_filters_dict(path):
+	filters_list = []
+	for fname in os.listdir(path):
+		try:
+			doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
+			doc_name = doc_dict['name']
+			filters = frappe.parse_json(doc_dict.get('filters_json'))
+			if isinstance(filters, list):
+				for f in filters:
+					if len(f) == 5:
+						f[4] = cint(f)
+			doc_filter = '''"{doc_name}": {filters}'''.format(doc_name=doc_name, filters=filters)
+			filters_list.append(doc_filter)
+		except FileNotFoundError:
+			frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
+			pass
+
+	filters_dict = ast.literal_eval('{' + ', '.join(filters_list) + '}')
+	return filters_dict
+
+def make_records(path, filters=None):
+	for fname in os.listdir(path):
+		if os.path.isdir(join(path, fname)):
+			if fname == '__pycache__':
+				continue
+			try:
+				doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
+				doc_name = doc_dict['name']
+				doc_dict['is_standard'] = 1
+				if filters:
+					doc_dict['filters_json'] = frappe.as_json(filters[doc_name])
+				import_doc(doc_dict)
+			except FileNotFoundError as e:
+				frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
+				pass

From d4872ff64746361a64ed15518115de19fa374c77 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 4 Jun 2020 16:11:37 +0530
Subject: [PATCH 154/345] fix: hide custom options section

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index a24526957d..77728b6ad9 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -14,6 +14,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.chart_filters = null;
 
 		if (!frappe.boot.developer_mode && frm.doc.is_standard) {
+			frm.set_df_property('chart_options_section', 'hidden', 1);
 			frm.disable_form();
 		}
 

From b409b11b4a3219f05a9949e74a47a5fbb1e88988 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 4 Jun 2020 16:14:04 +0530
Subject: [PATCH 155/345] fix: remove unused imports, variables

---
 frappe/utils/dashboard.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index 55e9e89464..edbaefaace 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -7,7 +7,7 @@ from functools import wraps
 from frappe.utils import add_to_date, cint, get_link_to_form
 from frappe.modules.import_file import import_doc
 import os
-from os.path import isfile, join
+from os.path import join
 import ast
 
 
@@ -183,6 +183,6 @@ def make_records(path, filters=None):
 				if filters:
 					doc_dict['filters_json'] = frappe.as_json(filters[doc_name])
 				import_doc(doc_dict)
-			except FileNotFoundError as e:
-				frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
+			except FileNotFoundError:
+				frappe.log_error(message=frappe.get_traceback(), title="Dashboard Sync")
 				pass

From cdc139d887dfd80eece5fc823f4bbfd51ce83067 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 8 Jun 2020 20:00:22 +0530
Subject: [PATCH 156/345] refactor: refactor dashboard sync - sync charts,
 cards, dashboards on update - set dynamic filters in form

---
 frappe/desk/doctype/dashboard/dashboard.js    |  16 +-
 frappe/desk/doctype/dashboard/dashboard.json  |   7 +-
 frappe/desk/doctype/dashboard/dashboard.py    |  42 ++---
 .../dashboard_chart/dashboard_chart.js        | 153 ++++++++++++++++++
 .../dashboard_chart/dashboard_chart.json      |  32 +++-
 .../dashboard_chart/dashboard_chart.py        |   4 +
 .../desk/doctype/number_card/number_card.json |  18 ++-
 .../desk/doctype/number_card/number_card.py   |   5 +
 .../public/js/frappe/widgets/chart_widget.js  |  45 +++++-
 frappe/utils/dashboard.py                     |  65 +-------
 10 files changed, 282 insertions(+), 105 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js
index cf06d91c4d..9be6b55d53 100644
--- a/frappe/desk/doctype/dashboard/dashboard.js
+++ b/frappe/desk/doctype/dashboard/dashboard.js
@@ -7,22 +7,13 @@ frappe.ui.form.on('Dashboard', {
 
 		if (!frappe.boot.developer_mode) {
 			frm.disable_form();
-		} else {
-			frm.add_custom_button(__("Export"), () => {
-				frappe.call({
-					method: 'frappe.desk.doctype.dashboard.dashboard.export_dashboard',
-					freeze: true,
-					args: {
-						doc: frm.doc
-					}
-				});
-			});
 		}
 
 		frm.set_query("chart", "charts", function() {
 			return {
 				filters: {
-					is_public: 1
+					is_public: 1,
+					is_standard: 1,
 				}
 			};
 		});
@@ -30,7 +21,8 @@ frappe.ui.form.on('Dashboard', {
 		frm.set_query("card", "cards", function() {
 			return {
 				filters: {
-					is_public: 1
+					is_public: 1,
+					is_standard: 1,
 				}
 			};
 		});
diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index 6093ac037a..232ca6b1f0 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -53,18 +53,19 @@
    "default": "0",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard",
-   "read_only": 1
+   "label": "Is Standard"
   },
   {
+   "depends_on": "eval: doc.is_standard",
    "fieldname": "module",
    "fieldtype": "Link",
    "label": "Module",
+   "mandatory_depends_on": "eval: doc.is_standard",
    "options": "Module Def"
   }
  ],
  "links": [],
- "modified": "2020-05-26 18:31:10.062311",
+ "modified": "2020-06-08 19:16:02.997796",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index 4fc0c89544..a7afde38c2 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -8,7 +8,6 @@ from frappe.modules.export_file import export_to_files
 import frappe
 from frappe import _
 import json
-from frappe.utils.dashboard import create_filters_file_after_export
 
 class Dashboard(Document):
 	def on_update(self):
@@ -17,6 +16,9 @@ class Dashboard(Document):
 			frappe.db.sql('''update
 				tabDashboard set is_default = 0 where name != %s''', self.name)
 
+		if frappe.conf.developer_mode and self.is_standard:
+			export_to_files(record_list=[['Dashboard', self.name, self.module + ' Dashboard']], record_module=self.module)
+
 	def validate(self):
 		if not frappe.conf.developer_mode and self.is_standard:
 			frappe.throw('Cannot edit Standard Dashboards')
@@ -29,29 +31,29 @@ class Dashboard(Document):
 			except ValueError as error:
 				frappe.throw(_("Invalid json added in the custom options: {0}").format(error))
 
-@frappe.whitelist()
-def export_dashboard(doc):
-	doc = frappe._dict(frappe.parse_json(doc))
-	card_count = 0
-	chart_count = 0
+# @frappe.whitelist()
+# def export_dashboard(doc):
+# 	doc = frappe._dict(frappe.parse_json(doc))
+# 	card_count = 0
+# 	chart_count = 0
 
-	if not doc.module:
-		frappe.msgprint(_('Please set Module'))
+# 	if not doc.module:
+# 		frappe.msgprint(_('Please set Module'))
 
-	if frappe.conf.developer_mode and doc.module:
-		export_to_files(record_list=[['Dashboard', doc.name, doc.module + ' Dashboard']], record_module=doc.module,)
-		record_list = []
-		for chart in doc.charts:
-			record_list.append(['Dashboard Chart', chart.get('chart'), 'Dashboard Charts'])
-			chart_count+=1
-		for card in doc.cards:
-			record_list.append(['Number Card', card.get('card'), 'Number Cards'])
-			card_count+=1
+# 	if frappe.conf.developer_mode and doc.module:
+# 		export_to_files(record_list=[['Dashboard', doc.name, doc.module + ' Dashboard']], record_module=doc.module,)
+# 		record_list = []
+# 		for chart in doc.charts:
+# 			record_list.append(['Dashboard Chart', chart.get('chart'), 'Dashboard Charts'])
+# 			chart_count+=1
+# 		for card in doc.cards:
+# 			record_list.append(['Number Card', card.get('card'), 'Number Cards'])
+# 			card_count+=1
 
-		export_to_files(record_list=record_list, record_module=doc.module)
-		frappe.msgprint(_('Successfully exported <b>{chart_count} Charts</b> and <b>{card_count} Cards</b>').format(chart_count=chart_count, card_count=card_count))
+# 		export_to_files(record_list=record_list, record_module=doc.module)
+# 		frappe.msgprint(_('Successfully exported <b>{chart_count} Charts</b> and <b>{card_count} Cards</b>').format(chart_count=chart_count, card_count=card_count))
 
-		create_filters_file_after_export(module_name=doc.module.lower(), dashboard_name=doc.name)
+# 		create_filters_file_after_export(module_name=doc.module.lower(), dashboard_name=doc.name)
 
 @frappe.whitelist()
 def get_permitted_charts(dashboard_name):
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 77728b6ad9..b445ca9bf7 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -9,6 +9,31 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.add_fetch('source', 'timeseries', 'timeseries');
 	},
 
+	before_save: function(frm) {
+		let dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
+		let static_filters = JSON.parse(frm.doc.filters_json || 'null');
+		console.log(dynamic_filters, static_filters);
+		if (dynamic_filters) {
+			if ($.isArray(static_filters)) {
+				static_filters = static_filters.filter(static_filter => {
+					for (let dynamic_filter of dynamic_filters) {
+						if (static_filter[0] == dynamic_filter[0]
+							&& static_filter[1] == dynamic_filter[1]) {
+								return false;
+						}
+					};
+					return true;
+				});
+			} else {
+				for (let key of Object.keys(dynamic_filters)) {
+					delete static_filters[key];
+				}
+			}
+		}
+
+		frm.set_value('filters_json', JSON.stringify(static_filters));
+		frm.trigger('show_filters');
+	},
 
 	refresh: function(frm) {
 		frm.chart_filters = null;
@@ -55,6 +80,8 @@ frappe.ui.form.on('Dashboard Chart', {
 		});
 
 		frm.set_df_property("filters_section", "hidden", 1);
+		frm.set_df_property("dynamic_filters_section", "hidden", 1);
+
 		frm.trigger('set_time_series');
 		frm.set_query('document_type', function() {
 			return {
@@ -72,6 +99,16 @@ frappe.ui.form.on('Dashboard Chart', {
 		if (!frappe.boot.developer_mode) {
 			frm.set_df_property("custom_options", "hidden", 1);
 		}
+
+		if (frappe.boot.developer_mode && frm.doc.is_standard) {
+			frm.trigger('render_dynamic_filters_table');
+		}
+	},
+
+	is_standard: function(frm) {
+		if (frappe.boot.developer_mode && frm.doc.is_standard) {
+			frm.trigger('render_dynamic_filters_table');
+		}
 	},
 
 	source: function(frm) {
@@ -384,4 +421,120 @@ frappe.ui.form.on('Dashboard Chart', {
 		});
 	},
 
+	render_dynamic_filters_table(frm) {
+		frm.set_df_property("dynamic_filters_section", "hidden", 0);
+
+		let is_document_type = frm.doc.chart_type !== 'Report'
+			&& frm.doc.chart_type !== 'Custom';
+
+		let wrapper = $(frm.get_field('dynamic_filters_json').wrapper).empty();
+
+		frm.dynamic_filter_table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
+			<thead>
+				<tr>
+					<th style="width: 33%">${__('Filter')}</th>
+					<th style="width: 33%">${__('Condition')}</th>
+					<th>${__('Value')}</th>
+				</tr>
+			</thead>
+			<tbody></tbody>
+		</table>`).appendTo(wrapper);
+
+		frm.dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
+
+		frm.trigger('set_dynamic_filters_in_table');
+
+		let filters = JSON.parse(frm.doc.filters_json);
+		let fields = [];
+
+		if (is_document_type) {
+			filters.forEach(f => {
+				if (f[2] == '=') {
+					fields.push({
+						label: `${f[1]} (${f[0]})`,
+						fieldname: f[0] + ':' + f[1],
+						fieldtype: 'Data',
+					});
+				}
+			});
+		} else {
+			for (let key of Object.keys(filters)) {
+				fields.push({
+					label: key,
+					fieldname: key,
+					fieldtype: 'Data',
+				});
+			}
+		}
+
+		let dialog_values;
+		frm.dynamic_filter_table.on('click', () => {
+			let dialog = new frappe.ui.Dialog({
+				title: __('Set Dynamic Filters'),
+				fields: fields,
+				primary_action: () => {
+					let values = dialog.get_values();
+					if (values) {
+						dialog.hide();
+						let dynamic_filters = [];
+						for (let key of Object.keys(values)) {
+							if (is_document_type) {
+								let [doctype, fieldname] = key.split(':');
+								dynamic_filters.push([doctype, fieldname, '=', values[key]]);
+							}
+						}
+
+						if (is_document_type) {
+							dialog_values = values;
+							frm.set_value('dynamic_filters_json', JSON.stringify(dynamic_filters));
+						} else {
+							dialog_values = frm.dynamic_filters;
+							frm.set_value('dynamic_filters_json', JSON.stringify(values));
+						}
+						frm.set_value('filters_json', JSON.stringify(filters));
+						frm.trigger('set_dynamic_filters_in_table');
+					}
+				},
+				primary_action_label: "Set"
+			});
+
+			dialog.show();
+			dialog.set_values(dialog_values);
+		});
+	},
+
+	set_dynamic_filters_in_table: function(frm) {
+		frm.dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
+		if (!frm.dynamic_filters) {
+			const filter_row = $(`<tr><td colspan="3" class="text-muted text-center">
+				${__("Click to Set Dynamic Filters")}</td></tr>`);
+			frm.dynamic_filter_table.find('tbody').html(filter_row);
+		} else {
+			let filter_rows = '';
+			if ($.isArray(frm.dynamic_filters)) {
+				frm.dynamic_filters.forEach(filter => {
+					filter_rows +=
+						`<tr>
+							<td>${filter[1]}</td>
+							<td>${filter[2] || ""}</td>
+							<td>${filter[3]}</td>
+						</tr>`
+				});
+			} else {
+				let condition = '=';
+				for (let [key, val] of Object.entries(frm.dynamic_filters)) {
+					filter_rows +=
+						`<tr>
+							<td>${key}</td>
+							<td>${condition}</td>
+							<td>${val || ""}</td>
+						</tr>`
+					;
+				}
+			}
+
+			frm.dynamic_filter_table.find('tbody').html(filter_rows);
+		}
+	}
+
 });
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 1e67b56574..deb70e464d 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -7,6 +7,8 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "is_standard",
+  "module",
   "chart_name",
   "chart_type",
   "report_name",
@@ -22,7 +24,6 @@
   "aggregate_function_based_on",
   "number_of_groups",
   "column_break_6",
-  "is_standard",
   "is_public",
   "heatmap_year",
   "timespan",
@@ -33,6 +34,8 @@
   "type",
   "filters_section",
   "filters_json",
+  "dynamic_filters_section",
+  "dynamic_filters_json",
   "chart_options_section",
   "custom_options",
   "column_break_2",
@@ -244,10 +247,35 @@
    "label": "Is Standard",
    "show_days": 1,
    "show_seconds": 1
+  },
+  {
+   "depends_on": "eval: doc.is_standard",
+   "fieldname": "module",
+   "fieldtype": "Link",
+   "label": "Module",
+   "mandatory_depends_on": "eval: doc.is_standard",
+   "options": "Module Def",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "fieldname": "dynamic_filters_json",
+   "fieldtype": "Code",
+   "label": "Dynamic Filters JSON",
+   "options": "JSON",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "fieldname": "dynamic_filters_section",
+   "fieldtype": "Section Break",
+   "label": "Dynamic Filters",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
  "links": [],
- "modified": "2020-06-04 15:59:52.046492",
+ "modified": "2020-06-08 19:43:12.000511",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index a50d51955b..70aece3ee7 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -13,6 +13,7 @@ from frappe.utils import nowdate, add_to_date, getdate, get_last_day, formatdate
 from frappe.model.naming import append_number_if_name_exists
 from frappe.boot import get_allowed_reports
 from frappe.model.document import Document
+from frappe.modules.export_file import export_to_files
 
 
 def get_permission_query_conditions(user):
@@ -349,6 +350,9 @@ class DashboardChart(Document):
 
 	def on_update(self):
 		frappe.cache().delete_key('chart-data:{}'.format(self.name))
+		if frappe.conf.developer_mode and self.is_standard:
+			export_to_files(record_list=[['Dashboard Chart', self.name]], record_module=self.module)
+
 
 	def validate(self):
 		if not frappe.conf.developer_mode and self.is_standard:
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index f911737e8e..7dca736bc8 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -5,12 +5,13 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "is_standard",
+  "module",
   "label",
   "function",
   "aggregate_function_based_on",
   "column_break_2",
   "document_type",
-  "is_standard",
   "is_public",
   "stats_section",
   "show_percentage_stats",
@@ -101,12 +102,21 @@
    "default": "0",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard",
-   "read_only": 1
+   "label": "Is Standard"
+  },
+  {
+   "depends_on": "eval: doc.is_standard",
+   "fieldname": "module",
+   "fieldtype": "Link",
+   "label": "Module",
+   "mandatory_depends_on": "eval: doc.is_standard",
+   "options": "Module Def",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
  "links": [],
- "modified": "2020-05-26 17:30:41.248436",
+ "modified": "2020-06-08 13:15:58.741945",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index b57913dfac..2f5cfb561c 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -7,6 +7,7 @@ import frappe
 from frappe.model.document import Document
 from frappe.utils import cint
 from frappe.model.naming import append_number_if_name_exists
+from frappe.modules.export_file import export_to_files
 
 class NumberCard(Document):
 	def autoname(self):
@@ -16,6 +17,10 @@ class NumberCard(Document):
 		if frappe.db.exists("Number Card", self.name):
 			self.name = append_number_if_name_exists('Number Card', self.name)
 
+	def on_update(self):
+		if frappe.conf.developer_mode and self.is_standard:
+			export_to_files(record_list=[['Number Card', self.name]], record_module=self.module)
+
 def get_permission_query_conditions(user=None):
 	if not user:
 		user = frappe.session.user
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 8a0eca9eaf..e31df3825b 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -412,10 +412,13 @@ export default class ChartWidget extends Widget {
 		}
 
 		dialog.show();
-		//Set query report object so that it can be used while fetching filter values in the report
-		frappe.query_report = new frappe.views.QueryReport({'filters': dialog.fields_list});
-		frappe.query_reports[this.chart_doc.report_name].onload
-				&& frappe.query_reports[this.chart_doc.report_name].onload(frappe.query_report);
+
+		if (this.chart_doc.chart_type == 'Report') {
+			//Set query report object so that it can be used while fetching filter values in the report
+			frappe.query_report = new frappe.views.QueryReport({'filters': dialog.fields_list});
+			frappe.query_reports[this.chart_doc.report_name].onload
+					&& frappe.query_reports[this.chart_doc.report_name].onload(frappe.query_report);
+		}
 		dialog.set_values(this.filters);
 	}
 
@@ -636,7 +639,7 @@ export default class ChartWidget extends Widget {
 
 	set_chart_filters() {
 		let user_saved_filters = this.chart_settings.filters || null;
-		let chart_saved_filters = JSON.parse(this.chart_doc.filters_json || "null");
+		let chart_saved_filters = this.get_all_chart_filters();
 
 		if (this.chart_doc.chart_type == 'Report') {
 			return frappe.dashboard_utils
@@ -652,6 +655,38 @@ export default class ChartWidget extends Widget {
 		}
 	}
 
+	get_all_chart_filters() {
+		let filters = JSON.parse(this.chart_doc.filters_json || "null");
+		let dynamic_filters = JSON.parse(this.chart_doc.dynamic_filters_json || "null");
+
+		if (!dynamic_filters) {
+			return filters;
+		}
+
+		if ($.isArray(dynamic_filters)) {
+			dynamic_filters.forEach(f => {
+				try {
+					f[3] = eval(f[3]);
+				} catch (e) {
+					frappe.throw(__(`Invalid expression set in filter ${f[1]} (${f[0]})`));
+				}
+			});
+			filters = [...filters, ...dynamic_filters];
+		} else {
+			for (let key of Object.keys(dynamic_filters)) {
+				try {
+					const val = eval(dynamic_filters[key]);
+					dynamic_filters[key] = val;
+				} catch (e) {
+					frappe.throw(__(`Invalid expression set in filter ${key}`));
+				}
+			}
+			Object.assign(filters, dynamic_filters);
+		}
+
+		return filters;
+	}
+
 	update_default_date_filters(report_filters, chart_filters) {
 		report_filters.map(f => {
 			if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index edbaefaace..a0b315e431 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -102,13 +102,11 @@ def sync_dashboards(app=None):
 		print("Updating Dashboard for {app}".format(app=app_name))
 		for module_name in frappe.local.app_modules.get(app_name) or []:
 			frappe.flags.in_import = True
-			setup_dashboards_from_file(app_name, module_name)
+			make_records_in_module(app_name, module_name)
 			frappe.flags.in_import = False
 
-def setup_dashboards_from_file(app, module):
+def make_records_in_module(app, module):
 	dashboards_path = frappe.get_module_path(module, "{module}_dashboard".format(module=module))
-	chart_filters = {}
-	card_filters = {}
 	if os.path.isdir(dashboards_path):
 		for fname in os.listdir(dashboards_path):
 			dashboard_path = dashboards_path + '/{}'.format(fname)
@@ -118,58 +116,11 @@ def setup_dashboards_from_file(app, module):
 
 				# create records for all dashboards in the module
 				make_records(dashboards_path)
-				chart_filters.update(get_filters(app, module, fname, 'dashboard_chart_filters'))
-				card_filters.update(get_filters(app, module, fname, 'number_card_filters'))
 
-		charts_path = frappe.get_module_path(module, "dashboard charts")
-		cards_path = frappe.get_module_path(module, "number cards")
-		make_records(charts_path, chart_filters)
-		make_records(cards_path, card_filters)
-
-def get_filters(app, module, dashboard, filters_file):
-	module_name = '{app}.{module}.{module}_dashboard.{dashboard}.{filters_file}'.format(
-		app=app,
-		module=module,
-		dashboard=dashboard,
-		filters_file=filters_file
-	)
-	try:
-		module = frappe.get_module(module_name)
-		filters = getattr(module, 'get_filters')()
-		return filters
-	except ModuleNotFoundError:
-		frappe.throw('No Dashboard filters file created')
-
-def create_filters_file(doc_folder_path, dashboard_path, fname):
-	filters_dict = get_filters_dict(doc_folder_path)
-	file_path = '{dashboard_path}/{fname}.py'.format(dashboard_path=dashboard_path, fname=fname)
-
-	with open(file_path, "w") as f:
-		f.write('''import frappe\n
-def get_filters():\n\treturn\\
-''')
-		f.write(frappe.as_json(filters_dict, indent='\t'))
-
-
-def get_filters_dict(path):
-	filters_list = []
-	for fname in os.listdir(path):
-		try:
-			doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
-			doc_name = doc_dict['name']
-			filters = frappe.parse_json(doc_dict.get('filters_json'))
-			if isinstance(filters, list):
-				for f in filters:
-					if len(f) == 5:
-						f[4] = cint(f)
-			doc_filter = '''"{doc_name}": {filters}'''.format(doc_name=doc_name, filters=filters)
-			filters_list.append(doc_filter)
-		except FileNotFoundError:
-			frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
-			pass
-
-	filters_dict = ast.literal_eval('{' + ', '.join(filters_list) + '}')
-	return filters_dict
+		charts_path = frappe.get_module_path(module, "dashboard chart")
+		cards_path = frappe.get_module_path(module, "number card")
+		make_records(charts_path)
+		make_records(cards_path)
 
 def make_records(path, filters=None):
 	for fname in os.listdir(path):
@@ -178,10 +129,6 @@ def make_records(path, filters=None):
 				continue
 			try:
 				doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
-				doc_name = doc_dict['name']
-				doc_dict['is_standard'] = 1
-				if filters:
-					doc_dict['filters_json'] = frappe.as_json(filters[doc_name])
 				import_doc(doc_dict)
 			except FileNotFoundError:
 				frappe.log_error(message=frappe.get_traceback(), title="Dashboard Sync")

From 65ae8e44a6a066fa90d23980d76d4916e6cb3ebd Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 8 Jun 2020 20:06:56 +0530
Subject: [PATCH 157/345] fix: formatting fixes

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index b445ca9bf7..a0306bb64c 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -12,16 +12,15 @@ frappe.ui.form.on('Dashboard Chart', {
 	before_save: function(frm) {
 		let dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
 		let static_filters = JSON.parse(frm.doc.filters_json || 'null');
-		console.log(dynamic_filters, static_filters);
 		if (dynamic_filters) {
 			if ($.isArray(static_filters)) {
 				static_filters = static_filters.filter(static_filter => {
 					for (let dynamic_filter of dynamic_filters) {
 						if (static_filter[0] == dynamic_filter[0]
 							&& static_filter[1] == dynamic_filter[1]) {
-								return false;
+							return false;
 						}
-					};
+					}
 					return true;
 				});
 			} else {
@@ -518,7 +517,7 @@ frappe.ui.form.on('Dashboard Chart', {
 							<td>${filter[1]}</td>
 							<td>${filter[2] || ""}</td>
 							<td>${filter[3]}</td>
-						</tr>`
+						</tr>`;
 				});
 			} else {
 				let condition = '=';

From e2caa4da7f5ee65c05a033b74327d26b1c1ab0f7 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 8 Jun 2020 20:07:50 +0530
Subject: [PATCH 158/345] fix: remove ununsed imports, functions

---
 frappe/utils/dashboard.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index a0b315e431..07142f6ece 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -8,7 +8,6 @@ from frappe.utils import add_to_date, cint, get_link_to_form
 from frappe.modules.import_file import import_doc
 import os
 from os.path import join
-import ast
 
 
 def cache_source(function):
@@ -77,18 +76,6 @@ def get_from_date_from_timespan(to_date, timespan):
 	return add_to_date(to_date, years=years, months=months, days=days,
 		as_datetime=True)
 
-def create_filters_file_after_export(module_name, dashboard_name):
-	dashboard_path = frappe.get_module_path(\
-		module_name,\
-		"{module_name}_dashboard".format(module_name=module_name),\
-		"{dashboard}".format(dashboard=dashboard_name)\
-	)
-	charts_path = frappe.get_module_path(module_name, "dashboard charts")
-	create_filters_file(charts_path, dashboard_path, 'dashboard_chart_filters')
-	cards_path = frappe.get_module_path(module_name, "number cards")
-	create_filters_file(cards_path, dashboard_path, 'number_card_filters')
-
-
 def sync_dashboards(app=None):
 	"""Import, overwrite fixtures from `[app]/fixtures`"""
 	if not cint(frappe.db.get_single_value('System Settings', 'setup_complete')):

From 4d7e8e8679c5a0aab6fdbd97c59ed64f66a7bc1c Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 8 Jun 2020 20:11:37 +0530
Subject: [PATCH 159/345] fix: remove commented out code

---
 frappe/desk/doctype/dashboard/dashboard.py | 24 ----------------------
 1 file changed, 24 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index a7afde38c2..78e8eb60f3 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -31,30 +31,6 @@ class Dashboard(Document):
 			except ValueError as error:
 				frappe.throw(_("Invalid json added in the custom options: {0}").format(error))
 
-# @frappe.whitelist()
-# def export_dashboard(doc):
-# 	doc = frappe._dict(frappe.parse_json(doc))
-# 	card_count = 0
-# 	chart_count = 0
-
-# 	if not doc.module:
-# 		frappe.msgprint(_('Please set Module'))
-
-# 	if frappe.conf.developer_mode and doc.module:
-# 		export_to_files(record_list=[['Dashboard', doc.name, doc.module + ' Dashboard']], record_module=doc.module,)
-# 		record_list = []
-# 		for chart in doc.charts:
-# 			record_list.append(['Dashboard Chart', chart.get('chart'), 'Dashboard Charts'])
-# 			chart_count+=1
-# 		for card in doc.cards:
-# 			record_list.append(['Number Card', card.get('card'), 'Number Cards'])
-# 			card_count+=1
-
-# 		export_to_files(record_list=record_list, record_module=doc.module)
-# 		frappe.msgprint(_('Successfully exported <b>{chart_count} Charts</b> and <b>{card_count} Cards</b>').format(chart_count=chart_count, card_count=card_count))
-
-# 		create_filters_file_after_export(module_name=doc.module.lower(), dashboard_name=doc.name)
-
 @frappe.whitelist()
 def get_permitted_charts(dashboard_name):
 	permitted_charts = []

From eeabdf42f2b11f38e97175e5be8b60242e442dcd Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 9 Jun 2020 13:13:11 +0530
Subject: [PATCH 160/345] fix: trigger dynamic filters when filters are set

---
 .../dashboard_chart/dashboard_chart.js        | 66 ++++++++++++-------
 .../public/js/frappe/utils/dashboard_utils.js |  2 +-
 2 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index a0306bb64c..6f5fb4ec59 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -99,14 +99,13 @@ frappe.ui.form.on('Dashboard Chart', {
 			frm.set_df_property("custom_options", "hidden", 1);
 		}
 
-		if (frappe.boot.developer_mode && frm.doc.is_standard) {
-			frm.trigger('render_dynamic_filters_table');
-		}
 	},
 
 	is_standard: function(frm) {
 		if (frappe.boot.developer_mode && frm.doc.is_standard) {
 			frm.trigger('render_dynamic_filters_table');
+		} else {
+			frm.set_df_property("dynamic_filters_section", "hidden", 1);
 		}
 	},
 
@@ -153,6 +152,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.set_value('based_on', '');
 		frm.set_value('value_based_on', '');
 		frm.set_value('filters_json', '[]');
+		frm.set_value('dynamic_filters_json', '[]');
 		frm.trigger('update_options');
 	},
 
@@ -161,6 +161,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.set_value('y_axis', []);
 		frm.set_df_property('x_field', 'options', []);
 		frm.set_value('filters_json', '{}');
+		frm.set_value('dynamic_filters_json', '{}');
 		frm.trigger('set_chart_report_filters');
 	},
 
@@ -188,7 +189,7 @@ frappe.ui.form.on('Dashboard Chart', {
 	},
 
 	set_chart_field_options: function(frm) {
-		let filters = frm.doc.filters_json.length > 2? JSON.parse(frm.doc.filters_json): null;
+		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
 		frappe.xcall(
 			'frappe.desk.query_report.run',
 			{
@@ -285,8 +286,11 @@ frappe.ui.form.on('Dashboard Chart', {
 			if (filters) {
 				frm.chart_filters = filters;
 			}
-
 			frm.trigger('render_filters_table');
+
+			if (frappe.boot.developer_mode && frm.doc.is_standard) {
+				frm.trigger('render_dynamic_filters_table');
+			}
 		});
 	},
 
@@ -439,15 +443,25 @@ frappe.ui.form.on('Dashboard Chart', {
 			<tbody></tbody>
 		</table>`).appendTo(wrapper);
 
-		frm.dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
+		frm.dynamic_filters = frm.doc.dynamic_filters_json && frm.doc.dynamic_filters_json.length > 2
+			? JSON.parse(frm.doc.dynamic_filters_json)
+			: null;
 
 		frm.trigger('set_dynamic_filters_in_table');
 
-		let filters = JSON.parse(frm.doc.filters_json);
+		let filters = JSON.parse(frm.doc.filters_json || '[]');
 		let fields = [];
 
 		if (is_document_type) {
+			if (frm.dynamic_filters) {
+				filters = [...filters, ...frm.dynamic_filters];
+			}
 			filters.forEach(f => {
+				for (let field of fields) {
+					if (field.fieldname == f[0] + ':' + f[1]) {
+						return;
+					}
+				}
 				if (f[2] == '=') {
 					fields.push({
 						label: `${f[1]} (${f[0]})`,
@@ -457,6 +471,7 @@ frappe.ui.form.on('Dashboard Chart', {
 				}
 			});
 		} else {
+			filters = {...frm.dynamic_filters, ...filters};
 			for (let key of Object.keys(filters)) {
 				fields.push({
 					label: key,
@@ -473,26 +488,24 @@ frappe.ui.form.on('Dashboard Chart', {
 				fields: fields,
 				primary_action: () => {
 					let values = dialog.get_values();
-					if (values) {
-						dialog.hide();
-						let dynamic_filters = [];
-						for (let key of Object.keys(values)) {
-							if (is_document_type) {
-								let [doctype, fieldname] = key.split(':');
-								dynamic_filters.push([doctype, fieldname, '=', values[key]]);
-							}
-						}
-
+					dialog.hide();
+					let dynamic_filters = [];
+					for (let key of Object.keys(values)) {
 						if (is_document_type) {
-							dialog_values = values;
-							frm.set_value('dynamic_filters_json', JSON.stringify(dynamic_filters));
-						} else {
-							dialog_values = frm.dynamic_filters;
-							frm.set_value('dynamic_filters_json', JSON.stringify(values));
+							let [doctype, fieldname] = key.split(':');
+							dynamic_filters.push([doctype, fieldname, '=', values[key]]);
 						}
-						frm.set_value('filters_json', JSON.stringify(filters));
-						frm.trigger('set_dynamic_filters_in_table');
 					}
+
+					if (is_document_type) {
+						dialog_values = values;
+						frm.set_value('dynamic_filters_json', dynamic_filters);
+					} else {
+						dialog_values = frm.dynamic_filters;
+						frm.set_value('dynamic_filters_json', JSON.stringify(values));
+					}
+					frm.set_value('filters_json', JSON.stringify(filters));
+					frm.trigger('set_dynamic_filters_in_table');
 				},
 				primary_action_label: "Set"
 			});
@@ -503,7 +516,10 @@ frappe.ui.form.on('Dashboard Chart', {
 	},
 
 	set_dynamic_filters_in_table: function(frm) {
-		frm.dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
+		frm.dynamic_filters =  frm.doc.dynamic_filters_json && frm.doc.dynamic_filters_json.length > 2
+			? JSON.parse(frm.doc.dynamic_filters_json)
+			: null;
+
 		if (!frm.dynamic_filters) {
 			const filter_row = $(`<tr><td colspan="3" class="text-muted text-center">
 				${__("Click to Set Dynamic Filters")}</td></tr>`);
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index d1621a3e15..dfeee2e010 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -47,7 +47,7 @@ frappe.dashboard_utils = {
 				frappe.dom.eval(config);
 				return frappe.dashboards.chart_sources[chart.source].filters;
 			});
-		} else if (chart.chart_type === 'Report') {
+		} else if (chart.chart_type === 'Report' && chart.report_name) {
 			return frappe.report_utils.get_report_filters(chart.report_name).then(filters => {
 				return filters;
 			});

From 5c9643c40784801f7695232e6d879acc9f7729ba Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 9 Jun 2020 13:14:58 +0530
Subject: [PATCH 161/345] fix: increase width of filter value column

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 6f5fb4ec59..aaa04c6ffb 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -435,8 +435,8 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.dynamic_filter_table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
 			<thead>
 				<tr>
-					<th style="width: 33%">${__('Filter')}</th>
-					<th style="width: 33%">${__('Condition')}</th>
+					<th style="width: 20%">${__('Filter')}</th>
+					<th style="width: 20%">${__('Condition')}</th>
 					<th>${__('Value')}</th>
 				</tr>
 			</thead>

From 05a974854a4d0e4617472c96641696a18e3c9395 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 9 Jun 2020 14:22:00 +0530
Subject: [PATCH 162/345] feat: dynamic filters for number cards

---
 .../dashboard_chart/dashboard_chart.js        |  22 +--
 .../desk/doctype/number_card/number_card.js   | 140 +++++++++++++++---
 .../desk/doctype/number_card/number_card.json |  26 +++-
 .../public/js/frappe/utils/dashboard_utils.js |  22 +++
 4 files changed, 168 insertions(+), 42 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index aaa04c6ffb..ac2a15ee0a 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -12,23 +12,8 @@ frappe.ui.form.on('Dashboard Chart', {
 	before_save: function(frm) {
 		let dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
 		let static_filters = JSON.parse(frm.doc.filters_json || 'null');
-		if (dynamic_filters) {
-			if ($.isArray(static_filters)) {
-				static_filters = static_filters.filter(static_filter => {
-					for (let dynamic_filter of dynamic_filters) {
-						if (static_filter[0] == dynamic_filter[0]
-							&& static_filter[1] == dynamic_filter[1]) {
-							return false;
-						}
-					}
-					return true;
-				});
-			} else {
-				for (let key of Object.keys(dynamic_filters)) {
-					delete static_filters[key];
-				}
-			}
-		}
+		static_filters =
+			frappe.dashboard_utils.remove_common_static_filter_values(static_filters, dynamic_filters);
 
 		frm.set_value('filters_json', JSON.stringify(static_filters));
 		frm.trigger('show_filters');
@@ -499,12 +484,11 @@ frappe.ui.form.on('Dashboard Chart', {
 
 					if (is_document_type) {
 						dialog_values = values;
-						frm.set_value('dynamic_filters_json', dynamic_filters);
+						frm.set_value('dynamic_filters_json', JSON.stringify(dynamic_filters));
 					} else {
 						dialog_values = frm.dynamic_filters;
 						frm.set_value('dynamic_filters_json', JSON.stringify(values));
 					}
-					frm.set_value('filters_json', JSON.stringify(filters));
 					frm.trigger('set_dynamic_filters_in_table');
 				},
 				primary_action_label: "Set"
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 56f1231760..ccabf5a823 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -7,8 +7,28 @@ frappe.ui.form.on('Number Card', {
 			frm.disable_form();
 		}
 		frm.set_df_property("filters_section", "hidden", 1);
+		frm.set_df_property("dynamic_filters_section", "hidden", 1);
 		frm.trigger('set_options');
 		frm.trigger('render_filters_table');
+		frm.trigger('render_dynamic_filters_table');
+	},
+
+	before_save: function(frm) {
+		let dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || 'null');
+		let static_filters = JSON.parse(frm.doc.filters_json || 'null');
+		static_filters =
+			frappe.dashboard_utils.remove_common_static_filter_values(static_filters, dynamic_filters);
+
+		frm.set_value('filters_json', JSON.stringify(static_filters));
+		frm.trigger('render_filters_table');
+	},
+
+	is_standard: function(frm) {
+		if (frappe.boot.developer_mode && frm.doc.is_standard) {
+			frm.trigger('render_dynamic_filters_table');
+		} else {
+			frm.set_df_property("dynamic_filters_section", "hidden", 1);
+		}
 	},
 
 	document_type: function(frm) {
@@ -20,6 +40,7 @@ frappe.ui.form.on('Number Card', {
 			};
 		});
 		frm.set_value('filters_json', '[]');
+		frm.set_value('dynamic_filters_json', '[]');
 		frm.set_value('aggregate_function_based_on', '');
 		frm.trigger('set_options');
 	},
@@ -50,7 +71,7 @@ frappe.ui.form.on('Number Card', {
 		frm.set_df_property("filters_section", "hidden", 0);
 
 		let wrapper = $(frm.get_field('filters_json').wrapper).empty();
-		frm.filter_table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
+		let table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
 			<thead>
 				<tr>
 					<th style="width: 33%">${__('Filter')}</th>
@@ -63,9 +84,9 @@ frappe.ui.form.on('Number Card', {
 
 		frm.filters = JSON.parse(frm.doc.filters_json || '[]');
 
-		frm.trigger('set_filters_in_table');
+		set_filters_in_table(frm.filters, table);
 
-		frm.filter_table.on('click', () => {
+		table.on('click', () => {
 			let dialog = new frappe.ui.Dialog({
 				title: __('Set Filters'),
 				fields: [{
@@ -78,7 +99,8 @@ frappe.ui.form.on('Number Card', {
 						this.hide();
 						frm.filters = frm.filter_group.get_filters();
 						frm.set_value('filters_json', JSON.stringify(frm.filters));
-						frm.trigger('set_filters_in_table');
+						set_filters_in_table(frm.filters, table);
+						frm.trigger('render_dynamic_filters_table');
 					}
 				},
 				primary_action_label: "Set"
@@ -100,23 +122,97 @@ frappe.ui.form.on('Number Card', {
 
 	},
 
-	set_filters_in_table: function(frm) {
-		if (!frm.filters.length) {
-			const filter_row = $(`<tr><td colspan="3" class="text-muted text-center">
-				${__("Click to Set Filters")}</td></tr>`);
-			frm.filter_table.find('tbody').html(filter_row);
-		} else {
-			let filter_rows = '';
-			frm.filters.forEach(filter => {
-				filter_rows +=
-					`<tr>
-						<td>${filter[1]}</td>
-						<td>${filter[2] || ""}</td>
-						<td>${filter[3]}</td>
-					</tr>`;
-
-			});
-			frm.filter_table.find('tbody').html(filter_rows);
+	render_dynamic_filters_table: function(frm) {
+		if (!frappe.boot.developer_mode || !frm.doc.is_standard) {
+			return;
 		}
-	}
+		let wrapper = $(frm.get_field('dynamic_filters_json').wrapper).empty();
+
+		frm.set_df_property("dynamic_filters_section", "hidden", 0);
+
+		let table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
+			<thead>
+				<tr>
+					<th style="width: 20%">${__('Filter')}</th>
+					<th style="width: 20%">${__('Condition')}</th>
+					<th>${__('Value')}</th>
+				</tr>
+			</thead>
+			<tbody></tbody>
+		</table>`).appendTo(wrapper);
+
+		frm.dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || '[]');
+
+		set_filters_in_table(frm.dynamic_filters, table);
+
+		let filters = JSON.parse(frm.doc.filters_json || '[]');
+		let fields = [];
+
+		if (frm.dynamic_filters.length) {
+			filters = [...filters, ...frm.dynamic_filters];
+		}
+
+		filters.forEach(f => {
+			for (let field of fields) {
+				if (field.fieldname == f[0] + ':' + f[1]) {
+					return;
+				}
+			}
+			if (f[2] == '=') {
+				fields.push({
+					label: `${f[1]} (${f[0]})`,
+					fieldname: f[0] + ':' + f[1],
+					fieldtype: 'Data',
+				});
+			}
+		});
+
+		table.on('click', () => {
+			let dialog = new frappe.ui.Dialog({
+				title: __('Set Filters'),
+				fields: fields,
+				primary_action: () => {
+					let values = dialog.get_values();
+					if (values) {
+						dialog.hide();
+						let dynamic_filters = [];
+						for (let key of Object.keys(values)) {
+							let [doctype, fieldname] = key.split(':');
+							dynamic_filters.push([doctype, fieldname, '=', values[key]]);
+						}
+
+						frm.set_value('dynamic_filters_json', JSON.stringify(dynamic_filters));
+						frm.dynamic_filters = dynamic_filters;
+						set_filters_in_table(frm.dynamic_filters, table);
+					}
+				},
+				primary_action_label: "Set"
+			});
+
+			dialog.show();
+			dialog.set_values(filters);
+		});
+
+	},
+
 });
+
+function set_filters_in_table(filters, table) {
+	if (!filters.length) {
+		const filter_row = $(`<tr><td colspan="3" class="text-muted text-center">
+			${__("Click to Set Filters")}</td></tr>`);
+		table.find('tbody').html(filter_row);
+	} else {
+		let filter_rows = '';
+		filters.forEach(filter => {
+			filter_rows +=
+				`<tr>
+					<td>${filter[1]}</td>
+					<td>${filter[2] || ""}</td>
+					<td>${filter[3]}</td>
+				</tr>`;
+
+		});
+		table.find('tbody').html(filter_rows);
+	}
+}
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index 7dca736bc8..3d42b340d1 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -18,6 +18,9 @@
   "stats_time_interval",
   "filters_section",
   "filters_json",
+  "dynamic_filters_section",
+  "dynamic_filters_json",
+  "section_break_16",
   "color"
  ],
  "fields": [
@@ -113,10 +116,31 @@
    "options": "Module Def",
    "show_days": 1,
    "show_seconds": 1
+  },
+  {
+   "fieldname": "dynamic_filters_json",
+   "fieldtype": "Code",
+   "label": "Dynamic Filters JSON",
+   "options": "JSON",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "fieldname": "section_break_16",
+   "fieldtype": "Section Break",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "fieldname": "dynamic_filters_section",
+   "fieldtype": "Section Break",
+   "label": "Dynamic Filters Section",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
  "links": [],
- "modified": "2020-06-08 13:15:58.741945",
+ "modified": "2020-06-09 14:17:53.145201",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index dfeee2e010..f737c6ad12 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -97,6 +97,28 @@ frappe.dashboard_utils = {
 
 	get_year(date_str) {
 		return date_str.substring(0, date_str.indexOf('-'));
+	},
+
+	remove_common_static_filter_values(static_filters, dynamic_filters) {
+		if (dynamic_filters) {
+			if ($.isArray(static_filters)) {
+				static_filters = static_filters.filter(static_filter => {
+					for (let dynamic_filter of dynamic_filters) {
+						if (static_filter[0] == dynamic_filter[0]
+							&& static_filter[1] == dynamic_filter[1]) {
+							return false;
+						}
+					}
+					return true;
+				});
+			} else {
+				for (let key of Object.keys(dynamic_filters)) {
+					delete static_filters[key];
+				}
+			}
+		}
+
+		return static_filters;
 	}
 
 };
\ No newline at end of file

From 8589552efd5b5b09f8d464648ffd9f1ff441d352 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 9 Jun 2020 14:39:03 +0530
Subject: [PATCH 163/345] fix: description for dynamic filters

---
 .../doctype/dashboard_chart/dashboard_chart.js    | 15 ++++++++++++++-
 frappe/desk/doctype/number_card/number_card.js    | 15 ++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index ac2a15ee0a..812622d33c 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -435,7 +435,20 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.trigger('set_dynamic_filters_in_table');
 
 		let filters = JSON.parse(frm.doc.filters_json || '[]');
-		let fields = [];
+		let fields = [
+			{
+				fieldtype: 'HTML',
+				fieldname: 'description',
+				options:
+					`<div>
+						<p>Set dynamic filter values in JavaScript for the required fields here.
+						</p>
+						<p>Ex:
+							<code>frappe.defaults.get_user_default("Company")</code>
+						</p>
+					</div>`
+			}
+		];
 
 		if (is_document_type) {
 			if (frm.dynamic_filters) {
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index ccabf5a823..d7abe57e2a 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -146,7 +146,20 @@ frappe.ui.form.on('Number Card', {
 		set_filters_in_table(frm.dynamic_filters, table);
 
 		let filters = JSON.parse(frm.doc.filters_json || '[]');
-		let fields = [];
+		let fields = [
+			{
+				fieldtype: 'HTML',
+				fieldname: 'description',
+				options:
+					`<div>
+						<p>Set dynamic filter values in JavaScript for the required fields here.
+						</p>
+						<p>Ex:
+							<code>frappe.defaults.get_user_default("Company")</code>
+						</p>
+					</div>`
+			}
+		];
 
 		if (frm.dynamic_filters.length) {
 			filters = [...filters, ...frm.dynamic_filters];

From 085dac23bcb797486ad9877bf74f96974737e846 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 6 Jul 2020 12:17:05 +0530
Subject: [PATCH 164/345] fix: error name

---
 frappe/utils/dashboard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index 07142f6ece..c4fef37575 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -118,5 +118,5 @@ def make_records(path, filters=None):
 				doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
 				import_doc(doc_dict)
 			except FileNotFoundError:
-				frappe.log_error(message=frappe.get_traceback(), title="Dashboard Sync")
+				frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
 				pass

From c140657aa61f76102a31a01f5ce596474f90a660 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 9 Jul 2020 13:27:08 +0530
Subject: [PATCH 165/345] fix: simplify sync dashboards code

---
 frappe/utils/dashboard.py | 39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index c4fef37575..fd8f8cea7b 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -94,29 +94,22 @@ def sync_dashboards(app=None):
 
 def make_records_in_module(app, module):
 	dashboards_path = frappe.get_module_path(module, "{module}_dashboard".format(module=module))
-	if os.path.isdir(dashboards_path):
-		for fname in os.listdir(dashboards_path):
-			dashboard_path = dashboards_path + '/{}'.format(fname)
-			if os.path.isdir(dashboard_path):
-				if fname == '__pycache__':
-					continue
+	charts_path = frappe.get_module_path(module, "dashboard chart")
+	cards_path = frappe.get_module_path(module, "number card")
 
-				# create records for all dashboards in the module
-				make_records(dashboards_path)
-
-		charts_path = frappe.get_module_path(module, "dashboard chart")
-		cards_path = frappe.get_module_path(module, "number card")
-		make_records(charts_path)
-		make_records(cards_path)
+	paths = [dashboards_path, charts_path, cards_path]
+	for path in paths:
+		make_records(path)
 
 def make_records(path, filters=None):
-	for fname in os.listdir(path):
-		if os.path.isdir(join(path, fname)):
-			if fname == '__pycache__':
-				continue
-			try:
-				doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
-				import_doc(doc_dict)
-			except FileNotFoundError:
-				frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
-				pass
+	if os.path.isdir(path):
+		for fname in os.listdir(path):
+			if os.path.isdir(join(path, fname)):
+				if fname == '__pycache__':
+					continue
+				try:
+					doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
+					import_doc(doc_dict)
+				except FileNotFoundError:
+					frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
+					pass

From 545412ff4e2eeed21e42442cdaff6c1be19e34f2 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sat, 11 Jul 2020 15:20:30 +0530
Subject: [PATCH 166/345] fix: validate if all docs in dashboard have been set
 as standard

---
 frappe/desk/doctype/dashboard/dashboard.py | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index 78e8eb60f3..b12bcfe27d 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -22,6 +22,17 @@ class Dashboard(Document):
 	def validate(self):
 		if not frappe.conf.developer_mode and self.is_standard:
 			frappe.throw('Cannot edit Standard Dashboards')
+
+		if self.is_standard:
+			non_standard_docs_map = {
+				'Dashboard Chart': get_non_standard_charts_in_dashboard(self),
+				'Number Card': get_non_standard_cards_in_dashboard(self)
+			}
+
+			if non_standard_docs_map['Dashboard Chart'] or non_standard_docs_map['Number Card']:
+				message = get_non_standard_warning_message(non_standard_docs_map)
+				frappe.throw(message, title=_("Standard Not Set"), is_minimizable=True)
+
 		self.validate_custom_options()
 
 	def validate_custom_options(self):
@@ -54,3 +65,29 @@ def get_permitted_cards(dashboard_name):
 		if frappe.has_permission('Number Card', doc=card.card):
 			permitted_cards.append(card)
 	return permitted_cards
+
+def get_non_standard_charts_in_dashboard(dashboard):
+	non_standard_charts = [doc.name for doc in frappe.get_list('Dashboard Chart', {'is_standard': 0})]
+	return [chart_link.chart for chart_link in dashboard.charts if chart_link.chart in non_standard_charts]
+
+def get_non_standard_cards_in_dashboard(dashboard):
+	non_standard_cards = [doc.name for doc in frappe.get_list('Number Card', {'is_standard': 0})]
+	return [card_link.card for card_link in dashboard.cards if card_link.card in non_standard_cards]
+
+def get_non_standard_warning_message(non_standard_docs_map):
+	message = _('''Please set the following documents in this Dashboard as standard first.''')
+
+	def get_html(docs, doctype):
+		html = '<p>{}</p>'.format(frappe.bold(doctype))
+		for doc in docs:
+			html += '<div><a href="#Form/{doctype}/{doc}">{doc}</a></div>'.format(doctype=doctype, doc=doc)
+		html += '<br>'
+		return html
+
+	html = message + '<br>'
+
+	for doctype in non_standard_docs_map:
+		if non_standard_docs_map[doctype]:
+			html += get_html(non_standard_docs_map[doctype], doctype)
+
+	return html

From f3534589cb4740c9ae34544f1023f5358a2257a7 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sat, 11 Jul 2020 15:21:03 +0530
Subject: [PATCH 167/345] fix: same width for filters and dynamic filters table

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 812622d33c..a14db4d18b 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -288,8 +288,8 @@ frappe.ui.form.on('Dashboard Chart', {
 		let table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
 			<thead>
 				<tr>
-					<th style="width: 33%">${__('Filter')}</th>
-					<th style="width: 33%">${__('Condition')}</th>
+					<th style="width: 20%">${__('Filter')}</th>
+					<th style="width: 20%">${__('Condition')}</th>
 					<th>${__('Value')}</th>
 				</tr>
 			</thead>

From 817b2488271ef109d4f53ecf4b1856ff3635892e Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Sat, 11 Jul 2020 17:34:28 +0530
Subject: [PATCH 168/345] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index a97154847b..bfe2bc4529 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -22,7 +22,7 @@
 <div class="help-article-feedback mb-4">
 	<hr />
 	<div class="feedback-view ">
-		<span class="text-muted small mr-2">{{ _("Was this article helpful?") }}</span>
+		<div class="text-muted small mr-2 mb-2">{{ _("Was this article helpful?") }}</div>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
 		<button class="feedback-msg btn btn-sm disabled hide">{{ _("Thank you for your feedback!") }}</button>

From 44979d17f6762f069acca40fb0ac5063bd5df550 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Sat, 11 Jul 2020 17:34:50 +0530
Subject: [PATCH 169/345] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 .../doctype/help_article/templates/help_article.html        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index bfe2bc4529..577383858b 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -47,9 +47,9 @@ frappe.ready(function() {
 			method: "frappe.website.doctype.help_article.help_article.add_feedback",
 			args: args,
 			callback: function(r) {
-				$(".feedback")[0].classList.add("hide");
-				$(".feedback")[1].classList.add("hide");
-				$(".feedback-msg")[0].classList.remove("hide");
+				$(".feedback")[0].classList.add("hidden");
+				$(".feedback")[1].classList.add("hidden");
+				$(".feedback-msg")[0].classList.remove("hidden");
 			}
 		})
 	});

From 3051ac5e57c7e435c5778c5da0868089e9232292 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sun, 12 Jul 2020 11:04:10 +0530
Subject: [PATCH 170/345] fix: Use gitpython module instead of subprocess

---
 frappe/utils/boilerplate.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py
index ff4356e56d..7dfa2ca1b0 100755
--- a/frappe/utils/boilerplate.py
+++ b/frappe/utils/boilerplate.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals, print_function
 
 from six.moves import input
 
-import frappe, os, re
+import frappe, os, re, git
 from frappe.utils import touch_file, cstr
 
 def make_boilerplate(dest, app_name):
@@ -98,11 +98,11 @@ def make_boilerplate(dest, app_name):
 	with open(os.path.join(dest, hooks.app_name, hooks.app_name, "config", "docs.py"), "w") as f:
 		f.write(frappe.as_unicode(docs_template.format(**hooks)))
 
-	# initialize git
+	# initialize git repository
 	app_directory = os.path.join(dest, hooks.app_name)
-	frappe.commands.popen('git init', cwd=app_directory)
-	frappe.commands.popen('git add .', cwd=app_directory)
-	frappe.commands.popen('git commit -m "Initialize app"', cwd=app_directory)
+	app_repo = git.Repo.init(app_directory)
+	app_repo.git.add(A=True)
+	app_repo.index.commit("feat: Initialize App")
 
 	print("'{app}' created at {path}".format(app=app_name, path=app_directory))
 

From 912763d3b98da5dff781299a99714990bbb550b3 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Mon, 13 Jul 2020 10:53:44 +0530
Subject: [PATCH 171/345] fix: Typo

---
 frappe/integrations/frappe_providers/frappecloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/integrations/frappe_providers/frappecloud.py b/frappe/integrations/frappe_providers/frappecloud.py
index b506788b48..e09f09a44b 100644
--- a/frappe/integrations/frappe_providers/frappecloud.py
+++ b/frappe/integrations/frappe_providers/frappecloud.py
@@ -13,7 +13,7 @@ def frappecloud_migrator(local_site):
 
 	if request.status_code / 100 != 2:
 		print("Request exitted with Status Code: {}\nPayload: {}".format(request.status_code, html2text(request.text)))
-		click.secho("Some errors occured while recovering the migration script. Please contact us @ Frappe Cloud if this issue persists", fg="yellow")
+		click.secho("Some errors occurred while recovering the migration script. Please contact us @ Frappe Cloud if this issue persists", fg="yellow")
 		return
 
 	script_contents = request.json()["message"]

From a871934f683db839875c3abc90ba39595d0d62de Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 13 Jul 2020 13:11:49 +0530
Subject: [PATCH 172/345] fix: Better check to skip patch

---
 frappe/patches/v13_0/replace_old_data_import.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frappe/patches/v13_0/replace_old_data_import.py b/frappe/patches/v13_0/replace_old_data_import.py
index f3eed6253c..41952f7200 100644
--- a/frappe/patches/v13_0/replace_old_data_import.py
+++ b/frappe/patches/v13_0/replace_old_data_import.py
@@ -6,11 +6,13 @@ import frappe
 
 
 def execute():
-	if not frappe.db.exists("DocType", "Data Import Beta"):
+	meta = frappe.get_meta("Data Import")
+	# if Data Import is the new one, return early
+	if meta.fields[1].fieldname == "import_type":
 		return
 
 	frappe.db.sql("DROP TABLE IF EXISTS `tabData Import Legacy`")
-	frappe.rename_doc('DocType', 'Data Import', 'Data Import Legacy')
+	frappe.rename_doc("DocType", "Data Import", "Data Import Legacy")
 	frappe.db.commit()
 	frappe.db.sql("DROP TABLE IF EXISTS `tabData Import`")
-	frappe.rename_doc('DocType', 'Data Import Beta', 'Data Import')
+	frappe.rename_doc("DocType", "Data Import Beta", "Data Import")

From cb7bea27eabec876b6fbde8ccf33ecd755bdc2f4 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 13 Jul 2020 13:31:52 +0530
Subject: [PATCH 173/345] fix(image-with-blur): Set width, height in CSS

---
 frappe/templates/includes/image_with_blur.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/templates/includes/image_with_blur.html b/frappe/templates/includes/image_with_blur.html
index 20b0380b88..dbddb9d8ef 100644
--- a/frappe/templates/includes/image_with_blur.html
+++ b/frappe/templates/includes/image_with_blur.html
@@ -1,7 +1,9 @@
 {%- set res = frappe.utils.get_thumbnail_base64_for_image(src) if src else false -%}
 {%- if res and res['base64'].startswith('data:') -%}
 <img src="{{ res['base64'] }}" class="image-with-blur {{ resolve_class(class) }}"
-	alt="{{ alt or '' }}" width="{{ res['width'] }}" height="{{ res['height'] }}" data-src="{{ src or '' }}" />
+	data-src="{{ src or '' }}" alt="{{ alt or '' }}"
+	width="{{ res['width'] }}" height="{{ res['height'] }}"
+	style="width: {{ res['width'] }}px; height: {{ res['height'] }}px;" />
 {%- else -%}
 <img src="{{ src or '' }}" class="{{ resolve_class(class) }}" alt="{{ alt or '' }}" />
 {%- endif -%}

From 28e0f42f9c6525b1b2ddaf0c6c80762a09115190 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Mon, 13 Jul 2020 13:42:17 +0530
Subject: [PATCH 174/345] feat: Hide timezone

---
 frappe/public/js/frappe/form/controls/datetime.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/controls/datetime.js b/frappe/public/js/frappe/form/controls/datetime.js
index f44591ddcb..c99dfe899f 100644
--- a/frappe/public/js/frappe/form/controls/datetime.js
+++ b/frappe/public/js/frappe/form/controls/datetime.js
@@ -17,9 +17,11 @@ frappe.ui.form.ControlDatetime = frappe.ui.form.ControlDate.extend({
 	set_description: function() {
 		const { description } = this.df;
 		const { time_zone } = frappe.sys_defaults;
-		if (!frappe.datetime.is_timezone_same()) {
+		if (!this.df.hide_timezone && !frappe.datetime.is_timezone_same()) {
 			if (!description) {
 				this.df.description = time_zone;
+			} else if (!description.includes(time_zone)) {
+				this.df.description += '<br>' + time_zone;
 			}
 		}
 		this._super();

From 05ccc8f13599907d68a88ec5e0cdab670cbe7211 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Mon, 13 Jul 2020 15:15:08 +0530
Subject: [PATCH 175/345] fix: Properly retain whitespace sequence (#10984)

---
 frappe/public/js/frappe/form/controls/text_editor.js | 2 ++
 frappe/public/less/quill.less                        | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index 3c0f7d5110..e367989b81 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -199,6 +199,8 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 
 	get_input_value() {
 		let value = this.quill ? this.quill.root.innerHTML : '';
+		// hack to retain space sequence.
+		value = value.replace(/(\s)(\s)/g, ' &nbsp;');
 		return value;
 	},
 
diff --git a/frappe/public/less/quill.less b/frappe/public/less/quill.less
index a72602697a..98c762bb4a 100644
--- a/frappe/public/less/quill.less
+++ b/frappe/public/less/quill.less
@@ -9,10 +9,6 @@
 	font-family: inherit;
 }
 
-.ql-editor {
-	white-space: normal;
-}
-
 .ql-editor {
 	font-family: @font-stack;
 	line-height: 1.6;

From 90cab5a2aaa03d9452bbf296467a42b64e6a31cf Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 13 Jul 2020 17:42:23 +0530
Subject: [PATCH 176/345] fix: dont set '__unsaved' for single doctypes

---
 frappe/model/create_new.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/model/create_new.py b/frappe/model/create_new.py
index 2142d544fe..fcf648e718 100644
--- a/frappe/model/create_new.py
+++ b/frappe/model/create_new.py
@@ -45,7 +45,9 @@ def make_new_doc(doctype):
 	doc = doc.get_valid_dict(sanitize=False)
 	doc["doctype"] = doctype
 	doc["__islocal"] = 1
-	doc["__unsaved"] = 1
+
+	if not frappe.model.meta.is_single(doctype):
+		doc["__unsaved"] = 1
 
 	return doc
 

From ccde503c5a0b81887eba33e0a17069d9ba08099b Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Mon, 13 Jul 2020 19:27:46 +0530
Subject: [PATCH 177/345] fix: Total Row in Reports

---
 .../js/frappe/views/reports/query_report.js       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index f82956adac..609e1feb46 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -861,8 +861,19 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 				if (column.isHeader && !data && this.data) {
 					// totalRow doesn't have a data object
 					// proxy it using the first data object
-					// this is needed only for currency formatting
-					data = this.data[0];
+					// applied to Float, Currency fields, needed only for currency formatting.
+					// make first data column have value 'Total'
+					let index = 1;
+					if (this.datatable && this.datatable.options.checkboxColumn) index = 2;
+
+					if (column.colIndex === index && !value) {
+						value = "Total";
+						column.fieldtype = "Data"; // avoid type issues for value if Date column
+					}
+					else if (in_list(["Currency", "Float"], column.fieldtype)) {
+						// proxy for currency and float
+						data = this.data[0];
+					}
 				}
 				return frappe.format(value, column,
 					{for_print: false, always_show_decimals: true}, data);

From 448c2f4e3f388ffdddb3928a2838b572d2de6c23 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 13 Jul 2020 22:05:54 +0530
Subject: [PATCH 178/345] fix(patch): Ignore cancelled ToDos while setting
 _assign

---
 frappe/patches/v12_0/set_correct_assign_value_in_docs.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/patches/v12_0/set_correct_assign_value_in_docs.py b/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
index d3f97af50b..65a635c170 100644
--- a/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
+++ b/frappe/patches/v12_0/set_correct_assign_value_in_docs.py
@@ -9,8 +9,9 @@ def execute():
 		FROM
 			`tabToDo`
 		WHERE
-			COALESCE(reference_type, '') != '' and
-			COALESCE(reference_name, '') != ''
+			COALESCE(reference_type, '') != '' AND
+			COALESCE(reference_name, '') != '' AND
+			status != 'Cancelled'
 		GROUP BY
 			reference_type, reference_name
 	'''

From 21277403a741d5ddabf9144f64f29af347d9ed69 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 13 Jul 2020 22:11:15 +0530
Subject: [PATCH 179/345] fix: Re-run fixed patch

---
 frappe/patches.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/patches.txt b/frappe/patches.txt
index cfcbc1ceba..dce4187695 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -264,7 +264,7 @@ frappe.patches.v11_0.make_all_prepared_report_attachments_private #2019-11-26
 frappe.patches.v12_0.setup_email_linking
 frappe.patches.v12_0.fix_home_settings_for_all_users
 frappe.patches.v12_0.change_existing_dashboard_chart_filters
-frappe.patches.v12_0.set_correct_assign_value_in_docs
+frappe.patches.v12_0.set_correct_assign_value_in_docs #2020-07-13
 execute:frappe.delete_doc("Test Runner")
 execute:frappe.delete_doc_if_exists('DocType', 'Google Maps Settings')
 execute:frappe.db.set_default('desktop:home_page', 'workspace')

From 44b61d66faca0966ce11e9158e136f2a7c079b48 Mon Sep 17 00:00:00 2001
From: Michelle Alva <50285544+michellealva@users.noreply.github.com>
Date: Tue, 14 Jul 2020 10:51:14 +0530
Subject: [PATCH 180/345] fix: Add Global Defaults under Core in Settings
 (#10989)

* fix: Add Global Defaults under Settings

* fix: add changes in desk page
---
 frappe/config/settings.py                    | 7 +++++++
 frappe/core/desk_page/settings/settings.json | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/frappe/config/settings.py b/frappe/config/settings.py
index 848ef2e1aa..e43abd9fcb 100644
--- a/frappe/config/settings.py
+++ b/frappe/config/settings.py
@@ -16,6 +16,13 @@ def get_data():
 					"description": _("Language, Date and Time settings"),
 					"hide_count": True
 				},
+				{
+					"type": "doctype",
+					"name": "Global Defaults",
+					"label": _("Global Defaults"),
+					"description": _("Company, Fiscal Year and Currency defaults"),
+					"hide_count": True
+				},
 				{
 					"type": "doctype",
 					"name": "Error Log",
diff --git a/frappe/core/desk_page/settings/settings.json b/frappe/core/desk_page/settings/settings.json
index 6569b2fb20..642a4fdadd 100644
--- a/frappe/core/desk_page/settings/settings.json
+++ b/frappe/core/desk_page/settings/settings.json
@@ -18,7 +18,7 @@
   {
    "hidden": 0,
    "label": "Core",
-   "links": "[\n    {\n        \"description\": \"Language, Date and Time settings\",\n        \"hide_count\": true,\n        \"label\": \"System Settings\",\n        \"name\": \"System Settings\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Log of error on automated events (scheduler).\",\n        \"label\": \"Error Log\",\n        \"name\": \"Error Log\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Log of error during requests.\",\n        \"label\": \"Error Snapshot\",\n        \"name\": \"Error Snapshot\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Enable / Disable Domains\",\n        \"hide_count\": true,\n        \"label\": \"Domain Settings\",\n        \"name\": \"Domain Settings\",\n        \"type\": \"doctype\"\n    }\n]"
+   "links": "[\n    {\n        \"description\": \"Language, Date and Time settings\",\n        \"hide_count\": true,\n        \"label\": \"System Settings\",\n        \"name\": \"System Settings\",\n        \"type\": \"doctype\"\n    },\n   {\n        \"description\": \"Company, Fiscal Year and Currency defaults\",\n        \"hide_count\": true,\n        \"label\": \"Global Defaults\",\n        \"name\": \"Global Defaults\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Log of error on automated events (scheduler).\",\n        \"label\": \"Error Log\",\n        \"name\": \"Error Log\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Log of error during requests.\",\n        \"label\": \"Error Snapshot\",\n        \"name\": \"Error Snapshot\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Enable / Disable Domains\",\n        \"hide_count\": true,\n        \"label\": \"Domain Settings\",\n        \"name\": \"Domain Settings\",\n        \"type\": \"doctype\"\n    }\n]"
   },
   {
    "hidden": 0,
@@ -39,10 +39,11 @@
  "docstatus": 0,
  "doctype": "Desk Page",
  "extends_another_page": 0,
+ "hide_custom": 0,
  "idx": 0,
  "is_standard": 1,
  "label": "Settings",
- "modified": "2020-04-01 11:24:40.636747",
+ "modified": "2020-07-14 10:09:09.520557",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Settings",

From f17b8a95dc3487ce76dc9559f5af40d13fb98779 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 14 Jul 2020 12:41:17 +0530
Subject: [PATCH 181/345] fix: Child row docs must have blank parent values

---
 frappe/core/doctype/data_import/importer.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index c37b80c9f5..af5bcc0741 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -441,9 +441,8 @@ class ImportFile:
 
 		# if there are child doctypes, find the subsequent rows
 		if len(doctypes) > 1:
-			# subsequent rows either dont have any parent value set
-			# or have the same value as the parent row
-			# we include a row if either of conditions match
+			# subsequent rows that have blank values in parent columns
+			# are considered as child rows
 			parent_column_indexes = self.header.get_column_indexes(self.doctype)
 			parent_row_values = first_row.get_values(parent_column_indexes)
 
@@ -454,11 +453,8 @@ class ImportFile:
 				if all([v in INVALID_VALUES for v in row_values]):
 					rows.append(row)
 					continue
-				# if the row has same values as parent row, it's a child row doc
-				if row_values == parent_row_values:
-					rows.append(row)
-					continue
-				# if any of those conditions dont match, it's the next doc
+				# if we encounter a row which has values in parent columns,
+				# then it is the next doc
 				break
 
 		parent_doc = None

From 0e1a8006ff081494b4b5483357de01adcf85fd52 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 14 Jul 2020 12:56:12 +0530
Subject: [PATCH 182/345] fix: Return empty array

---
 frappe/contacts/doctype/contact/contact.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 4af4362aff..0cdd7c7fdd 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -187,7 +187,7 @@ def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
 	if not frappe.get_meta("Contact").get_field(searchfield):
-		return {}
+		return []
 
 	link_doctype = filters.pop('link_doctype')
 	link_name = filters.pop('link_name')

From 8a747eec2759a5153e52d17bbfe463548a85734f Mon Sep 17 00:00:00 2001
From: Abhishek Balam <abhishekbalam96@gmail.com>
Date: Tue, 14 Jul 2020 13:45:44 +0530
Subject: [PATCH 183/345] fix: Move checkbox from Print Settings to System
 Settings (#10905)

---
 frappe/core/doctype/communication/email.py    |   2 +-
 .../system_settings/system_settings.json      |   9 +-
 .../print_settings/print_settings.json        | 851 ++----------------
 3 files changed, 70 insertions(+), 792 deletions(-)

diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py
index daf64d4b8b..e9db865ade 100755
--- a/frappe/core/doctype/communication/email.py
+++ b/frappe/core/doctype/communication/email.py
@@ -221,7 +221,7 @@ def prepare_to_notify(doc, print_html=None, print_format=None, attachments=None)
 	:param print_html: Send given value as HTML attachment.
 	:param print_format: Attach print format of parent document."""
 
-	view_link = frappe.utils.cint(frappe.db.get_value("Print Settings", "Print Settings", "attach_view_link"))
+	view_link = frappe.utils.cint(frappe.db.get_value("System Settings", "System Settings", "attach_view_link"))
 
 	if print_format and view_link:
 		doc.content += get_attach_link(doc, print_format)
diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json
index 1d0cda95a4..b2cb67dbc9 100644
--- a/frappe/core/doctype/system_settings/system_settings.json
+++ b/frappe/core/doctype/system_settings/system_settings.json
@@ -59,6 +59,7 @@
   "column_break_18",
   "disable_standard_email_footer",
   "hide_footer_in_auto_email_reports",
+  "attach_view_link",
   "chat",
   "enable_chat",
   "use_socketio_to_upload_file"
@@ -422,12 +423,18 @@
    "fieldname": "enable_onboarding",
    "fieldtype": "Check",
    "label": "Enable Onboarding"
+  },
+  {
+   "default": "1",
+   "fieldname": "attach_view_link",
+   "fieldtype": "Check",
+   "label": "Send document Web View link in email"
   }
  ],
  "icon": "fa fa-cog",
  "issingle": 1,
  "links": [],
- "modified": "2020-05-01 19:21:15.496065",
+ "modified": "2020-07-02 16:13:00.166382",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "System Settings",
diff --git a/frappe/printing/doctype/print_settings/print_settings.json b/frappe/printing/doctype/print_settings/print_settings.json
index 397d9dda5d..f93ad0ee5a 100644
--- a/frappe/printing/doctype/print_settings/print_settings.json
+++ b/frappe/printing/doctype/print_settings/print_settings.json
@@ -1,932 +1,203 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
+ "actions": [],
  "creation": "2014-07-17 06:54:20.782907",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
  "document_type": "System",
- "editable_grid": 0,
+ "engine": "InnoDB",
+ "field_order": [
+  "pdf_settings",
+  "send_print_as_pdf",
+  "repeat_header_footer",
+  "column_break_4",
+  "pdf_page_size",
+  "view_link_in_email",
+  "with_letterhead",
+  "allow_print_for_draft",
+  "add_draft_heading",
+  "column_break_10",
+  "allow_page_break_inside_tables",
+  "allow_print_for_cancelled",
+  "server_printer",
+  "enable_print_server",
+  "server_ip",
+  "printer_name",
+  "port",
+  "raw_printing_section",
+  "enable_raw_printing",
+  "print_style_section",
+  "print_style",
+  "print_style_preview",
+  "section_break_8",
+  "font",
+  "font_size"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "pdf_settings",
    "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": "PDF Settings",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "PDF Settings"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "1",
    "description": "Send Email Print Attachments as PDF (Recommended)",
-   "fetch_if_empty": 0,
    "fieldname": "send_print_as_pdf",
    "fieldtype": "Check",
-   "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": "Send Print as PDF",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Send Print as PDF"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "1",
-   "fetch_if_empty": 0,
    "fieldname": "repeat_header_footer",
    "fieldtype": "Check",
-   "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": "Repeat Header and Footer in PDF",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Repeat Header and Footer in PDF"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "column_break_4",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "A4",
-   "fetch_if_empty": 0,
    "fieldname": "pdf_page_size",
    "fieldtype": "Select",
-   "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": "PDF Page Size",
-   "length": 0,
-   "no_copy": 0,
-   "options": "A4\nLetter",
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "options": "A4\nLetter"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "view_link_in_email",
    "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": "Page Settings",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Page Settings"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "1",
-   "description": "",
-   "fetch_if_empty": 0,
    "fieldname": "with_letterhead",
    "fieldtype": "Check",
-   "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": "Print with letterhead",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Print with letterhead"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "1",
-   "description": "",
-   "fetch_if_empty": 0,
    "fieldname": "allow_print_for_draft",
    "fieldtype": "Check",
-   "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": "Allow Print for Draft",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Allow Print for Draft"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "1",
-   "description": "",
-   "fetch_if_empty": 0,
-   "fieldname": "attach_view_link",
-   "fieldtype": "Check",
-   "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": "Send document web view link in email",
-   "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,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "column_break_10",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "1",
-   "fetch_if_empty": 0,
    "fieldname": "add_draft_heading",
    "fieldtype": "Check",
-   "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": "Always add \"Draft\" Heading for printing draft documents",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Always add \"Draft\" Heading for printing draft documents"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
+   "default": "0",
    "fieldname": "allow_page_break_inside_tables",
    "fieldtype": "Check",
-   "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": "Allow page break inside tables",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Allow page break inside tables"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fetch_if_empty": 0,
+   "default": "0",
    "fieldname": "allow_print_for_cancelled",
    "fieldtype": "Check",
-   "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": "Allow Print for Cancelled",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Allow Print for Cancelled"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fetch_if_empty": 0,
    "fieldname": "server_printer",
    "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": "Print Server",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Print Server"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
+   "default": "0",
    "fieldname": "enable_print_server",
    "fieldtype": "Check",
-   "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": "Enable Print Server",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Enable Print Server"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "localhost",
    "depends_on": "enable_print_server",
-   "fetch_if_empty": 0,
    "fieldname": "server_ip",
    "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": "Server IP",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Server IP"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "depends_on": "enable_print_server",
-   "fetch_if_empty": 0,
    "fieldname": "printer_name",
    "fieldtype": "Select",
-   "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": "Printer Name",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Printer Name"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "631",
    "depends_on": "enable_print_server",
-   "fetch_if_empty": 0,
    "fieldname": "port",
    "fieldtype": "Int",
-   "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": "Port",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Port"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "raw_printing_section",
    "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": "Raw Printing",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Raw Printing"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
+   "default": "0",
    "fieldname": "enable_raw_printing",
    "fieldtype": "Check",
-   "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": "Enable Raw Printing",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Enable Raw Printing"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "print_style_section",
    "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": "Print Style",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Print Style"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "Modern",
-   "fetch_if_empty": 0,
    "fieldname": "print_style",
    "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": "Print Style",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Print Style",
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "options": "Print Style"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "print_style_preview",
    "fieldtype": "HTML",
-   "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": "Print Style Preview",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Print Style Preview"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "section_break_8",
    "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": "Fonts",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Fonts"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "Default",
-   "fetch_if_empty": 0,
    "fieldname": "font",
    "fieldtype": "Select",
-   "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": "Font",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Default\nArial\nHelvetica\nVerdana\nMonospace",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "options": "Default\nArial\nHelvetica\nVerdana\nMonospace"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "In points. Default is 9.",
-   "fetch_if_empty": 0,
    "fieldname": "font_size",
    "fieldtype": "Float",
-   "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": "Font Size",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Font Size"
   }
  ],
- "has_web_view": 0,
- "hide_toolbar": 0,
  "icon": "fa fa-cog",
- "idx": 0,
- "in_create": 0,
- "is_submittable": 0,
  "issingle": 1,
- "istable": 0,
- "max_attachments": 0,
- "menu_index": 0,
- "modified": "2019-04-10 14:12:31.081187",
+ "links": [],
+ "modified": "2020-07-02 16:14:47.470668",
  "modified_by": "Administrator",
  "module": "Printing",
  "name": "Print Settings",
- "name_case": "",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
    "read": 1,
-   "report": 0,
    "role": "System Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   }
  ],
  "quick_entry": 1,
- "read_only": 0,
- "show_name_in_global_search": 0,
  "sort_field": "modified",
  "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ "track_changes": 1
 }
\ No newline at end of file

From 2e4ac0515c8b7a90471bc62686cd686c4b1461b3 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 14 Jul 2020 13:54:39 +0530
Subject: [PATCH 184/345] fix: Handle parsed date values

---
 frappe/core/doctype/data_import/importer.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index af5bcc0741..910e42af1a 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -689,6 +689,9 @@ class Row:
 		return value
 
 	def get_date(self, value, column):
+		if isinstance(value, datetime):
+			return value
+
 		date_format = column.date_format
 		if date_format:
 			try:

From 49aba266965e679530697b9f06f833fbb8ee3f19 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 14 Jul 2020 16:36:24 +0530
Subject: [PATCH 185/345] fix: Use non-pretty version of HTML for pdf
 generation

---
 frappe/utils/pdf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py
index 58275a5c6c..f3d2e75c2b 100644
--- a/frappe/utils/pdf.py
+++ b/frappe/utils/pdf.py
@@ -137,7 +137,7 @@ def read_options_from_html(html):
 		except:
 			pass
 
-	return soup.prettify(), options
+	return str(soup), options
 
 
 def prepare_header_footer(soup):

From f057260e90a5e8c7888ac9b62431bb19d09063ef Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 14 Jul 2020 17:49:34 +0530
Subject: [PATCH 186/345] fix: reorder result according to custom columns for
 script reports

---
 frappe/desk/query_report.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py
index 0edfd57d4f..d0a32ef076 100644
--- a/frappe/desk/query_report.py
+++ b/frappe/desk/query_report.py
@@ -67,8 +67,7 @@ def generate_report_result(report, filters=None, user=None, custom_columns=None)
 		# Reordered columns
 		columns = json.loads(report.custom_columns)
 
-		if report.report_type == 'Query Report':
-			result = reorder_data_for_custom_columns(columns, query_columns, result)
+		result = reorder_data_for_custom_columns(columns, query_columns, result, report.report_type)
 
 		result = add_data_to_custom_columns(columns, result)
 
@@ -216,15 +215,21 @@ def add_data_to_custom_columns(columns, result):
 
 	return data
 
-def reorder_data_for_custom_columns(custom_columns, columns, result):
+def reorder_data_for_custom_columns(custom_columns, columns, result, report_type):
+	custom_column_labels = [col["label"] for col in custom_columns]
+
+	if report_type == 'Query Report':
+		original_column_labels = [col.split(":")[0] for col in columns]
+	else:
+		original_column_labels = [col["label"] for col in columns]
+
 	reordered_result = []
-	columns = [col.split(":")[0] for col in columns]
 
 	for res in result:
 		r = []
-		for col in custom_columns:
+		for col_name in custom_column_labels:
 			try:
-				idx = columns.index(col.get("label"))
+				idx = original_column_labels.index(col_name)
 				r.append(res[idx])
 			except ValueError:
 				pass

From 6eab1091b0303f9325fa9223182fd334647f7bcc Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 14 Jul 2020 19:16:29 +0530
Subject: [PATCH 187/345] fix: set dynamic filter value in dialog

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index a14db4d18b..6f071a6e2b 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -479,7 +479,6 @@ frappe.ui.form.on('Dashboard Chart', {
 			}
 		}
 
-		let dialog_values;
 		frm.dynamic_filter_table.on('click', () => {
 			let dialog = new frappe.ui.Dialog({
 				title: __('Set Dynamic Filters'),
@@ -496,10 +495,8 @@ frappe.ui.form.on('Dashboard Chart', {
 					}
 
 					if (is_document_type) {
-						dialog_values = values;
 						frm.set_value('dynamic_filters_json', JSON.stringify(dynamic_filters));
 					} else {
-						dialog_values = frm.dynamic_filters;
 						frm.set_value('dynamic_filters_json', JSON.stringify(values));
 					}
 					frm.trigger('set_dynamic_filters_in_table');
@@ -508,7 +505,7 @@ frappe.ui.form.on('Dashboard Chart', {
 			});
 
 			dialog.show();
-			dialog.set_values(dialog_values);
+			dialog.set_values(frm.dynamic_filters);
 		});
 	},
 

From 71f9c3aab0961cfb17b2cfe47a9491cd3db7714c Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 14 Jul 2020 21:10:49 +0530
Subject: [PATCH 188/345] fix: set form perm only for standard reports

---
 frappe/core/doctype/report/report.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/report/report.js b/frappe/core/doctype/report/report.js
index 818c5951e6..b4c30f5bbd 100644
--- a/frappe/core/doctype/report/report.js
+++ b/frappe/core/doctype/report/report.js
@@ -1,6 +1,6 @@
 frappe.ui.form.on('Report', {
 	refresh: function(frm) {
-		if(!frappe.boot.developer_mode && frappe.session.user !== 'Administrator') {
+		if (frm.doc.is_standard && !frappe.boot.developer_mode) {
 			// make the document read-only
 			frm.set_read_only();
 		}

From dfbf453eec5b5ebe47cfbcaa1f70c44b3fff4148 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 14 Jul 2020 21:58:04 +0530
Subject: [PATCH 189/345] fix: don't allow removing ID column

---
 frappe/public/js/frappe/views/reports/report_view.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 9e7e5cbdd6..4ae61c6f96 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -768,10 +768,12 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		const index = this.fields.findIndex(f => column.field === f[0]);
 		if (index === -1) return;
 		const field = this.fields[index];
-		if (field[0] === 'name' && this.group_by === null) {
+
+		if (field[0] === 'name') {
 			this.refresh();
 			frappe.throw(__('Cannot remove ID field'));
 		}
+
 		this.fields.splice(index, 1);
 		this.build_fields();
 		this.setup_columns();

From 46b5cb587f67c1da58dcca2a255aaa0c8f58318a Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 14 Jul 2020 21:58:23 +0530
Subject: [PATCH 190/345] feat: don't show name field in pick columns

---
 frappe/public/js/frappe/views/reports/report_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 4ae61c6f96..95a3577698 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -852,7 +852,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			columns: 2,
 			options: columns[this.doctype]
 				.filter(df => {
-					return !df.hidden;
+					return !df.hidden && df.fieldname !== 'name';
 				})
 				.map(df => ({
 					label: __(df.label),

From 52f2b944ff42aad66f238d896594b821c4d5d6c2 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 15 Jul 2020 13:08:16 +0530
Subject: [PATCH 191/345] fix: rtl layout for desk

---
 frappe/public/less/desktop.less | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less
index 3e3b59ddf8..a738679cc8 100644
--- a/frappe/public/less/desktop.less
+++ b/frappe/public/less/desktop.less
@@ -143,6 +143,13 @@
 	}
 }
 
+.frappe-rtl {
+	.desk-body {
+		padding-left: 0px;
+		padding-right: calc(20rem + 15px);
+	}
+}
+
 .widget-group {
 	margin-bottom: 25px;
 	// -webkit-animation-name: slideInUp;

From 13a1bda36479c953610caa5b44639dec5604d9c9 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 15 Jul 2020 13:15:12 +0530
Subject: [PATCH 192/345] fix: Strip HTML from notification subject

---
 frappe/desk/doctype/notification_log/notification_log.py  | 1 -
 frappe/public/js/frappe/ui/notifications/notifications.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py
index 12f2c41274..c4c6077e85 100644
--- a/frappe/desk/doctype/notification_log/notification_log.py
+++ b/frappe/desk/doctype/notification_log/notification_log.py
@@ -69,7 +69,6 @@ def make_notification_logs(doc, users):
 				_doc = frappe.new_doc('Notification Log')
 				_doc.update(doc)
 				_doc.for_user = user
-				_doc.subject = _doc.subject.replace('<div>', '').replace('</div>', '')
 				if _doc.for_user != _doc.from_user or doc.type == 'Energy Point' or doc.type == 'Alert':
 					_doc.insert(ignore_permissions=True)
 
diff --git a/frappe/public/js/frappe/ui/notifications/notifications.js b/frappe/public/js/frappe/ui/notifications/notifications.js
index 3570420c81..03f3662d2a 100644
--- a/frappe/public/js/frappe/ui/notifications/notifications.js
+++ b/frappe/public/js/frappe/ui/notifications/notifications.js
@@ -309,7 +309,7 @@ frappe.ui.Notifications = class Notifications {
 		let mark_read_action = field.read ? '': 'data-action="mark_as_read"';
 		let message = field.subject;
 		let title = message.match(/<b class="subject-title">(.*?)<\/b>/);
-		message = title ? message.replace(title[1], frappe.ellipsis(title[1], 100)): message;
+		message = title ? message.replace(title[1], frappe.ellipsis(strip_html(title[1]), 100)) : message;
 		let message_html = `<div class="message">${message}</div>`;
 		let user = field.from_user;
 		let user_avatar = frappe.avatar(user, 'avatar-small user-avatar');

From 43a8a7c71c9129c28344e920f6d2794efc9fd7f5 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Wed, 15 Jul 2020 14:02:54 +0530
Subject: [PATCH 193/345] fix: replace_old_data_import patch failing

---
 frappe/patches/v13_0/replace_old_data_import.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/patches/v13_0/replace_old_data_import.py b/frappe/patches/v13_0/replace_old_data_import.py
index 41952f7200..920ee7b553 100644
--- a/frappe/patches/v13_0/replace_old_data_import.py
+++ b/frappe/patches/v13_0/replace_old_data_import.py
@@ -6,6 +6,8 @@ import frappe
 
 
 def execute():
+	if not frappe.db.table_exists("Data Import"): return
+
 	meta = frappe.get_meta("Data Import")
 	# if Data Import is the new one, return early
 	if meta.fields[1].fieldname == "import_type":

From 5ce6940aa69e7ff41c2ac6dab0096dddce6856f5 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Wed, 15 Jul 2020 14:05:12 +0530
Subject: [PATCH 194/345] feat: reset driver on hash change (#11005)

---
 frappe/public/js/frappe/form/form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index ebe94b4cdb..e7df7c718e 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1604,6 +1604,7 @@ frappe.ui.form.Form = class FrappeForm {
 		});
 
 		driver.defineSteps(steps);
+		frappe.route.on('change', () => driver.reset());
 		driver.start();
 	}
 };

From 72615449dbf46b6c4aa71ac2f7beb3c4af4fe04c Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 15 Jul 2020 14:19:51 +0530
Subject: [PATCH 195/345] fix: Use import_file_by_path to sync dashboard

---
 frappe/utils/dashboard.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index fd8f8cea7b..1ff6380973 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -5,7 +5,7 @@ import frappe
 from frappe import _
 from functools import wraps
 from frappe.utils import add_to_date, cint, get_link_to_form
-from frappe.modules.import_file import import_doc
+from frappe.modules.import_file import import_file_by_path
 import os
 from os.path import join
 
@@ -107,9 +107,4 @@ def make_records(path, filters=None):
 			if os.path.isdir(join(path, fname)):
 				if fname == '__pycache__':
 					continue
-				try:
-					doc_dict = frappe.get_file_json("{path}/{fname}/{fname}.json".format(path=path, fname=fname))
-					import_doc(doc_dict)
-				except FileNotFoundError:
-					frappe.log_error(message=frappe.get_traceback(), title="Dashboard Import Error")
-					pass
+				import_file_by_path("{path}/{fname}/{fname}.json".format(path=path, fname=fname))

From e6a986559e2f5f7d1a22bc34408e15d4586e2060 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 10 Jul 2020 19:25:00 +0530
Subject: [PATCH 196/345] fix(patch): create new docs for customized standard
 dashboards

---
 frappe/patches.txt                            |  3 +-
 ...eate_custom_dashboards_cards_and_charts.py | 46 +++++++++++++++++++
 frappe/utils/dashboard.py                     | 20 ++++++++
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index cfcbc1ceba..c936fd7398 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -292,4 +292,5 @@ execute:frappe.delete_doc("DocType", "Onboarding Slide Field")
 execute:frappe.delete_doc("DocType", "Onboarding Slide Help Link")
 frappe.patches.v13_0.update_date_filters_in_user_settings
 frappe.patches.v13_0.update_duration_options
-frappe.patches.v13_0.replace_old_data_import # 2020-06-24
\ No newline at end of file
+frappe.patches.v13_0.replace_old_data_import # 2020-06-24
+frappe.patches.v13_0.create_custom_dashboards_cards_and_charts
\ No newline at end of file
diff --git a/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py b/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
new file mode 100644
index 0000000000..750c0e3d7c
--- /dev/null
+++ b/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
@@ -0,0 +1,46 @@
+import frappe
+import json
+from frappe.model.naming import append_number_if_name_exists
+from frappe.utils.dashboard import get_dashboards_with_link
+
+def execute():
+	if not frappe.db.table_exists('Dashboard Chart')\
+		or not frappe.db.table_exists('Number Card')\
+		or not frappe.db.table_exists('Dashboard'):
+		return
+
+	frappe.reload_doc('desk', 'doctype', 'dashboard_chart')
+	frappe.reload_doc('desk', 'doctype', 'number_card')
+	frappe.reload_doc('desk', 'doctype', 'dashboard')
+
+	modified_charts = get_modified_docs('Dashboard Chart')
+	modified_cards = get_modified_docs('Number Card')
+	modified_dashboards = [doc.name for doc in get_modified_docs('Dashboard')]
+
+	for chart in modified_charts:
+		modified_dashboards += get_dashboards_with_link(chart.name, 'Dashboard Chart')
+		rename_modified_doc(chart.name, 'Dashboard Chart')
+
+	for card in modified_cards:
+		modified_dashboards += get_dashboards_with_link(card.name, 'Number Card')
+		rename_modified_doc(card.name, 'Number Card')
+
+	modified_dashboards = list(set(modified_dashboards))
+
+	for dashboard in modified_dashboards:
+		rename_modified_doc(dashboard, 'Dashboard')
+
+def get_modified_docs(doctype):
+	return frappe.get_all(doctype,
+		filters = {
+			'owner': 'Administrator',
+			'modified_by': ['!=', 'Administrator']
+		})
+
+def rename_modified_doc(docname, doctype):
+	new_name = docname + ' Custom'
+	try:
+		frappe.rename_doc(doctype, docname, new_name)
+	except:
+		new_name = append_number_if_name_exists(doctype, new_name)
+		frappe.rename_doc(doctype, docname, new_name)
diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index 1ff6380973..7eaf470767 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -76,6 +76,26 @@ def get_from_date_from_timespan(to_date, timespan):
 	return add_to_date(to_date, years=years, months=months, days=days,
 		as_datetime=True)
 
+def get_dashboards_with_link(docname, doctype):
+	dashboards = []
+	links = []
+
+	if doctype == 'Dashboard Chart':
+		links = frappe.get_all('Dashboard Chart Link',
+			fields = ['parent'],
+			filters = {
+				'chart': docname
+			})
+	elif doctype == 'Number Card':
+		links = frappe.get_all('Number Card Link',
+			fields = ['parent'],
+			filters = {
+				'card': docname
+			})
+
+	dashboards = [link.parent for link in links]
+	return dashboards
+
 def sync_dashboards(app=None):
 	"""Import, overwrite fixtures from `[app]/fixtures`"""
 	if not cint(frappe.db.get_single_value('System Settings', 'setup_complete')):

From fc9401fb1a45c7b294f2f843c60db8b43d725820 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 10 Jul 2020 19:25:54 +0530
Subject: [PATCH 197/345] fix: allow rename for dashboard chart and number card

---
 frappe/desk/doctype/dashboard/dashboard.json     | 1 +
 frappe/desk/doctype/number_card/number_card.json | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index 232ca6b1f0..d0855aaf42 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -1,5 +1,6 @@
 {
  "actions": [],
+ "allow_rename": 1,
  "autoname": "field:dashboard_name",
  "creation": "2019-01-10 12:54:40.938705",
  "doctype": "DocType",
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index 3d42b340d1..41362a8982 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -1,5 +1,6 @@
 {
  "actions": [],
+ "allow_rename": 1,
  "creation": "2020-04-15 18:06:39.444683",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -140,7 +141,7 @@
   }
  ],
  "links": [],
- "modified": "2020-06-09 14:17:53.145201",
+ "modified": "2020-07-10 17:55:35.873222",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",

From 3c7b9f9986b9f09aea1642b989a253577bbb99d1 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sat, 11 Jul 2020 15:53:33 +0530
Subject: [PATCH 198/345] fix: remove unused import

---
 .../patches/v13_0/create_custom_dashboards_cards_and_charts.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py b/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
index 750c0e3d7c..9a075a22cc 100644
--- a/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
+++ b/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
@@ -1,5 +1,4 @@
 import frappe
-import json
 from frappe.model.naming import append_number_if_name_exists
 from frappe.utils.dashboard import get_dashboards_with_link
 
@@ -41,6 +40,6 @@ def rename_modified_doc(docname, doctype):
 	new_name = docname + ' Custom'
 	try:
 		frappe.rename_doc(doctype, docname, new_name)
-	except:
+	except frappe.ValidationError:
 		new_name = append_number_if_name_exists(doctype, new_name)
 		frappe.rename_doc(doctype, docname, new_name)

From 67aca7c9ad901cac7283e614cf3c38fd2e28fc4e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 15 Jul 2020 14:45:00 +0530
Subject: [PATCH 199/345] fix: Update modified value for dashboard

---
 frappe/desk/doctype/dashboard/dashboard.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index d0855aaf42..c7128823fe 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -66,7 +66,7 @@
   }
  ],
  "links": [],
- "modified": "2020-06-08 19:16:02.997796",
+ "modified": "2020-07-10 17:48:19.468813",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",

From 3b09087c5bd2b891042e8af17d255232714afc08 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 15 Jul 2020 14:46:39 +0530
Subject: [PATCH 200/345] fix: Markdown content in Blog Post

`markdown` checks if the content is html, if not, converts to markdown.
This breaks when there are html tags in markdown. Instead we can
use `md_to_html` directly.
---
 frappe/website/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/website/utils.py b/frappe/website/utils.py
index f5e35976eb..dc981fe30a 100644
--- a/frappe/website/utils.py
+++ b/frappe/website/utils.py
@@ -9,7 +9,7 @@ import frappe
 
 from six import iteritems
 from past.builtins import cmp
-from frappe.utils import markdown
+from frappe.utils import md_to_html
 
 
 def delete_page_cache(path):
@@ -357,7 +357,7 @@ def get_html_content_based_on_type(doc, fieldname, content_type):
 		content = doc.get(fieldname)
 
 		if content_type == 'Markdown':
-			content = markdown(doc.get(fieldname + '_md'))
+			content = md_to_html(doc.get(fieldname + '_md'))
 		elif content_type == 'HTML':
 			content = doc.get(fieldname + '_html')
 

From bb2f09b270f56ee502557d0909157f77b99f47fd Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 14 Jul 2020 18:49:02 +0530
Subject: [PATCH 201/345] feat(Dashboard): option to refresh all charts and
 cards

---
 frappe/core/page/dashboard/dashboard.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index f17bc1e0b5..cee230265f 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -172,19 +172,26 @@ class Dashboard {
 	set_dropdown() {
 		this.page.clear_menu();
 
-		this.page.add_menu_item('Edit...', () => {
+		this.page.add_menu_item(__('Edit'), () => {
 			frappe.set_route('Form', 'Dashboard', frappe.dashboard.dashboard_name);
-		}, 1);
+		});
 
-		this.page.add_menu_item('New...', () => {
+		this.page.add_menu_item(__('New'), () => {
 			frappe.new_doc('Dashboard');
-		}, 1);
+		});
 
-		frappe.db.get_list("Dashboard").then(dashboards => {
+		this.page.add_menu_item(__('Refresh All'), () => {
+			this.chart_group &&
+				this.chart_group.widgets_list.forEach(chart => chart.refresh());
+			this.number_card_group &&
+				this.number_card_group.widgets_list.forEach(card => card.render_card());
+		});
+
+		frappe.db.get_list('Dashboard').then(dashboards => {
 			dashboards.map(dashboard => {
 				let name = dashboard.name;
 				if(name != this.dashboard_name){
-					this.page.add_menu_item(name, () => frappe.set_route("dashboard", name));
+					this.page.add_menu_item(name, () => frappe.set_route("dashboard", name), 1);
 				}
 			});
 		});

From 1023422433213a03c181e19966277fd01e1ec0d7 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 15 Jul 2020 17:54:51 +0530
Subject: [PATCH 202/345] fix: Add share perm in set_read_only

---
 frappe/public/js/frappe/form/form.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index f7d1b3e873..843e5382dc 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1401,6 +1401,9 @@ frappe.ui.form.Form = class FrappeForm {
 		for (var i=0, l=docperms.length; i<l; i++) {
 			var p = docperms[i];
 			perm[p.permlevel || 0] = {read:1, print:1, cancel:1, email:1};
+			if (p.share) {
+				perm[p.permlevel || 0].share = 1;
+			}
 		}
 		this.perm = perm;
 	}

From 9890ae6ff28e85951d04dab69ddd17e8803a5f33 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 16 Jul 2020 13:23:16 +0530
Subject: [PATCH 203/345] fix: Canonical URL

Must obey hostname value in config.
---
 frappe/website/context.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/website/context.py b/frappe/website/context.py
index ec56489c66..c5f23ab21c 100644
--- a/frappe/website/context.py
+++ b/frappe/website/context.py
@@ -20,12 +20,10 @@ def get_context(path, args=None):
 		# for <body data-path=""> (remove leading slash)
 		# path could be overriden in render.resolve_from_map
 		context["path"] = frappe.local.request.path.strip('/ ')
-		scheme = frappe.local.request.scheme
 	else:
 		context["path"] = path
-		scheme = 'http'
 
-	context.canonical = scheme + '://' + frappe.local.site + '/' + frappe.utils.escape_html(context.path)
+	context.canonical = frappe.utils.get_url(frappe.utils.escape_html(context.path))
 	context.route = context.path
 	context = build_context(context)
 

From fdf501c2fa755069c17556edb125e8204d3baee3 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 16 Jul 2020 00:59:34 +0530
Subject: [PATCH 204/345] feat: report type number cards

---
 .../desk/doctype/number_card/number_card.json | 55 +++++++++++++------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index 41362a8982..2a7b5ef478 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -1,6 +1,7 @@
 {
  "actions": [],
  "allow_rename": 1,
+ "allow_workflow": 1,
  "creation": "2020-04-15 18:06:39.444683",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -9,10 +10,13 @@
   "is_standard",
   "module",
   "label",
+  "type",
+  "report_name",
   "function",
   "aggregate_function_based_on",
   "column_break_2",
   "document_type",
+  "report_field",
   "is_public",
   "stats_section",
   "show_percentage_stats",
@@ -26,20 +30,21 @@
  ],
  "fields": [
   {
+   "depends_on": "eval: doc.type == 'Document Type'",
    "fieldname": "document_type",
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Document Type",
-   "options": "DocType",
-   "reqd": 1
+   "mandatory_depends_on": "eval: doc.type == 'Document Type'",
+   "options": "DocType"
   },
   {
-   "depends_on": "eval: doc.document_type",
+   "depends_on": "eval: doc.type == 'Document Type'",
    "fieldname": "function",
    "fieldtype": "Select",
    "label": "Function",
-   "options": "Count\nSum\nAverage\nMinimum\nMaximum",
-   "reqd": 1
+   "mandatory_depends_on": "eval: doc.type == 'Document Type'",
+   "options": "Count\nSum\nAverage\nMinimum\nMaximum"
   },
   {
    "depends_on": "eval: doc.function !== 'Count'",
@@ -98,6 +103,7 @@
    "options": "Daily\nWeekly\nMonthly\nYearly"
   },
   {
+   "depends_on": "eval: doc.type == 'Document Type'",
    "fieldname": "stats_section",
    "fieldtype": "Section Break",
    "label": "Stats"
@@ -114,34 +120,47 @@
    "fieldtype": "Link",
    "label": "Module",
    "mandatory_depends_on": "eval: doc.is_standard",
-   "options": "Module Def",
-   "show_days": 1,
-   "show_seconds": 1
+   "options": "Module Def"
   },
   {
    "fieldname": "dynamic_filters_json",
    "fieldtype": "Code",
    "label": "Dynamic Filters JSON",
-   "options": "JSON",
-   "show_days": 1,
-   "show_seconds": 1
+   "options": "JSON"
   },
   {
    "fieldname": "section_break_16",
-   "fieldtype": "Section Break",
-   "show_days": 1,
-   "show_seconds": 1
+   "fieldtype": "Section Break"
   },
   {
    "fieldname": "dynamic_filters_section",
    "fieldtype": "Section Break",
-   "label": "Dynamic Filters Section",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Dynamic Filters Section"
+  },
+  {
+   "fieldname": "type",
+   "fieldtype": "Select",
+   "label": "Type",
+   "options": "Document Type\nReport"
+  },
+  {
+   "depends_on": "eval: doc.type == 'Report'",
+   "fieldname": "report_name",
+   "fieldtype": "Link",
+   "label": "Report Name",
+   "mandatory_depends_on": "eval: doc.type == 'Report'",
+   "options": "Report"
+  },
+  {
+   "depends_on": "eval: doc.type == 'Report'",
+   "fieldname": "report_field",
+   "fieldtype": "Select",
+   "label": "Field",
+   "mandatory_depends_on": "eval: doc.type == 'Report'"
   }
  ],
  "links": [],
- "modified": "2020-07-10 17:55:35.873222",
+ "modified": "2020-07-16 00:58:30.426929",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",

From 17f58beeac0e2b487a050c45207afea526971956 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 16 Jul 2020 01:59:17 +0530
Subject: [PATCH 205/345] fix: report filters in number card

---
 .../dashboard_chart/dashboard_chart.js        |  47 +--
 .../desk/doctype/number_card/number_card.js   | 378 ++++++++++++------
 .../public/js/frappe/utils/dashboard_utils.js |  48 +++
 .../js/frappe/views/reports/report_utils.js   |   2 +-
 4 files changed, 311 insertions(+), 164 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 6f071a6e2b..c8783f0e64 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -193,7 +193,7 @@ frappe.ui.form.on('Dashboard Chart', {
 
 			if (!frm.doc.is_custom) {
 				if (data.result.length) {
-					frm.field_options = frappe.report_utils.get_possible_chart_options(data.columns, data);
+					frm.field_options = frappe.report_utils.get_field_options_from_report(data.columns, data);
 					frm.set_df_property('x_field', 'options', frm.field_options.non_numeric_fields);
 					if (!frm.field_options.numeric_fields.length) {
 						frappe.msgprint(__(`Report has no numeric fields, please change the Report Name`));
@@ -435,49 +435,10 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.trigger('set_dynamic_filters_in_table');
 
 		let filters = JSON.parse(frm.doc.filters_json || '[]');
-		let fields = [
-			{
-				fieldtype: 'HTML',
-				fieldname: 'description',
-				options:
-					`<div>
-						<p>Set dynamic filter values in JavaScript for the required fields here.
-						</p>
-						<p>Ex:
-							<code>frappe.defaults.get_user_default("Company")</code>
-						</p>
-					</div>`
-			}
-		];
 
-		if (is_document_type) {
-			if (frm.dynamic_filters) {
-				filters = [...filters, ...frm.dynamic_filters];
-			}
-			filters.forEach(f => {
-				for (let field of fields) {
-					if (field.fieldname == f[0] + ':' + f[1]) {
-						return;
-					}
-				}
-				if (f[2] == '=') {
-					fields.push({
-						label: `${f[1]} (${f[0]})`,
-						fieldname: f[0] + ':' + f[1],
-						fieldtype: 'Data',
-					});
-				}
-			});
-		} else {
-			filters = {...frm.dynamic_filters, ...filters};
-			for (let key of Object.keys(filters)) {
-				fields.push({
-					label: key,
-					fieldname: key,
-					fieldtype: 'Data',
-				});
-			}
-		}
+		let fields = frappe.dashboard_utils.get_fields_for_dynamic_filter_dialog(
+			is_document_type, filters, frm.dynamic_filters
+		);
 
 		frm.dynamic_filter_table.on('click', () => {
 			let dialog = new frappe.ui.Dialog({
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index d7abe57e2a..b2c7e544e2 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -9,8 +9,19 @@ frappe.ui.form.on('Number Card', {
 		frm.set_df_property("filters_section", "hidden", 1);
 		frm.set_df_property("dynamic_filters_section", "hidden", 1);
 		frm.trigger('set_options');
+
+		if (!frm.doc.type) {
+			frm.set_value('type', 'Document Type');
+		}
+
+		if (frm.doc.type == 'Report') {
+			frm.trigger('set_report_filters');
+		}
+
 		frm.trigger('render_filters_table');
-		frm.trigger('render_dynamic_filters_table');
+		if (frappe.boot.developer_mode && frm.doc.is_standard) {
+			frm.trigger('render_dynamic_filters_table');
+		}
 	},
 
 	before_save: function(frm) {
@@ -31,6 +42,29 @@ frappe.ui.form.on('Number Card', {
 		}
 	},
 
+	type: function(frm) {
+		if (frm.doc.type == 'Report') {
+			frm.set_query('report_name', () => {
+				return {
+					filters: {
+						'report_type': ['!=', 'Report Builder']
+					}
+				};
+			});
+			frm.trigger('set_report_filters');
+		}
+		frm.set_value('filters_json', 'null');
+		frm.filters = null;
+		frm.trigger('render_filters_table');
+	},
+
+	report_name: function(frm) {
+		frm.trigger('set_report_filters');
+		frm.set_value('filters_json', '{}');
+		frm.set_value('dynamic_filters_json', '{}');
+		frm.filters = null;
+	},
+
 	document_type: function(frm) {
 		frm.set_query('document_type', function() {
 			return {
@@ -46,6 +80,10 @@ frappe.ui.form.on('Number Card', {
 	},
 
 	set_options: function(frm) {
+		if (!frm.doc.type == 'Document Type') {
+			return;
+		}
+
 		let aggregate_based_on_fields = [];
 		const doctype = frm.doc.document_type;
 
@@ -64,72 +102,56 @@ frappe.ui.form.on('Number Card', {
 
 				frm.set_df_property('aggregate_function_based_on', 'options', aggregate_based_on_fields);
 			});
+			frm.trigger('render_filters_table');
 		}
 	},
 
+	set_report_filters: function(frm) {
+		const report_name = frm.doc.report_name;
+		if (report_name) {
+			frappe.report_utils.get_report_filters(report_name).then(filters => {
+				if (filters) {
+					frm.filters = filters;
+					const filter_values = frappe.report_utils.get_filter_values(filters);
+					if (!JSON.parse(frm.doc.filters_json)) {
+						frm.set_value('filters_json', JSON.stringify(filter_values));
+					}
+				}
+				frm.trigger('render_filters_table');
+				frm.trigger('set_report_field_options');
+			});
+		}
+	},
+
+	set_report_field_options: function(frm) {
+		let filters = JSON.parse(frm.doc.filters_json);
+		frappe.xcall(
+			'frappe.desk.query_report.run',
+			{
+				report_name: frm.doc.report_name,
+				filters: filters,
+				ignore_prepared_report: 1
+			}
+		).then(data => {
+			frm.report_data = data;
+			if (data.result.length) {
+				frm.field_options = frappe.report_utils.get_field_options_from_report(data.columns, data);
+				frm.set_df_property('report_field', 'options', frm.field_options.numeric_fields);
+				if (!frm.field_options.numeric_fields.length) {
+					frappe.msgprint(__(`Report has no numeric fields, please change the Report Name`));
+				}
+			} else {
+				frappe.msgprint(__('Report has no data, please modify the filters or change the Report Name'));
+			}
+		});
+	},
+
 	render_filters_table: function(frm) {
 		frm.set_df_property("filters_section", "hidden", 0);
+		let is_document_type = frm.doc.type == 'Document Type';
+		let is_dynamic_filter = f => ['Date', 'DateRange'].includes(f.fieldtype) && f.default;
 
 		let wrapper = $(frm.get_field('filters_json').wrapper).empty();
-		let table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
-			<thead>
-				<tr>
-					<th style="width: 33%">${__('Filter')}</th>
-					<th style="width: 33%">${__('Condition')}</th>
-					<th>${__('Value')}</th>
-				</tr>
-			</thead>
-			<tbody></tbody>
-		</table>`).appendTo(wrapper);
-
-		frm.filters = JSON.parse(frm.doc.filters_json || '[]');
-
-		set_filters_in_table(frm.filters, table);
-
-		table.on('click', () => {
-			let dialog = new frappe.ui.Dialog({
-				title: __('Set Filters'),
-				fields: [{
-					fieldtype: 'HTML',
-					fieldname: 'filter_area',
-				}],
-				primary_action: function() {
-					let values = this.get_values();
-					if (values) {
-						this.hide();
-						frm.filters = frm.filter_group.get_filters();
-						frm.set_value('filters_json', JSON.stringify(frm.filters));
-						set_filters_in_table(frm.filters, table);
-						frm.trigger('render_dynamic_filters_table');
-					}
-				},
-				primary_action_label: "Set"
-			});
-
-			frappe.dashboards.filters_dialog = dialog;
-
-			frm.filter_group = new frappe.ui.FilterGroup({
-				parent: dialog.get_field('filter_area').$wrapper,
-				doctype: frm.doc.document_type,
-				on_change: () => {},
-			});
-
-			frm.filter_group.add_filters_to_filter_group(frm.filters);
-
-			dialog.show();
-			dialog.set_values(frm.filters);
-		});
-
-	},
-
-	render_dynamic_filters_table: function(frm) {
-		if (!frappe.boot.developer_mode || !frm.doc.is_standard) {
-			return;
-		}
-		let wrapper = $(frm.get_field('dynamic_filters_json').wrapper).empty();
-
-		frm.set_df_property("dynamic_filters_section", "hidden", 0);
-
 		let table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
 			<thead>
 				<tr>
@@ -140,92 +162,208 @@ frappe.ui.form.on('Number Card', {
 			</thead>
 			<tbody></tbody>
 		</table>`).appendTo(wrapper);
-
-		frm.dynamic_filters = JSON.parse(frm.doc.dynamic_filters_json || '[]');
-
-		set_filters_in_table(frm.dynamic_filters, table);
+		$(`<p class="text-muted small">${__("Click table to edit")}</p>`).appendTo(wrapper);
 
 		let filters = JSON.parse(frm.doc.filters_json || '[]');
-		let fields = [
-			{
-				fieldtype: 'HTML',
-				fieldname: 'description',
-				options:
-					`<div>
-						<p>Set dynamic filter values in JavaScript for the required fields here.
-						</p>
-						<p>Ex:
-							<code>frappe.defaults.get_user_default("Company")</code>
-						</p>
-					</div>`
-			}
-		];
+		let filters_set = false;
 
-		if (frm.dynamic_filters.length) {
-			filters = [...filters, ...frm.dynamic_filters];
+		// Set dynamic filters for reports
+		if (frm.doc.type == 'Report') {
+			let set_filters = false;
+			frm.filters.forEach(f => {
+				if (is_dynamic_filter(f)) {
+					filters[f.fieldname] = f.default;
+					set_filters = true;
+				}
+			});
+			set_filters && frm.set_value('filters_json', JSON.stringify(filters));
 		}
 
-		filters.forEach(f => {
-			for (let field of fields) {
-				if (field.fieldname == f[0] + ':' + f[1]) {
-					return;
+		let fields;
+		if (is_document_type) {
+			fields = [
+				{
+					fieldtype: 'HTML',
+					fieldname: 'filter_area',
 				}
-			}
-			if (f[2] == '=') {
-				fields.push({
-					label: `${f[1]} (${f[0]})`,
-					fieldname: f[0] + ':' + f[1],
-					fieldtype: 'Data',
+			];
+
+			if (filters.length) {
+				filters.forEach(filter => {
+					const filter_row =
+						$(`<tr>
+							<td>${filter[1]}</td>
+							<td>${filter[2] || ""}</td>
+							<td>${filter[3]}</td>
+						</tr>`);
+
+					table.find('tbody').append(filter_row);
 				});
+				filters_set = true;
 			}
-		});
+		} else if (frm.filters.length) {
+			filters_set = true;
+			fields = frm.filters.filter(f => f.fieldname);
+			fields.map(f => {
+				if (filters[f.fieldname]) {
+					let condition = '=';
+					const filter_row =
+						$(`<tr>
+							<td>${f.label}</td>
+							<td>${condition}</td>
+							<td>${filters[f.fieldname] || ""}</td>
+						</tr>`);
+
+					table.find('tbody').append(filter_row);
+				}
+			});
+		}
+
+		if (!filters_set) {
+			const filter_row = $(`<tr><td colspan="3" class="text-muted text-center">
+				${__("Click to Set Filters")}</td></tr>`);
+			table.find('tbody').append(filter_row);
+		}
 
 		table.on('click', () => {
 			let dialog = new frappe.ui.Dialog({
 				title: __('Set Filters'),
-				fields: fields,
-				primary_action: () => {
-					let values = dialog.get_values();
+				fields: fields.filter(f => !is_dynamic_filter(f)),
+				primary_action: function() {
+					let values = this.get_values();
 					if (values) {
-						dialog.hide();
-						let dynamic_filters = [];
-						for (let key of Object.keys(values)) {
-							let [doctype, fieldname] = key.split(':');
-							dynamic_filters.push([doctype, fieldname, '=', values[key]]);
+						this.hide();
+						if (is_document_type) {
+							let filters = frm.filter_group.get_filters();
+							frm.set_value('filters_json', JSON.stringify(filters));
+						} else {
+							frm.set_value('filters_json', JSON.stringify(values));
 						}
-
-						frm.set_value('dynamic_filters_json', JSON.stringify(dynamic_filters));
-						frm.dynamic_filters = dynamic_filters;
-						set_filters_in_table(frm.dynamic_filters, table);
+						frm.trigger('render_filters_table');
 					}
 				},
 				primary_action_label: "Set"
 			});
 
+			if (is_document_type) {
+				frm.filter_group = new frappe.ui.FilterGroup({
+					parent: dialog.get_field('filter_area').$wrapper,
+					doctype: frm.doc.document_type,
+					on_change: () => {},
+				});
+				filters && frm.filter_group.add_filters_to_filter_group(filters);
+			}
+
 			dialog.show();
+
+			if (frm.doc.type == 'Report') {
+				//Set query report object so that it can be used while fetching filter values in the report
+				frappe.query_report = new frappe.views.QueryReport({'filters': dialog.fields_list});
+				frappe.query_reports[frm.doc.report_name]
+					&& frappe.query_reports[frm.doc.report_name].onload
+						&& frappe.query_reports[frm.doc.report_name].onload(frappe.query_report);
+			}
+
 			dialog.set_values(filters);
 		});
 
 	},
 
-});
+	render_dynamic_filters_table(frm) {
+		frm.set_df_property("dynamic_filters_section", "hidden", 0);
 
-function set_filters_in_table(filters, table) {
-	if (!filters.length) {
-		const filter_row = $(`<tr><td colspan="3" class="text-muted text-center">
-			${__("Click to Set Filters")}</td></tr>`);
-		table.find('tbody').html(filter_row);
-	} else {
-		let filter_rows = '';
-		filters.forEach(filter => {
-			filter_rows +=
-				`<tr>
-					<td>${filter[1]}</td>
-					<td>${filter[2] || ""}</td>
-					<td>${filter[3]}</td>
-				</tr>`;
+		let is_document_type = frm.doc.type == 'Document Type';
 
+		let wrapper = $(frm.get_field('dynamic_filters_json').wrapper).empty();
+
+		frm.dynamic_filter_table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
+			<thead>
+				<tr>
+					<th style="width: 20%">${__('Filter')}</th>
+					<th style="width: 20%">${__('Condition')}</th>
+					<th>${__('Value')}</th>
+				</tr>
+			</thead>
+			<tbody></tbody>
+		</table>`).appendTo(wrapper);
+
+		frm.dynamic_filters = frm.doc.dynamic_filters_json && frm.doc.dynamic_filters_json.length > 2
+			? JSON.parse(frm.doc.dynamic_filters_json)
+			: null;
+
+		frm.trigger('set_dynamic_filters_in_table');
+
+		let filters = JSON.parse(frm.doc.filters_json || '[]');
+
+		let fields = frappe.dashboard_utils.get_fields_for_dynamic_filter_dialog(
+			is_document_type, filters, frm.dynamic_filters
+		);
+
+		frm.dynamic_filter_table.on('click', () => {
+			let dialog = new frappe.ui.Dialog({
+				title: __('Set Dynamic Filters'),
+				fields: fields,
+				primary_action: () => {
+					let values = dialog.get_values();
+					dialog.hide();
+					let dynamic_filters = [];
+					for (let key of Object.keys(values)) {
+						if (is_document_type) {
+							let [doctype, fieldname] = key.split(':');
+							dynamic_filters.push([doctype, fieldname, '=', values[key]]);
+						}
+					}
+
+					if (is_document_type) {
+						frm.set_value('dynamic_filters_json', JSON.stringify(dynamic_filters));
+					} else {
+						frm.set_value('dynamic_filters_json', JSON.stringify(values));
+					}
+					frm.trigger('set_dynamic_filters_in_table');
+				},
+				primary_action_label: "Set"
+			});
+
+			dialog.show();
+			dialog.set_values(frm.dynamic_filters);
 		});
-		table.find('tbody').html(filter_rows);
+	},
+
+	set_dynamic_filters_in_table: function(frm) {
+		frm.dynamic_filters =  frm.doc.dynamic_filters_json && frm.doc.dynamic_filters_json.length > 2
+			? JSON.parse(frm.doc.dynamic_filters_json)
+			: null;
+
+		if (!frm.dynamic_filters) {
+			const filter_row = $(`<tr><td colspan="3" class="text-muted text-center">
+				${__("Click to Set Dynamic Filters")}</td></tr>`);
+			frm.dynamic_filter_table.find('tbody').html(filter_row);
+		} else {
+			let filter_rows = '';
+			if ($.isArray(frm.dynamic_filters)) {
+				frm.dynamic_filters.forEach(filter => {
+					filter_rows +=
+						`<tr>
+							<td>${filter[1]}</td>
+							<td>${filter[2] || ""}</td>
+							<td>${filter[3]}</td>
+						</tr>`;
+				});
+			} else {
+				let condition = '=';
+				for (let [key, val] of Object.entries(frm.dynamic_filters)) {
+					filter_rows +=
+						`<tr>
+							<td>${key}</td>
+							<td>${condition}</td>
+							<td>${val || ""}</td>
+						</tr>`
+					;
+				}
+			}
+
+			frm.dynamic_filter_table.find('tbody').html(filter_rows);
+		}
 	}
-}
+
+});
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index f737c6ad12..c98de6b4ac 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -119,6 +119,54 @@ frappe.dashboard_utils = {
 		}
 
 		return static_filters;
+	},
+
+	get_fields_for_dynamic_filter_dialog(is_document_type, filters, dynamic_filters) {
+		let fields = [
+			{
+				fieldtype: 'HTML',
+				fieldname: 'description',
+				options:
+					`<div>
+						<p>Set dynamic filter values in JavaScript for the required fields here.
+						</p>
+						<p>Ex:
+							<code>frappe.defaults.get_user_default("Company")</code>
+						</p>
+					</div>`
+			}
+		];
+
+		if (is_document_type) {
+			if (dynamic_filters) {
+				filters = [...filters, ...dynamic_filters];
+			}
+			filters.forEach(f => {
+				for (let field of fields) {
+					if (field.fieldname == f[0] + ':' + f[1]) {
+						return;
+					}
+				}
+				if (f[2] == '=') {
+					fields.push({
+						label: `${f[1]} (${f[0]})`,
+						fieldname: f[0] + ':' + f[1],
+						fieldtype: 'Data',
+					});
+				}
+			});
+		} else {
+			filters = {...dynamic_filters, ...filters};
+			for (let key of Object.keys(filters)) {
+				fields.push({
+					label: key,
+					fieldname: key,
+					fieldtype: 'Data',
+				});
+			}
+		}
+
+		return fields;
 	}
 
 };
\ No newline at end of file
diff --git a/frappe/public/js/frappe/views/reports/report_utils.js b/frappe/public/js/frappe/views/reports/report_utils.js
index 7b1205482f..856262e468 100644
--- a/frappe/public/js/frappe/views/reports/report_utils.js
+++ b/frappe/public/js/frappe/views/reports/report_utils.js
@@ -41,7 +41,7 @@ frappe.report_utils = {
 		}
 	},
 
-	get_possible_chart_options: function(columns, data) {
+	get_field_options_from_report: function(columns, data) {
 		const rows =  data.result.filter(value => Object.keys(value).length);
 		const first_row = Array.isArray(rows[0]) ? rows[0] : columns.map(col => rows[0][col.fieldname]);
 

From 1d31df649f4da2164fb2e6e383784124072744b7 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 16 Jul 2020 02:09:16 +0530
Subject: [PATCH 206/345] feat: custom type number card

---
 .../desk/doctype/number_card/number_card.js   | 41 +++++++++++++++++++
 .../desk/doctype/number_card/number_card.json | 27 +++++++++++-
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index b2c7e544e2..20da748516 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -18,6 +18,14 @@ frappe.ui.form.on('Number Card', {
 			frm.trigger('set_report_filters');
 		}
 
+		if (frm.doc.type == 'Custom') {
+			if (!frappe.boot.developer_mode) {
+				frm.disable_form();
+			}
+			frm.filters = eval(frm.doc.filters_config);
+			frm.trigger('set_filters_description');
+		}
+
 		frm.trigger('render_filters_table');
 		if (frappe.boot.developer_mode && frm.doc.is_standard) {
 			frm.trigger('render_dynamic_filters_table');
@@ -42,7 +50,33 @@ frappe.ui.form.on('Number Card', {
 		}
 	},
 
+	set_filters_description: function(frm) {
+		if (frm.doc.type == 'Custom') {
+			frm.fields_dict.filters_config.set_description(`
+		Set the filters here. For example:
+<pre class="small text-muted">
+<code>
+[{
+	fieldname: "company",
+	label: __("Company"),
+	fieldtype: "Link",
+	options: "Company",
+	default: frappe.defaults.get_user_default("Company"),
+	reqd: 1
+},
+{
+	fieldname: "account",
+	label: __("Account"),
+	fieldtype: "Link",
+	options: "Account",
+	reqd: 1
+}]
+</code></pre>`);
+		}
+	},
+
 	type: function(frm) {
+		frm.trigger('set_filters_description');
 		if (frm.doc.type == 'Report') {
 			frm.set_query('report_name', () => {
 				return {
@@ -65,6 +99,13 @@ frappe.ui.form.on('Number Card', {
 		frm.filters = null;
 	},
 
+	filters_config: function(frm) {
+		frm.filters = eval(frm.doc.filters_config);
+		const filter_values = frappe.report_utils.get_filter_values(frm.filters);
+		frm.set_value('filters_json', JSON.stringify(filter_values));
+		frm.trigger('render_filters_table');
+	},
+
 	document_type: function(frm) {
 		frm.set_query('document_type', function() {
 			return {
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index 2a7b5ef478..83e00e48cb 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -12,12 +12,15 @@
   "label",
   "type",
   "report_name",
+  "method",
   "function",
   "aggregate_function_based_on",
   "column_break_2",
   "document_type",
   "report_field",
   "is_public",
+  "custom_configuration_section",
+  "filters_config",
   "stats_section",
   "show_percentage_stats",
   "stats_time_interval",
@@ -141,7 +144,7 @@
    "fieldname": "type",
    "fieldtype": "Select",
    "label": "Type",
-   "options": "Document Type\nReport"
+   "options": "Document Type\nReport\nCustom"
   },
   {
    "depends_on": "eval: doc.type == 'Report'",
@@ -157,10 +160,30 @@
    "fieldtype": "Select",
    "label": "Field",
    "mandatory_depends_on": "eval: doc.type == 'Report'"
+  },
+  {
+   "depends_on": "eval: doc.type == 'Custom'",
+   "description": "This should contain the path to a whitelisted function that will return the number on the card",
+   "fieldname": "method",
+   "fieldtype": "Data",
+   "label": "Method",
+   "mandatory_depends_on": "eval: doc.type == 'Custom'"
+  },
+  {
+   "depends_on": "eval: doc.type == 'Custom'",
+   "fieldname": "custom_configuration_section",
+   "fieldtype": "Section Break",
+   "label": "Custom Configuration"
+  },
+  {
+   "fieldname": "filters_config",
+   "fieldtype": "Code",
+   "label": "Filters Configuration",
+   "options": "JSON"
   }
  ],
  "links": [],
- "modified": "2020-07-16 00:58:30.426929",
+ "modified": "2020-07-16 02:03:09.175701",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",

From 44968de176c9f6d450648be1b2d702d04c79e3d6 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 16 Jul 2020 12:06:04 +0530
Subject: [PATCH 207/345] feat: number card widgets with type

---
 .../desk/doctype/number_card/number_card.js   | 35 ++++-----
 .../js/frappe/views/reports/report_utils.js   | 10 +++
 .../js/frappe/widgets/number_card_widget.js   | 78 +++++++++++++++----
 3 files changed, 87 insertions(+), 36 deletions(-)

diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 20da748516..db181c91e8 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -14,7 +14,7 @@ frappe.ui.form.on('Number Card', {
 			frm.set_value('type', 'Document Type');
 		}
 
-		if (frm.doc.type == 'Report') {
+		if (frm.doc.type == 'Report' && frm.doc.report_name) {
 			frm.trigger('set_report_filters');
 		}
 
@@ -25,11 +25,6 @@ frappe.ui.form.on('Number Card', {
 			frm.filters = eval(frm.doc.filters_config);
 			frm.trigger('set_filters_description');
 		}
-
-		frm.trigger('render_filters_table');
-		if (frappe.boot.developer_mode && frm.doc.is_standard) {
-			frm.trigger('render_dynamic_filters_table');
-		}
 	},
 
 	before_save: function(frm) {
@@ -43,11 +38,8 @@ frappe.ui.form.on('Number Card', {
 	},
 
 	is_standard: function(frm) {
-		if (frappe.boot.developer_mode && frm.doc.is_standard) {
-			frm.trigger('render_dynamic_filters_table');
-		} else {
-			frm.set_df_property("dynamic_filters_section", "hidden", 1);
-		}
+		frm.trigger('render_dynamic_filters_table');
+		frm.set_df_property("dynamic_filters_section", "hidden", 1);
 	},
 
 	set_filters_description: function(frm) {
@@ -85,18 +77,15 @@ frappe.ui.form.on('Number Card', {
 					}
 				};
 			});
-			frm.trigger('set_report_filters');
 		}
-		frm.set_value('filters_json', 'null');
-		frm.filters = null;
-		frm.trigger('render_filters_table');
+
 	},
 
 	report_name: function(frm) {
-		frm.trigger('set_report_filters');
 		frm.set_value('filters_json', '{}');
 		frm.set_value('dynamic_filters_json', '{}');
-		frm.filters = null;
+		frm.set_df_property('report_field', 'options', []);
+		frm.trigger('set_report_filters');
 	},
 
 	filters_config: function(frm) {
@@ -121,7 +110,7 @@ frappe.ui.form.on('Number Card', {
 	},
 
 	set_options: function(frm) {
-		if (!frm.doc.type == 'Document Type') {
+		if (frm.doc.type !== 'Document Type') {
 			return;
 		}
 
@@ -154,18 +143,19 @@ frappe.ui.form.on('Number Card', {
 				if (filters) {
 					frm.filters = filters;
 					const filter_values = frappe.report_utils.get_filter_values(filters);
-					if (!JSON.parse(frm.doc.filters_json)) {
+					if (frm.doc.filters_json.length <= 2) {
 						frm.set_value('filters_json', JSON.stringify(filter_values));
 					}
 				}
 				frm.trigger('render_filters_table');
 				frm.trigger('set_report_field_options');
+				frm.trigger('render_dynamic_filters_table');
 			});
 		}
 	},
 
 	set_report_field_options: function(frm) {
-		let filters = JSON.parse(frm.doc.filters_json);
+		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
 		frappe.xcall(
 			'frappe.desk.query_report.run',
 			{
@@ -174,7 +164,6 @@ frappe.ui.form.on('Number Card', {
 				ignore_prepared_report: 1
 			}
 		).then(data => {
-			frm.report_data = data;
 			if (data.result.length) {
 				frm.field_options = frappe.report_utils.get_field_options_from_report(data.columns, data);
 				frm.set_df_property('report_field', 'options', frm.field_options.numeric_fields);
@@ -311,6 +300,10 @@ frappe.ui.form.on('Number Card', {
 	},
 
 	render_dynamic_filters_table(frm) {
+		if (!frappe.boot.developer_mode || !frm.doc.is_standard) {
+			return
+		}
+
 		frm.set_df_property("dynamic_filters_section", "hidden", 0);
 
 		let is_document_type = frm.doc.type == 'Document Type';
diff --git a/frappe/public/js/frappe/views/reports/report_utils.js b/frappe/public/js/frappe/views/reports/report_utils.js
index 856262e468..158dbd653b 100644
--- a/frappe/public/js/frappe/views/reports/report_utils.js
+++ b/frappe/public/js/frappe/views/reports/report_utils.js
@@ -138,4 +138,14 @@ frappe.report_utils = {
 		return filter_values;
 	},
 
+	get_result_of_fn(fn, values) {
+		const get_result = {
+			'Minimum': values => values.reduce((min, val) => Math.min(min, val), values[0]),
+			'Maximum': values => values.reduce((min, val) => Math.max(min, val), values[0]),
+			'Average': values => values.reduce((a, b) => a + b, 0) / values.length,
+			'Sum': values => values.reduce((a, b) => a + b, 0)
+		};
+		return get_result[fn](values);
+	},
+
 };
diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js
index 77cb8a59c2..8a8b3309dc 100644
--- a/frappe/public/js/frappe/widgets/number_card_widget.js
+++ b/frappe/public/js/frappe/widgets/number_card_widget.js
@@ -59,8 +59,7 @@ export default class NumberCardWidget extends Widget {
 			}
 		).then(doc => {
 			this.name = doc.name;
-			this.card_doc.stats_time_interval = doc.stats_time_interval;
-			this.card_doc.name = this.name;
+			this.card_doc = doc;
 			this.widget.attr('data-widget-name', this.name);
 		});
 	}
@@ -84,11 +83,43 @@ export default class NumberCardWidget extends Widget {
 		});
 	}
 
+	get_settings(type) {
+		const settings_map = {
+			'Custom': {
+				method: this.card_doc.method,
+				args: {
+					filters: JSON.parse(this.card_doc.filters_json || '{}')
+				}
+			},
+			'Report': {
+				method: 'frappe.desk.query_report.run',
+				args: {
+					report_name: this.card_doc.report_name,
+					filters: JSON.parse(this.card_doc.filters_json || '{}'),
+					ignore_prepared_report: 1
+				}
+			},
+			'Document Type': {
+				method: 'frappe.desk.doctype.number_card.number_card.get_result',
+				args: {
+					doc: this.card_doc
+				}
+			}
+		};
+		return settings_map[type];
+	}
+
 	render_card() {
 		this.prepare_actions();
 		this.set_title();
 		this.set_loading_state();
 
+		if (!this.card_doc.type) {
+			this.card_doc.type = 'Document Type';
+		}
+
+		this.settings = this.get_settings(this.card_doc.type);
+
 		frappe.run_serially([
 			() => this.render_number(),
 			() => this.render_stats(),
@@ -102,29 +133,42 @@ export default class NumberCardWidget extends Widget {
 	}
 
 	get_number() {
-		return frappe.xcall('frappe.desk.doctype.number_card.number_card.get_result', {
-			doc: this.card_doc
-		}).then(res => {
-			this.number = res;
-			if (this.card_doc.function !== 'Count') {
-				return frappe.model.with_doctype(this.card_doc.document_type, () => {
-					this.get_formatted_number();
-				});
+		return frappe.xcall(this.settings.method, this.settings.args).then(res => {
+			if (this.card_doc.type == 'Report') {
+				this.get_number_for_report(res);
 			} else {
-				this.number_html = res;
+				this.number = res;
+				if (this.card_doc.function !== 'Count') {
+					return frappe.model.with_doctype(this.card_doc.document_type, () => {
+						const based_on_df =
+							frappe.meta.get_docfield(this.card_doc.document_type, this.card_doc.aggregate_function_based_on);
+						this.get_formatted_number(based_on_df);
+					});
+				} else {
+					this.number_html = res;
+				}
 			}
 		});
 	}
 
-	get_formatted_number() {
-		const based_on_df =
-			frappe.meta.get_docfield(this.card_doc.document_type, this.card_doc.aggregate_function_based_on);
+	get_number_for_report(res) {
+		const field = this.card_doc.report_field;
+		const vals = res.result.reduce((acc, col) => {
+			col[field] && acc.push(col[field]);
+			return acc;
+		}, []);
+		const col = res.columns.find(col => col.fieldname == field);
+		this.number = frappe.report_utils.get_result_of_fn(this.card_doc.report_function, vals);
+		this.get_formatted_number(col);
+	}
+
+	get_formatted_number(df) {
 		const default_country = frappe.sys_defaults.country;
 		const shortened_number = shorten_number(this.number, default_country);
 		let number_parts = shortened_number.split(' ');
 
 		const symbol = number_parts[1] || '';
-		const formatted_number = $(frappe.format(number_parts[0], based_on_df)).text();
+		const formatted_number = $(frappe.format(number_parts[0], df)).text();
 
 		this.number_html = formatted_number + ' ' + symbol;
 	}
@@ -138,6 +182,10 @@ export default class NumberCardWidget extends Widget {
 	}
 
 	render_stats() {
+		if (this.card_doc.type !== 'Document Type') {
+			return;
+		}
+
 		let caret_html ='';
 		let color_class = '';
 

From 7836141d33b45d8c8da460b0d2bc5e43adabf9bf Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 16 Jul 2020 12:06:26 +0530
Subject: [PATCH 208/345] fix: remove is_standard from dashboard query

---
 frappe/desk/doctype/dashboard/dashboard.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js
index 9be6b55d53..237b549433 100644
--- a/frappe/desk/doctype/dashboard/dashboard.js
+++ b/frappe/desk/doctype/dashboard/dashboard.js
@@ -13,7 +13,6 @@ frappe.ui.form.on('Dashboard', {
 			return {
 				filters: {
 					is_public: 1,
-					is_standard: 1,
 				}
 			};
 		});
@@ -22,7 +21,6 @@ frappe.ui.form.on('Dashboard', {
 			return {
 				filters: {
 					is_public: 1,
-					is_standard: 1,
 				}
 			};
 		});

From f5b80f21d45cf9aae3306600b97998b8b3ca824d Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 16 Jul 2020 13:23:26 +0530
Subject: [PATCH 209/345] fix: get all filters for charts and cards

---
 .../desk/doctype/number_card/number_card.json | 11 +++++-
 .../desk/doctype/number_card/number_card.py   | 25 ++++++++++----
 .../public/js/frappe/utils/dashboard_utils.js | 32 +++++++++++++++++
 .../public/js/frappe/widgets/chart_widget.js  | 34 +------------------
 .../js/frappe/widgets/number_card_widget.js   | 14 ++++++--
 5 files changed, 72 insertions(+), 44 deletions(-)

diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index 83e00e48cb..1d0528b298 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -18,6 +18,7 @@
   "column_break_2",
   "document_type",
   "report_field",
+  "report_function",
   "is_public",
   "custom_configuration_section",
   "filters_config",
@@ -180,10 +181,18 @@
    "fieldtype": "Code",
    "label": "Filters Configuration",
    "options": "JSON"
+  },
+  {
+   "depends_on": "eval: doc.type == 'Report'",
+   "fieldname": "report_function",
+   "fieldtype": "Select",
+   "label": "Function",
+   "mandatory_depends_on": "eval: doc.type == 'Report'",
+   "options": "Sum\nAverage\nMinimum\nMaximum"
   }
  ],
  "links": [],
- "modified": "2020-07-16 02:03:09.175701",
+ "modified": "2020-07-16 13:04:03.470001",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 2f5cfb561c..1243b1850f 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -52,7 +52,7 @@ def has_permission(doc, ptype, user):
 	return False
 
 @frappe.whitelist()
-def get_result(doc, to_date=None):
+def get_result(doc, filters, to_date=None):
 	doc = frappe.parse_json(doc)
 	fields = []
 	sql_function_map = {
@@ -70,13 +70,13 @@ def get_result(doc, to_date=None):
 	else:
 		fields = ['{function}({based_on}) as result'.format(function=function, based_on=doc.aggregate_function_based_on)]
 
-	filters = frappe.parse_json(doc.filters_json)
+	filters = frappe.parse_json(filters)
 
 	if not filters:
 			filters = []
 
 	if to_date:
-		filters.append([doc.document_type, 'creation', '<', to_date, False])
+		filters.append([doc.document_type, 'creation', '<', to_date])
 
 	res = frappe.db.get_list(doc.document_type, fields=fields, filters=filters)
 	number = res[0]['result'] if res else 0
@@ -84,7 +84,7 @@ def get_result(doc, to_date=None):
 	return cint(number)
 
 @frappe.whitelist()
-def get_percentage_difference(doc, result):
+def get_percentage_difference(doc, filters, result):
 	doc = frappe.parse_json(doc)
 	result = frappe.parse_json(result)
 
@@ -93,13 +93,13 @@ def get_percentage_difference(doc, result):
 	if not doc.get('show_percentage_stats'):
 		return
 
-	previous_result = calculate_previous_result(doc)
+	previous_result = calculate_previous_result(doc, filters)
 	difference = (result - previous_result)/100.0
 
 	return difference
 
 
-def calculate_previous_result(doc):
+def calculate_previous_result(doc, filters):
 	from frappe.utils import add_to_date
 
 	current_date = frappe.utils.now()
@@ -112,7 +112,7 @@ def calculate_previous_result(doc):
 	else:
 		previous_date = add_to_date(current_date, years=-1)
 
-	number = get_result(doc, previous_date)
+	number = get_result(doc, filters, previous_date)
 	return number
 
 @frappe.whitelist()
@@ -155,3 +155,14 @@ def get_cards_for_user(doctype, txt, searchfield, start, page_len, filters):
 		search_conditions=search_conditions,
 		conditions=conditions
 	), values)
+
+@frappe.whitelist()
+def add_card_to_dashboard(args):
+	args = frappe.parse_json(args)
+
+	dashboard = frappe.get_doc('Dashboard', args.dashboard)
+	dashboard_link = frappe.new_doc('Number Card Link')
+	dashboard_link.card = args.name
+
+	dashboard.append('cards', dashboard_link)
+	dashboard.save()
\ No newline at end of file
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index c98de6b4ac..8618f6dd59 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -167,6 +167,38 @@ frappe.dashboard_utils = {
 		}
 
 		return fields;
+	},
+
+	get_all_filters(doc) {
+		let filters = JSON.parse(doc.filters_json || "null");
+		let dynamic_filters = JSON.parse(doc.dynamic_filters_json || "null");
+
+		if (!dynamic_filters) {
+			return filters;
+		}
+
+		if ($.isArray(dynamic_filters)) {
+			dynamic_filters.forEach(f => {
+				try {
+					f[3] = eval(f[3]);
+				} catch (e) {
+					frappe.throw(__(`Invalid expression set in filter ${f[1]} (${f[0]})`));
+				}
+			});
+			filters = [...filters, ...dynamic_filters];
+		} else {
+			for (let key of Object.keys(dynamic_filters)) {
+				try {
+					const val = eval(dynamic_filters[key]);
+					dynamic_filters[key] = val;
+				} catch (e) {
+					frappe.throw(__(`Invalid expression set in filter ${key}`));
+				}
+			}
+			Object.assign(filters, dynamic_filters);
+		}
+
+		return filters;
 	}
 
 };
\ No newline at end of file
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index e31df3825b..674f53670e 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -639,7 +639,7 @@ export default class ChartWidget extends Widget {
 
 	set_chart_filters() {
 		let user_saved_filters = this.chart_settings.filters || null;
-		let chart_saved_filters = this.get_all_chart_filters();
+		let chart_saved_filters = frappe.dashboard_utils.get_all_filters(this.chart_doc);
 
 		if (this.chart_doc.chart_type == 'Report') {
 			return frappe.dashboard_utils
@@ -655,38 +655,6 @@ export default class ChartWidget extends Widget {
 		}
 	}
 
-	get_all_chart_filters() {
-		let filters = JSON.parse(this.chart_doc.filters_json || "null");
-		let dynamic_filters = JSON.parse(this.chart_doc.dynamic_filters_json || "null");
-
-		if (!dynamic_filters) {
-			return filters;
-		}
-
-		if ($.isArray(dynamic_filters)) {
-			dynamic_filters.forEach(f => {
-				try {
-					f[3] = eval(f[3]);
-				} catch (e) {
-					frappe.throw(__(`Invalid expression set in filter ${f[1]} (${f[0]})`));
-				}
-			});
-			filters = [...filters, ...dynamic_filters];
-		} else {
-			for (let key of Object.keys(dynamic_filters)) {
-				try {
-					const val = eval(dynamic_filters[key]);
-					dynamic_filters[key] = val;
-				} catch (e) {
-					frappe.throw(__(`Invalid expression set in filter ${key}`));
-				}
-			}
-			Object.assign(filters, dynamic_filters);
-		}
-
-		return filters;
-	}
-
 	update_default_date_filters(report_filters, chart_filters) {
 		report_filters.map(f => {
 			if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js
index 8a8b3309dc..f384e84af6 100644
--- a/frappe/public/js/frappe/widgets/number_card_widget.js
+++ b/frappe/public/js/frappe/widgets/number_card_widget.js
@@ -84,31 +84,38 @@ export default class NumberCardWidget extends Widget {
 	}
 
 	get_settings(type) {
+		this.filters = this.get_filters();
 		const settings_map = {
 			'Custom': {
 				method: this.card_doc.method,
 				args: {
-					filters: JSON.parse(this.card_doc.filters_json || '{}')
+					filters: this.filters
 				}
 			},
 			'Report': {
 				method: 'frappe.desk.query_report.run',
 				args: {
 					report_name: this.card_doc.report_name,
-					filters: JSON.parse(this.card_doc.filters_json || '{}'),
+					filters: this.filters,
 					ignore_prepared_report: 1
 				}
 			},
 			'Document Type': {
 				method: 'frappe.desk.doctype.number_card.number_card.get_result',
 				args: {
-					doc: this.card_doc
+					doc: this.card_doc,
+					filters: this.filters,
 				}
 			}
 		};
 		return settings_map[type];
 	}
 
+	get_filters() {
+		const filters = frappe.dashboard_utils.get_all_filters(this.card_doc);
+		return filters;
+	}
+
 	render_card() {
 		this.prepare_actions();
 		this.set_title();
@@ -225,6 +232,7 @@ export default class NumberCardWidget extends Widget {
 	get_percentage_stats() {
 		return frappe.xcall('frappe.desk.doctype.number_card.number_card.get_percentage_difference', {
 			doc: this.card_doc,
+			filters: this.filters,
 			result: this.number
 		}).then(res => {
 			if (res !== undefined) {

From 8f59711e1e7841483921497ab15bc97bee410abb Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 16 Jul 2020 13:23:47 +0530
Subject: [PATCH 210/345] feat: add to dashboard button in number card form

---
 .../desk/doctype/number_card/number_card.js   | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index db181c91e8..202c0ce075 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -25,6 +25,47 @@ frappe.ui.form.on('Number Card', {
 			frm.filters = eval(frm.doc.filters_config);
 			frm.trigger('set_filters_description');
 		}
+		frm.trigger('create_add_to_dashboard_button');
+	},
+
+	create_add_to_dashboard_button: function(frm) {
+		frm.add_custom_button('Add Card to Dashboard', () => {
+			const d = new frappe.ui.Dialog({
+				title: __('Add to Dashboard'),
+				fields: [
+					{
+						label: __('Select Dashboard'),
+						fieldtype: 'Link',
+						fieldname: 'dashboard',
+						options: 'Dashboard',
+					}
+				],
+				primary_action: (values) => {
+					values.name = frm.doc.name;
+					frappe.xcall(
+						'frappe.desk.doctype.number_card.number_card.add_card_to_dashboard',
+						{
+							args: values
+						}
+					).then(()=> {
+						let dashboard_route_html =
+							`<a href = "#dashboard/${values.dashboard}">${values.dashboard}</a>`;
+						let message =
+							__(`Number Card ${values.name} add to Dashboard ` + dashboard_route_html);
+
+						frappe.msgprint(message);
+					});
+
+					d.hide();
+				}
+			});
+
+			if (!frm.doc.name) {
+				frappe.msgprint(__('Please create Card first'));
+			} else {
+				d.show();
+			}
+		});
 	},
 
 	before_save: function(frm) {
@@ -35,6 +76,7 @@ frappe.ui.form.on('Number Card', {
 
 		frm.set_value('filters_json', JSON.stringify(static_filters));
 		frm.trigger('render_filters_table');
+		frm.trigger('render_dynamic_filters_table');
 	},
 
 	is_standard: function(frm) {
@@ -133,6 +175,7 @@ frappe.ui.form.on('Number Card', {
 				frm.set_df_property('aggregate_function_based_on', 'options', aggregate_based_on_fields);
 			});
 			frm.trigger('render_filters_table');
+			frm.trigger('render_dynamic_filters_table');
 		}
 	},
 
@@ -156,6 +199,9 @@ frappe.ui.form.on('Number Card', {
 
 	set_report_field_options: function(frm) {
 		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
+		if (frm.doc.dynamic_filters_json.length > 2) {
+			filters = {...filters, ...JSON.parse(frm.doc.dynamic_filters_json)};
+		}
 		frappe.xcall(
 			'frappe.desk.query_report.run',
 			{

From ba89bd948aa5f11ae60c001374ec7eb9d01e7a35 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 16 Jul 2020 13:24:06 +0530
Subject: [PATCH 211/345] fix: add dynamic filters in report filters for charts

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index c8783f0e64..738d77ae27 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -175,6 +175,9 @@ frappe.ui.form.on('Dashboard Chart', {
 
 	set_chart_field_options: function(frm) {
 		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
+		if (frm.doc.dynamic_filters_json.length > 2) {
+			filters = {...filters, ...JSON.parse(frm.doc.dynamic_filters_json)};
+		}
 		frappe.xcall(
 			'frappe.desk.query_report.run',
 			{

From d8192de74f2d03feeeccb9d329427e30fcb5011f Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 16 Jul 2020 13:31:31 +0530
Subject: [PATCH 212/345] feat: add card from report

---
 .../desk/doctype/number_card/number_card.py   |   8 ++
 .../js/frappe/views/reports/query_report.js   | 105 ++++++++++++++++--
 2 files changed, 106 insertions(+), 7 deletions(-)

diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 1243b1850f..5b52b60474 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -156,6 +156,14 @@ def get_cards_for_user(doctype, txt, searchfield, start, page_len, filters):
 		conditions=conditions
 	), values)
 
+@frappe.whitelist()
+def create_report_number_card(args):
+	card = create_number_card(args)
+	args = frappe.parse_json(args)
+	args.name = card.name
+	if args.dashboard:
+		add_card_to_dashboard(frappe.as_json(args))
+
 @frappe.whitelist()
 def add_card_to_dashboard(args):
 	args = frappe.parse_json(args)
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index f82956adac..2d49948dfc 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -128,10 +128,17 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			() => this.setup_progress_bar(),
 			() => this.setup_page_head(),
 			() => this.refresh_report(),
-			() => this.add_chart_buttons_to_toolbar(true)
+			() => this.add_chart_buttons_to_toolbar(true),
+			() => this.add_card_button_to_toolbar(),
 		]);
 	}
 
+	add_card_button_to_toolbar() {
+		this.page.add_inner_button(__("Create Card"), () => {
+			this.add_card_to_dashboard();
+		});
+	}
+
 	add_chart_buttons_to_toolbar(show) {
 		if (show) {
 			this.page.add_inner_button(__("Set Chart"), () => {
@@ -148,6 +155,62 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		}
 	}
 
+	add_card_to_dashboard() {
+		let field_options = frappe.report_utils.get_field_options_from_report(this.columns, this.raw_data);
+		const dialog = new frappe.ui.Dialog({
+			title: __('Create Card'),
+			fields: [
+				{
+					fieldname: 'report_field',
+					label: __('Field'),
+					fieldtype: 'Select',
+					options: field_options.numeric_fields,
+				},
+				{
+					fieldname: 'cb_1',
+					fieldtype: 'Column Break'
+				},
+				{
+					fieldname: 'report_function',
+					label: __('Function'),
+					options: ['Sum', 'Average', 'Minimum', 'Maximum'],
+					fieldtype: 'Select'
+				},
+				{
+					fieldname: 'sb_1',
+					label: __('Add to Dashboard'),
+					fieldtype: 'Section Break'
+				},
+				{
+					fieldname: 'dashboard',
+					label: __('Choose Dashboard'),
+					fieldtype: 'Link',
+					options: 'Dashboard',
+				},
+				{
+					fieldname: 'cb_2',
+					fieldtype: 'Column Break'
+				},
+				{
+					fieldname: 'label',
+					label: __('Card Label'),
+					fieldtype: 'Data',
+				}
+			],
+			primary_action_label: __('Add'),
+			primary_action: (values) => {
+				if (!values.label) {
+					values.label = `${values.report_function} of ${toTitle(values.report_field)}`;
+				}
+				this.create_number_card(values, values.dashboard, values.label);
+				dialog.hide();
+			}
+		});
+
+		dialog.show();
+
+	}
+
 	add_chart_to_dashboard() {
 		if (this.chart_fields || this.chart_options) {
 			const dialog = new frappe.ui.Dialog({
@@ -182,6 +245,24 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		}
 	}
 
+	create_number_card(values, dashboard_name, card_name) {
+		let args = {
+			'dashboard': dashboard_name || null,
+			'type': 'Report',
+			'report_name': this.report_name,
+			'filters_json': JSON.stringify(this.get_filter_values()),
+		};
+		Object.assign(args, values);
+
+		this.add_to_dashboard(
+			'frappe.desk.doctype.number_card.number_card.create_report_number_card',
+			args,
+			dashboard_name,
+			card_name,
+			'Number Card'
+		);
+	}
+
 	create_dashboard_chart(chart_args, dashboard_name, chart_name) {
 		let args = {
 			'dashboard': dashboard_name || null,
@@ -224,19 +305,29 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			);
 		}
 
-		frappe.xcall(
+		this.add_to_dashboard(
 			'frappe.desk.doctype.dashboard_chart.dashboard_chart.create_report_chart',
+			args,
+			dashboard_name,
+			chart_name,
+			'Dashboard Chart'
+		);
+	}
+
+	add_to_dashboard(method, args, dashboard_name, name, doctype) {
+		frappe.xcall(
+			method,
 			{args: args}
-		).then( () => {
+		).then(() => {
 			let message;
 			if (dashboard_name) {
 				let dashboard_route_html = `<a href = "#dashboard/${dashboard_name}">${dashboard_name}</a>`;
-				message = __(`New Dashboard Chart ${chart_name} added to Dashboard ` + dashboard_route_html);
+				message = __(`New {0} {1} added to Dashboard ` + dashboard_route_html, [doctype, name]);
 			} else {
-				message = __(`New chart ${chart_name} created`);
+				message = __(`New {0} {1} created`, [doctype, name]);
 			}
 
-			frappe.msgprint(message, __('New Chart Created'));
+			frappe.msgprint(message, __(`New {0} Created`, [doctype]));
 		});
 	}
 
@@ -700,7 +791,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 
 	open_create_chart_dialog() {
 		const me = this;
-		let field_options = frappe.report_utils.get_possible_chart_options(this.columns, this.raw_data);
+		let field_options = frappe.report_utils.get_field_options_from_report(this.columns, this.raw_data);
 
 		function set_chart_values(values) {
 			values.y_fields = [];

From c574e3c20d925410ca938bc0b7448c6d0af177cf Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 15 Jul 2020 16:06:08 +0530
Subject: [PATCH 213/345] fix: handle set route for report type cards

---
 .../js/frappe/widgets/number_card_widget.js   | 28 ++++++++++++++++---
 frappe/public/js/frappe/widgets/utils.js      | 10 -------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js
index f384e84af6..657ffde8ad 100644
--- a/frappe/public/js/frappe/widgets/number_card_widget.js
+++ b/frappe/public/js/frappe/widgets/number_card_widget.js
@@ -1,5 +1,5 @@
 import Widget from "./base_widget.js";
-import { go_to_list_with_filters, shorten_number } from "./utils";
+import { generate_route, shorten_number } from "./utils";
 
 export default class NumberCardWidget extends Widget {
 	constructor(opts) {
@@ -66,12 +66,32 @@ export default class NumberCardWidget extends Widget {
 
 	set_events() {
 		$(this.body).click(() => {
-			if (this.in_customize_mode) return;
-			let filters = JSON.parse(this.card_doc.filters_json);
-			go_to_list_with_filters(this.card_doc.document_type, filters);
+			if (this.in_customize_mode || this.card_doc.type == 'Custom') return;
+			this.set_route();
 		});
 	}
 
+	set_route() {
+		const is_document_type = this.card_doc.type !== 'Report';
+		const name = is_document_type ? this.card_doc.document_type : this.card_doc.report_name;
+		const route = generate_route({
+			name: name,
+			type: is_document_type ? 'doctype' : 'report',
+			is_query_report: !is_document_type,
+		});
+
+		if (is_document_type) {
+			const filters = JSON.parse(this.card_doc.filters_json);
+			frappe.route_options = filters.reduce((acc, filter) => {
+					return Object.assign(acc, {
+						[`${filter[0]}.${filter[1]}`]: [filter[2], filter[3]]
+					});
+			}, {});
+		}
+
+		frappe.set_route(route);
+	}
+
 	set_doc_args() {
 		this.card_doc = Object.assign({}, {
 			document_type: this.document_type,
diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js
index dff4db807e..1f235ea7a7 100644
--- a/frappe/public/js/frappe/widgets/utils.js
+++ b/frappe/public/js/frappe/widgets/utils.js
@@ -117,16 +117,6 @@ const build_summary_item = (summary) => {
 	</div>`);
 };
 
-function go_to_list_with_filters(doctype, filters) {
-	const route = `List/${doctype}/List`;
-	frappe.set_route(route).then(()=> {
-		let list_view = frappe.views.list_view[route];
-		let filter_area = list_view.filter_area;
-		filter_area.clear();
-		filter_area.filter_list.add_filters_to_filter_group(filters);
-	});
-}
-
 function shorten_number(number, country) {
 	country = (country == 'India') ? country : '';
 	const number_system = get_number_system(country);

From ab845e8d54a4dd6a94a8ccff04becda1227b66d2 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 16 Jul 2020 13:50:05 +0530
Subject: [PATCH 214/345] fix: don't render dynamic filters for custom cards

---
 frappe/desk/doctype/number_card/number_card.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 202c0ce075..dbb7f8d623 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -24,6 +24,7 @@ frappe.ui.form.on('Number Card', {
 			}
 			frm.filters = eval(frm.doc.filters_config);
 			frm.trigger('set_filters_description');
+			frm.trigger('render_filters_table');
 		}
 		frm.trigger('create_add_to_dashboard_button');
 	},
@@ -278,7 +279,6 @@ frappe.ui.form.on('Number Card', {
 				filters_set = true;
 			}
 		} else if (frm.filters.length) {
-			filters_set = true;
 			fields = frm.filters.filter(f => f.fieldname);
 			fields.map(f => {
 				if (filters[f.fieldname]) {
@@ -289,8 +289,8 @@ frappe.ui.form.on('Number Card', {
 							<td>${condition}</td>
 							<td>${filters[f.fieldname] || ""}</td>
 						</tr>`);
-
 					table.find('tbody').append(filter_row);
+					if (!filters_set) filters_set = true;
 				}
 			});
 		}
@@ -346,7 +346,7 @@ frappe.ui.form.on('Number Card', {
 	},
 
 	render_dynamic_filters_table(frm) {
-		if (!frappe.boot.developer_mode || !frm.doc.is_standard) {
+		if (!frappe.boot.developer_mode || !frm.doc.is_standard || frm.doc.type == 'Custom') {
 			return
 		}
 

From 75e15cbbe9716a11e6a12b4bc917d79d0076c116 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 16 Jul 2020 13:50:26 +0530
Subject: [PATCH 215/345] fix: don't export go_to_list_with_filters

---
 frappe/public/js/frappe/widgets/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js
index 1f235ea7a7..22b3167977 100644
--- a/frappe/public/js/frappe/widgets/utils.js
+++ b/frappe/public/js/frappe/widgets/utils.js
@@ -157,4 +157,4 @@ function get_number_system(country) {
 	return number_system_map[country];
 }
 
-export { generate_route, generate_grid, build_summary_item, go_to_list_with_filters, shorten_number };
\ No newline at end of file
+export { generate_route, generate_grid, build_summary_item, shorten_number };
\ No newline at end of file

From 8304f1fa83a17f02caf0a41401ac7bf10b25088d Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 16 Jul 2020 14:00:02 +0530
Subject: [PATCH 216/345] style: formatting fixes

---
 frappe/desk/doctype/number_card/number_card.js        | 2 +-
 frappe/public/js/frappe/widgets/number_card_widget.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index dbb7f8d623..9bc071b723 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -347,7 +347,7 @@ frappe.ui.form.on('Number Card', {
 
 	render_dynamic_filters_table(frm) {
 		if (!frappe.boot.developer_mode || !frm.doc.is_standard || frm.doc.type == 'Custom') {
-			return
+			return;
 		}
 
 		frm.set_df_property("dynamic_filters_section", "hidden", 0);
diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js
index 657ffde8ad..6c85c03b0a 100644
--- a/frappe/public/js/frappe/widgets/number_card_widget.js
+++ b/frappe/public/js/frappe/widgets/number_card_widget.js
@@ -83,9 +83,9 @@ export default class NumberCardWidget extends Widget {
 		if (is_document_type) {
 			const filters = JSON.parse(this.card_doc.filters_json);
 			frappe.route_options = filters.reduce((acc, filter) => {
-					return Object.assign(acc, {
-						[`${filter[0]}.${filter[1]}`]: [filter[2], filter[3]]
-					});
+				return Object.assign(acc, {
+					[`${filter[0]}.${filter[1]}`]: [filter[2], filter[3]]
+				});
 			}, {});
 		}
 

From 92a778c44a3e1a158389fae02f0427c6efe05ccc Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Thu, 16 Jul 2020 14:03:11 +0530
Subject: [PATCH 217/345] fix: Made Workflow State Field Mandatory

---
 .../workflow/doctype/workflow/workflow.json   | 324 ++----------------
 1 file changed, 29 insertions(+), 295 deletions(-)

diff --git a/frappe/workflow/doctype/workflow/workflow.json b/frappe/workflow/doctype/workflow/workflow.json
index 28bc186bc8..e22d21b5d3 100644
--- a/frappe/workflow/doctype/workflow/workflow.json
+++ b/frappe/workflow/doctype/workflow/workflow.json
@@ -1,389 +1,123 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
+ "actions": [],
  "allow_rename": 1,
  "autoname": "field:workflow_name",
- "beta": 0,
  "creation": "2012-12-28 10:49:55",
- "custom": 0,
  "description": "Defines workflow states and rules for a document.",
- "docstatus": 0,
  "doctype": "DocType",
  "document_type": "Document",
- "editable_grid": 0,
  "engine": "InnoDB",
+ "field_order": [
+  "workflow_name",
+  "document_type",
+  "is_active",
+  "override_status",
+  "send_email_alert",
+  "states_head",
+  "states",
+  "transition_rules",
+  "transitions",
+  "workflow_state_field"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "workflow_name",
    "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": "Workflow Name",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "unique": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "DocType on which this Workflow is applicable.",
    "fieldname": "document_type",
    "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": 1,
    "label": "Document Type",
-   "length": 0,
-   "no_copy": 0,
    "options": "DocType",
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
+   "default": "0",
    "description": "If checked, all other workflows become inactive.",
    "fieldname": "is_active",
    "fieldtype": "Check",
-   "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": "Is Active",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Is Active"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
+   "default": "0",
    "description": "If Checked workflow status will not override status in list view",
    "fieldname": "override_status",
    "fieldtype": "Check",
-   "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": "Don't Override Status",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Don't Override Status"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "1",
    "description": "Emails will be sent with next possible workflow actions",
    "fieldname": "send_email_alert",
    "fieldtype": "Check",
-   "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": "Send Email Alert",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Send Email Alert"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Different \"States\" this document can exist in. Like \"Open\", \"Pending Approval\" etc.",
    "fieldname": "states_head",
    "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": "States",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "States"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "All possible Workflow States and roles of the workflow. Docstatus Options: 0 is\"Saved\", 1 is \"Submitted\" and 2 is \"Cancelled\"",
    "fieldname": "states",
    "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": "Document States",
-   "length": 0,
-   "no_copy": 0,
    "options": "Workflow Document State",
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Rules for how states are transitions, like next state and which role is allowed to change state etc.",
    "fieldname": "transition_rules",
    "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": "Transition Rules",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Transition Rules"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Rules defining transition of state in the workflow.",
    "fieldname": "transitions",
    "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": "Transitions",
-   "length": 0,
-   "no_copy": 0,
    "options": "Workflow Transition",
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "workflow_state",
    "description": "Field that represents the Workflow State of the transaction (if field is not present, a new hidden Custom Field will be created)",
    "fieldname": "workflow_state_field",
    "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": "Workflow State Field",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
  "icon": "fa fa-random",
  "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "menu_index": 0,
- "modified": "2018-06-11 10:45:46.418470",
+ "links": [],
+ "modified": "2020-07-16 04:29:20.898040",
  "modified_by": "Administrator",
  "module": "Workflow",
  "name": "Workflow",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
-   "report": 0,
    "role": "System Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   }
  ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
  "show_name_in_global_search": 1,
+ "sort_field": "modified",
  "sort_order": "ASC",
- "track_changes": 1,
- "track_seen": 0
+ "track_changes": 1
 }
\ No newline at end of file

From 907411d33fbc0db7950df119f75acae28b83ae90 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 16 Jul 2020 15:33:04 +0530
Subject: [PATCH 218/345] fix: validate if field exists in meta before adding
 to query

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/address/address.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 79bdb42931..9c838eeb40 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -238,13 +238,14 @@ def address_query(doctype, txt, searchfield, start, page_len, filters):
 	link_name = filters.pop('link_name')
 
 	condition = ""
-	for fieldname, value in iteritems(filters):
-		condition += " and {field}={value}".format(
-			field=fieldname,
-			value=value
-		)
-
 	meta = frappe.get_meta("Address")
+	for fieldname, value in iteritems(filters):
+		if meta.get_field(fieldname) or fieldname in frappe.db.DEFAULT_COLUMNS:
+			condition += " and {field}={value}".format(
+				field=fieldname,
+				value=value
+			)
+
 	searchfields = meta.get_search_fields()
 
 	if searchfield:

From 79e3f88a6566df3da19bf16caf37fab6a291f975 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Thu, 16 Jul 2020 13:26:45 +0530
Subject: [PATCH 219/345] fix: Edit in full page broken link

---
 frappe/model/document.py                    | 7 +++++++
 frappe/public/js/frappe/form/quick_entry.js | 9 ++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/frappe/model/document.py b/frappe/model/document.py
index ea693167f8..69a781d6d1 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -403,9 +403,16 @@ class Document(BaseDocument):
 
 	def set_new_name(self, force=False, set_name=None, set_child_names=True):
 		"""Calls `frappe.naming.set_new_name` for parent and child docs."""
+
 		if self.flags.name_set and not force:
 			return
 
+		# If autoname has set as Prompt (name)
+		if self.get("__newname"):
+			self.name = self.get("__newname")
+			self.flags.name_set = True
+			return
+
 		if set_name:
 			self.name = set_name
 		else:
diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js
index 68444c8a3b..5a46e8ae8b 100644
--- a/frappe/public/js/frappe/form/quick_entry.js
+++ b/frappe/public/js/frappe/form/quick_entry.js
@@ -240,13 +240,8 @@ frappe.ui.form.QuickEntryForm = Class.extend({
 		var me = this;
 		var data = this.dialog.get_values(true);
 		$.each(data, function(key, value) {
-			if(key==='__newname') {
-				me.dialog.doc.name = value;
-			}
-			else {
-				if(!is_null(value)) {
-					me.dialog.doc[key] = value;
-				}
+			if(!is_null(value)) {
+				me.dialog.doc[key] = value;
 			}
 		});
 		return this.dialog.doc;

From 1e6e305a3746c9aa7bec8cb907faf41c815a2aff Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 16 Jul 2020 15:36:07 +0530
Subject: [PATCH 220/345] fix: check if searchfield exists in default columns

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/contact/contact.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 0cdd7c7fdd..5be2cd086c 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -186,7 +186,8 @@ def update_contact(doc, method):
 def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
-	if not frappe.get_meta("Contact").get_field(searchfield):
+	if not frappe.get_meta("Contact").get_field(searchfield)\
+		or searchfield not in frappe.db.DEFAULT_COLUMNS:
 		return []
 
 	link_doctype = filters.pop('link_doctype')

From 28399ba94b7436df9d2833328d0100b36303f60c Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 16 Jul 2020 15:41:29 +0530
Subject: [PATCH 221/345] fix: check for searchfield in meta

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/address/address.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 9c838eeb40..4de92cfa57 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -248,7 +248,8 @@ def address_query(doctype, txt, searchfield, start, page_len, filters):
 
 	searchfields = meta.get_search_fields()
 
-	if searchfield:
+	if searchfield and (meta.get_field(searchfield)\
+				or searchfield in frappe.db.DEFAULT_COLUMNS):
 		searchfields.append(searchfield)
 
 	search_condition = ''

From 476e625261ab4954b7429978b24840e52967c9c0 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 16 Jul 2020 16:26:20 +0530
Subject: [PATCH 222/345] fix: Add site validation for logger

---
 frappe/__init__.py     | 4 ++--
 frappe/app.py          | 5 +++--
 frappe/utils/logger.py | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index d644d2a473..8c24980189 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1559,10 +1559,10 @@ def get_doctype_app(doctype):
 
 loggers = {}
 log_level = None
-def logger(module=None, with_more_info=False):
+def logger(module=None, with_more_info=False, _site=None):
 	'''Returns a python logger that uses StreamHandler'''
 	from frappe.utils.logger import get_logger
-	return get_logger(module=module, with_more_info=with_more_info)
+	return get_logger(module=module, with_more_info=with_more_info, _site=_site)
 
 def log_error(message=None, title=_("Error")):
 	'''Log error to Error Log'''
diff --git a/frappe/app.py b/frappe/app.py
index 57db867882..83a9b8c149 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -99,8 +99,9 @@ def application(request):
 		frappe.monitor.stop(response)
 		frappe.recorder.dump()
 
-		frappe.logger("frappe.web").info({
-			"site": get_site_name(request.host),
+		_site = get_site_name(request.host)
+		frappe.logger("frappe.web", _site=_site).info({
+			"site": _site,
 			"remote_addr": getattr(request, "remote_addr", "NOTFOUND"),
 			"base_url": getattr(request, "base_url", "NOTFOUND"),
 			"full_path": getattr(request, "full_path", "NOTFOUND"),
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 89e3711b0f..bea83297d2 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -17,7 +17,7 @@ default_log_level = logging.DEBUG
 site = getattr(frappe.local, 'site', None)
 
 
-def get_logger(module, with_more_info=False):
+def get_logger(module, with_more_info=False, _site=None):
 	global site
 	if module in frappe.loggers:
 		return frappe.loggers[module]
@@ -38,7 +38,7 @@ def get_logger(module, with_more_info=False):
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
 	logger.addHandler(handler)
 #
-	if site:
+	if site == _site:
 		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)

From e92a612ba231eebb8dbe7ac42d24ac002a89fbe1 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 16 Jul 2020 16:26:53 +0530
Subject: [PATCH 223/345] docs(get_logger): add docstring

---
 frappe/utils/logger.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index bea83297d2..afe4335aea 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -18,7 +18,24 @@ site = getattr(frappe.local, 'site', None)
 
 
 def get_logger(module, with_more_info=False, _site=None):
+	"""Application Logger for your given module
+
+	Args:
+		module (str): Name of your logger and consequently your log file.
+		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
+		_site (str, optional): If set, validates the current site context with the passed value. The `frappe.web` logger uses this to determine that the application is logging information related to the logger called. Defaults to None.
+
+	Returns:
+		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
+	"""
 	global site
+
+	def allow_site():
+		allow = False
+		if site: allow = True
+		if _site: allow = site == _site
+		return allow
+
 	if module in frappe.loggers:
 		return frappe.loggers[module]
 
@@ -37,8 +54,8 @@ def get_logger(module, with_more_info=False, _site=None):
 	formatter = logging.Formatter('%(asctime)s %(levelname)s %(name)s %(message)s')
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
 	logger.addHandler(handler)
-#
-	if site == _site:
+
+	if allow_site():
 		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)

From 434c892ac004cffbf724214132540a282d02ccf2 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Thu, 16 Jul 2020 17:05:08 +0530
Subject: [PATCH 224/345] feat: Bench command to open ngrok tunnel (#11024)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/commands/site.py | 26 +++++++++++++++++++++++++-
 requirements.txt        |  5 +++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index ec80ee019d..26eb455338 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -631,6 +631,29 @@ def stop_recording(context):
 	if not context.sites:
 		raise SiteNotSpecifiedError
 
+@click.command('ngrok')
+@pass_context
+def start_ngrok(context):
+	from pyngrok import ngrok
+
+	site = get_site(context)
+	frappe.init(site=site)
+
+	port = frappe.conf.http_port or frappe.conf.webserver_port
+	public_url = ngrok.connect(port=port, options={
+		'host_header': site
+	})
+	print(f'Public URL: {public_url}')
+	print('Inspect logs at http://localhost:4040')
+
+	ngrok_process = ngrok.get_ngrok_process()
+	try:
+		# Block until CTRL-C or some other terminating event
+		ngrok_process.proc.wait()
+	except KeyboardInterrupt:
+		print("Shutting down server...")
+		frappe.destroy()
+		ngrok.kill()
 
 commands = [
 	add_system_manager,
@@ -656,5 +679,6 @@ commands = [
 	browse,
 	start_recording,
 	stop_recording,
-	add_to_hosts
+	add_to_hosts,
+	start_ngrok
 ]
diff --git a/requirements.txt b/requirements.txt
index 0d01886f05..e0ca1a6fad 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,8 +13,8 @@ dropbox==9.1.0
 email-reply-parser==0.5.9
 Faker==2.0.4
 future==0.18.2
-GitPython==2.1.15
 gitdb2==2.0.6;python_version<'3.4'
+GitPython==2.1.15
 google-api-python-client==1.9.3
 google-auth-httplib2==0.0.3
 google-auth-oauthlib==0.4.1
@@ -40,6 +40,7 @@ psycopg2-binary==2.8.4
 pyasn1==0.4.8
 PyJWT==1.7.1
 PyMySQL==0.9.3
+pyngrok==4.1.6
 pyOpenSSL==19.1.0
 pyotp==2.3.0
 PyPDF2==1.26.0
@@ -64,6 +65,6 @@ unittest-xml-reporting==2.5.2
 urllib3==1.25.8
 watchdog==0.8.0
 Werkzeug==0.16.1
+Whoosh==2.7.4
 xlrd==1.2.0
 zxcvbn-python==4.4.24
-Whoosh==2.7.4

From 4cdaedcbad229376be203533b0d34f9bcf3def64 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 16 Jul 2020 17:38:34 +0530
Subject: [PATCH 225/345] style: Add space after if

---
 frappe/public/js/frappe/form/quick_entry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js
index 5a46e8ae8b..b1df0a1080 100644
--- a/frappe/public/js/frappe/form/quick_entry.js
+++ b/frappe/public/js/frappe/form/quick_entry.js
@@ -277,7 +277,7 @@ frappe.ui.form.QuickEntryForm = Class.extend({
 			field.doctype = me.doc.doctype;
 			field.docname = me.doc.name;
 
-			if(!is_null(me.doc[fieldname])) {
+			if (!is_null(me.doc[fieldname])) {
 				field.set_input(me.doc[fieldname]);
 			}
 		});

From 80fb256421989ace15cb5c8ea96e9825963d8b26 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 16 Jul 2020 17:41:37 +0530
Subject: [PATCH 226/345] style: Add space after if

---
 frappe/public/js/frappe/form/quick_entry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js
index b1df0a1080..2da7b8f236 100644
--- a/frappe/public/js/frappe/form/quick_entry.js
+++ b/frappe/public/js/frappe/form/quick_entry.js
@@ -240,7 +240,7 @@ frappe.ui.form.QuickEntryForm = Class.extend({
 		var me = this;
 		var data = this.dialog.get_values(true);
 		$.each(data, function(key, value) {
-			if(!is_null(value)) {
+			if (!is_null(value)) {
 				me.dialog.doc[key] = value;
 			}
 		});

From 252e6d877966b33f7d62509cf3038e160bc5d2aa Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Thu, 16 Jul 2020 22:49:26 +0530
Subject: [PATCH 227/345] fix: Make checkboxes navigatable via tab key

---
 frappe/public/less/desk.less             | 9 ++++++++-
 frappe/public/less/frappe-datatable.less | 4 ++++
 frappe/public/less/role_editor.less      | 4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index b0fb60b6a3..c4f8626a60 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -790,10 +790,17 @@ li.user-progress {
 	height: 12px;
 }
 
+.frappe-control {
+	.checkbox input[type=checkbox]:before{
+		margin-top: -10px;
+	}
+}
+
+
 // custom font awesome checkbox
 input[type="checkbox"] {
 	position: relative;
-	visibility: hidden;
+	height: 0px !important;
 
 	&:before {
 		position: absolute;
diff --git a/frappe/public/less/frappe-datatable.less b/frappe/public/less/frappe-datatable.less
index 54eecf2b3d..56725636ae 100644
--- a/frappe/public/less/frappe-datatable.less
+++ b/frappe/public/less/frappe-datatable.less
@@ -33,6 +33,10 @@
 	}
 }
 
+.dt-cell input[type=checkbox]:before {
+	margin-top: -10px;
+}
+
 .dt-scrollable {
 	max-height: calc(100vh - 250px);
 	min-height: 100px;
diff --git a/frappe/public/less/role_editor.less b/frappe/public/less/role_editor.less
index c95f1ebc55..91eefcf7d0 100644
--- a/frappe/public/less/role_editor.less
+++ b/frappe/public/less/role_editor.less
@@ -9,6 +9,10 @@
 	padding-top: 2px;
 }
 
+.user-role input[type=checkbox]:before {
+	margin-top: -10px;
+}
+
 table.user-perm {
 	border-collapse: collapse;
     width: 100%;

From 66cb9a5c1a027d9049ce8ea3839cd59fd3dc3d13 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Fri, 17 Jul 2020 10:04:37 +0530
Subject: [PATCH 228/345] fix: Move csss from desk.less to cotrol.less

---
 frappe/public/less/controls.less | 6 ++++++
 frappe/public/less/desk.less     | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/frappe/public/less/controls.less b/frappe/public/less/controls.less
index f842401515..cee13a4737 100644
--- a/frappe/public/less/controls.less
+++ b/frappe/public/less/controls.less
@@ -30,6 +30,12 @@
 	}
 }
 
+.frappe-control {
+	.checkbox input[type=checkbox]:before{
+		margin-top: -10px;
+	}
+}
+
 .frappe-control .control-value {
 	overflow-wrap: break-word;
 }
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index c4f8626a60..7fe6b4e3a2 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -790,13 +790,6 @@ li.user-progress {
 	height: 12px;
 }
 
-.frappe-control {
-	.checkbox input[type=checkbox]:before{
-		margin-top: -10px;
-	}
-}
-
-
 // custom font awesome checkbox
 input[type="checkbox"] {
 	position: relative;

From f12ed9791a2da4a9619c7564ba2bb6dcc64cda80 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Fri, 17 Jul 2020 11:32:02 +0530
Subject: [PATCH 229/345] fix: remove example users email ids from
 notifications

currently the system tries sending emails to all users that have
'thread_notify' enabled, including the default example emails that the
Administrator and Guest accounts have. this patch disables email
notifications for these accounts, and additionally tries to disable it
for any other user accounts with example emails

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/patches.txt                                        | 3 ++-
 .../patches/v12_0/remove_example_email_thread_notify.py   | 8 ++++++++
 frappe/utils/install.py                                   | 6 ++++--
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 frappe/patches/v12_0/remove_example_email_thread_notify.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index 1108f1fb1b..f8c767f5a3 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -273,6 +273,7 @@ execute:frappe.delete_doc_if_exists('DocType', 'GSuite Templates')
 execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Account')
 execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Settings')
 frappe.patches.v12_0.remove_parent_and_parenttype_from_print_formats
+frappe.patches.v12_0.remove_example_email_thread_notify
 execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders()
 frappe.patches.v12_0.set_correct_url_in_files
 frappe.patches.v13_0.website_theme_custom_scss
@@ -293,4 +294,4 @@ execute:frappe.delete_doc("DocType", "Onboarding Slide Help Link")
 frappe.patches.v13_0.update_date_filters_in_user_settings
 frappe.patches.v13_0.update_duration_options
 frappe.patches.v13_0.replace_old_data_import # 2020-06-24
-frappe.patches.v13_0.create_custom_dashboards_cards_and_charts
\ No newline at end of file
+frappe.patches.v13_0.create_custom_dashboards_cards_and_charts
diff --git a/frappe/patches/v12_0/remove_example_email_thread_notify.py b/frappe/patches/v12_0/remove_example_email_thread_notify.py
new file mode 100644
index 0000000000..94959b6077
--- /dev/null
+++ b/frappe/patches/v12_0/remove_example_email_thread_notify.py
@@ -0,0 +1,8 @@
+import frappe
+
+
+def execute():
+	# remove all example.com email user accounts from notifications
+	frappe.db.sql("""UPDATE `tabUser`
+	SET thread_notify=0, send_me_a_copy=0
+	WHERE email like '%@example.com'""")
diff --git a/frappe/utils/install.py b/frappe/utils/install.py
index e5bf122d81..bb384fb300 100644
--- a/frappe/utils/install.py
+++ b/frappe/utils/install.py
@@ -50,11 +50,13 @@ def install_basic_docs():
 	install_docs = [
 		{'doctype':'User', 'name':'Administrator', 'first_name':'Administrator',
 			'email':'admin@example.com', 'enabled':1, "is_admin": 1,
-			'roles': [{'role': 'Administrator'}]
+			'roles': [{'role': 'Administrator'}],
+			'thread_notify': 0, 'send_me_a_copy': 0
 		},
 		{'doctype':'User', 'name':'Guest', 'first_name':'Guest',
 			'email':'guest@example.com', 'enabled':1, "is_guest": 1,
-			'roles': [{'role': 'Guest'}]
+			'roles': [{'role': 'Guest'}],
+			'thread_notify': 0, 'send_me_a_copy': 0
 		},
 		{'doctype': "Role", "role_name": "Report Manager"},
 		{'doctype': "Role", "role_name": "Translator"},

From 654950fef341fcc4473413188eea513548090d14 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Fri, 17 Jul 2020 13:14:31 +0530
Subject: [PATCH 230/345] fix: Use SameSite=Lax instead of SameSite=Strict

Reference: https://web.dev/samesite-cookies-explained/

Scenario:
A user is logged in on a frappe instance. (with, say, sid=abcd)

In an OAuth like flow, a third party site, say, GitHub redirects the user to the frappe instance.

Now because SameSite=Strict is set, the browser can't send the cookies it has (sid=abcd) to the frappe server.

Once the frappe server receives this request without cookies, It assumes that this is an unauthenticated user, and sets cookies in response as sid=Guest.
Reference: https://github.com/frappe/frappe/blob/f3e14b4ac71135fae5d83bb371c665879be36600/frappe/sessions.py#L178

Once the browser receives these values in response (sid=Guest) it overwrites the existing cookie values(sid=abcd) and sets sid=Guest,

This effectively causes the user session to be terminated.
---
 frappe/auth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/auth.py b/frappe/auth.py
index ab3624bee8..64fea36748 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -337,7 +337,7 @@ class CookieManager:
 		if frappe.session.session_country:
 			self.set_cookie("country", frappe.session.session_country)
 
-	def set_cookie(self, key, value, expires=None, secure=False, httponly=False, samesite="Strict"):
+	def set_cookie(self, key, value, expires=None, secure=False, httponly=False, samesite="Lax"):
 		if not secure:
 			secure = frappe.local.request.scheme == "https"
 		self.cookies[key] = {

From 1cdd8c5b92c32378bf3d5ccece21fddf9eb88940 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Fri, 17 Jul 2020 13:15:27 +0530
Subject: [PATCH 231/345] fix: Update CSS

---
 frappe/public/less/controls.less         |  6 ------
 frappe/public/less/desk.less             | 17 +++++++++++++----
 frappe/public/less/frappe-datatable.less |  4 ----
 frappe/public/less/list.less             |  2 +-
 frappe/public/less/role_editor.less      |  4 ----
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/frappe/public/less/controls.less b/frappe/public/less/controls.less
index cee13a4737..f842401515 100644
--- a/frappe/public/less/controls.less
+++ b/frappe/public/less/controls.less
@@ -30,12 +30,6 @@
 	}
 }
 
-.frappe-control {
-	.checkbox input[type=checkbox]:before{
-		margin-top: -10px;
-	}
-}
-
 .frappe-control .control-value {
 	overflow-wrap: break-word;
 }
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 7fe6b4e3a2..d0117c88ad 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -787,9 +787,10 @@ li.user-progress {
 	margin-right: 5px;
 	margin-left: 0px;
 	position: relative;
-	height: 12px;
 }
 
+@checkbox-height: 14px;
+
 // custom font awesome checkbox
 input[type="checkbox"] {
 	position: relative;
@@ -804,9 +805,10 @@ input[type="checkbox"] {
 		font-weight: normal;
 		font-variant: normal;
 		text-transform: none;
-		line-height: 14px;
+		line-height: @checkbox-height;
+		margin-top: -10px;
 		display: inline-block;
-		font-size: 14px;
+		font-size: @checkbox-height;
 		color: @text-extra-muted;
 		.transition(150ms color);
 		left: 0px;
@@ -818,10 +820,17 @@ input[type="checkbox"] {
 
 	&:checked:before {
 		content: '\f14a';
-		font-size: 13px;
+		font-size: @checkbox-height - 1px;
 		color: @checkbox-color;
 	}
 
+	&:checked:focus:before {
+		box-shadow: inset 0 0 1px 2px @text-muted;
+		padding: 0px 1px;
+		border-radius: 3px;
+		height: @checkbox-height - 1px;
+	}
+
 	&:focus {
 		outline: none;
 	}
diff --git a/frappe/public/less/frappe-datatable.less b/frappe/public/less/frappe-datatable.less
index 56725636ae..54eecf2b3d 100644
--- a/frappe/public/less/frappe-datatable.less
+++ b/frappe/public/less/frappe-datatable.less
@@ -33,10 +33,6 @@
 	}
 }
 
-.dt-cell input[type=checkbox]:before {
-	margin-top: -10px;
-}
-
 .dt-scrollable {
 	max-height: calc(100vh - 250px);
 	min-height: 100px;
diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less
index 4e066f86e4..7fc64d2d9b 100644
--- a/frappe/public/less/list.less
+++ b/frappe/public/less/list.less
@@ -197,7 +197,7 @@ body.no-list-sidebar {
 }
 
 input.list-check-all, input.list-row-checkbox {
-	margin-top: 0px;
+	display: 'inline';
 }
 
 .filterable {
diff --git a/frappe/public/less/role_editor.less b/frappe/public/less/role_editor.less
index 91eefcf7d0..c95f1ebc55 100644
--- a/frappe/public/less/role_editor.less
+++ b/frappe/public/less/role_editor.less
@@ -9,10 +9,6 @@
 	padding-top: 2px;
 }
 
-.user-role input[type=checkbox]:before {
-	margin-top: -10px;
-}
-
 table.user-perm {
 	border-collapse: collapse;
     width: 100%;

From 53312282e2701e826dc6be0bd303432c3004af41 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Fri, 17 Jul 2020 13:29:54 +0530
Subject: [PATCH 232/345] fix: Update CSS

---
 frappe/public/less/list.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less
index 7fc64d2d9b..4c7d04406d 100644
--- a/frappe/public/less/list.less
+++ b/frappe/public/less/list.less
@@ -197,7 +197,7 @@ body.no-list-sidebar {
 }
 
 input.list-check-all, input.list-row-checkbox {
-	display: 'inline';
+	display: inline-block;
 }
 
 .filterable {

From e52341f3d6dda5db0d8c8ac45b3076644377b790 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 17 Jul 2020 15:19:13 +0530
Subject: [PATCH 233/345] fix: toggle card button if report has data

---
 frappe/public/js/frappe/views/reports/query_report.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 2d49948dfc..e2020e8690 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -129,11 +129,11 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			() => this.setup_page_head(),
 			() => this.refresh_report(),
 			() => this.add_chart_buttons_to_toolbar(true),
-			() => this.add_card_button_to_toolbar(),
+			() => this.add_card_button_to_toolbar(true),
 		]);
 	}
 
-	add_card_button_to_toolbar() {
+	add_card_button_to_toolbar(show) {
 		this.page.add_inner_button(__("Create Card"), () => {
 			this.add_card_to_dashboard();
 		});
@@ -609,10 +609,12 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 				}
 				this.render_datatable();
 				this.add_chart_buttons_to_toolbar(true);
+				this.add_card_button_to_toolbar(true);
 			} else {
 				this.data = [];
 				this.toggle_nothing_to_show(true);
 				this.add_chart_buttons_to_toolbar(false);
+				this.add_card_button_to_toolbar(false);
 			}
 
 			this.show_footer_message();

From 8c93d91c5ad7681e98d0fd6d1472152635447d99 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 17 Jul 2020 15:27:07 +0530
Subject: [PATCH 234/345] fix: better variable name

---
 frappe/public/js/frappe/widgets/number_card_widget.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js
index 6c85c03b0a..657275418f 100644
--- a/frappe/public/js/frappe/widgets/number_card_widget.js
+++ b/frappe/public/js/frappe/widgets/number_card_widget.js
@@ -172,7 +172,7 @@ export default class NumberCardWidget extends Widget {
 						this.get_formatted_number(based_on_df);
 					});
 				} else {
-					this.number_html = res;
+					this.formatted_number = res;
 				}
 			}
 		});
@@ -197,13 +197,13 @@ export default class NumberCardWidget extends Widget {
 		const symbol = number_parts[1] || '';
 		const formatted_number = $(frappe.format(number_parts[0], df)).text();
 
-		this.number_html = formatted_number + ' ' + symbol;
+		this.formatted_number = formatted_number + ' ' + symbol;
 	}
 
 	render_number() {
 		return this.get_number().then(() => {
 			$(this.body).html(`<div class="widget-content">
-				<div class="number" style="color:${this.card_doc.color}">${this.number_html}</div>
+				<div class="number" style="color:${this.card_doc.color}">${this.formatted_number}</div>
 				</div>`);
 		});
 	}

From ff39b6ae5f6024bb5ab3118d7b4171a0cb539678 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Fri, 17 Jul 2020 16:24:31 +0530
Subject: [PATCH 235/345] fix: email encoding issue inside email queue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

email addresses get formatted incorrectly inside the email queue,
causing emails to be sent with encoded-words addresses instead of
proper, human readable email addresses. this particularly happens when
the address has special and accented characters. an example of
encoded-words address looks like:

=?utf-8?q?=C3=A1dministr=C3=A1tor?= <admin@example.com>

instead of something like:

ádministrátor <admin@example.com>

another issue that causes this is validations that strip html tags from
field when ignore_xss_filter is not set in a docfield. setting
ignore_xss_filter for the email field inside email queue fixes
this issue.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/core/doctype/communication/email.py    |   2 +-
 .../doctype/email_queue/email_queue.json      | 564 ++----------------
 frappe/utils/__init__.py                      |   5 +-
 3 files changed, 49 insertions(+), 522 deletions(-)

diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py
index e9db865ade..4c531fbac6 100755
--- a/frappe/core/doctype/communication/email.py
+++ b/frappe/core/doctype/communication/email.py
@@ -236,7 +236,7 @@ def prepare_to_notify(doc, print_html=None, print_format=None, attachments=None)
 
 	if doc.sender:
 		# combine for sending to get the format 'Jane <jane@example.com>'
-		doc.sender = formataddr([doc.sender_full_name, doc.sender])
+		doc.sender = get_formatted_email(doc.sender_full_name, mail=doc.sender)
 
 	doc.attachments = []
 
diff --git a/frappe/email/doctype/email_queue/email_queue.json b/frappe/email/doctype/email_queue/email_queue.json
index ee8683af22..4529ea8211 100644
--- a/frappe/email/doctype/email_queue/email_queue.json
+++ b/frappe/email/doctype/email_queue/email_queue.json
@@ -1,640 +1,166 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
+ "actions": [],
  "autoname": "hash",
- "beta": 0,
  "creation": "2012-08-02 15:17:28",
- "custom": 0,
  "description": "Email Queue records.",
- "docstatus": 0,
  "doctype": "DocType",
  "document_type": "System",
- "editable_grid": 0,
  "engine": "InnoDB",
+ "field_order": [
+  "sender",
+  "recipients",
+  "show_as_cc",
+  "message",
+  "status",
+  "error",
+  "message_id",
+  "reference_doctype",
+  "reference_name",
+  "communication",
+  "send_after",
+  "priority",
+  "add_unsubscribe_link",
+  "unsubscribe_param",
+  "unsubscribe_method",
+  "expose_recipients",
+  "attachments",
+  "retry"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "sender",
    "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,
+   "ignore_xss_filter": 1,
    "label": "Sender",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Email",
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "options": "Email"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "recipients",
    "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": "Recipient",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Email Queue Recipient",
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "options": "Email Queue Recipient"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "show_as_cc",
    "fieldtype": "Small Text",
-   "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": "Show as cc",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Show as cc"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "message",
    "fieldtype": "Code",
-   "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": "Message",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Message"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "Not Sent",
    "fieldname": "status",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Status",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nNot Sent\nSending\nSent\nError\nExpired",
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "options": "\nNot Sent\nSending\nSent\nError\nExpired"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "error",
    "fieldtype": "Code",
-   "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": "Error",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Error"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "message_id",
    "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": "Message ID",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
    "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "reference_doctype",
    "fieldtype": "Link",
-   "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": "Reference Document Type",
-   "length": 0,
-   "no_copy": 0,
    "options": "DocType",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "reference_name",
    "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": "Reference DocName",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "communication",
    "fieldtype": "Link",
-   "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": "Communication",
-   "length": 0,
-   "no_copy": 0,
    "options": "Communication",
-   "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": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "send_after",
    "fieldtype": "Datetime",
-   "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": "Send After",
-   "length": 0,
    "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "1",
    "fieldname": "priority",
    "fieldtype": "Int",
-   "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": "Priority",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "1",
    "fieldname": "add_unsubscribe_link",
    "fieldtype": "Check",
-   "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": "Add Unsubscribe Link",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Add Unsubscribe Link"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "unsubscribe_param",
    "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": "Unsubscribe Param",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "unsubscribe_method",
    "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": "Unsubscribe Method",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Unsubscribe Method"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "expose_recipients",
    "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": "Expose Recipients",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Expose Recipients"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "attachments",
    "fieldtype": "Code",
-   "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": "Attachments",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "0",
    "fieldname": "retry",
    "fieldtype": "Int",
-   "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": "Retry",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
  "icon": "fa fa-envelope",
  "idx": 1,
- "image_view": 0,
  "in_create": 1,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2019-09-05 14:22:27.664645",
+ "links": [],
+ "modified": "2020-07-17 15:58:15.369419",
  "modified_by": "Administrator",
  "module": "Email",
  "name": "Email Queue",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
    "delete": 1,
    "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
+   "role": "System Manager"
   }
  ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
+ "sort_field": "modified",
  "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index f996b5109e..1da220dc30 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -63,10 +63,11 @@ def get_email_address(user=None):
 
 	return frappe.db.get_value("User", user, "email")
 
-def get_formatted_email(user):
+def get_formatted_email(user, mail=None):
 	"""get Email Address of user formatted as: `John Doe <johndoe@example.com>`"""
 	fullname = get_fullname(user)
-	mail = get_email_address(user)
+	if not mail:
+		mail = get_email_address(user)
 	return cstr(make_header(decode_header(formataddr((fullname, mail)))))
 
 def extract_email_id(email):

From c87d598480e006a88a4374d0ab17d15429701441 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 17 Jul 2020 17:35:08 +0530
Subject: [PATCH 236/345] refactor: less word do trick

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
---
 frappe/utils/logger.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index afe4335aea..9254c0aedd 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -31,10 +31,7 @@ def get_logger(module, with_more_info=False, _site=None):
 	global site
 
 	def allow_site():
-		allow = False
-		if site: allow = True
-		if _site: allow = site == _site
-		return allow
+		return (_site and _site == site) or bool(site)
 
 	if module in frappe.loggers:
 		return frappe.loggers[module]

From c4a8852a68c0c42409315cbb04760ad78f3379bb Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 17 Jul 2020 18:12:44 +0530
Subject: [PATCH 237/345] fix: handle result of custom cards

---
 frappe/public/js/frappe/widgets/number_card_widget.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js
index 657275418f..829c6d70dd 100644
--- a/frappe/public/js/frappe/widgets/number_card_widget.js
+++ b/frappe/public/js/frappe/widgets/number_card_widget.js
@@ -163,6 +163,9 @@ export default class NumberCardWidget extends Widget {
 		return frappe.xcall(this.settings.method, this.settings.args).then(res => {
 			if (this.card_doc.type == 'Report') {
 				this.get_number_for_report(res);
+			} else if (this.card_doc.type == 'Custom') {
+				this.number = res.value;
+				this.get_formatted_number(res);
 			} else {
 				this.number = res;
 				if (this.card_doc.function !== 'Count') {
@@ -213,7 +216,7 @@ export default class NumberCardWidget extends Widget {
 			return;
 		}
 
-		let caret_html ='';
+		let caret_html = '';
 		let color_class = '';
 
 		return this.get_percentage_stats().then(() => {

From 3551fecd74a91b62e58df94d8bd85f2f4879114d Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 17 Jul 2020 18:13:18 +0530
Subject: [PATCH 238/345] fix: update description of method field

---
 frappe/desk/doctype/number_card/number_card.js   | 16 ++++++++++++++++
 frappe/desk/doctype/number_card/number_card.json |  3 +--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 9bc071b723..5ad5d76ac8 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -24,6 +24,7 @@ frappe.ui.form.on('Number Card', {
 			}
 			frm.filters = eval(frm.doc.filters_config);
 			frm.trigger('set_filters_description');
+			frm.trigger('set_method_description');
 			frm.trigger('render_filters_table');
 		}
 		frm.trigger('create_add_to_dashboard_button');
@@ -110,6 +111,21 @@ frappe.ui.form.on('Number Card', {
 		}
 	},
 
+	set_method_description: function(frm) {
+		console.log('called');
+		if (frm.doc.type == 'Custom') {
+			frm.fields_dict.method.set_description(`
+		Set the path to a whitelisted function that will return the number on the card in the format:
+<pre class="small text-muted">
+<code>
+{
+	"value": value,
+	"fieldtype": "Currency"
+}
+</code></pre>`)
+		}
+	},
+
 	type: function(frm) {
 		frm.trigger('set_filters_description');
 		if (frm.doc.type == 'Report') {
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index 1d0528b298..e94a06dab8 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -164,7 +164,6 @@
   },
   {
    "depends_on": "eval: doc.type == 'Custom'",
-   "description": "This should contain the path to a whitelisted function that will return the number on the card",
    "fieldname": "method",
    "fieldtype": "Data",
    "label": "Method",
@@ -192,7 +191,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-16 13:04:03.470001",
+ "modified": "2020-07-17 18:04:00.814756",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",

From b32a47ec587fba733f9facdbb465f605b1e16516 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 17 Jul 2020 18:29:29 +0530
Subject: [PATCH 239/345] refactor: set get_number method in settings

---
 .../js/frappe/widgets/number_card_widget.js   | 51 +++++++++++--------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js
index 829c6d70dd..220394919c 100644
--- a/frappe/public/js/frappe/widgets/number_card_widget.js
+++ b/frappe/public/js/frappe/widgets/number_card_widget.js
@@ -110,7 +110,8 @@ export default class NumberCardWidget extends Widget {
 				method: this.card_doc.method,
 				args: {
 					filters: this.filters
-				}
+				},
+				get_number: res => this.get_number_for_custom_card(res),
 			},
 			'Report': {
 				method: 'frappe.desk.query_report.run',
@@ -118,14 +119,16 @@ export default class NumberCardWidget extends Widget {
 					report_name: this.card_doc.report_name,
 					filters: this.filters,
 					ignore_prepared_report: 1
-				}
+				},
+				get_number: res => this.get_number_for_report_card(res),
 			},
 			'Document Type': {
 				method: 'frappe.desk.doctype.number_card.number_card.get_result',
 				args: {
 					doc: this.card_doc,
 					filters: this.filters,
-				}
+				},
+				get_number: res => this.get_number_for_doctype_card(res),
 			}
 		};
 		return settings_map[type];
@@ -161,27 +164,33 @@ export default class NumberCardWidget extends Widget {
 
 	get_number() {
 		return frappe.xcall(this.settings.method, this.settings.args).then(res => {
-			if (this.card_doc.type == 'Report') {
-				this.get_number_for_report(res);
-			} else if (this.card_doc.type == 'Custom') {
-				this.number = res.value;
-				this.get_formatted_number(res);
-			} else {
-				this.number = res;
-				if (this.card_doc.function !== 'Count') {
-					return frappe.model.with_doctype(this.card_doc.document_type, () => {
-						const based_on_df =
-							frappe.meta.get_docfield(this.card_doc.document_type, this.card_doc.aggregate_function_based_on);
-						this.get_formatted_number(based_on_df);
-					});
-				} else {
-					this.formatted_number = res;
-				}
-			}
+			this.settings.get_number(res);
 		});
 	}
 
-	get_number_for_report(res) {
+	get_number_for_custom_card(res) {
+		if (typeof res === 'object') {
+			this.number = res.value;
+			this.get_formatted_number(res);
+		} else {
+			this.formatted_number = res;
+		}
+	}
+
+	get_number_for_doctype_card(res) {
+		this.number = res;
+		if (this.card_doc.function !== 'Count') {
+			return frappe.model.with_doctype(this.card_doc.document_type, () => {
+				const based_on_df =
+					frappe.meta.get_docfield(this.card_doc.document_type, this.card_doc.aggregate_function_based_on);
+				this.get_formatted_number(based_on_df);
+			});
+		} else {
+			this.formatted_number = res;
+		}
+	}
+
+	get_number_for_report_card(res) {
 		const field = this.card_doc.report_field;
 		const vals = res.result.reduce((acc, col) => {
 			col[field] && acc.push(col[field]);

From 39ec64f1e3ba69f2b83c09afbceee31760950b93 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Fri, 17 Jul 2020 18:36:53 +0530
Subject: [PATCH 240/345] fix: add default email policy to mail body

the default policy encodes special characters correctly, and is not set
by _default_ unless python3.8 is used. so we'll explicitly define the
policy to be used for the email body

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/email/email_body.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index 8340d81917..d21d9290fb 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -11,6 +11,7 @@ import email.utils
 from six import iteritems, text_type, string_types
 from email.mime.multipart import MIMEMultipart
 from email.header import Header
+from email import policy
 
 
 def get_email(recipients, sender='', msg='', subject='[No Subject]',
@@ -68,7 +69,7 @@ class EMail:
 		self.subject = subject
 		self.expose_recipients = expose_recipients
 
-		self.msg_root = MIMEMultipart('mixed')
+		self.msg_root = MIMEMultipart('mixed', policy=policy.default)
 		self.msg_alternative = MIMEMultipart('alternative')
 		self.msg_root.attach(self.msg_alternative)
 		self.cc = cc or []
@@ -238,7 +239,7 @@ class EMail:
 		"""validate, build message and convert to string"""
 		self.validate()
 		self.make()
-		return self.msg_root.as_string()
+		return self.msg_root.as_string(policy=policy.default)
 
 def get_formatted_html(subject, message, footer=None, print_html=None,
 		email_account=None, header=None, unsubscribe_link=None, sender=None):

From 6bc31f1d6a521f9dabc3feaef0976102efeb2ed7 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 17 Jul 2020 18:37:30 +0530
Subject: [PATCH 241/345] style: formatting fixes

---
 frappe/desk/doctype/number_card/number_card.js        | 3 +--
 frappe/public/js/frappe/views/reports/query_report.js | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 5ad5d76ac8..d5a743818a 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -112,7 +112,6 @@ frappe.ui.form.on('Number Card', {
 	},
 
 	set_method_description: function(frm) {
-		console.log('called');
 		if (frm.doc.type == 'Custom') {
 			frm.fields_dict.method.set_description(`
 		Set the path to a whitelisted function that will return the number on the card in the format:
@@ -122,7 +121,7 @@ frappe.ui.form.on('Number Card', {
 	"value": value,
 	"fieldtype": "Currency"
 }
-</code></pre>`)
+</code></pre>`);
 		}
 	},
 
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index e2020e8690..40ebd1c497 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -133,7 +133,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		]);
 	}
 
-	add_card_button_to_toolbar(show) {
+	add_card_button_to_toolbar() {
 		this.page.add_inner_button(__("Create Card"), () => {
 			this.add_card_to_dashboard();
 		});
@@ -609,12 +609,11 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 				}
 				this.render_datatable();
 				this.add_chart_buttons_to_toolbar(true);
-				this.add_card_button_to_toolbar(true);
+				this.add_card_button_to_toolbar();
 			} else {
 				this.data = [];
 				this.toggle_nothing_to_show(true);
 				this.add_chart_buttons_to_toolbar(false);
-				this.add_card_button_to_toolbar(false);
 			}
 
 			this.show_footer_message();

From 3678435d4ab3e0c706bbc5c9a7b6bb3e7f46d789 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Fri, 17 Jul 2020 18:38:57 +0530
Subject: [PATCH 242/345] fix: remove redundant condition for field
 sanitization

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/model/base_document.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index c7ef7890b4..d89800b296 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -702,10 +702,7 @@ class BaseDocument(object):
 			df = self.meta.get_field(fieldname)
 			sanitized_value = value
 
-			if df and df.get("fieldtype") in ("Data", "Code", "Small Text", "Text") and df.get("options")=="Email":
-				sanitized_value = sanitize_email(value)
-
-			elif df and (df.get("ignore_xss_filter")
+			if df and (df.get("ignore_xss_filter")
 						or (df.get("fieldtype")=="Code" and df.get("options")!="Email")
 						or df.get("fieldtype") in ("Attach", "Attach Image", "Barcode")
 

From cac8a8c4a0ab67b83f665905fab6a10c316bc70f Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sat, 18 Jul 2020 14:16:16 +0530
Subject: [PATCH 243/345] fix: set policy to SMTPUTF8

---
 frappe/email/email_body.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index d21d9290fb..a004bbac5f 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -239,7 +239,7 @@ class EMail:
 		"""validate, build message and convert to string"""
 		self.validate()
 		self.make()
-		return self.msg_root.as_string(policy=policy.default)
+		return self.msg_root.as_string(policy=policy.SMTPUTF8)
 
 def get_formatted_html(subject, message, footer=None, print_html=None,
 		email_account=None, header=None, unsubscribe_link=None, sender=None):

From 742d79cd5fd0d4d44ecff987a29b1d70ab124798 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sat, 18 Jul 2020 14:16:32 +0530
Subject: [PATCH 244/345] style: fix indent

---
 frappe/model/base_document.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index d89800b296..7d56736cdc 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -703,12 +703,12 @@ class BaseDocument(object):
 			sanitized_value = value
 
 			if df and (df.get("ignore_xss_filter")
-						or (df.get("fieldtype")=="Code" and df.get("options")!="Email")
-						or df.get("fieldtype") in ("Attach", "Attach Image", "Barcode")
+				or (df.get("fieldtype")=="Code" and df.get("options")!="Email")
+				or df.get("fieldtype") in ("Attach", "Attach Image", "Barcode")
 
-						# cancelled and submit but not update after submit should be ignored
-						or self.docstatus==2
-						or (self.docstatus==1 and not df.get("allow_on_submit"))):
+				# cancelled and submit but not update after submit should be ignored
+				or self.docstatus==2
+				or (self.docstatus==1 and not df.get("allow_on_submit"))):
 				continue
 
 			else:

From 6f83cece05fd98cf9ddf8de2a8c9f17b8cf91f31 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sat, 18 Jul 2020 17:09:23 +0530
Subject: [PATCH 245/345] fix: remove allow_worflow from number_card.json

---
 frappe/desk/doctype/number_card/number_card.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index e94a06dab8..333885a7f9 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -1,7 +1,6 @@
 {
  "actions": [],
  "allow_rename": 1,
- "allow_workflow": 1,
  "creation": "2020-04-15 18:06:39.444683",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -191,7 +190,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-17 18:04:00.814756",
+ "modified": "2020-07-18 17:08:22.882538",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",

From c45864eac0a4049b58ed826a86b6c5651990c61f Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Sat, 18 Jul 2020 18:27:44 +0530
Subject: [PATCH 246/345] fix: specify SMTPUTF8 policy everywhere

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/email/email_body.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index a004bbac5f..a404f7fdfa 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -69,8 +69,8 @@ class EMail:
 		self.subject = subject
 		self.expose_recipients = expose_recipients
 
-		self.msg_root = MIMEMultipart('mixed', policy=policy.default)
-		self.msg_alternative = MIMEMultipart('alternative')
+		self.msg_root = MIMEMultipart('mixed', policy=policy.SMTPUTF8)
+		self.msg_alternative = MIMEMultipart('alternative', policy=policy.SMTPUTF8)
 		self.msg_root.attach(self.msg_alternative)
 		self.cc = cc or []
 		self.bcc = bcc or []
@@ -101,7 +101,7 @@ class EMail:
 			Attach message in the text portion of multipart/alternative
 		"""
 		from email.mime.text import MIMEText
-		part = MIMEText(message, 'plain', 'utf-8')
+		part = MIMEText(message, 'plain', 'utf-8', policy=policy.SMTPUTF8)
 		self.msg_alternative.attach(part)
 
 	def set_part_html(self, message, inline_images):
@@ -114,9 +114,9 @@ class EMail:
 			message, _inline_images = replace_filename_with_cid(message)
 
 			# prepare parts
-			msg_related = MIMEMultipart('related')
+			msg_related = MIMEMultipart('related', policy=policy.SMTPUTF8)
 
-			html_part = MIMEText(message, 'html', 'utf-8')
+			html_part = MIMEText(message, 'html', 'utf-8', policy=policy.SMTPUTF8)
 			msg_related.attach(html_part)
 
 			for image in _inline_images:
@@ -125,7 +125,7 @@ class EMail:
 
 			self.msg_alternative.attach(msg_related)
 		else:
-			self.msg_alternative.attach(MIMEText(message, 'html', 'utf-8'))
+			self.msg_alternative.attach(MIMEText(message, 'html', 'utf-8', policy=policy.SMTPUTF8))
 
 	def set_html_as_text(self, html):
 		"""Set plain text from HTML"""
@@ -136,7 +136,7 @@ class EMail:
 		from email.mime.text import MIMEText
 
 		maintype, subtype = mime_type.split('/')
-		part = MIMEText(message, _subtype = subtype)
+		part = MIMEText(message, _subtype = subtype, policy=policy.SMTPUTF8)
 
 		if as_attachment:
 			part.add_header('Content-Disposition', 'attachment', filename=filename)

From b32238a2951b19e60f2e77dd38be6e59c68283f6 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Sat, 18 Jul 2020 18:40:36 +0530
Subject: [PATCH 247/345] fix: CSS for mozila browser

---
 frappe/public/less/desk.less | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index d0117c88ad..26f80c1262 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -807,7 +807,7 @@ input[type="checkbox"] {
 		text-transform: none;
 		line-height: @checkbox-height;
 		margin-top: -10px;
-		display: inline-block;
+		display: inline-block !important;
 		font-size: @checkbox-height;
 		color: @text-extra-muted;
 		.transition(150ms color);
@@ -851,6 +851,7 @@ input[type="checkbox"] {
 	input[type="checkbox"] {
 		visibility: visible;
 		left: 0;
+		height: 12px !important
 	}
 }
 
@@ -858,6 +859,7 @@ input[type="checkbox"] {
 	input[type="checkbox"] {
 		visibility: visible;
 		left: 0;
+		height: 12px !important
 	}
 }
 
@@ -867,6 +869,7 @@ input[type="checkbox"] {
 	input[type="checkbox"] {
 		 visibility: visible;
 		 left: 0;
+		 height: 12px !important
 	}
 }
 

From 8a6cb7db3d99dc55c149bf49446b612771b46f64 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Sat, 18 Jul 2020 18:52:55 +0530
Subject: [PATCH 248/345] chore: replace rfc-compatible newlines with \n

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/email/test_email_body.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/email/test_email_body.py b/frappe/email/test_email_body.py
index 43c4bb8333..7d24ea9025 100644
--- a/frappe/email/test_email_body.py
+++ b/frappe/email/test_email_body.py
@@ -39,7 +39,7 @@ This is the text version of this email
 			subject='Test Subject',
 			content=email_html,
 			text_content=email_text
-		).as_string()
+		).as_string().replace("\r\n", "\n")
 
 	def test_prepare_message_returns_already_encoded_string(self):
 

From 42591f2828013e00e03796e2e08cc0bd98072ff1 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Sat, 18 Jul 2020 19:08:29 +0530
Subject: [PATCH 249/345] chore: replace rfc-compatible newline with \n

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/email/test_email_body.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/email/test_email_body.py b/frappe/email/test_email_body.py
index 7d24ea9025..705a853bc6 100644
--- a/frappe/email/test_email_body.py
+++ b/frappe/email/test_email_body.py
@@ -153,7 +153,7 @@ w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 			subject='Test Subject',
 			content=email_html,
 			header=['Email Title', 'green']
-		).as_string()
+		).as_string().replace("\r\n", "\n")
 
 		self.assertTrue('''<span class=3D"indicator indicator-green" style=3D"background-color:#98=
 d85b; border-radius:8px; display:inline-block; height:8px; margin-right:5px=

From a4239c4f1f3a8318dfcc3f545de968e90805d1d0 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sat, 18 Jul 2020 19:40:10 +0530
Subject: [PATCH 250/345] fix: don't set header if empty

---
 frappe/email/email_body.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index a404f7fdfa..d545190c47 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -223,7 +223,8 @@ class EMail:
 
 		# reset headers as values may be changed.
 		for key, val in iteritems(headers):
-			self.set_header(key, val)
+			if val:
+				self.set_header(key, val)
 
 		# call hook to enable apps to modify msg_root before sending
 		for hook in frappe.get_hooks("make_email_body_message"):

From 3787c4eb28a2125cb5109c2dcdbe86d0505def03 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 19 Jul 2020 18:18:29 +0530
Subject: [PATCH 251/345] refactor: Remove un-wanted code

---
 frappe/public/less/desk.less | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 26f80c1262..36ceed9bfa 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -845,31 +845,11 @@ input[type="checkbox"] {
 	height: 100%;
 }
 
-// mozilla doesn't support
+// Firefox doesn't support
 // pseudo elements on checkbox
-@-moz-document url-prefix() {
+@supports (-moz-appearance: none) or (-ms-ime-align:auto) {
 	input[type="checkbox"] {
-		visibility: visible;
-		left: 0;
-		height: 12px !important
-	}
-}
-
-@supports (-moz-appearance: none) {
-	input[type="checkbox"] {
-		visibility: visible;
-		left: 0;
-		height: 12px !important
-	}
-}
-
-// edge doesn't support pseudo elements on checkbox
-//Microsoft Edge Browser 12+ (All)
-@supports (-ms-ime-align:auto) {
-	input[type="checkbox"] {
-		 visibility: visible;
-		 left: 0;
-		 height: 12px !important
+		height: @checkbox-height !important
 	}
 }
 

From 0eae7dc1d875351117a3e4d61b33b7f4ed339a54 Mon Sep 17 00:00:00 2001
From: Abhishek Balam <abhishekbalam96@gmail.com>
Date: Mon, 20 Jul 2020 08:32:05 +0530
Subject: [PATCH 252/345] fix(Controls): 'Yes/No' instead of '1/0' in Filter
 Descriptions for 'Check' values (#11040)

* fix: show 'Yes/No' instead of '1/0' in Filter Descriptions for 'Check' fieldtype

* fix: spacing

* fix: add gettext and cleanup
---
 frappe/public/js/frappe/form/controls/link.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 603506a056..56f9430238 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -332,6 +332,10 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
 			let docfield = frappe.meta.get_docfield(doctype, fieldname);
 			let label = docfield ? docfield.label : frappe.model.unscrub(fieldname);
 
+			if (docfield && docfield.fieldtype === 'Check') {
+				filter[3] = filter[3] ? __('Yes'): __('No');
+			}
+
 			if (filter[3] && Array.isArray(filter[3]) && filter[3].length > 5) {
 				filter[3] = filter[3].slice(0, 5);
 				filter[3].push('...');

From 42daf5a905e763fb4f9c9c9209760a737ab1ed71 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Mon, 20 Jul 2020 19:05:43 +0530
Subject: [PATCH 253/345] chore: escape value and remove unused condition

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/address/address.py | 3 +--
 frappe/contacts/doctype/contact/contact.py | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 4de92cfa57..57dea8284c 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -243,8 +243,7 @@ def address_query(doctype, txt, searchfield, start, page_len, filters):
 		if meta.get_field(fieldname) or fieldname in frappe.db.DEFAULT_COLUMNS:
 			condition += " and {field}={value}".format(
 				field=fieldname,
-				value=value
-			)
+				value=frappe.db.escape(value))
 
 	searchfields = meta.get_search_fields()
 
diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 5be2cd086c..8240940d2f 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -193,13 +193,6 @@ def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	link_doctype = filters.pop('link_doctype')
 	link_name = filters.pop('link_name')
 
-	condition = ""
-	for fieldname, value in iteritems(filters):
-		condition += " and {field}={value}".format(
-			field=fieldname,
-			value=value
-		)
-
 	return frappe.db.sql("""select
 			`tabContact`.name, `tabContact`.first_name, `tabContact`.last_name
 		from

From fc3816d2de4463b72c3612dc2f2d949b84449f22 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Mon, 20 Jul 2020 19:42:21 +0530
Subject: [PATCH 254/345] fix: update all required perms form doc perms

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/public/js/frappe/form/form.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 843e5382dc..c0b76ee94d 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1400,10 +1400,13 @@ frappe.ui.form.Form = class FrappeForm {
 		var docperms = frappe.perm.get_perm(this.doc.doctype);
 		for (var i=0, l=docperms.length; i<l; i++) {
 			var p = docperms[i];
-			perm[p.permlevel || 0] = {read:1, print:1, cancel:1, email:1};
-			if (p.share) {
-				perm[p.permlevel || 0].share = 1;
-			}
+			perm[p.permlevel || 0] = {
+				read: p.read,
+				cancel: p.cancel,
+				share: p.share,
+				print: p.print,
+				email: p.email
+			};
 		}
 		this.perm = perm;
 	}

From a3cc30437facf7087e5bfa654a0110d6c2110791 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 20 Jul 2020 21:03:38 +0530
Subject: [PATCH 255/345] feat: compress build from theme generator

---
 generate_bootstrap_theme.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generate_bootstrap_theme.js b/generate_bootstrap_theme.js
index bb2a121052..83955856f5 100644
--- a/generate_bootstrap_theme.js
+++ b/generate_bootstrap_theme.js
@@ -10,7 +10,7 @@ scss_content = scss_content.replace(/\\n/g, '\n');
 
 sass.render({
 	data: scss_content,
-	outputStyle: 'compact',
+	outputStyle: 'compressed',
 	importer: function(url) {
 		if (url.startsWith('~')) {
 			// strip ~ so that it can resolve from node_modules

From 0ae7d40ebe9268e9f08928f475bda7a920aa52db Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 20 Jul 2020 23:08:50 +0530
Subject: [PATCH 256/345] fix(paytm-integration): use checksum library to
 generate/verify checksum

---
 .../doctype/paytm_settings/checksum.py        | 80 -------------------
 .../doctype/paytm_settings/paytm_settings.py  |  2 +-
 requirements.txt                              |  2 +-
 3 files changed, 2 insertions(+), 82 deletions(-)
 delete mode 100644 frappe/integrations/doctype/paytm_settings/checksum.py

diff --git a/frappe/integrations/doctype/paytm_settings/checksum.py b/frappe/integrations/doctype/paytm_settings/checksum.py
deleted file mode 100644
index 32f976ae18..0000000000
--- a/frappe/integrations/doctype/paytm_settings/checksum.py
+++ /dev/null
@@ -1,80 +0,0 @@
-import base64
-import string
-import random
-import hashlib
-import sys
-
-from Crypto.Cipher import AES
-
-
-iv = '@@@@&&&&####$$$$'
-BLOCK_SIZE = 16
-
-if (sys.version_info > (3, 0)):
-	__pad__ = lambda s: bytes(s + (BLOCK_SIZE - len(s) % BLOCK_SIZE) * chr(BLOCK_SIZE - len(s) % BLOCK_SIZE), 'utf-8')
-else:
-	__pad__ = lambda s: s + (BLOCK_SIZE - len(s) % BLOCK_SIZE) * chr(BLOCK_SIZE - len(s) % BLOCK_SIZE)
-
-__unpad__ = lambda s: s[0:-ord(s[-1])]
-
-def encrypt(input, key):
-	input = __pad__(input)
-	c = AES.new(key.encode("utf8"), AES.MODE_CBC, iv.encode("utf8"))
-	input = c.encrypt(input)
-	input = base64.b64encode(input)
-	return input.decode("UTF-8")
-
-def decrypt(encrypted, key):
-	encrypted = base64.b64decode(encrypted)
-	c = AES.new(key.encode("utf8"), AES.MODE_CBC, iv.encode("utf8"))
-	param = c.decrypt(encrypted)
-	if type(param) == bytes:
-		param = param.decode()
-	return __unpad__(param)
-
-def generateSignature(params, key):
-	if not type(params) is dict and not type(params) is str:
-		raise Exception("string or dict expected, " + str(type(params)) + " given")
-	if type(params) is dict:
-		params = getStringByParams(params)
-	return generateSignatureByString(params, key)
-
-def verifySignature(params, key, checksum):
-	if not type(params) is dict and not type(params) is str:
-		raise Exception("string or dict expected, " + str(type(params)) + " given")
-	if "CHECKSUMHASH" in params:
-		del params["CHECKSUMHASH"]
-		
-	if type(params) is dict:
-		params = getStringByParams(params)
-	return verifySignatureByString(params, key, checksum)
-
-def generateSignatureByString(params, key):
-	salt = generateRandomString(4)
-	return calculateChecksum(params, key, salt)
-
-def verifySignatureByString(params, key, checksum):
-	paytm_hash = decrypt(checksum, key)    
-	salt = paytm_hash[-4:]
-	return paytm_hash == calculateHash(params, salt)
-
-def generateRandomString(length):
-	chars = string.ascii_uppercase + string.digits + string.ascii_lowercase
-	return ''.join(random.choice(chars) for _ in range(length))
-
-def getStringByParams(params):
-	params_string = []
-	for key in sorted(params.keys()):
-		value = params[key] if params[key] is not None and params[key].lower() != "null" else ""
-		params_string.append(str(value))
-	return '|'.join(params_string)
-
-def calculateHash(params, salt):
-	finalString = '%s|%s' % (params, salt)
-	hasher = hashlib.sha256(finalString.encode())
-	hashString = hasher.hexdigest() + salt
-	return hashString
-
-def calculateChecksum(params, key, salt): 
-	hashString = calculateHash(params, salt)
-	return encrypt(hashString, key)
\ No newline at end of file
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index c169a53246..bfa9b6b3eb 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -13,7 +13,7 @@ from frappe import _
 from frappe.utils import get_url, call_hook_method, cint, flt, cstr
 from frappe.integrations.utils import create_request_log, create_payment_gateway
 from frappe.utils import get_request_site_address
-from frappe.integrations.doctype.paytm_settings.checksum import generateSignature, verifySignature
+from paytmchecksum import generateSignature, verifySignature
 from frappe.utils.password import get_decrypted_password
 
 class PaytmSettings(Document):
diff --git a/requirements.txt b/requirements.txt
index e6f6f9fff9..d053f8f48c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -66,5 +66,5 @@ watchdog==0.8.0
 Werkzeug==0.16.1
 xlrd==1.2.0
 zxcvbn-python==4.4.24
-pycryptodome==3.9.7
 Whoosh==2.7.4
+paytmchecksum==1.7.0
\ No newline at end of file

From 158da07c6ab6b125086d60f83082d8d208272d8f Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 21 Jul 2020 00:12:06 +0530
Subject: [PATCH 257/345] fix: make the checkout page responsive for mobile
 view

---
 .../pages/integrations/paytm_checkout.html       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/frappe/templates/pages/integrations/paytm_checkout.html b/frappe/templates/pages/integrations/paytm_checkout.html
index 77a2045edf..168f6597e5 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.html
+++ b/frappe/templates/pages/integrations/paytm_checkout.html
@@ -16,8 +16,9 @@
 
 {%- block page_content -%}
 <body>
-	<div style="margin: 30vh;">
-		<center><h2>Please do not refresh this page...</h2></center>
+	<div class="centered">
+		<h2>Please do not refresh this page...</h2>
+
 		<form method="post" action="{{ url }}" name="paytm_form">
 			{% for name, value in payment_details.items() %}
 				<input type="hidden" name="{{ name }}" value="{{ value }}">
@@ -29,9 +30,14 @@
 
 {% block style %}
 <style>
-	/* header,
-	footer {
+	.centered {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.web-footer {
 		display: none;
-	} */
+	}
 </style>
 {% endblock %}
\ No newline at end of file

From 2083224609f62b71b6e486dbe476be3e7783fb3c Mon Sep 17 00:00:00 2001
From: Abhishek Balam <abhishekbalam96@gmail.com>
Date: Tue, 21 Jul 2020 12:36:23 +0530
Subject: [PATCH 258/345] fix: add a confirmation dialog on enabling auto reply

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 .../doctype/email_account/email_account.js     | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/frappe/email/doctype/email_account/email_account.js b/frappe/email/doctype/email_account/email_account.js
index 71f9cccb0d..83896e0af7 100644
--- a/frappe/email/doctype/email_account/email_account.js
+++ b/frappe/email/doctype/email_account/email_account.js
@@ -95,6 +95,11 @@ frappe.ui.form.on("Email Account", {
 	enable_incoming: function(frm) {
 		frm.doc.no_remaining = null; //perform full sync
 		//frm.set_df_property("append_to", "reqd", frm.doc.enable_incoming);
+		frm.trigger("warn_autoreply_on_incoming");
+	},
+
+	enable_auto_reply: function(frm) {
+		frm.trigger("warn_autoreply_on_incoming");
 	},
 
 	notify_if_unreplied: function(frm) {
@@ -184,7 +189,18 @@ frappe.ui.form.on("Email Account", {
 				read as well as unread message from server. This may also cause the duplication\
 				of Communication (emails).");
 			frappe.confirm(msg, null, function() {
-				frm.set_value("email_sync_option", "ALL");
+				frm.set_value("email_sync_option", "UNSEEN");
+			});
+		}
+	},
+
+	warn_autoreply_on_incoming: function(frm) {
+		if (frm.doc.enable_incoming && frm.doc.enable_auto_reply && frm.doc.__islocal) {
+			var msg = __("Enabling auto reply on an incoming email account will send automated replies \
+				to all the synchronized emails. Do you wish to continue?");
+			frappe.confirm(msg, null, function() {
+				frm.set_value("enable_auto_reply", 0);
+				frappe.show_alert({message: __("Disabled Auto Reply"), indicator: "blue"});
 			});
 		}
 	}

From 146762767d462359350c519062bdf0d5947dbb17 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 21 Jul 2020 15:49:44 +0530
Subject: [PATCH 259/345] refactor: Rename is_custom to use_report_chart
 (#11051)

* refactor: Rename is_custom to use_report_chart

* fix: Patch to move is_custom data to use_report_chart

* fix: Import rename_field

* fix: Rename is_custom in depends_on

* fix: Reload doc before renaming field
---
 .../dashboard_chart/dashboard_chart.js        | 12 +++---
 .../dashboard_chart/dashboard_chart.json      | 42 ++++++++-----------
 ...eate_custom_dashboards_cards_and_charts.py |  5 +++
 3 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 738d77ae27..fd7e5764bc 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -187,14 +187,12 @@ frappe.ui.form.on('Dashboard Chart', {
 			}
 		).then(data => {
 			frm.report_data = data;
-			if (!data.chart) {
-				frm.set_value('is_custom', 0);
-				frm.set_df_property('is_custom', 'hidden', 1);
-			} else {
-				frm.set_df_property('is_custom', 'hidden', 0);
-			}
+			let report_has_chart = Boolean(data.chart);
 
-			if (!frm.doc.is_custom) {
+			frm.set_value('use_report_chart', 0);
+			frm.set_df_property('use_report_chart', 'hidden', !report_has_chart);
+
+			if (!frm.doc.use_report_chart) {
 				if (data.result.length) {
 					frm.field_options = frappe.report_utils.get_field_options_from_report(data.columns, data);
 					frm.set_df_property('x_field', 'options', frm.field_options.non_numeric_fields);
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index d67e725eb9..a049e2058c 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -12,7 +12,7 @@
   "chart_name",
   "chart_type",
   "report_name",
-  "is_custom",
+  "use_report_chart",
   "x_field",
   "y_axis",
   "source",
@@ -194,11 +194,11 @@
    "label": "To Date"
   },
   {
-   "depends_on": "eval:doc.chart_type == 'Report' && doc.report_name && !doc.is_custom",
+   "depends_on": "eval:doc.chart_type == 'Report' && doc.report_name && !doc.use_report_chart",
    "fieldname": "x_field",
    "fieldtype": "Select",
    "label": "X Field",
-   "mandatory_depends_on": "eval: doc.report_name && !doc.is_custom"
+   "mandatory_depends_on": "eval: doc.report_name && !doc.use_report_chart"
   },
   {
    "depends_on": "eval:doc.chart_type === 'Report'",
@@ -209,18 +209,11 @@
    "set_only_once": 1
   },
   {
-   "default": "0",
-   "depends_on": "eval: doc.report_name",
-   "fieldname": "is_custom",
-   "fieldtype": "Check",
-   "label": "Is Custom"
-  },
-  {
-   "depends_on": "eval:doc.chart_type == 'Report' && doc.report_name && !doc.is_custom",
+   "depends_on": "eval:doc.chart_type == 'Report' && doc.report_name && !doc.use_report_chart",
    "fieldname": "y_axis",
    "fieldtype": "Table",
    "label": "Y Axis",
-   "mandatory_depends_on": "eval:doc.report_name && !doc.is_custom",
+   "mandatory_depends_on": "eval:doc.report_name && !doc.use_report_chart",
    "options": "Dashboard Chart Field"
   },
   {
@@ -246,9 +239,7 @@
    "default": "0",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Is Standard"
   },
   {
    "depends_on": "eval: doc.is_standard",
@@ -256,28 +247,29 @@
    "fieldtype": "Link",
    "label": "Module",
    "mandatory_depends_on": "eval: doc.is_standard",
-   "options": "Module Def",
-   "show_days": 1,
-   "show_seconds": 1
+   "options": "Module Def"
   },
   {
    "fieldname": "dynamic_filters_json",
    "fieldtype": "Code",
    "label": "Dynamic Filters JSON",
-   "options": "JSON",
-   "show_days": 1,
-   "show_seconds": 1
+   "options": "JSON"
   },
   {
    "fieldname": "dynamic_filters_section",
    "fieldtype": "Section Break",
-   "label": "Dynamic Filters",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Dynamic Filters"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval: doc.report_name",
+   "fieldname": "use_report_chart",
+   "fieldtype": "Check",
+   "label": "Use Report Chart"
   }
  ],
  "links": [],
- "modified": "2020-07-10 16:09:47.102062",
+ "modified": "2020-07-21 15:41:19.990283",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py b/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
index 9a075a22cc..f61941bf01 100644
--- a/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
+++ b/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
@@ -1,6 +1,7 @@
 import frappe
 from frappe.model.naming import append_number_if_name_exists
 from frappe.utils.dashboard import get_dashboards_with_link
+from frappe.model.utils.rename_field import rename_field
 
 def execute():
 	if not frappe.db.table_exists('Dashboard Chart')\
@@ -8,10 +9,14 @@ def execute():
 		or not frappe.db.table_exists('Dashboard'):
 		return
 
+
 	frappe.reload_doc('desk', 'doctype', 'dashboard_chart')
 	frappe.reload_doc('desk', 'doctype', 'number_card')
 	frappe.reload_doc('desk', 'doctype', 'dashboard')
 
+	if frappe.db.has_column('Dashboard Chart', 'is_custom'):
+		rename_field('Dashboard Chart', 'is_custom', 'use_report_chart')
+
 	modified_charts = get_modified_docs('Dashboard Chart')
 	modified_cards = get_modified_docs('Number Card')
 	modified_dashboards = [doc.name for doc in get_modified_docs('Dashboard')]

From e3e94a5430ca90a16256c29faac07844d56143d3 Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Tue, 21 Jul 2020 16:22:19 +0530
Subject: [PATCH 260/345] fix: Rename pending 'is_custom' usage to
 'use_report_chart'

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 4 ++--
 frappe/public/js/frappe/views/reports/query_report.js  | 4 ++--
 frappe/public/js/frappe/widgets/chart_widget.js        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index fd7e5764bc..07b0b69345 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -148,6 +148,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.set_value('filters_json', '{}');
 		frm.set_value('dynamic_filters_json', '{}');
 		frm.trigger('set_chart_report_filters');
+		frm.set_value('use_report_chart', 0);
 	},
 
 
@@ -176,7 +177,7 @@ frappe.ui.form.on('Dashboard Chart', {
 	set_chart_field_options: function(frm) {
 		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
 		if (frm.doc.dynamic_filters_json.length > 2) {
-			filters = {...filters, ...JSON.parse(frm.doc.dynamic_filters_json)};
+			filters = frappe.dashboard_utils.get_all_filters(frm.doc)
 		}
 		frappe.xcall(
 			'frappe.desk.query_report.run',
@@ -189,7 +190,6 @@ frappe.ui.form.on('Dashboard Chart', {
 			frm.report_data = data;
 			let report_has_chart = Boolean(data.chart);
 
-			frm.set_value('use_report_chart', 0);
 			frm.set_df_property('use_report_chart', 'hidden', !report_has_chart);
 
 			if (!frm.doc.use_report_chart) {
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 40ebd1c497..9b094149b8 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -292,7 +292,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 					'y_axis': chart_args.y_axis_fields.map(f => {
 						return {'y_field': f.y_field, 'color': f.color};
 					}),
-					'is_custom': 0
+					'use_report_chart': 0
 				}
 			);
 		} else {
@@ -300,7 +300,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			Object.assign(args,
 				{
 					'chart_name': chart_name,
-					'is_custom': 1
+					'use_report_chart': 1
 				}
 			);
 		}
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 674f53670e..4aa0b23a63 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -255,7 +255,7 @@ export default class ChartWidget extends Widget {
 	}
 
 	get_report_chart_data(result) {
-		if (result.chart && this.chart_doc.is_custom) {
+		if (result.chart && this.chart_doc.use_report_chart) {
 			return result.chart.data;
 		} else {
 			let y_fields = [];

From 660d27389c09325be39ca3f912bb0eb61f2f1d12 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 21 Jul 2020 16:39:26 +0530
Subject: [PATCH 261/345] fix: get_all_filters for number cards

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 2 +-
 frappe/desk/doctype/number_card/number_card.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 07b0b69345..fc3708c983 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -147,8 +147,8 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.set_df_property('x_field', 'options', []);
 		frm.set_value('filters_json', '{}');
 		frm.set_value('dynamic_filters_json', '{}');
-		frm.trigger('set_chart_report_filters');
 		frm.set_value('use_report_chart', 0);
+		frm.trigger('set_chart_report_filters');
 	},
 
 
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index d5a743818a..8e05a28783 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -216,7 +216,7 @@ frappe.ui.form.on('Number Card', {
 	set_report_field_options: function(frm) {
 		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
 		if (frm.doc.dynamic_filters_json.length > 2) {
-			filters = {...filters, ...JSON.parse(frm.doc.dynamic_filters_json)};
+			filters = frappe.dashboard_utils.get_all_filters(frm.doc);
 		}
 		frappe.xcall(
 			'frappe.desk.query_report.run',

From c709ebc9f103b726692c7901496051a780591b54 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 21 Jul 2020 16:39:58 +0530
Subject: [PATCH 262/345] fix: set report name as mandatory

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index a049e2058c..a25d0cc6c5 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -205,6 +205,7 @@
    "fieldname": "report_name",
    "fieldtype": "Link",
    "label": "Report Name",
+   "mandatory_depends_on": "eval:doc.chart_type === 'Report'",
    "options": "Report",
    "set_only_once": 1
   },
@@ -269,7 +270,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-21 15:41:19.990283",
+ "modified": "2020-07-21 16:37:07.763482",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",

From 6e9fe40b0e0a81ccd23dac0f06e0a9fbea662304 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 21 Jul 2020 16:40:56 +0530
Subject: [PATCH 263/345] style: fix formatting

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index fc3708c983..6d33d7717b 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -177,7 +177,7 @@ frappe.ui.form.on('Dashboard Chart', {
 	set_chart_field_options: function(frm) {
 		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
 		if (frm.doc.dynamic_filters_json.length > 2) {
-			filters = frappe.dashboard_utils.get_all_filters(frm.doc)
+			filters = frappe.dashboard_utils.get_all_filters(frm.doc);
 		}
 		frappe.xcall(
 			'frappe.desk.query_report.run',

From e3ce17a0c9ec989bd9cd2eddc9b975777d2eecbb Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 21 Jul 2020 17:16:19 +0530
Subject: [PATCH 264/345] fix: check if dynamic filters exists

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 2 +-
 frappe/desk/doctype/number_card/number_card.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 6d33d7717b..ee6eb3289d 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -176,7 +176,7 @@ frappe.ui.form.on('Dashboard Chart', {
 
 	set_chart_field_options: function(frm) {
 		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
-		if (frm.doc.dynamic_filters_json.length > 2) {
+		if (frm.doc.dynamic_filters_json && frm.doc.dynamic_filters_json.length > 2) {
 			filters = frappe.dashboard_utils.get_all_filters(frm.doc);
 		}
 		frappe.xcall(
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 8e05a28783..42899a4ebb 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -215,7 +215,7 @@ frappe.ui.form.on('Number Card', {
 
 	set_report_field_options: function(frm) {
 		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
-		if (frm.doc.dynamic_filters_json.length > 2) {
+		if (frm.doc.dynamic_filters_json && frm.doc.dynamic_filters_json.length > 2) {
 			filters = frappe.dashboard_utils.get_all_filters(frm.doc);
 		}
 		frappe.xcall(

From 48b835c1dc3757e7be6e741489b26916debe15a5 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 21 Jul 2020 18:26:42 +0530
Subject: [PATCH 265/345] fix: Text editor content style in email and website
 (#11003)

---
 frappe/public/css/email.css                     |  6 ++++++
 .../js/frappe/form/controls/text_editor.js      |  5 ++++-
 frappe/public/js/frappe/form/formatters.js      |  7 ++++++-
 frappe/public/less/email.less                   |  9 ++++++++-
 frappe/public/less/quill.less                   |  6 +++++-
 frappe/public/scss/website.scss                 | 17 ++++++++++++++++-
 .../print_formats/standard_macros.html          |  2 --
 7 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/frappe/public/css/email.css b/frappe/public/css/email.css
index 40c6149927..5c398009ff 100644
--- a/frappe/public/css/email.css
+++ b/frappe/public/css/email.css
@@ -7,6 +7,12 @@ body {
 p {
   margin: 1em 0 !important;
 }
+.ql-editor {
+  white-space: normal;
+}
+.ql-editor p {
+  margin: 0 !important;
+}
 hr {
   border-top: 1px solid #d1d8dd;
 }
diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index e367989b81..3fe0b60ae0 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -69,7 +69,6 @@ Quill.register(CustomColor, true);
 frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 	make_wrapper() {
 		this._super();
-		this.$wrapper.find(".like-disabled-input").addClass('ql-editor');
 	},
 
 	make_input() {
@@ -201,6 +200,10 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 		let value = this.quill ? this.quill.root.innerHTML : '';
 		// hack to retain space sequence.
 		value = value.replace(/(\s)(\s)/g, ' &nbsp;');
+
+		if (!$(value).find('.ql-editor').length) {
+			value = `<div class="ql-editor read-mode">${value}</div>`;
+		}
 		return value;
 	},
 
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 4f9dd377c9..a7adc9175a 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -228,7 +228,12 @@ frappe.form.formatters = {
 		return frappe.form.formatters.Text(value);
 	},
 	TextEditor: function(value) {
-		return frappe.form.formatters.Text(value);
+		let formatted_value = frappe.form.formatters.Text(value);
+		// to use ql-editor styles
+		if (!$(formatted_value).find('.ql-editor').length) {
+			formatted_value = `<div class="ql-editor read-mode">${formatted_value}</div>`;
+		}
+		return formatted_value;
 	},
 	Code: function(value) {
 		return "<pre>" + (value==null ? "" : $("<div>").text(value).html()) + "</pre>"
diff --git a/frappe/public/less/email.less b/frappe/public/less/email.less
index b6d9540586..bf0507138b 100644
--- a/frappe/public/less/email.less
+++ b/frappe/public/less/email.less
@@ -10,6 +10,13 @@ p {
 	margin: 1em 0 !important;
 }
 
+.ql-editor {
+	white-space: normal;
+	p {
+		margin: 0 !important;
+	}
+}
+
 hr {
 	border-top: 1px solid @border-color;
 }
@@ -210,4 +217,4 @@ hr {
 .report-title {
 	margin-bottom: 20px;
 }
-/* csslint ignore:end */
+/* csslint ignore:end */
\ No newline at end of file
diff --git a/frappe/public/less/quill.less b/frappe/public/less/quill.less
index 98c762bb4a..514d8993cd 100644
--- a/frappe/public/less/quill.less
+++ b/frappe/public/less/quill.less
@@ -78,7 +78,7 @@
 	}
 }
 
-.ql-editor .mention {
+.ql-editor:not(.read-mode) .mention {
 	height: auto;
 	width: auto;
 	border-radius: 10px;
@@ -133,3 +133,7 @@
 	margin-top: 0px;
 	margin-bottom: 0px;
 }
+
+.ql-editor.read-mode {
+	padding: 0;
+}
\ No newline at end of file
diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index c89641b238..3c11d23252 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -1,3 +1,4 @@
+@import '~quill/dist/quill.core';
 @import 'variables';
 @import 'frappe/public/css/font-awesome';
 @import '~bootstrap/scss/bootstrap';
@@ -11,6 +12,20 @@
 @import 'portal';
 @import 'doc';
 
+.ql-editor.read-mode {
+	padding: 0;
+	line-height: 1.6;
+
+	h1,
+	h2,
+	h3,
+	h4,
+	h5 {
+		margin-top: 0.5em;
+		margin-bottom: 0.25em;
+	}
+}
+
 .container {
 	padding-left: 1.25rem;
 	padding-right: 1.25rem;
@@ -338,4 +353,4 @@ h5.modal-title {
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
-}
\ No newline at end of file
+}
diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html
index 07ef577aa7..3681a87f53 100644
--- a/frappe/templates/print_formats/standard_macros.html
+++ b/frappe/templates/print_formats/standard_macros.html
@@ -99,9 +99,7 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}"
 	{%- if df.fieldtype=="Code" %}
 		<pre class="value">{{ doc.get(df.fieldname) }}</pre>
 	{% else -%}
-		{%- if df.fieldtype=="Text Editor" -%}<div class='ql-editor'>{%- endif -%}
 		{{ doc.get_formatted(df.fieldname, parent_doc or doc, translated=df.translatable) }}
-		{%- if df.fieldtype=="Text Editor" -%}</div>{%- endif -%}
   {% endif -%}
 </div>
 {%- endif -%}

From 547bd77c207e2f1668de43889e540edb7d4a36c2 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 21 Jul 2020 18:46:51 +0530
Subject: [PATCH 266/345] fix: Do not check all attachments on adding new
 (#10926)

---
 .../public/js/frappe/views/communication.js   | 129 ++++++++----------
 1 file changed, 59 insertions(+), 70 deletions(-)

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 53d946f75d..29b21242af 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -44,26 +44,6 @@ frappe.views.CommunicationComposer = Class.extend({
 			}
 		});
 
-		$(document).on("upload_complete", function(event, attachment) {
-			if(me.dialog.display) {
-				var wrapper = $(me.dialog.fields_dict.select_attachments.wrapper);
-
-				// find already checked items
-				var checked_items = wrapper.find('[data-file-name]:checked').map(function() {
-					return $(this).attr("data-file-name");
-				});
-
-				// reset attachment list
-				me.render_attach();
-
-				// check latest added
-				checked_items.push(attachment.name);
-
-				$.each(checked_items, function(i, filename) {
-					wrapper.find('[data-file-name="'+ filename +'"]').prop("checked", true);
-				});
-			}
-		})
 		this.prepare();
 		this.dialog.show();
 
@@ -387,77 +367,86 @@ frappe.views.CommunicationComposer = Class.extend({
 			folder: 'Home/Attachments',
 			on_success: attachment => {
 				this.attachments.push(attachment);
-				this.render_attach();
+				this.render_attachment_rows(attachment);
 			}
 		};
 
-		if(this.frm) {
+		if (this.frm) {
 			args = {
 				doctype: this.frm.doctype,
 				docname: this.frm.docname,
 				folder: 'Home/Attachments',
 				on_success: attachment => {
 					this.frm.attachments.attachment_uploaded(attachment);
-					this.render_attach();
+					this.render_attachment_rows(attachment);
 				}
-			}
+			};
 		}
 
-		$("<h6 class='text-muted add-attachment' style='margin-top: 12px; cursor:pointer;'>"
-			+__("Select Attachments")+"</h6><div class='attach-list'></div>\
-			<p class='add-more-attachments'>\
-			<a class='text-muted small'><i class='octicon octicon-plus' style='font-size: 12px'></i> "
-			+__("Add Attachment")+"</a></p>").appendTo(attach.empty())
+		$(`
+			<h6 class='text-muted add-attachment' style='margin-top: 12px; cursor:pointer;'>
+				${__("Select Attachments")}
+			</h6>
+			<div class='attach-list'></div>
+			<p class='add-more-attachments'>
+				<a class='text-muted small'>
+					<i class='octicon octicon-plus' style='font-size: 12px'></i>
+					${__("Add Attachment")}
+				</a>
+			</p>
+		`).appendTo(attach.empty());
+
 		attach
 			.find(".add-more-attachments a")
-			.on('click',() => new frappe.ui.FileUploader(args));
-		this.render_attach();
+			.on('click', () => new frappe.ui.FileUploader(args));
+		this.render_attachment_rows();
 	},
-	render_attach:function(){
-		var fields = this.dialog.fields_dict;
-		var attach = $(fields.select_attachments.wrapper).find(".attach-list").empty();
 
-		var files = [];
-		if (this.attachments && this.attachments.length) {
-			files = files.concat(this.attachments);
-		}
-		if (cur_frm) {
-			files = files.concat(cur_frm.get_files());
-		}
+	render_attachment_rows: function(attachment) {
+		const select_attachments = this.dialog.fields_dict.select_attachments;
+		const attachment_rows = $(select_attachments.wrapper).find(".attach-list");
+		if (attachment) {
+			attachment_rows.append(this.get_attachment_row(attachment, true));
+		} else {
+			let files = [];
+			if (this.attachments && this.attachments.length) {
+				files = files.concat(this.attachments);
+			}
+			if (this.frm) {
+				files = files.concat(this.frm.get_files());
+			}
 
-		if(files.length) {
-			$.each(files, function(i, f) {
-				if (!f.file_name) return;
-				f.file_url = frappe.urllib.get_full_url(f.file_url);
-
-				$(repl('<p class="checkbox">'
-					+	'<label><span><input type="checkbox" data-file-name="%(name)s"></input></span>'
-					+		'<span class="small">%(file_name)s</span>'
-					+	' <a href="%(file_url)s" target="_blank" class="text-muted small">'
-					+		'<i class="fa fa-share" style="vertical-align: middle; margin-left: 3px;"></i>'
-					+ '</label></p>', f))
-					.appendTo(attach)
-			});
-		}
-		this.select_attachments();
-	},
-	select_attachments:function(){
-		let me = this;
-		if(me.dialog.display) {
-			let wrapper = $(me.dialog.fields_dict.select_attachments.wrapper);
-
-			let unchecked_items = wrapper.find('[data-file-name]:not(:checked)').map(function() {
-				return $(this).attr("data-file-name");
-			});
-
-			$.each(unchecked_items, function(i, filename) {
-				wrapper.find('[data-file-name="'+ filename +'"]').prop("checked", true);
-			});
+			if (files.length) {
+				$.each(files, (i, f) => {
+					if (!f.file_name) return;
+					if (!attachment_rows.find(`[data-file-name="${f.name}"]`).length) {
+						f.file_url = frappe.urllib.get_full_url(f.file_url);
+						attachment_rows.append(this.get_attachment_row(f));
+					}
+				});
+			}
 		}
 	},
+
+	get_attachment_row(attachment, checked) {
+		return $(`<p class="checkbox">
+			<label>
+				<span>
+					<input
+						type="checkbox"
+						data-file-name="${attachment.name}"
+						${checked ? 'checked': ''}>
+					</input>
+				</span>
+				<span class="small">${attachment.file_name}</span>
+				<a href="${attachment.file_url}" target="_blank" class="text-muted small">
+				<i class="fa fa-share" style="vertical-align: middle; margin-left: 3px;"></i>
+			</label>
+		</p>`);
+	},
+
 	setup_email: function() {
 		// email
-		var me = this;
 		var fields = this.dialog.fields_dict;
 
 		if(this.attach_document_print) {

From 061c8d90886d319dea9b8fa6c8c13741b08e3640 Mon Sep 17 00:00:00 2001
From: Diksha Jadhav <dikshajadhav11.dj@gmail.com>
Date: Tue, 21 Jul 2020 19:14:07 +0530
Subject: [PATCH 267/345] fix(grid): trigger onchange on field

---
 frappe/public/js/frappe/form/grid_row.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index f5a06311e9..f4bcecc68e 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -392,8 +392,11 @@ export default class GridRow {
 
 		// sync get_query
 		field.get_query = this.grid.get_field(df.fieldname).get_query;
-		field.df.onchange = function() {
-			me.grid.grid_rows[this.doc.idx-1].refresh_field(this.df.fieldname);
+
+		var field_on_change_function = field.df.onchange;
+		field.df.onchange = function(e) {
+			field_on_change_function && field_on_change_function(e);
+			me.grid.grid_rows[this.doc.idx - 1].refresh_field(this.df.fieldname);
 		};
 		field.refresh();
 		if(field.$input) {

From 1d9903bfdd51a42dae0034c1a0ceecde4b7fe5f2 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 21 Jul 2020 20:45:27 +0530
Subject: [PATCH 268/345] fix: get value from filter lsit if base list doesn't
 exist

---
 frappe/public/js/frappe/ui/filters/filter.js      | 4 +++-
 frappe/public/js/frappe/ui/filters/filter_list.js | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index 5e41ed645e..d4fb6db436 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -249,7 +249,9 @@ frappe.ui.Filter = class {
 			let args = {};
 			if (this.filters_config[condition].depends_on) {
 				const field_name = this.filters_config[condition].depends_on;
-				const filter_value = this.base_list.get_filter_value(field_name);
+				const filter_value = this.base_list
+					? this.base_list.get_filter_value(field_name)
+					: this.filter_list.get_filter_value(field_name);
 				args[field_name] = filter_value;
 			}
 			frappe
diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index ed9ddefe64..7ae48bc7d9 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -104,13 +104,18 @@ frappe.ui.FilterGroup = class {
 			filter_items: (doctype, fieldname) => {
 				return !this.filter_exists([doctype, fieldname]);
 			},
-			base_list: this.base_list
+			base_list: this.base_list,
+			filter_list: this,
 		};
 		let filter = new frappe.ui.Filter(args);
 		this.filters.push(filter);
 		return filter;
 	}
 
+	get_filter_value(fieldname) {
+		return this.filters.filter(f => f.fieldname == fieldname)[0].value;
+	}
+
 	filter_exists(filter_value) {
 		// filter_value of form: [doctype, fieldname, condition, value]
 		let exists = false;

From 220b56f0a08b3dc68e4837ededd6b3850ccbf1a6 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 21 Jul 2020 21:20:06 +0530
Subject: [PATCH 269/345] feat: API to fetch the latest backup available

Take a backup if it doesnt exist with the required expiry
---
 frappe/utils/backups.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index bb03c85bf9..707a9ac511 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -206,6 +206,31 @@ def get_backup():
 	recipient_list = odb.send_email()
 	frappe.msgprint(_("Download link for your backup will be emailed on the following email address: {0}").format(', '.join(recipient_list)))
 
+
+@frappe.whitelist()
+def fetch_latest_backups(with_files=True, recent=3):
+	"""Takes backup on-demand if doesnt exist satisfying the `recent` parameter
+	Only for: System Managers
+
+	Args:
+		with_files (bool, optional): If set, files will backuped up. Defaults to True.
+		recent (int, optional): Won't take a new backup if backup exists within this paramter. Defaults to 3 hours
+
+	Returns:
+		dict: relative Backup Paths
+	"""
+	frappe.only_for("System Manager")
+	odb = BackupGenerator(frappe.conf.db_name, frappe.conf.db_name, frappe.conf.db_password, db_host=frappe.db.host, db_type=frappe.conf.db_type, db_port=frappe.conf.db_port)
+	odb.get_backup(older_than=recent, ignore_files=not with_files)
+
+	return {
+		"database": odb.backup_path_files,
+		"public": odb.backup_path_db,
+		"private": odb.backup_path_private_files,
+		"config": odb.site_config_backup_path
+	}
+
+
 def scheduled_backup(older_than=6, ignore_files=False, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, force=False, verbose=False):
 	"""this function is called from scheduler
 		deletes backups older than 7 days

From 3c4e1ea3a5fabb62f465a432760044b6db7529d2 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 21 Jul 2020 22:20:27 +0530
Subject: [PATCH 270/345] fix: add pycryptodome for checksum generation

---
 requirements.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 0c57da9eac..33cd292bf6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -68,4 +68,5 @@ Werkzeug==0.16.1
 Whoosh==2.7.4
 xlrd==1.2.0
 zxcvbn-python==4.4.24
-paytmchecksum==1.7.0
+pycryptodome==3.9.8
+paytmchecksum==1.7.0
\ No newline at end of file

From 06788762d60cad293c7ad34dc7525bed8aab6da4 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 22 Jul 2020 10:09:58 +0530
Subject: [PATCH 271/345] fix(website): Properly load colocated javascript and
 style

---
 frappe/templates/base.html | 12 ++++++++++--
 frappe/website/router.py   | 28 +++++++++++++---------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/frappe/templates/base.html b/frappe/templates/base.html
index 0b82b3dac2..8c843a44a4 100644
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -42,7 +42,11 @@
 		{{ head_include or "" }}
 	{% endblock -%}
 
-	{%- block style %}{%- endblock -%}
+	{%- block style %}
+		{% if colocated_css -%}
+			<style>{{ colocated_css }}</style>
+		{%- endif %}
+	{%- endblock -%}
 
 	<script>
 		window.frappe = {};
@@ -86,7 +90,11 @@
 	<script type="text/javascript" src="{{ link | abs_url }}"></script>
 	{%- endfor -%}
 
-	{%- block script %}{%- endblock %}
+	{%- block script %}
+		{% if colocated_js -%}
+			<script>{{ colocated_js }}</script>
+		{%- endif %}
+	{%- endblock %}
 	<!-- csrf_token -->
 	{%- block body_include %}{{ body_include or "" }}{% endblock -%}
 </body>
diff --git a/frappe/website/router.py b/frappe/website/router.py
index db7e6f322c..fb9cae7d76 100644
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@@ -283,22 +283,20 @@ def setup_source(page_info):
 		# set the source only if it contains raw content
 		html = source
 
-		# load css/js files
-		js, css = '', ''
+	# load css/js files
+	js_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.js')
+	if os.path.exists(js_path):
+		if not '{% block script %}' in html:
+			with io.open(js_path, 'r', encoding = 'utf-8') as f:
+				js = f.read()
+				page_info.colocated_js = js
 
-		js_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.js')
-		if os.path.exists(js_path):
-			if not '{% block script %}' in html:
-				with io.open(js_path, 'r', encoding = 'utf-8') as f:
-					js = f.read()
-				html += '\n{% block script %}<script>' + js + '\n</script>\n{% endblock %}'
-
-		css_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.css')
-		if os.path.exists(css_path):
-			if not '{% block style %}' in html:
-				with io.open(css_path, 'r', encoding='utf-8') as f:
-					css = f.read()
-				html += '\n{% block style %}\n<style>\n' + css + '\n</style>\n{% endblock %}'
+	css_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.css')
+	if os.path.exists(css_path):
+		if not '{% block style %}' in html:
+			with io.open(css_path, 'r', encoding='utf-8') as f:
+				css = f.read()
+				page_info.colocated_css = css
 
 	if html:
 		page_info.source = html

From 2bf77cd82a3c14976cf4fe2fcd4073978338f4f0 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 22 Jul 2020 10:32:12 +0530
Subject: [PATCH 272/345] style: Fix sider

---
 frappe/website/router.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/website/router.py b/frappe/website/router.py
index fb9cae7d76..9a647e1030 100644
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@@ -286,14 +286,14 @@ def setup_source(page_info):
 	# load css/js files
 	js_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.js')
 	if os.path.exists(js_path):
-		if not '{% block script %}' in html:
+		if '{% block script %}' not in html:
 			with io.open(js_path, 'r', encoding = 'utf-8') as f:
 				js = f.read()
 				page_info.colocated_js = js
 
 	css_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.css')
 	if os.path.exists(css_path):
-		if not '{% block style %}' in html:
+		if '{% block style %}' not in html:
 			with io.open(css_path, 'r', encoding='utf-8') as f:
 				css = f.read()
 				page_info.colocated_css = css

From 2a068bad19a1fcae28921c9e4fd494b6209be527 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 22 Jul 2020 11:17:04 +0530
Subject: [PATCH 273/345] fix: set page actions after setting read only

---
 frappe/public/js/frappe/form/form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index c0b76ee94d..43128065bc 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1409,6 +1409,7 @@ frappe.ui.form.Form = class FrappeForm {
 			};
 		}
 		this.perm = perm;
+		this.toolbar.set_page_action();
 	}
 
 	trigger(event, doctype, docname) {

From 8f6329de4953f99637c98c68ad94645560b51a73 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 22 Jul 2020 11:23:35 +0530
Subject: [PATCH 274/345] refactor: Simplify code

---
 frappe/website/router.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/frappe/website/router.py b/frappe/website/router.py
index 9a647e1030..263d5b0f07 100644
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@@ -285,18 +285,16 @@ def setup_source(page_info):
 
 	# load css/js files
 	js_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.js')
-	if os.path.exists(js_path):
-		if '{% block script %}' not in html:
-			with io.open(js_path, 'r', encoding = 'utf-8') as f:
-				js = f.read()
-				page_info.colocated_js = js
+	if os.path.exists(js_path) and '{% block script %}' not in html:
+		with io.open(js_path, 'r', encoding = 'utf-8') as f:
+			js = f.read()
+			page_info.colocated_js = js
 
 	css_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.css')
-	if os.path.exists(css_path):
-		if '{% block style %}' not in html:
-			with io.open(css_path, 'r', encoding='utf-8') as f:
-				css = f.read()
-				page_info.colocated_css = css
+	if os.path.exists(css_path) and '{% block style %}' not in html:
+		with io.open(css_path, 'r', encoding='utf-8') as f:
+			css = f.read()
+			page_info.colocated_css = css
 
 	if html:
 		page_info.source = html

From 1e56fcc85765681c79631116dd48bd13c1ff3368 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:40:28 +0530
Subject: [PATCH 275/345] fix: filter out standard dashboards if not in
 developer mode

---
 .../dashboard_chart/dashboard_chart.js        | 36 +++-----------
 .../dashboard_chart/dashboard_chart.py        |  8 ++-
 .../desk/doctype/number_card/number_card.js   | 36 +++-----------
 .../desk/doctype/number_card/number_card.py   |  6 +++
 .../public/js/frappe/utils/dashboard_utils.js | 49 +++++++++++++++++++
 5 files changed, 75 insertions(+), 60 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index ee6eb3289d..65db4839a1 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -28,38 +28,16 @@ frappe.ui.form.on('Dashboard Chart', {
 		}
 
 		frm.add_custom_button('Add Chart to Dashboard', () => {
-			const d = new frappe.ui.Dialog({
-				title: __('Add to Dashboard'),
-				fields: [
-					{
-						label: __('Select Dashboard'),
-						fieldtype: 'Link',
-						fieldname: 'dashboard',
-						options: 'Dashboard',
-					}
-				],
-				primary_action: (values) => {
-					values.chart_name = frm.doc.chart_name;
-					frappe.xcall(
-						'frappe.desk.doctype.dashboard_chart.dashboard_chart.add_chart_to_dashboard',
-						{args: values}
-					).then(()=> {
-						let dashboard_route_html =
-							`<a href = "#dashboard/${values.dashboard}">${values.dashboard}</a>`;
-						let message =
-							__(`Dashboard Chart ${values.chart_name} add to Dashboard ` + dashboard_route_html);
-
-						frappe.msgprint(message);
-					});
-
-					d.hide();
-				}
-			});
+			const dialog = frappe.dashboard_utils.get_add_to_dashboard_dialog(
+				frm.doc.name,
+				'Dashboard Chart',
+				'frappe.desk.doctype.dashboard_chart.dashboard_chart.add_chart_to_dashboard'
+			);
 
 			if (!frm.doc.chart_name) {
 				frappe.msgprint(__('Please create chart first'));
 			} else {
-				d.show();
+				dialog.show();
 			}
 		});
 
@@ -338,7 +316,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		} else if (frm.chart_filters.length) {
 			fields = frm.chart_filters.filter(f => f.fieldname);
 
-			fields.map( f => {
+			fields.map(f => {
 				if (filters[f.fieldname]) {
 					let condition = '=';
 					const filter_row =
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 70aece3ee7..a25e0cab9e 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -128,7 +128,13 @@ def add_chart_to_dashboard(args):
 
 	dashboard = frappe.get_doc('Dashboard', args.dashboard)
 	dashboard_link = frappe.new_doc('Dashboard Chart Link')
-	dashboard_link.chart = args.chart_name
+	dashboard_link.chart = args.chart_name or args.name
+
+	if args.set_standard:
+		chart = frappe.get_doc('Dashboard Chart', dashboard_link.chart)
+		chart.is_standard = 1
+		chart.module = dashboard.module
+		chart.save()
 
 	dashboard.append('charts', dashboard_link)
 	dashboard.save()
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 42899a4ebb..2ae163d7aa 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -32,40 +32,16 @@ frappe.ui.form.on('Number Card', {
 
 	create_add_to_dashboard_button: function(frm) {
 		frm.add_custom_button('Add Card to Dashboard', () => {
-			const d = new frappe.ui.Dialog({
-				title: __('Add to Dashboard'),
-				fields: [
-					{
-						label: __('Select Dashboard'),
-						fieldtype: 'Link',
-						fieldname: 'dashboard',
-						options: 'Dashboard',
-					}
-				],
-				primary_action: (values) => {
-					values.name = frm.doc.name;
-					frappe.xcall(
-						'frappe.desk.doctype.number_card.number_card.add_card_to_dashboard',
-						{
-							args: values
-						}
-					).then(()=> {
-						let dashboard_route_html =
-							`<a href = "#dashboard/${values.dashboard}">${values.dashboard}</a>`;
-						let message =
-							__(`Number Card ${values.name} add to Dashboard ` + dashboard_route_html);
-
-						frappe.msgprint(message);
-					});
-
-					d.hide();
-				}
-			});
+			const dialog = frappe.dashboard_utils.get_add_to_dashboard_dialog(
+				frm.doc.name,
+				'Number Card',
+				'frappe.desk.doctype.number_card.number_card.add_card_to_dashboard'
+			);
 
 			if (!frm.doc.name) {
 				frappe.msgprint(__('Please create Card first'));
 			} else {
-				d.show();
+				dialog.show();
 			}
 		});
 	},
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 5b52b60474..3eb08ec00a 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -172,5 +172,11 @@ def add_card_to_dashboard(args):
 	dashboard_link = frappe.new_doc('Number Card Link')
 	dashboard_link.card = args.name
 
+	if args.set_standard:
+		card = frappe.get_doc('Number Card', dashboard_link.card)
+		card.is_standard = 1
+		card.module = dashboard.module
+		card.save()
+
 	dashboard.append('cards', dashboard_link)
 	dashboard.save()
\ No newline at end of file
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index 8618f6dd59..4074404aa3 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -199,6 +199,55 @@ frappe.dashboard_utils = {
 		}
 
 		return filters;
+	},
+
+	get_dashboard_link_field() {
+		let field = {
+			label: __('Select Dashboard'),
+			fieldtype: 'Link',
+			fieldname: 'dashboard',
+			options: 'Dashboard',
+		}
+
+		if (!frappe.boot.developer_mode) {
+			field.get_query = () => {
+				return {
+					filters: {
+						is_standard: 0
+					}
+				};
+			};
+		}
+
+		return field;
+	},
+
+	get_add_to_dashboard_dialog(docname, doctype, method) {
+		const field = this.get_dashboard_link_field();
+
+		const dialog = new frappe.ui.Dialog({
+			title: __('Add to Dashboard'),
+			fields: [field],
+			primary_action: (values) => {
+				values.name = docname;
+				values.set_standard = frappe.boot.developer_mode;
+				frappe.xcall(
+					method,
+					{args: values}
+				).then(()=> {
+					let dashboard_route_html =
+						`<a href = "#dashboard/${values.dashboard}">${values.dashboard}</a>`;
+					let message =
+						__(`${doctype} ${values.name} added to Dashboard ` + dashboard_route_html);
+
+					frappe.msgprint(message);
+				});
+
+				dialog.hide();
+			}
+		});
+
+		return dialog;
 	}
 
 };
\ No newline at end of file

From cdd7cb2f177492e24423f3ac15bb575bbf94e22a Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:42:13 +0530
Subject: [PATCH 276/345] fix: filter out standard dashboards while creating
 from reports

---
 .../js/frappe/views/reports/query_report.js   | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 9b094149b8..777be2aaa1 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -157,6 +157,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 
 	add_card_to_dashboard() {
 		let field_options = frappe.report_utils.get_field_options_from_report(this.columns, this.raw_data);
+		const dashboard_field = frappe.dashboard_utils.get_dashboard_link_field();
+		const set_standard = frappe.boot.developer_mode;
+
 		const dialog = new frappe.ui.Dialog({
 			title: __('Create Card'),
 			fields: [
@@ -181,12 +184,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 					label: __('Add to Dashboard'),
 					fieldtype: 'Section Break'
 				},
-				{
-					fieldname: 'dashboard',
-					label: __('Choose Dashboard'),
-					fieldtype: 'Link',
-					options: 'Dashboard',
-				},
+				dashboard_field,
 				{
 					fieldname: 'cb_2',
 					fieldtype: 'Column Break'
@@ -202,7 +200,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 				if (!values.label) {
 					values.label = `${values.report_function} of ${toTitle(values.report_field)}`;
 				}
-				this.create_number_card(values, values.dashboard, values.label);
+				this.create_number_card(values, values.dashboard, values.label, set_standard);
 				dialog.hide();
 			}
 		});
@@ -213,27 +211,26 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 
 	add_chart_to_dashboard() {
 		if (this.chart_fields || this.chart_options) {
+			const dashboard_field = frappe.dashboard_utils.get_dashboard_link_field();
+			const set_standard = frappe.boot.developer_mode;
+
 			const dialog = new frappe.ui.Dialog({
 				title: __('Create Chart'),
 				fields: [
-					{
-						fieldname: 'dashboard',
-						label: 'Choose Dashboard',
-						fieldtype: 'Link',
-						options: 'Dashboard',
-					},
 					{
 						fieldname: 'dashboard_chart_name',
 						label: 'Chart Name',
 						fieldtype: 'Data',
-					}
+					},
+					dashboard_field,
 				],
 				primary_action_label: __('Add'),
 				primary_action: (values) => {
 					this.create_dashboard_chart(
 						this.chart_fields || this.chart_options,
 						values.dashboard,
-						values.dashboard_chart_name
+						values.dashboard_chart_name,
+						set_standard
 					);
 					dialog.hide();
 				}
@@ -245,12 +242,13 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		}
 	}
 
-	create_number_card(values, dashboard_name, card_name) {
+	create_number_card(values, dashboard_name, card_name, set_standard) {
 		let args = {
 			'dashboard': dashboard_name || null,
 			'type': 'Report',
 			'report_name': this.report_name,
 			'filters_json': JSON.stringify(this.get_filter_values()),
+			set_standard: set_standard,
 		};
 		Object.assign(args, values);
 
@@ -263,7 +261,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		);
 	}
 
-	create_dashboard_chart(chart_args, dashboard_name, chart_name) {
+	create_dashboard_chart(chart_args, dashboard_name, chart_name, set_standard) {
 		let args = {
 			'dashboard': dashboard_name || null,
 			'chart_type': 'Report',
@@ -271,7 +269,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			'type': chart_args.chart_type || frappe.model.unscrub(chart_args.type),
 			'color': chart_args.color,
 			'filters_json': JSON.stringify(this.get_filter_values()),
-			'custom_options': {}
+			'custom_options': {},
+			'set_standard': set_standard,
 		};
 
 		for (let key in chart_args) {

From 7f1a5adb0e221452019076aa05b3dafae7d153e0 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:43:37 +0530
Subject: [PATCH 277/345] fix: disable dashboard form only if doc is standard

---
 frappe/desk/doctype/dashboard/dashboard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js
index 237b549433..61300b920b 100644
--- a/frappe/desk/doctype/dashboard/dashboard.js
+++ b/frappe/desk/doctype/dashboard/dashboard.js
@@ -5,7 +5,7 @@ frappe.ui.form.on('Dashboard', {
 	refresh: function(frm) {
 		frm.add_custom_button(__("Show Dashboard"), () => frappe.set_route('dashboard', frm.doc.name));
 
-		if (!frappe.boot.developer_mode) {
+		if (!frappe.boot.developer_mode && frm.doc.is_standard) {
 			frm.disable_form();
 		}
 

From dd6a361058e425ec03d162f8e4f88a3251f5537a Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:44:21 +0530
Subject: [PATCH 278/345] fix: don't show is_standard if not in developer mode

---
 frappe/desk/doctype/dashboard/dashboard.json             | 3 ++-
 frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 3 ++-
 frappe/desk/doctype/number_card/number_card.json         | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index c7128823fe..0c54f1ee7f 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -52,6 +52,7 @@
   },
   {
    "default": "0",
+   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
    "label": "Is Standard"
@@ -66,7 +67,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-10 17:48:19.468813",
+ "modified": "2020-07-22 11:23:37.858568",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index a25d0cc6c5..f0616dddd0 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -238,6 +238,7 @@
   },
   {
    "default": "0",
+   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
    "label": "Is Standard"
@@ -270,7 +271,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-21 16:37:07.763482",
+ "modified": "2020-07-22 11:32:51.185499",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index 333885a7f9..0d1cc279c8 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -113,6 +113,7 @@
   },
   {
    "default": "0",
+   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
    "label": "Is Standard"
@@ -190,7 +191,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-18 17:08:22.882538",
+ "modified": "2020-07-22 11:26:32.039023",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",

From 1bd610f858a29a0d32681d175b418bc675a2817d Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:51:32 +0530
Subject: [PATCH 279/345] fix: separate patch to rename is_custom field

---
 frappe/patches.txt                                    |  1 +
 .../create_custom_dashboards_cards_and_charts.py      |  5 -----
 .../rename_is_custom_field_in_dashboard_chart.py      | 11 +++++++++++
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index f8c767f5a3..b207a325cb 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -295,3 +295,4 @@ frappe.patches.v13_0.update_date_filters_in_user_settings
 frappe.patches.v13_0.update_duration_options
 frappe.patches.v13_0.replace_old_data_import # 2020-06-24
 frappe.patches.v13_0.create_custom_dashboards_cards_and_charts
+frappe.patches.v13_0.rename_is_custom_field_in_dashboard_chart
diff --git a/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py b/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
index f61941bf01..9a075a22cc 100644
--- a/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
+++ b/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
@@ -1,7 +1,6 @@
 import frappe
 from frappe.model.naming import append_number_if_name_exists
 from frappe.utils.dashboard import get_dashboards_with_link
-from frappe.model.utils.rename_field import rename_field
 
 def execute():
 	if not frappe.db.table_exists('Dashboard Chart')\
@@ -9,14 +8,10 @@ def execute():
 		or not frappe.db.table_exists('Dashboard'):
 		return
 
-
 	frappe.reload_doc('desk', 'doctype', 'dashboard_chart')
 	frappe.reload_doc('desk', 'doctype', 'number_card')
 	frappe.reload_doc('desk', 'doctype', 'dashboard')
 
-	if frappe.db.has_column('Dashboard Chart', 'is_custom'):
-		rename_field('Dashboard Chart', 'is_custom', 'use_report_chart')
-
 	modified_charts = get_modified_docs('Dashboard Chart')
 	modified_cards = get_modified_docs('Number Card')
 	modified_dashboards = [doc.name for doc in get_modified_docs('Dashboard')]
diff --git a/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py b/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
new file mode 100644
index 0000000000..90860e211b
--- /dev/null
+++ b/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
@@ -0,0 +1,11 @@
+import frappe
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+	if not frappe.db.table_exists('Dashboard Chart')
+		return
+
+	frappe.reload_doc('desk', 'doctype', 'dashboard_chart')
+
+	if frappe.db.has_column('Dashboard Chart', 'is_custom'):
+		rename_field('Dashboard Chart', 'is_custom', 'use_report_chart')
\ No newline at end of file

From c25100cb47260f2e898f85cd820b952735cd97e7 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:59:17 +0530
Subject: [PATCH 280/345] style: fix formatting

---
 .../patches/v13_0/rename_is_custom_field_in_dashboard_chart.py  | 2 +-
 frappe/public/js/frappe/utils/dashboard_utils.js                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py b/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
index 90860e211b..4da0f8164a 100644
--- a/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
+++ b/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
@@ -2,7 +2,7 @@ import frappe
 from frappe.model.utils.rename_field import rename_field
 
 def execute():
-	if not frappe.db.table_exists('Dashboard Chart')
+	if not frappe.db.table_exists('Dashboard Chart'):
 		return
 
 	frappe.reload_doc('desk', 'doctype', 'dashboard_chart')
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index 4074404aa3..fca26d6ece 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -207,7 +207,7 @@ frappe.dashboard_utils = {
 			fieldtype: 'Link',
 			fieldname: 'dashboard',
 			options: 'Dashboard',
-		}
+		};
 
 		if (!frappe.boot.developer_mode) {
 			field.get_query = () => {

From 1f2cf125035185bd3c610702afa7de0969d7bbb8 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Wed, 22 Jul 2020 14:14:05 +0530
Subject: [PATCH 281/345] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index f5583931e2..1b4bf123e6 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -24,7 +24,7 @@
 		<div class="text-muted small mr-2 mb-2">{{ _("Was this article helpful?") }}</div>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
-		<button class="feedback-msg btn btn-sm disabled hide">{{ _("Thank you for your feedback!") }}</button>
+		<span class="feedback-msg small hidden">{{ _("Thank you for your feedback!") }}</span>
 	</div>
 </div>
 <div class="help-article-comments">

From 19ff07b53b4927fca53faae2f9adb82ad3159305 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Wed, 22 Jul 2020 14:27:18 +0530
Subject: [PATCH 282/345] fix: Margin top for child table index checkboxes

---
 frappe/public/less/desk.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 36ceed9bfa..d951178be0 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -789,6 +789,10 @@ li.user-progress {
 	position: relative;
 }
 
+.row-index input[type=checkbox] {
+	margin-top: 12px;
+}
+
 @checkbox-height: 14px;
 
 // custom font awesome checkbox

From 95aa4a72dcd81b98a9f318b35979964bdedbc032 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 14:53:03 +0530
Subject: [PATCH 283/345] fix: reduce code complexity

---
 frappe/public/js/frappe/ui/filters/filter.js      | 8 +++++---
 frappe/public/js/frappe/ui/filters/filter_list.js | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index d4fb6db436..7c6d532f5c 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -249,9 +249,7 @@ frappe.ui.Filter = class {
 			let args = {};
 			if (this.filters_config[condition].depends_on) {
 				const field_name = this.filters_config[condition].depends_on;
-				const filter_value = this.base_list
-					? this.base_list.get_filter_value(field_name)
-					: this.filter_list.get_filter_value(field_name);
+				const filter_value = this.get_filter_value(field_name);
 				args[field_name] = filter_value;
 			}
 			frappe
@@ -267,6 +265,10 @@ frappe.ui.Filter = class {
 		}
 	}
 
+	get_filter_value(fieldname) {
+		return this.filter_list.get_filter_value(fieldname);
+	}
+
 	make_field(df, old_fieldtype) {
 		let old_text = this.field ? this.field.get_value() : null;
 		this.hide_invalid_conditions(df.fieldtype, df.original_type);
diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index 7ae48bc7d9..9a35a9bb5f 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -104,8 +104,7 @@ frappe.ui.FilterGroup = class {
 			filter_items: (doctype, fieldname) => {
 				return !this.filter_exists([doctype, fieldname]);
 			},
-			base_list: this.base_list,
-			filter_list: this,
+			filter_list: this.base_list || this,
 		};
 		let filter = new frappe.ui.Filter(args);
 		this.filters.push(filter);

From 0c475792cd3f1860af674c9f0073855de4753665 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 14:55:02 +0530
Subject: [PATCH 284/345] refactor: delete unused file filters.js

---
 frappe/public/js/frappe/ui/filters/filters.js | 684 ------------------
 1 file changed, 684 deletions(-)
 delete mode 100644 frappe/public/js/frappe/ui/filters/filters.js

diff --git a/frappe/public/js/frappe/ui/filters/filters.js b/frappe/public/js/frappe/ui/filters/filters.js
deleted file mode 100644
index a775413d39..0000000000
--- a/frappe/public/js/frappe/ui/filters/filters.js
+++ /dev/null
@@ -1,684 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt
-
-frappe.ui.FilterList = Class.extend({
-	init: function(opts) {
-		$.extend(this, opts);
-		this.filters = [];
-		this.wrapper = this.parent;
-		this.stats = [];
-		this.make();
-		this.set_events();
-	},
-	make: function() {
-		this.wrapper.find('.show_filters, .filter_area').remove();
-		this.wrapper.append(`
-			<div class="show_filters">
-				<div class="set-filters">
-					<button
-						style="margin-right: 10px;"
-						class="btn btn-default btn-xs new-filter text-muted">
-						${__("Add Filter")}</button>
-				</div>
-			</div>
-			<div class="filter_area"></div>`);
-	},
-	set_events: function() {
-		var me = this;
-		// show filters
-		this.wrapper.find('.new-filter').bind('click', function() {
-			me.add_filter();
-		});
-
-		this.wrapper.find('.clear-filters').bind('click', function() {
-			me.clear_filters();
-			$('.date-range-picker').val('')
-			me.base_list.run();
-			$(this).addClass("hide");
-		});
-	},
-
-	show_filters: function() {
-		this.wrapper.find('.show_filters').toggle();
-		if(!this.filters.length) {
-			this.add_filter(this.doctype, 'name');
-			this.filters[0].wrapper.find(".filter_field input").focus();
-		}
-	},
-
-	clear_filters: function() {
-		$.each(this.filters, function(i, f) { f.remove(true); });
-		if(this.base_list.page.fields_dict) {
-			$.each(this.base_list.page.fields_dict, (key, value) => {
-				value.set_input('');
-			});
-		}
-		this.filters = [];
-	},
-
-	add_filter: function(doctype, fieldname, condition, value, hidden) {
-		// adds a new filter, returns true if filter has been added
-
-		// allow equal to be used as like
-		let base_filter = this.base_list.page.fields_dict[fieldname];
-		if (base_filter
-			&& (base_filter.df.condition==condition
-				|| (condition==='=' && base_filter.df.condition==='like'))) {
-			// if filter exists in base_list, then exit
-			this.base_list.page.fields_dict[fieldname].set_input(value);
-
-			return true;
-		}
-
-		if(doctype && fieldname
-			&& !frappe.meta.has_field(doctype, fieldname)
-			&& !in_list(frappe.model.std_fields_list, fieldname)) {
-			frappe.msgprint({
-				message: __('Filter {0} missing', [fieldname.bold()]),
-				title: 'Invalid Filter',
-				indicator: 'red'
-			});
-			return false;
-		}
-
-		this.wrapper.find('.show_filters').toggle(true);
-		var is_new_filter = arguments.length===0;
-
-		if (is_new_filter && this.wrapper.find(".is-new-filter:visible").length) {
-			// only allow 1 new filter at a time!
-			return false;
-		}
-
-		var filter = this.push_new_filter(doctype, fieldname, condition, value);
-		if (!filter) return;
-
-		if(this.wrapper.find('.clear-filters').hasClass("hide")) {
-			this.wrapper.find('.clear-filters').removeClass("hide");
-		}
-
-		if (filter && is_new_filter) {
-			filter.wrapper.addClass("is-new-filter");
-		} else {
-			filter.freeze();
-		}
-
-		if (hidden) {
-			filter.$btn_group.addClass("hide");
-		}
-
-		return true;
-	},
-	push_new_filter: function(doctype, fieldname, condition, value) {
-		if(this.filter_exists(doctype, fieldname, condition, value)) {
-			return;
-		}
-
-		// if standard filter exists, then clear it.
-		if(this.base_list.page.fields_dict[fieldname]) {
-			this.base_list.page.fields_dict[fieldname].set_input('');
-		}
-
-		var filter = new frappe.ui.Filter({
-			flist: this,
-			_doctype: doctype,
-			fieldname: fieldname,
-			condition: condition,
-			value: value
-		});
-
-		this.filters.push(filter);
-
-		return filter;
-	},
-
-	remove: function(filter) {
-		// remove `filter` from flist
-		for (var i in this.filters) {
-			if (this.filters[i] === filter) {
-				break;
-			}
-		}
-		if (i!==undefined) {
-			// remove index
-			this.filters.splice(i, 1);
-		}
-	},
-
-	filter_exists: function(doctype, fieldname, condition, value) {
-		var flag = false;
-		for(var i in this.filters) {
-			if(this.filters[i].field) {
-				var f = this.filters[i].get_value();
-
-				if(f[0]==doctype && f[1]==fieldname && f[2]==condition && f[3]==value) {
-					flag = true;
-				} else if($.isArray(value) && frappe.utils.arrays_equal(value, f[3])) {
-					flag = true;
-				}
-			}
-		}
-		return flag;
-	},
-
-	get_filters: function() {
-		// get filter values as dict
-		var values = [];
-		$.each(this.filters, function(i, filter) {
-			if(filter.field) {
-				filter.freeze();
-				values.push(filter.get_value());
-			}
-		});
-		this.base_list.update_standard_filters(values);
-
-		return values;
-	},
-
-	// remove hidden filters
-	update_filters: function() {
-		var fl = [];
-		$.each(this.filters, function(i, f) {
-			if(f.field) fl.push(f);
-		})
-		this.filters = fl;
-		if(this.filters.length === 0) {
-			this.wrapper.find('.clear-filters').addClass("hide");
-		}
-	},
-
-	get_filter: function(fieldname) {
-		for(var i in this.filters) {
-			if(this.filters[i].field && this.filters[i].field.df.fieldname==fieldname)
-				return this.filters[i];
-		}
-	},
-
-	get_formatted_value: function(field, val){
-		var value = val;
-
-		if(field.df.fieldname==="docstatus") {
-			value = {0:"Draft", 1:"Submitted", 2:"Cancelled"}[value] || value;
-		} else if(field.df.original_type==="Check") {
-			value = {0:"No", 1:"Yes"}[cint(value)];
-		} else if (field.df.original_type === "Duration") {
-			let duration_options = {
-				hide_days: field.df.hide_days,
-				hide_seconds: field.df.hide_seconds
-			};
-			value = frappe.utils.get_formatted_duration(value, duration_options);
-		}
-
-		value = frappe.format(value, field.df, {only_value: 1});
-		return value;
-	}
-});
-
-frappe.ui.Filter = Class.extend({
-	init: function(opts) {
-		$.extend(this, opts);
-
-		this.doctype = this.flist.doctype;
-		this.make();
-		this.make_select();
-		this.set_events();
-	},
-	make: function() {
-		this.wrapper = $(frappe.render_template("edit_filter", {}))
-			.appendTo(this.flist.wrapper.find('.filter_area'));
-	},
-	make_select: function() {
-		var me = this;
-		this.fieldselect = new frappe.ui.FieldSelect({
-			parent: this.wrapper.find('.fieldname_select_area'),
-			doctype: this.doctype,
-			filter_fields: this.filter_fields,
-			select: function(doctype, fieldname) {
-				me.set_field(doctype, fieldname);
-			}
-		});
-		if(this.fieldname) {
-			this.fieldselect.set_value(this._doctype || this.doctype, this.fieldname);
-		}
-	},
-	set_events: function() {
-		var me = this;
-
-		this.wrapper.find("a.remove-filter").on("click", function() {
-			me.remove();
-		});
-
-		this.wrapper.find(".set-filter-and-run").on("click", function() {
-			me.wrapper.removeClass("is-new-filter");
-			me.flist.base_list.run();
-			me.apply();
-		});
-
-		// add help for "in" codition
-		me.wrapper.find('.condition').change(function() {
-			if(!me.field) return;
-			var condition = $(this).val();
-			if(in_list(["in", "like", "not in", "not like"], condition)) {
-				me.set_field(me.field.df.parent, me.field.df.fieldname, 'Data', condition);
-				if(!me.field.desc_area) {
-					me.field.desc_area = $('<div class="text-muted small">').appendTo(me.field.wrapper);
-				}
-				// set description
-				me.field.desc_area.html((in_list(["in", "not in"], condition)==="in"
-					? __("values separated by commas")
-					: __("use % as wildcard"))+'</div>');
-			} else {
-				//if condition selected after refresh
-				me.set_field(me.field.df.parent, me.field.df.fieldname, null, condition);
-			}
-		});
-
-		// set the field
-		if(me.fieldname) {
-			// pre-sets given (could be via tags!)
-			return this.set_values(me._doctype, me.fieldname, me.condition, me.value);
-		} else {
-			me.set_field(me.doctype, 'name');
-		}
-	},
-
-	apply: function() {
-		var f = this.get_value();
-
-		this.flist.remove(this);
-		this.flist.push_new_filter(f[0], f[1], f[2], f[3]);
-		this.remove();
-	},
-
-	remove: function(dont_run) {
-		this.wrapper.remove();
-		this.$btn_group && this.$btn_group.remove();
-		this.field = null;
-		this.flist.update_filters();
-
-		if(!dont_run) {
-			this.flist.base_list.refresh(true);
-		}
-	},
-
-	set_values: function(doctype, fieldname, condition, value) {
-		// presents given (could be via tags!)
-		this.set_field(doctype, fieldname);
-
-		// change 0,1 to Yes, No for check field type
-		if(this.field.df.original_type==='Check') {
-			if(value==0) value = 'No';
-			else if(value==1) value = 'Yes';
-		}
-
-		if(condition) {
-			this.wrapper.find('.condition').val(condition).change();
-		}
-		if(value!=null) {
-			return this.field.set_value(value);
-		}
-	},
-
-	set_field: function(doctype, fieldname, fieldtype, condition) {
-		var me = this;
-
-		// set in fieldname (again)
-		var cur = me.field ? {
-			fieldname: me.field.df.fieldname,
-			fieldtype: me.field.df.fieldtype,
-			parent: me.field.df.parent,
-		} : {};
-
-		var original_docfield = me.fieldselect.fields_by_name[doctype][fieldname];
-		if(!original_docfield) {
-			frappe.msgprint(__("Field {0} is not selectable.", [fieldname]));
-			return;
-		}
-
-		var df = copy_dict(me.fieldselect.fields_by_name[doctype][fieldname]);
-
-		// filter field shouldn't be read only or hidden
-		df.read_only = 0;
-		df.hidden = 0;
-
-		if(!condition) this.set_default_condition(df, fieldtype);
-		this.set_fieldtype(df, fieldtype);
-
-		// called when condition is changed,
-		// don't change if all is well
-		if(me.field && cur.fieldname == fieldname && df.fieldtype == cur.fieldtype &&
-			df.parent == cur.parent) {
-			return;
-		}
-
-		// clear field area and make field
-		me.fieldselect.selected_doctype = doctype;
-		me.fieldselect.selected_fieldname = fieldname;
-
-		// save old text
-		var old_text = null;
-		if(me.field) {
-			old_text = me.field.get_value();
-		}
-
-		var field_area = me.wrapper.find('.filter_field').empty().get(0);
-		var f = frappe.ui.form.make_control({
-			df: df,
-			parent: field_area,
-			only_input: true,
-		})
-		f.refresh();
-
-		me.field = f;
-		if(old_text && me.field.df.fieldtype===cur.fieldtype) {
-			me.field.set_value(old_text);
-		}
-
-		// run on enter
-		$(me.field.wrapper).find(':input').keydown(function(ev) {
-			if(ev.which==13) {
-				me.flist.base_list.run();
-			}
-		})
-	},
-
-	set_fieldtype: function(df, fieldtype) {
-		// reset
-		if(df.original_type)
-			df.fieldtype = df.original_type;
-		else
-			df.original_type = df.fieldtype;
-
-		df.description = ''; df.reqd = 0;
-		df.ignore_link_validation = true;
-
-		// given
-		if(fieldtype) {
-			df.fieldtype = fieldtype;
-			return;
-		}
-
-		// scrub
-		if(df.fieldname=="docstatus") {
-			df.fieldtype="Select",
-			df.options=[
-				{value:0, label:__("Draft")},
-				{value:1, label:__("Submitted")},
-				{value:2, label:__("Cancelled")}
-			]
-		} else if(df.fieldtype=='Check') {
-			df.fieldtype='Select';
-			df.options='No\nYes';
-		} else if(['Text','Small Text','Text Editor','Code','Tag','Comments',
-			'Dynamic Link','Read Only','Assign'].indexOf(df.fieldtype)!=-1) {
-			df.fieldtype = 'Data';
-		} else if(df.fieldtype=='Link' && ['=', '!='].indexOf(this.wrapper.find('.condition').val())==-1) {
-			df.fieldtype = 'Data';
-		}
-		if(df.fieldtype==="Data" && (df.options || "").toLowerCase()==="email") {
-			df.options = null;
-		}
-		if(this.wrapper.find('.condition').val()== "Between" && (df.fieldtype == 'Date' || df.fieldtype == 'Datetime')){
-			df.fieldtype = 'DateRange';
-		}
-	},
-
-	set_default_condition: function(df, fieldtype) {
-		if(!fieldtype) {
-			// set as "like" for data fields
-			if (df.fieldtype == 'Data') {
-				this.wrapper.find('.condition').val('like');
-			} else if (df.fieldtype == 'Date' || df.fieldtype == 'Datetime'){
-				this.wrapper.find('.condition').val('Between');
-			}else{
-				this.wrapper.find('.condition').val('=');
-			}
-		}
-	},
-
-	get_value: function() {
-		return [this.fieldselect.selected_doctype,
-			this.field.df.fieldname, this.get_condition(), this.get_selected_value()];
-	},
-
-	get_selected_value: function() {
-		var val = this.field.get_value();
-
-		if(typeof val==='string') {
-			val = strip(val);
-		}
-
-		if(this.field.df.original_type == 'Check') {
-			val = (val=='Yes' ? 1 :0);
-		}
-
-		if(this.get_condition().indexOf('like', 'not like')!==-1) {
-			// automatically append wildcards
-			if(val) {
-				if(val.slice(0,1) !== "%") {
-					val = "%" + val;
-				}
-				if(val.slice(-1) !== "%") {
-					val = val + "%";
-				}
-			}
-		} else if(in_list(["in", "not in"], this.get_condition())) {
-			if(val) {
-				val = $.map(val.split(","), function(v) { return strip(v); });
-			}
-		} if(val === '%') {
-			val = "";
-		}
-
-		return val;
-	},
-
-	get_condition: function() {
-		return this.wrapper.find('.condition').val();
-	},
-
-	freeze: function() {
-		if(this.$btn_group) {
-			// already made, just hide the condition setter
-			this.set_filter_button_text();
-			this.wrapper.toggle(false);
-			return;
-		}
-
-		var me = this;
-
-		// add a button for new filter if missing
-		this.$btn_group = $(`<div class="btn-group">
-			<button class="btn btn-default btn-xs toggle-filter"
-				title="${ __("Edit Filter") }">
-			</button>
-			<button class="btn btn-default btn-xs remove-filter"
-				title="${ __("Remove Filter") }">
-				<i class="fa fa-remove text-muted"></i>
-			</button></div>`)
-			.insertAfter(this.flist.wrapper.find(".set-filters .new-filter"));
-
-		this.set_filter_button_text();
-
-		this.$btn_group.find(".remove-filter").on("click", function() {
-			me.remove();
-		});
-
-		this.$btn_group.find(".toggle-filter").on("click", function() {
-			$(this).closest('.show_filters').find('.filter_area').show();
-			me.wrapper.toggle();
-		})
-		this.wrapper.toggle(false);
-	},
-
-	set_filter_button_text: function() {
-		var value = this.get_selected_value();
-		value = this.flist.get_formatted_value(this.field, value);
-
-		// for translations
-		// __("like"), __("not like"), __("in")
-
-		this.$btn_group.find(".toggle-filter")
-			.html(repl('%(label)s %(condition)s "%(value)s"', {
-				label: __(this.field.df.label),
-				condition: __(this.get_condition()),
-				value: __(value),
-			}));
-	}
-
-});
-
-// <select> widget with all fields of a doctype as options
-frappe.ui.FieldSelect = Class.extend({
-	// opts parent, doctype, filter_fields, with_blank, select
-	init: function(opts) {
-		var me = this;
-		$.extend(this, opts);
-		this.fields_by_name = {};
-		this.options = [];
-		this.$select = $('<input class="form-control">')
-			.appendTo(this.parent)
-			.on("click", function () { $(this).select(); });
-		this.select_input = this.$select.get(0);
-		this.awesomplete = new Awesomplete(this.select_input, {
-			minChars: 0,
-			maxItems: 99,
-			autoFirst: true,
-			list: me.options,
-			item: function(item, input) {
-				return $(repl('<li class="filter-field-select"><p>%(label)s</p></li>', item))
-				.data("item.autocomplete", item)
-				.get(0);
-			}
-		});
-		this.$select.on("awesomplete-select", function(e) {
-			var o = e.originalEvent;
-			var value = o.text.value;
-			var item = me.awesomplete.get_item(value);
-			me.selected_doctype = item.doctype;
-			me.selected_fieldname = item.fieldname;
-			if(me.select) me.select(item.doctype, item.fieldname);
-		});
-		this.$select.on("awesomplete-selectcomplete", function(e) {
-			var o = e.originalEvent;
-			var value = o.text.value;
-			var item = me.awesomplete.get_item(value);
-			me.$select.val(item.label);
-		});
-
-		if(this.filter_fields) {
-			for(var i in this.filter_fields)
-				this.add_field_option(this.filter_fields[i])
-		} else {
-			this.build_options();
-		}
-		this.set_value(this.doctype, "name");
-		window.last_filter = this;
-	},
-	get_value: function() {
-		return this.selected_doctype ? this.selected_doctype + "." + this.selected_fieldname : null;
-	},
-	val: function(value) {
-		if(value===undefined) {
-			return this.get_value();
-		} else {
-			this.set_value(value);
-		}
-	},
-	clear: function() {
-		this.selected_doctype = null;
-		this.selected_fieldname = null;
-		this.$select.val("");
-	},
-	set_value: function(doctype, fieldname) {
-		var me = this;
-		this.clear();
-		if(!doctype) return;
-
-		// old style
-		if(doctype.indexOf(".")!==-1) {
-			var parts = doctype.split(".");
-			doctype = parts[0];
-			fieldname = parts[1];
-		}
-
-		$.each(this.options, function(i, v) {
-			if(v.doctype===doctype && v.fieldname===fieldname) {
-				me.selected_doctype = doctype;
-				me.selected_fieldname = fieldname;
-				me.$select.val(v.label);
-				return false;
-			}
-		});
-	},
-	build_options: function() {
-		var me = this;
-		me.table_fields = [];
-		var std_filters = $.map(frappe.model.std_fields, function(d) {
-			var opts = {parent: me.doctype}
-			if(d.fieldname=="name") opts.options = me.doctype;
-			return $.extend(copy_dict(d), opts);
-		});
-
-		// add parenttype column
-		var doctype_obj = locals['DocType'][me.doctype];
-		if(doctype_obj && cint(doctype_obj.istable)) {
-			std_filters = std_filters.concat([{
-				fieldname: 'parent',
-				fieldtype: 'Data',
-				label: 'Parent',
-				parent: me.doctype,
-			}]);
-		}
-
-		// blank
-		if(this.with_blank) {
-			this.options.push({
-				label:"",
-				value:"",
-			})
-		}
-
-		// main table
-		var main_table_fields = std_filters.concat(frappe.meta.docfield_list[me.doctype]);
-		$.each(frappe.utils.sort(main_table_fields, "label", "string"), function(i, df) {
-			// show fields where user has read access and if report hide flag is not set
-			if(frappe.perm.has_perm(me.doctype, df.permlevel, "read") && !df.report_hide)
-				me.add_field_option(df);
-		});
-
-		// child tables
-		$.each(me.table_fields, function(i, table_df) {
-			if(table_df.options) {
-				var child_table_fields = [].concat(frappe.meta.docfield_list[table_df.options]);
-				$.each(frappe.utils.sort(child_table_fields, "label", "string"), function(i, df) {
-					// show fields where user has read access and if report hide flag is not set
-					if(frappe.perm.has_perm(me.doctype, df.permlevel, "read") && !df.report_hide)
-						me.add_field_option(df);
-				});
-			}
-		});
-	},
-
-	add_field_option: function(df) {
-		var me = this;
-		if(me.doctype && df.parent==me.doctype) {
-			var label = __(df.label);
-			var table = me.doctype;
-			if(frappe.model.table_fields.includes(df.fieldtype)) me.table_fields.push(df);
-		} else {
-			var label = __(df.label) + ' (' + __(df.parent) + ')';
-			var table = df.parent;
-		}
-		if(frappe.model.no_value_type.indexOf(df.fieldtype) == -1 &&
-			!(me.fields_by_name[df.parent] && me.fields_by_name[df.parent][df.fieldname])) {
-			this.options.push({
-				label: label,
-				value: table + "." + df.fieldname,
-				fieldname: df.fieldname,
-				doctype: df.parent
-			});
-			if(!me.fields_by_name[df.parent]) me.fields_by_name[df.parent] = {};
-			me.fields_by_name[df.parent][df.fieldname] = df;
-		}
-	},
-})

From 64a03125460fec1ac6e6c7352a3f5e68c8f7ee08 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 22 Jul 2020 15:51:07 +0530
Subject: [PATCH 285/345] feat: always render footer links layout

---
 frappe/templates/includes/footer/footer_links.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frappe/templates/includes/footer/footer_links.html b/frappe/templates/includes/footer/footer_links.html
index fe9f69fed3..e8bfdadb7f 100644
--- a/frappe/templates/includes/footer/footer_links.html
+++ b/frappe/templates/includes/footer/footer_links.html
@@ -7,8 +7,6 @@
 	{%- endif -%}
 </a>
 {% endmacro %}
-
-{% if footer_items -%}
 <div class="footer-links">
 	<div class="row">
 		<div class="footer-col-left col-sm-6">
@@ -24,4 +22,3 @@
 		</div>
 	</div>
 </div>
-{% endif %}

From 0ba3fb5a92d3bfca9b781f5cebb984bf08328392 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 22 Jul 2020 15:53:10 +0530
Subject: [PATCH 286/345] fix: proper sequence of backups

---
 frappe/utils/backups.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index 707a9ac511..56f3b9cafb 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -224,8 +224,8 @@ def fetch_latest_backups(with_files=True, recent=3):
 	odb.get_backup(older_than=recent, ignore_files=not with_files)
 
 	return {
-		"database": odb.backup_path_files,
-		"public": odb.backup_path_db,
+		"database": odb.backup_path_db,
+		"public": odb.backup_path_files,
 		"private": odb.backup_path_private_files,
 		"config": odb.site_config_backup_path
 	}

From c64df2787f8328e6d7e46c4cb722ec27820eb722 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 16:51:17 +0530
Subject: [PATCH 287/345] fix: use get_filter_value in filter_list

---
 frappe/public/js/frappe/ui/filters/filter.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index 7c6d532f5c..bfc0b1449d 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -249,7 +249,7 @@ frappe.ui.Filter = class {
 			let args = {};
 			if (this.filters_config[condition].depends_on) {
 				const field_name = this.filters_config[condition].depends_on;
-				const filter_value = this.get_filter_value(field_name);
+				const filter_value = this.filter_list.get_filter_value(fieldname);
 				args[field_name] = filter_value;
 			}
 			frappe
@@ -265,10 +265,6 @@ frappe.ui.Filter = class {
 		}
 	}
 
-	get_filter_value(fieldname) {
-		return this.filter_list.get_filter_value(fieldname);
-	}
-
 	make_field(df, old_fieldtype) {
 		let old_text = this.field ? this.field.get_value() : null;
 		this.hide_invalid_conditions(df.fieldtype, df.original_type);

From b541ffac68d0ff140c937d40a2a2648ff754b0c2 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Wed, 22 Jul 2020 19:30:11 +0530
Subject: [PATCH 288/345] Revert "fix: set page actions after setting read
 only"

---
 frappe/public/js/frappe/form/form.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 43128065bc..c0b76ee94d 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1409,7 +1409,6 @@ frappe.ui.form.Form = class FrappeForm {
 			};
 		}
 		this.perm = perm;
-		this.toolbar.set_page_action();
 	}
 
 	trigger(event, doctype, docname) {

From 51a473336a56fa559ba2b3b7438495b3dcc6604c Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Wed, 22 Jul 2020 21:55:56 +0530
Subject: [PATCH 289/345] fix: Margin top for child table index checkboxes

---
 frappe/public/less/desk.less      | 4 ----
 frappe/public/less/form_grid.less | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index d951178be0..36ceed9bfa 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -789,10 +789,6 @@ li.user-progress {
 	position: relative;
 }
 
-.row-index input[type=checkbox] {
-	margin-top: 12px;
-}
-
 @checkbox-height: 14px;
 
 // custom font awesome checkbox
diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less
index 5cb04a252c..d9e7d8bceb 100644
--- a/frappe/public/less/form_grid.less
+++ b/frappe/public/less/form_grid.less
@@ -98,6 +98,10 @@
 	text-align: right;
 }
 
+.grid-row .grid-row-check {
+	margin-top: 12px;
+}
+
 .grid-row > .row {
 	.col:last-child {
 		margin-right: -10px;

From 6187de8e3da34cc4f0f74198f1148170c3d9d83d Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 23 Jul 2020 11:12:13 +0530
Subject: [PATCH 290/345] fix: make is_standard read only if not in developer
 mode

---
 frappe/desk/doctype/dashboard/dashboard.json             | 6 +++---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 6 +++---
 frappe/desk/doctype/number_card/number_card.json         | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index 0c54f1ee7f..95b0846452 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -52,10 +52,10 @@
   },
   {
    "default": "0",
-   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard"
+   "label": "Is Standard",
+   "read_only_depends_on": "eval: !frappe.boot.developer_mode"
   },
   {
    "depends_on": "eval: doc.is_standard",
@@ -67,7 +67,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-22 11:23:37.858568",
+ "modified": "2020-07-23 11:05:41.890459",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index f0616dddd0..d4bba53068 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -238,10 +238,10 @@
   },
   {
    "default": "0",
-   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard"
+   "label": "Is Standard",
+   "read_only_depends_on": "eval: !frappe.boot.developer_mode"
   },
   {
    "depends_on": "eval: doc.is_standard",
@@ -271,7 +271,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-22 11:32:51.185499",
+ "modified": "2020-07-23 11:10:33.509497",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index 0d1cc279c8..d3e9598eb7 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -113,10 +113,10 @@
   },
   {
    "default": "0",
-   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard"
+   "label": "Is Standard",
+   "read_only_depends_on": "eval: !frappe.boot.developer_mode"
   },
   {
    "depends_on": "eval: doc.is_standard",
@@ -191,7 +191,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-22 11:26:32.039023",
+ "modified": "2020-07-23 11:11:03.391719",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",

From 33e0b785764f873c75b20e43a1e940c6bc25e715 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 23 Jul 2020 15:06:46 +0530
Subject: [PATCH 291/345] fix: validate recipients before sending newsletter

---
 frappe/email/doctype/newsletter/newsletter.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py
index a82b52a663..48688afdb6 100755
--- a/frappe/email/doctype/newsletter/newsletter.py
+++ b/frappe/email/doctype/newsletter/newsletter.py
@@ -107,6 +107,9 @@ class Newsletter(WebsiteGenerator):
 		if self.get("__islocal"):
 			throw(_("Please save the Newsletter before sending"))
 
+		if not self.recipients:
+			frappe.throw(_("Newsletter should have at least one recipient"))
+
 	def get_context(self, context):
 		newsletters = get_newsletter_list("Newsletter", None, None, 0)
 		if newsletters:

From 24adc8c3625f146ecae895ac57bdd8ff081d92b8 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 23 Jul 2020 17:34:18 +0530
Subject: [PATCH 292/345] fix: Use find instead of filter

---
 frappe/public/js/frappe/ui/filters/filter_list.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index 9a35a9bb5f..ee04fb6077 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -112,7 +112,8 @@ frappe.ui.FilterGroup = class {
 	}
 
 	get_filter_value(fieldname) {
-		return this.filters.filter(f => f.fieldname == fieldname)[0].value;
+		let filter_obj = this.filters.find(f => f.fieldname == filename) || {};
+		return filter_obj.value;
 	}
 
 	filter_exists(filter_value) {

From 5f5facfb0a0c6d7725c309708eadb90af50c7278 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 23 Jul 2020 17:40:51 +0530
Subject: [PATCH 293/345] fix: set frm.filters to empty array for number card

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 2 +-
 frappe/desk/doctype/number_card/number_card.js         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 65db4839a1..8d89cc2f31 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -291,7 +291,7 @@ frappe.ui.form.on('Dashboard Chart', {
 			set_filters && frm.set_value('filters_json', JSON.stringify(filters));
 		}
 
-		let fields;
+		let fields = [];
 		if (is_document_type) {
 			fields = [
 				{
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 2ae163d7aa..63b41b956e 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -116,6 +116,7 @@ frappe.ui.form.on('Number Card', {
 	},
 
 	report_name: function(frm) {
+		frm.filters = [];
 		frm.set_value('filters_json', '{}');
 		frm.set_value('dynamic_filters_json', '{}');
 		frm.set_df_property('report_field', 'options', []);
@@ -247,7 +248,7 @@ frappe.ui.form.on('Number Card', {
 			set_filters && frm.set_value('filters_json', JSON.stringify(filters));
 		}
 
-		let fields;
+		let fields = [];
 		if (is_document_type) {
 			fields = [
 				{

From 771feca0730a563cd3278fc4de11b10060389b27 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 23 Jul 2020 17:41:55 +0530
Subject: [PATCH 294/345] feat: remove restricted button in dashboard

---
 frappe/core/page/dashboard/dashboard.js                   | 7 -------
 frappe/public/js/frappe/views/dashboard/dashboard_view.js | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index cee230265f..7e45163a7e 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -26,13 +26,6 @@ class Dashboard {
 		</div>`).appendTo(this.wrapper.find(".page-content").empty());
 		this.container = this.wrapper.find(".dashboard-graph");
 		this.page = wrapper.page;
-
-		this.page.set_title_sub(
-			$(`<button class="restricted-button">
-				<span class="octicon octicon-lock"></span>
-				<span>${__('Restricted')}</span>
-			</button>`)
-		);
 	}
 
 	show() {
diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js
index 83f45da5be..6f6279fd08 100644
--- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js
+++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js
@@ -44,10 +44,6 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView {
 				<div class="text-muted">
 					<span class="uppercase header-title"> ${dashboard_name} </span>
 				</div>
-				<button class="restricted-button">
-					<span class="octicon octicon-lock"></span>
-					<span>${__('Restricted')}</span>
-				</button>
 				<div class="text-muted customize-dashboard" data-action="customize">${__('Customize')}</div>
 				<div class="small text-muted customize-options small-bounce">
 					<span class="reset-customization customize-option" data-action="reset_dashboard_customization">${__('Reset')}</span>

From b95d28d5f126785e2198eae1b5eba556599dd814 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 23 Jul 2020 17:43:01 +0530
Subject: [PATCH 295/345] fix: remove unused style

---
 frappe/core/page/dashboard/dashboard.css | 5 -----
 frappe/public/less/dashboard_view.less   | 7 -------
 2 files changed, 12 deletions(-)
 delete mode 100644 frappe/core/page/dashboard/dashboard.css

diff --git a/frappe/core/page/dashboard/dashboard.css b/frappe/core/page/dashboard/dashboard.css
deleted file mode 100644
index b319cc1ed2..0000000000
--- a/frappe/core/page/dashboard/dashboard.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.restricted-button {
-	cursor: default;
-	position: relative;
-	right: -5px;
-}
\ No newline at end of file
diff --git a/frappe/public/less/dashboard_view.less b/frappe/public/less/dashboard_view.less
index ab78fa5b2a..17fa52cc0f 100644
--- a/frappe/public/less/dashboard_view.less
+++ b/frappe/public/less/dashboard_view.less
@@ -33,13 +33,6 @@
 				line-height: 1.5em;
 				vertical-align: text-bottom;
 			}
-
-			.restricted-button {
-				cursor: default;
-				position: relative;
-				right: 5px;
-				top: -3px;
-			}
 		}
 
 		.customize-dashboard {

From 160a84cee4177cf4fa828fd098ebdae89d307040 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Thu, 23 Jul 2020 17:55:23 +0530
Subject: [PATCH 296/345] fix: use correct variable

---
 frappe/public/js/frappe/ui/filters/filter_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index ee04fb6077..6c577aa0bc 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -112,7 +112,7 @@ frappe.ui.FilterGroup = class {
 	}
 
 	get_filter_value(fieldname) {
-		let filter_obj = this.filters.find(f => f.fieldname == filename) || {};
+		let filter_obj = this.filters.find(f => f.fieldname == fieldname) || {};
 		return filter_obj.value;
 	}
 

From 047280013dcc6b8c55fdf5ad4bf44270fc81b3bc Mon Sep 17 00:00:00 2001
From: gavin <gavin18d@gmail.com>
Date: Thu, 23 Jul 2020 18:42:44 +0530
Subject: [PATCH 297/345] fix: Fetch latest files filtered by names (#11056)

---
 frappe/utils/backups.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index bb03c85bf9..9f9a64f296 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -104,11 +104,11 @@ class BackupGenerator:
 			this_file = cstr(this_file)
 			this_file_path = os.path.join(get_backup_path(), this_file)
 			if not is_file_old(this_file_path, older_than):
-				if "_private_files" in this_file_path:
+				if "-private-files" in this_file_path:
 					backup_path_private_files = this_file_path
-				elif "_files" in this_file_path:
+				elif "-files" in this_file_path:
 					backup_path_files = this_file_path
-				elif "_database" in this_file_path:
+				elif "-database" in this_file_path:
 					backup_path_db = this_file_path
 				elif "site_config" in this_file_path:
 					site_config_backup_path = this_file_path

From 441630acc48bc58b71bd0fe100b73559e5180150 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 23 Jul 2020 23:43:35 +0530
Subject: [PATCH 298/345] fix: check file backup config before backing up files

---
 .../doctype/google_drive/google_drive.py        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/frappe/integrations/doctype/google_drive/google_drive.py b/frappe/integrations/doctype/google_drive/google_drive.py
index c110694dff..58f28f882a 100644
--- a/frappe/integrations/doctype/google_drive/google_drive.py
+++ b/frappe/integrations/doctype/google_drive/google_drive.py
@@ -189,14 +189,17 @@ def upload_system_backup_to_google_drive():
 	if frappe.flags.create_new_backup:
 		set_progress(1, "Backing up Data.")
 		backup = new_backup()
-		fileurl_backup = backup.backup_path_db
-		fileurl_site_config = backup.site_config_backup_path
-		fileurl_public_files = backup.backup_path_files
-		fileurl_private_files = backup.backup_path_private_files
-	else:
-		fileurl_backup, fileurl_site_config, fileurl_public_files, fileurl_private_files = get_latest_backup_file(with_files=True)
+		file_urls = []
+		file_urls.append(backup.backup_path_db)
+		file_urls.append(backup.site_config_backup_path)
 
-	for fileurl in [fileurl_backup, fileurl_site_config, fileurl_public_files, fileurl_private_files]:
+		if account.file_backup:
+			file_urls.append(backup.backup_path_files)
+			file_urls.append(backup.backup_path_private_files)
+	else:
+		file_urls = get_latest_backup_file(with_files=account.file_backup)
+
+	for fileurl in file_urls:
 		if not fileurl:
 			continue
 

From 47b0fb3de4882787a910938feff605f880cc44b3 Mon Sep 17 00:00:00 2001
From: Anupam K <anupamvns0099@gmail.com>
Date: Fri, 24 Jul 2020 03:31:58 +0530
Subject: [PATCH 299/345] fix: print format custom button

---
 .../doctype/print_format/print_format.js      | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/frappe/printing/doctype/print_format/print_format.js b/frappe/printing/doctype/print_format/print_format.js
index 252c706e51..bb0ba27e38 100644
--- a/frappe/printing/doctype/print_format/print_format.js
+++ b/frappe/printing/doctype/print_format/print_format.js
@@ -35,13 +35,20 @@ frappe.ui.form.on("Print Format", {
 			else if (frm.doc.custom_format && !frm.doc.raw_printing) {
 				frm.set_df_property("html", "reqd", 1);
 			}
-			frm.add_custom_button(__("Make Default"), function () {
-				frappe.call({
-					method: "frappe.printing.doctype.print_format.print_format.make_default",
-					args: {
-						name: frm.doc.name
-					}
-				})
+			frappe.db.get_value('DocType', frm.doc.doc_type, ['default_print_format', 'custom'], (r) => {
+				if (r.default_print_format != frm.doc.name && r.custom) {
+					frm.add_custom_button(__("Set as Default"), function () {
+						frappe.call({
+							method: "frappe.printing.doctype.print_format.print_format.make_default",
+							args: {
+								name: frm.doc.name
+							},
+							callback: function() {
+								frm.refresh();
+							}
+						});
+					});
+				}
 			});
 		}
 	},

From 35f3b5b4051b9d0054c540e93e04606937048977 Mon Sep 17 00:00:00 2001
From: Wolfram Schmidt <wolfram.schmidt@tueit.de>
Date: Fri, 24 Jul 2020 14:11:24 +0200
Subject: [PATCH 300/345] fix: Allowing to rename DocType Tag (#11100)

---
 frappe/desk/doctype/tag/tag.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/tag/tag.json b/frappe/desk/doctype/tag/tag.json
index 895516594e..ad9838d10f 100644
--- a/frappe/desk/doctype/tag/tag.json
+++ b/frappe/desk/doctype/tag/tag.json
@@ -1,4 +1,5 @@
 {
+ "allow_rename": 1,
  "autoname": "Prompt",
  "creation": "2016-05-25 09:43:44.767581",
  "doctype": "DocType",
@@ -46,4 +47,4 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC"
-}
\ No newline at end of file
+}

From bc56a596715c47ed73cb2ad76db8e090ac8536fd Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 24 Jul 2020 20:19:35 +0530
Subject: [PATCH 301/345] fix(paytm-integration): simplify code and remove
 additional loop

---
 .../doctype/paytm_settings/paytm_settings.py  | 20 +++++++------------
 .../pages/integrations/paytm_checkout.py      |  2 --
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index bfa9b6b3eb..a166d245f5 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -25,7 +25,7 @@ class PaytmSettings(Document):
 
 	def validate_transaction_currency(self, currency):
 		if currency not in self.supported_currencies:
-			frappe.throw(_("Please select another payment method. Stripe does not support transactions in currency '{0}'").format(currency))
+			frappe.throw(_("Please select another payment method. Paytm does not support transactions in currency '{0}'").format(currency))
 
 	def get_payment_url(self, **kwargs):
 		'''Return payment url with several params'''
@@ -87,29 +87,23 @@ def get_paytm_params(payment_details, order_id, paytm_config):
 def verify_transaction(**kwargs):
 	'''Verify checksum for received data in the callback and then verify the transaction'''
 	paytm_config = get_paytm_config()
-	received_data = frappe._dict(kwargs)
+	paytm_params = frappe._dict(kwargs)
 	is_valid_checksum = False
 
-	paytm_params = {}
-	for key, value in received_data.items(): 
-		if key == 'CHECKSUMHASH':
-			paytm_checksum = value
-		elif key == 'cmd':
-			continue
-		else:
-			paytm_params[key] = value
+	paytm_params.pop('cmd', None)
+	paytm_checksum = paytm_params.pop('CHECKSUMHASH', None)
 
 	if paytm_params and paytm_config and paytm_checksum:
 		# Verify checksum
 		is_valid_checksum = verifySignature(paytm_params, paytm_config.merchant_key, paytm_checksum)
 
-	if is_valid_checksum and received_data['RESPCODE'] == '01':
-		verify_transaction_status(paytm_config, received_data['ORDERID'])
+	if is_valid_checksum and paytm_params.get('RESPCODE') == '01':
+		verify_transaction_status(paytm_config, paytm_params['ORDERID'])
 	else:
 		frappe.respond_as_web_page("Payment Failed",
 			"Transaction failed to complete. In case of any deductions, deducted amount will get refunded to your account.",
 			http_status_code=401, indicator_color='red')
-		frappe.log_error("Order unsuccessful. Failed Response:"+cstr(received_data), 'Paytm Payment Failed')
+		frappe.log_error("Order unsuccessful. Failed Response:"+cstr(paytm_params), 'Paytm Payment Failed')
 
 def verify_transaction_status(paytm_config, order_id):
 	'''Verify transaction completion after checksum has been verified'''
diff --git a/frappe/templates/pages/integrations/paytm_checkout.py b/frappe/templates/pages/integrations/paytm_checkout.py
index 3018a9d65b..bc385b5784 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.py
+++ b/frappe/templates/pages/integrations/paytm_checkout.py
@@ -6,8 +6,6 @@ from frappe import _
 import json
 from frappe.integrations.doctype.paytm_settings.paytm_settings import get_paytm_params, get_paytm_config
 
-no_cache = 1
-
 def get_context(context):
 	context.no_cache = 1
 	paytm_config = get_paytm_config()

From ab8a63d6fe0fe892ac578edb7b4deeae29fcc4cf Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 24 Jul 2020 22:59:16 +0530
Subject: [PATCH 302/345] fix: minor changes

---
 frappe/integrations/doctype/paytm_settings/paytm_settings.py | 3 +--
 frappe/www/message.html                                      | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index a166d245f5..616c3837d4 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -84,10 +84,9 @@ def get_paytm_params(payment_details, order_id, paytm_config):
 	return paytm_params
 
 @frappe.whitelist(allow_guest=True)
-def verify_transaction(**kwargs):
+def verify_transaction(**paytm_params):
 	'''Verify checksum for received data in the callback and then verify the transaction'''
 	paytm_config = get_paytm_config()
-	paytm_params = frappe._dict(kwargs)
 	is_valid_checksum = False
 
 	paytm_params.pop('cmd', None)
diff --git a/frappe/www/message.html b/frappe/www/message.html
index 87d311d9cc..2919592901 100644
--- a/frappe/www/message.html
+++ b/frappe/www/message.html
@@ -24,7 +24,7 @@ html, body {
 		<span class='indicator {{ indicator_color or "blue" }}'>
 			{{ title or _("Message") }}</span>
 	</h5>
-	<div class="page-card-body ellipsis">
+	<div class="page-card-body">
 	{% block message_body %}
 		<p>{{ message or "" }}</p>
 		{% if primary_action %}

From 8844c2b690d2e6a1011963b1a63fd24c40445b22 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 27 Jul 2020 15:37:01 +0530
Subject: [PATCH 303/345] fix: route to new doc 1 explicitly

---
 frappe/public/js/frappe/widgets/onboarding_widget.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index 9b4c9973e2..8c1d2cbb5b 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -136,7 +136,7 @@ export default class OnboardingWidget extends Widget {
 		if (step.is_single) {
 			route = `Form/${step.reference_document}`;
 		} else {
-			route = `Form/${step.reference_document}/${__('New')} ${__(step.reference_document)}`;
+			route = `Form/${step.reference_document}/${__('New')} ${__(step.reference_document)} 1`;
 		}
 
 		let current_route = frappe.get_route();
@@ -262,7 +262,7 @@ export default class OnboardingWidget extends Widget {
 			frappe.route_hooks.after_save = callback;
 		}
 
-		frappe.set_route(`Form/${step.reference_document}/${__('New')} ${__(step.reference_document)}`);
+		frappe.set_route(`Form/${step.reference_document}/${__('New')} ${__(step.reference_document)} 1`);
 	}
 
 	show_quick_entry(step) {

From 28605191b1f1359b4b71ae9fd9435d47d26e9ad1 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 27 Jul 2020 16:59:49 +0530
Subject: [PATCH 304/345] fix(Number Card): return value in promise

---
 frappe/public/js/frappe/widgets/number_card_widget.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js
index 220394919c..6b38412ebd 100644
--- a/frappe/public/js/frappe/widgets/number_card_widget.js
+++ b/frappe/public/js/frappe/widgets/number_card_widget.js
@@ -164,7 +164,7 @@ export default class NumberCardWidget extends Widget {
 
 	get_number() {
 		return frappe.xcall(this.settings.method, this.settings.args).then(res => {
-			this.settings.get_number(res);
+			return this.settings.get_number(res);
 		});
 	}
 

From ad1152f8e8367f8d7c46d0e4e9a14ee9e2d0df9b Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 27 Jul 2020 17:13:18 +0530
Subject: [PATCH 305/345] feat: override site name via _site

added filter parameter for logger
---
 frappe/__init__.py     |  4 ++--
 frappe/utils/logger.py | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 8c24980189..504ac96eb9 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1559,10 +1559,10 @@ def get_doctype_app(doctype):
 
 loggers = {}
 log_level = None
-def logger(module=None, with_more_info=False, _site=None):
+def logger(module=None, with_more_info=False, _site=None, filter=None):
 	'''Returns a python logger that uses StreamHandler'''
 	from frappe.utils.logger import get_logger
-	return get_logger(module=module, with_more_info=with_more_info, _site=_site)
+	return get_logger(module=module, with_more_info=with_more_info, _site=_site, filter=filter)
 
 def log_error(message=None, title=_("Error")):
 	'''Log error to Error Log'''
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 9254c0aedd..56fcf9857a 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -17,22 +17,20 @@ default_log_level = logging.DEBUG
 site = getattr(frappe.local, 'site', None)
 
 
-def get_logger(module, with_more_info=False, _site=None):
+def get_logger(module, with_more_info=False, _site=None, filter=None):
 	"""Application Logger for your given module
 
 	Args:
 		module (str): Name of your logger and consequently your log file.
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
-		_site (str, optional): If set, validates the current site context with the passed value. The `frappe.web` logger uses this to determine that the application is logging information related to the logger called. Defaults to None.
+		_site (str, optional): Overrides the global site variable set in this scope. Defaults to None.
+		filter (function, optional): Add a filter function for your logger
 
 	Returns:
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
 	"""
 	global site
 
-	def allow_site():
-		return (_site and _site == site) or bool(site)
-
 	if module in frappe.loggers:
 		return frappe.loggers[module]
 
@@ -42,6 +40,7 @@ def get_logger(module, with_more_info=False, _site=None):
 
 	logfile = module + '.log'
 	site = getattr(frappe.local, 'site', None)
+	equivalent_site = _site or site
 	LOG_FILENAME = os.path.join('..', 'logs', logfile)
 
 	logger = logging.getLogger(module)
@@ -52,8 +51,8 @@ def get_logger(module, with_more_info=False, _site=None):
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
 	logger.addHandler(handler)
 
-	if allow_site():
-		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
+	if equivalent_site:
+		SITELOG_FILENAME = os.path.join(equivalent_site, 'logs', logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)
 		logger.addHandler(site_handler)
@@ -61,6 +60,9 @@ def get_logger(module, with_more_info=False, _site=None):
 	if with_more_info:
 		handler.addFilter(SiteContextFilter())
 
+	if filter:
+		logger.addFilter(filter)
+
 	handler.setFormatter(formatter)
 
 	frappe.loggers[module] = logger

From 1345c2feb311bf7abb06b3f1969c4a2a43dc9b94 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 27 Jul 2020 17:31:12 +0530
Subject: [PATCH 306/345] feat: Allow_site flag in frappe.logger

---
 frappe/__init__.py     |  4 ++--
 frappe/app.py          |  2 +-
 frappe/utils/logger.py | 22 +++++++++++++---------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 504ac96eb9..7ea95ec3db 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1559,10 +1559,10 @@ def get_doctype_app(doctype):
 
 loggers = {}
 log_level = None
-def logger(module=None, with_more_info=False, _site=None, filter=None):
+def logger(module=None, with_more_info=False, allow_site=True, filter=None):
 	'''Returns a python logger that uses StreamHandler'''
 	from frappe.utils.logger import get_logger
-	return get_logger(module=module, with_more_info=with_more_info, _site=_site, filter=filter)
+	return get_logger(module=module, with_more_info=with_more_info, allow_site=allow_site, filter=filter)
 
 def log_error(message=None, title=_("Error")):
 	'''Log error to Error Log'''
diff --git a/frappe/app.py b/frappe/app.py
index 83a9b8c149..100b10e9ef 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -100,7 +100,7 @@ def application(request):
 		frappe.recorder.dump()
 
 		_site = get_site_name(request.host)
-		frappe.logger("frappe.web", _site=_site).info({
+		frappe.logger("frappe.web", allow_site=_site).info({
 			"site": _site,
 			"remote_addr": getattr(request, "remote_addr", "NOTFOUND"),
 			"base_url": getattr(request, "base_url", "NOTFOUND"),
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 56fcf9857a..e7058ce42d 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -14,22 +14,20 @@ import frappe
 
 
 default_log_level = logging.DEBUG
-site = getattr(frappe.local, 'site', None)
 
 
-def get_logger(module, with_more_info=False, _site=None, filter=None):
+def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	"""Application Logger for your given module
 
 	Args:
 		module (str): Name of your logger and consequently your log file.
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
-		_site (str, optional): Overrides the global site variable set in this scope. Defaults to None.
+		allow_site ((str, bool), optional): Pass site name to explicitly log under it's logs. If True and unspecified, guesses which site the logs would be saved under. Defaults to True.
 		filter (function, optional): Add a filter function for your logger
 
 	Returns:
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
 	"""
-	global site
 
 	if module in frappe.loggers:
 		return frappe.loggers[module]
@@ -39,8 +37,14 @@ def get_logger(module, with_more_info=False, _site=None, filter=None):
 		with_more_info = True
 
 	logfile = module + '.log'
-	site = getattr(frappe.local, 'site', None)
-	equivalent_site = _site or site
+
+	if allow_site == True:
+		site = getattr(frappe.local, 'site', None)
+	elif allow_site:
+		site = allow_site
+	else:
+		site = False
+
 	LOG_FILENAME = os.path.join('..', 'logs', logfile)
 
 	logger = logging.getLogger(module)
@@ -51,8 +55,8 @@ def get_logger(module, with_more_info=False, _site=None, filter=None):
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
 	logger.addHandler(handler)
 
-	if equivalent_site:
-		SITELOG_FILENAME = os.path.join(equivalent_site, 'logs', logfile)
+	if site:
+		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)
 		logger.addHandler(site_handler)
@@ -73,7 +77,7 @@ class SiteContextFilter(logging.Filter):
 	"""This is a filter which injects request information (if available) into the log."""
 	def filter(self, record):
 		if "Form Dict" not in text_type(record.msg):
-			record.msg = text_type(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(site, getattr(frappe.local, 'form_dict', None))
+			record.msg = text_type(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(getattr(frappe.local, 'site', None), getattr(frappe.local, 'form_dict', None))
 			return True
 
 def set_log_level(level):

From dc46450f89a2d95163eda8002f047ba3e6b04630 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 27 Jul 2020 18:14:02 +0530
Subject: [PATCH 307/345] fix: push fieldtype in invalid conditions map

---
 frappe/public/js/frappe/ui/filters/filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index bfc0b1449d..4dedfb32fe 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -57,7 +57,7 @@ frappe.ui.Filter = class {
 				this.conditions.push([key, __(`{0}`, [filter.label])]);
 				for (let fieldtype of Object.keys(this.invalid_condition_map)) {
 					if (!filter.valid_for_fieldtypes.includes(fieldtype)) {
-						this.invalid_condition_map[fieldtype].push(filter.label);
+						this.invalid_condition_map[fieldtype].push(key);
 					}
 				}
 			}

From 59ab9249cc3a9e7abeb5f6e599133f705ea6d8e6 Mon Sep 17 00:00:00 2001
From: Anupam K <anupamvns0099@gmail.com>
Date: Mon, 27 Jul 2020 19:40:11 +0530
Subject: [PATCH 308/345] fix: print format custom button

---
 frappe/printing/doctype/print_format/print_format.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/printing/doctype/print_format/print_format.js b/frappe/printing/doctype/print_format/print_format.js
index bb0ba27e38..e6599b2496 100644
--- a/frappe/printing/doctype/print_format/print_format.js
+++ b/frappe/printing/doctype/print_format/print_format.js
@@ -35,8 +35,8 @@ frappe.ui.form.on("Print Format", {
 			else if (frm.doc.custom_format && !frm.doc.raw_printing) {
 				frm.set_df_property("html", "reqd", 1);
 			}
-			frappe.db.get_value('DocType', frm.doc.doc_type, ['default_print_format', 'custom'], (r) => {
-				if (r.default_print_format != frm.doc.name && r.custom) {
+			frappe.db.get_value('DocType', frm.doc.doc_type, 'default_print_format', (r) => {
+				if (r.default_print_format != frm.doc.name) {
 					frm.add_custom_button(__("Set as Default"), function () {
 						frappe.call({
 							method: "frappe.printing.doctype.print_format.print_format.make_default",

From 786625a92a94536b749f0b02acc9fc4cf56516c7 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Mon, 27 Jul 2020 21:34:56 +0530
Subject: [PATCH 309/345] fix: regex for youtube video help link

---
 frappe/public/js/frappe/utils/help.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/utils/help.js b/frappe/public/js/frappe/utils/help.js
index 336d1ef526..f88849d212 100644
--- a/frappe/public/js/frappe/utils/help.js
+++ b/frappe/public/js/frappe/utils/help.js
@@ -17,7 +17,7 @@ frappe.help.show = function(doctype) {
 
 frappe.help.show_video = function(youtube_id, title) {
 	if (frappe.utils.is_url(youtube_id)) {
-		const expression = '(?:youtube.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu.be/)([^\"&?/s]{11})';
+		const expression = '(?:youtube.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu.be/)([^\"&?\\s]{11})';
 		youtube_id = youtube_id.match(expression)[1];
 	}
 

From c8817e52210f526c8b71a4989bc65ad05e2e4e79 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Mon, 27 Jul 2020 21:39:00 +0530
Subject: [PATCH 310/345] fix: check for empty report filters while creating
 report type dashboard chart

---
 frappe/public/js/frappe/widgets/chart_widget.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 4aa0b23a63..5d2c89b739 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -656,14 +656,15 @@ export default class ChartWidget extends Widget {
 	}
 
 	update_default_date_filters(report_filters, chart_filters) {
-		report_filters.map(f => {
-			if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
-				if (f.reqd || chart_filters[f.fieldname]) {
-					chart_filters[f.fieldname] = f.default;
+		if (report_filters) {
+			report_filters.map(f => {
+				if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
+					if (f.reqd || chart_filters[f.fieldname]) {
+						chart_filters[f.fieldname] = f.default;
+					}
 				}
-			}
-		});
-
+			});
+		}
 		return chart_filters;
 	}
 

From a11496f05ca1270abf51574489dd19f0b6ffbb6f Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Mon, 27 Jul 2020 23:35:19 +0530
Subject: [PATCH 311/345] fix: translation syntax

---
 frappe/public/js/frappe/widgets/chart_widget.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 5d2c89b739..ccec5b3ef4 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -615,9 +615,7 @@ export default class ChartWidget extends Widget {
 	}
 
 	update_last_synced() {
-		let last_synced_text = __("Last synced {0}", [
-			comment_when(this.chart_doc.last_synced_on)
-		]);
+		let last_synced_text = __("Last synced {0}", [comment_when(this.chart_doc.last_synced_on)]);
 		this.footer.html(last_synced_text);
 	}
 

From 7383a55c9adb9af62590ba18738609784b4ea8b3 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Tue, 28 Jul 2020 11:29:22 +0530
Subject: [PATCH 312/345] fix: remove useless escape character

---
 frappe/public/js/frappe/utils/help.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/utils/help.js b/frappe/public/js/frappe/utils/help.js
index f88849d212..ec6f7c8158 100644
--- a/frappe/public/js/frappe/utils/help.js
+++ b/frappe/public/js/frappe/utils/help.js
@@ -17,7 +17,7 @@ frappe.help.show = function(doctype) {
 
 frappe.help.show_video = function(youtube_id, title) {
 	if (frappe.utils.is_url(youtube_id)) {
-		const expression = '(?:youtube.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu.be/)([^\"&?\\s]{11})';
+		const expression = '(?:youtube.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu.be/)([^"&?\\s]{11})';
 		youtube_id = youtube_id.match(expression)[1];
 	}
 

From d9c8b6b66281946ee504c240c84a8819e60bc903 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 28 Jul 2020 13:09:24 +0530
Subject: [PATCH 313/345] fix: Don't render meta tags if no value

---
 frappe/templates/includes/meta_block.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/templates/includes/meta_block.html b/frappe/templates/includes/meta_block.html
index 3d867aaef3..1aef8a160e 100644
--- a/frappe/templates/includes/meta_block.html
+++ b/frappe/templates/includes/meta_block.html
@@ -1,5 +1,8 @@
 {%- if metatags -%}
 {%- for name in metatags %}
-<meta {% if name.startswith('og:') %}property="{{ name }}"{% else %}name="{{ name }}"{% endif %} content="{{ metatags[name] | striptags | escape }}">
+{%- set content = metatags.get(name, '') -%}
+{%- if content -%}
+<meta {% if name.startswith('og:') %}property="{{ name }}"{% else %}name="{{ name }}"{% endif %} content="{{ content | striptags | escape }}">
+{%- endif -%}
 {%- endfor -%}
 {%- endif -%}

From 8ce340046ee27fccb1232e80d1aa3d3d5f8d4128 Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahilkhan28297@gmail.com>
Date: Tue, 28 Jul 2020 19:33:44 +0530
Subject: [PATCH 314/345] fix: do not sanitize code field

Co-authored-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/model/base_document.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 7d56736cdc..09d303bec7 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -703,8 +703,8 @@ class BaseDocument(object):
 			sanitized_value = value
 
 			if df and (df.get("ignore_xss_filter")
-				or (df.get("fieldtype")=="Code" and df.get("options")!="Email")
-				or df.get("fieldtype") in ("Attach", "Attach Image", "Barcode")
+				or (df.get("fieldtype") in ("Data", "Small Text", "Text") and df.get("options")=="Email")
+				or df.get("fieldtype") in ("Attach", "Attach Image", "Barcode", "Code")
 
 				# cancelled and submit but not update after submit should be ignored
 				or self.docstatus==2

From ac2493b391a4213f3412390b88b157a2fcf2bbd7 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Wed, 29 Jul 2020 11:00:59 +0530
Subject: [PATCH 315/345] style: use 1tbs braces for if-else

---
 frappe/public/js/frappe/views/reports/query_report.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 609e1feb46..0701a34b76 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -869,8 +869,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 					if (column.colIndex === index && !value) {
 						value = "Total";
 						column.fieldtype = "Data"; // avoid type issues for value if Date column
-					}
-					else if (in_list(["Currency", "Float"], column.fieldtype)) {
+					} else if (in_list(["Currency", "Float"], column.fieldtype)) {
 						// proxy for currency and float
 						data = this.data[0];
 					}

From ae3ee5b2eb5c64fa00f4461ad1a11841ced65c54 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 29 Jul 2020 13:33:04 +0530
Subject: [PATCH 316/345] fix: save frappe loggers site wise

---
 frappe/utils/logger.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index e7058ce42d..c38e0e6997 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -29,8 +29,18 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
 	"""
 
+	if allow_site == True:
+		site = getattr(frappe.local, 'site', None)
+	elif allow_site:
+		site = allow_site
+	else:
+		site = False
+
 	if module in frappe.loggers:
-		return frappe.loggers[module]
+		try:
+			return frappe.loggers[module][site or "all"]
+		except:
+			pass
 
 	if not module:
 		module = "frappe"
@@ -38,12 +48,6 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	logfile = module + '.log'
 
-	if allow_site == True:
-		site = getattr(frappe.local, 'site', None)
-	elif allow_site:
-		site = allow_site
-	else:
-		site = False
 
 	LOG_FILENAME = os.path.join('..', 'logs', logfile)
 
@@ -69,7 +73,11 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	handler.setFormatter(formatter)
 
-	frappe.loggers[module] = logger
+	try:
+		frappe.loggers[module][site or "all"] = logger
+	except KeyError:
+		frappe.loggers[module] = {}
+		frappe.loggers[module][site or "all"] = logger
 
 	return logger
 

From 727a2b13bf3050c8dd4e2bed9bf6f1911864dcd5 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 29 Jul 2020 14:28:45 +0530
Subject: [PATCH 317/345] fix: fetch latest backups

updated behaviour of fetch latest backups. doesnt take new backups
and accepts no args
---
 frappe/utils/backups.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index 3b905de6bd..7eb00ceccd 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -208,26 +208,22 @@ def get_backup():
 
 
 @frappe.whitelist()
-def fetch_latest_backups(with_files=True, recent=3):
-	"""Takes backup on-demand if doesnt exist satisfying the `recent` parameter
+def fetch_latest_backups():
+	"""Fetches paths of the latest backup taken in the last 30 days
 	Only for: System Managers
 
-	Args:
-		with_files (bool, optional): If set, files will backuped up. Defaults to True.
-		recent (int, optional): Won't take a new backup if backup exists within this paramter. Defaults to 3 hours
-
 	Returns:
 		dict: relative Backup Paths
 	"""
 	frappe.only_for("System Manager")
 	odb = BackupGenerator(frappe.conf.db_name, frappe.conf.db_name, frappe.conf.db_password, db_host=frappe.db.host, db_type=frappe.conf.db_type, db_port=frappe.conf.db_port)
-	odb.get_backup(older_than=recent, ignore_files=not with_files)
+	database, public, private, config = odb.get_recent_backup(older_than=24 * 30)
 
 	return {
-		"database": odb.backup_path_db,
-		"public": odb.backup_path_files,
-		"private": odb.backup_path_private_files,
-		"config": odb.site_config_backup_path
+		"database": database,
+		"public": public,
+		"private": private,
+		"config": config
 	}
 
 

From d3e4a97b6fc96f2003c1fad3c14a99b105ade5ed Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 29 Jul 2020 17:17:53 +0530
Subject: [PATCH 318/345] test: Make email account is email account test
 (#11139)

---
 frappe/core/doctype/server_script/test_server_script.py  | 7 ++++---
 frappe/email/doctype/email_account/test_email_account.py | 5 ++++-
 frappe/model/workflow.py                                 | 2 +-
 frappe/tests/test_naming.py                              | 1 +
 frappe/workflow/doctype/workflow/test_workflow.py        | 3 ++-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/frappe/core/doctype/server_script/test_server_script.py b/frappe/core/doctype/server_script/test_server_script.py
index 3e6b7a3a98..5c12858e8a 100644
--- a/frappe/core/doctype/server_script/test_server_script.py
+++ b/frappe/core/doctype/server_script/test_server_script.py
@@ -52,9 +52,10 @@ class TestServerScript(unittest.TestCase):
 
 		frappe.db.commit()
 
-	# @classmethod
-	# def tearDownClass(cls):
-	# 	frappe.db.sql('truncate `tabServer Script`')
+	@classmethod
+	def tearDownClass(cls):
+		frappe.db.commit()
+		frappe.db.sql('truncate `tabServer Script`')
 
 	def setUp(self):
 		frappe.cache().delete_value('server_script_map')
diff --git a/frappe/email/doctype/email_account/test_email_account.py b/frappe/email/doctype/email_account/test_email_account.py
index 29b54d7f8b..f87ee32bb1 100644
--- a/frappe/email/doctype/email_account/test_email_account.py
+++ b/frappe/email/doctype/email_account/test_email_account.py
@@ -5,7 +5,10 @@ from __future__ import unicode_literals
 import frappe, os
 import unittest, email
 
-test_records = frappe.get_test_records('Email Account')
+from frappe.test_runner import make_test_records
+
+make_test_records("User")
+make_test_records("Email Account")
 
 from frappe.core.doctype.communication.email import make
 from frappe.desk.form.load import get_attachments
diff --git a/frappe/model/workflow.py b/frappe/model/workflow.py
index ea563dfc13..32919b3333 100644
--- a/frappe/model/workflow.py
+++ b/frappe/model/workflow.py
@@ -307,4 +307,4 @@ def set_workflow_state_on_action(doc, workflow_name, action):
 	for state in workflow.states:
 		if state.doc_status == docstatus:
 			doc.set(workflow_state_field, state.state)
-			return
\ No newline at end of file
+			return
diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py
index 90ab6a6a94..b47fb809ca 100644
--- a/frappe/tests/test_naming.py
+++ b/frappe/tests/test_naming.py
@@ -88,6 +88,7 @@ class TestNaming(unittest.TestCase):
 		series = 'TEST-'
 		key = 'TEST-'
 		name = 'TEST-00003'
+		frappe.db.sql("DELETE FROM `tabSeries` WHERE `name`=%s", series)
 		frappe.db.sql("""INSERT INTO `tabSeries` (name, current) values (%s, 3)""", (series,))
 		revert_series_if_last(key, name)
 		count = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0]
diff --git a/frappe/workflow/doctype/workflow/test_workflow.py b/frappe/workflow/doctype/workflow/test_workflow.py
index 9999df40cb..2719bc7cf0 100644
--- a/frappe/workflow/doctype/workflow/test_workflow.py
+++ b/frappe/workflow/doctype/workflow/test_workflow.py
@@ -10,6 +10,7 @@ from frappe.model.workflow import apply_workflow, WorkflowTransitionError, Workf
 class TestWorkflow(unittest.TestCase):
 	def setUp(self):
 		frappe.db.sql('DELETE FROM `tabToDo`')
+		frappe.db.sql("DELETE FROM `tabHas Role` WHERE `role`='Test Approver'")
 		if not getattr(self, 'workflow', None):
 			self.workflow = create_todo_workflow()
 		frappe.set_user('Administrator')
@@ -146,4 +147,4 @@ def create_todo_workflow():
 		return workflow
 
 def create_new_todo():
-	return frappe.get_doc(dict(doctype='ToDo', description='workflow ' + random_string(10))).insert()
\ No newline at end of file
+	return frappe.get_doc(dict(doctype='ToDo', description='workflow ' + random_string(10))).insert()

From 219fbc8e88d8505391fe8259b0fbeda86844f42d Mon Sep 17 00:00:00 2001
From: Matteo D <md@lab51.org>
Date: Wed, 29 Jul 2020 17:28:46 +0200
Subject: [PATCH 319/345] fix: Added AWS S3 missing regions (#11109)

---
 .gitignore                                                | 5 ++++-
 .../doctype/s3_backup_settings/s3_backup_settings.json    | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7df673c1f1..900ae1c7b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -188,4 +188,7 @@ typings/
 
 # cypress
 cypress/screenshots
-cypress/videos
\ No newline at end of file
+cypress/videos
+
+# JetBrains IDEs
+.idea/
diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json
index 830afbae53..123bb21e88 100755
--- a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json
+++ b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json
@@ -74,11 +74,11 @@
   },
   {
    "default": "us-east-1",
-   "description": "See https://docs.aws.amazon.com/de_de/general/latest/gr/rande.html#s3_region for details.",
+   "description": "See https://docs.aws.amazon.com/general/latest/gr/s3.html for details.",
    "fieldname": "region",
    "fieldtype": "Select",
    "label": "Region",
-   "options": "us-east-1\nus-east-2\nus-west-1\nus-west-2\nap-south-1\nap-southeast-1\nap-southeast-2\nap-northeast-1\nap-northeast-2\nap-northeast-3\nca-central-1\ncn-north-1\ncn-northwest-1\neu-central-1\neu-west-1\neu-west-2\neu-west-3\neu-north-1\nsa-east-1"
+   "options": "us-east-1\nus-east-2\nus-west-1\nus-west-2\naf-south-1\nap-east-1\nap-south-1\nap-southeast-1\nap-southeast-2\nap-northeast-1\nap-northeast-2\nap-northeast-3\nca-central-1\ncn-north-1\ncn-northwest-1\neu-central-1\neu-west-1\neu-west-2\neu-west-3\neu-south-1\neu-north-1\nme-south-1\nsa-east-1"
   },
   {
    "fieldname": "endpoint_url",
@@ -151,7 +151,7 @@
  "hide_toolbar": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-04-13 20:57:24.432183",
+ "modified": "2020-07-27 17:27:21.400000",
  "modified_by": "Administrator",
  "module": "Integrations",
  "name": "S3 Backup Settings",
@@ -172,4 +172,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}

From 8d18fb43230c80b40c00732850b5631c4346d54a Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Wed, 29 Jul 2020 17:48:39 +0200
Subject: [PATCH 320/345] fix(oauth provider): parse cookies correctly (#11066)

---
 frappe/oauth.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/frappe/oauth.py b/frappe/oauth.py
index 4dc50366be..122c806072 100644
--- a/frappe/oauth.py
+++ b/frappe/oauth.py
@@ -4,6 +4,7 @@ import pytz
 
 from frappe import _
 from frappe.auth import LoginManager
+from http import cookies
 from oauthlib.oauth2.rfc6749.tokens import BearerToken
 from oauthlib.oauth2.rfc6749.grant_types import AuthorizationCodeGrant, ImplicitGrant, ResourceOwnerPasswordCredentialsGrant, ClientCredentialsGrant,  RefreshTokenGrant
 from oauthlib.oauth2 import RequestValidator
@@ -130,15 +131,12 @@ class OAuthWebRequestValidator(RequestValidator):
 		oac.scopes = get_url_delimiter().join(request.scopes)
 		oac.redirect_uri_bound_to_authorization_code = request.redirect_uri
 		oac.client = client_id
-		oac.user = unquote(cookie_dict['user_id'])
+		oac.user = unquote(cookie_dict['user_id'].value)
 		oac.authorization_code = code['code']
 		oac.save(ignore_permissions=True)
 		frappe.db.commit()
 
 	def authenticate_client(self, request, *args, **kwargs):
-
-		cookie_dict = get_cookie_dict_from_headers(request)
-
 		#Get ClientID in URL
 		if request.client_id:
 			oc = frappe.get_doc("OAuth Client", request.client_id)
@@ -155,7 +153,9 @@ class OAuthWebRequestValidator(RequestValidator):
 		except Exception as e:
 			print("Failed body authentication: Application %s does not exist".format(cid=request.client_id))
 
-		return frappe.session.user == unquote(cookie_dict.get('user_id', "Guest"))
+		cookie_dict = get_cookie_dict_from_headers(request)
+		user_id = unquote(cookie_dict['user_id']) if 'user_id' in cookie_dict else "Guest"
+		return frappe.session.user == user_id
 
 	def authenticate_client_id(self, client_id, request, *args, **kwargs):
 		cli_id = frappe.db.get_value('OAuth Client', client_id, 'name')
@@ -400,13 +400,10 @@ class OAuthWebRequestValidator(RequestValidator):
 		return True
 
 def get_cookie_dict_from_headers(r):
+	cookie = cookies.BaseCookie()
 	if r.headers.get('Cookie'):
-		cookie = r.headers.get('Cookie')
-		cookie = cookie.split("; ")
-		cookie_dict = {k:v for k,v in (x.split('=') for x in cookie)}
-		return cookie_dict
-	else:
-		return {}
+		cookie.load(r.headers.get('Cookie'))
+	return cookie
 
 def calculate_at_hash(access_token, hash_alg):
 	"""Helper method for calculating an access token

From 9cef385005e68221cc2d4b628f9080b81a434da2 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 30 Jul 2020 14:37:22 +0530
Subject: [PATCH 321/345] refactor: refer to frappe.boot.single_types instead
 of db call

---
 .../public/js/frappe/widgets/widget_dialog.js  | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js
index 054159116f..1089d7e629 100644
--- a/frappe/public/js/frappe/widgets/widget_dialog.js
+++ b/frappe/public/js/frappe/widgets/widget_dialog.js
@@ -174,18 +174,12 @@ class ShortcutDialog extends WidgetDialog {
 				onchange: () => {
 					if (this.dialog.get_value("type") == "DocType") {
 						let doctype = this.dialog.get_value("link_to");
-
-						doctype &&
-							frappe.db
-								.get_value("DocType", doctype, "issingle")
-								.then((res) => {
-									if (res.message && res.message.issingle) {
-										this.hide_filters();
-									} else {
-										this.setup_filter(doctype);
-										this.show_filters();
-									}
-								});
+						if (frappe.boot.single_types.includes("Stock Settings")) {
+							this.hide_filters();
+						} else {
+							this.setup_filter(doctype);
+							this.show_filters();
+						}
 					} else {
 						this.hide_filters();
 					}

From 2ad15ee9f75dca2391e45b83f5298b1e7e90e163 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Thu, 30 Jul 2020 14:57:01 +0530
Subject: [PATCH 322/345] fix: use doctype variable

---
 frappe/public/js/frappe/widgets/widget_dialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js
index 1089d7e629..e3b4cc1d8c 100644
--- a/frappe/public/js/frappe/widgets/widget_dialog.js
+++ b/frappe/public/js/frappe/widgets/widget_dialog.js
@@ -174,7 +174,7 @@ class ShortcutDialog extends WidgetDialog {
 				onchange: () => {
 					if (this.dialog.get_value("type") == "DocType") {
 						let doctype = this.dialog.get_value("link_to");
-						if (frappe.boot.single_types.includes("Stock Settings")) {
+						if (frappe.boot.single_types.includes(doctype)) {
 							this.hide_filters();
 						} else {
 							this.setup_filter(doctype);

From 7427fb9cd3b9589d8366f330b968a9f5e8c6f310 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 30 Jul 2020 15:56:38 +0530
Subject: [PATCH 323/345] fix: Dont validate skipped columns

---
 frappe/core/doctype/data_import/importer.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 910e42af1a..14626eb5e3 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -955,6 +955,9 @@ class Column:
 		if not self.df:
 			return
 
+		if self.skip_import:
+			return
+
 		if self.df.fieldtype == 'Link':
 			# find all values that dont exist
 			values = list(set([cstr(v) for v in self.column_values[1:] if v]))

From 84a15407a733a57ce5d1b13c2c1fefd80f12b198 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 30 Jul 2020 16:06:10 +0530
Subject: [PATCH 324/345] fix: Respect hostname config in sitemap.xml

---
 frappe/www/sitemap.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/www/sitemap.py b/frappe/www/sitemap.py
index 8b93270ab5..f8f03c45f8 100644
--- a/frappe/www/sitemap.py
+++ b/frappe/www/sitemap.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 
 import frappe
 from frappe.model.document import get_controller
-from frappe.utils import get_request_site_address, get_datetime, nowdate
+from frappe.utils import get_datetime, nowdate, get_url
 from frappe.website.router import get_pages, get_all_page_context_from_doctypes
 from six import iteritems
 from six.moves.urllib.parse import quote, urljoin
@@ -25,13 +25,13 @@ def get_context(context):
 	for route, page in iteritems(get_pages()):
 		if page.sitemap:
 			links.append({
-				"loc": urljoin(host, quote(page.name.encode("utf-8"))),
+				"loc": get_url(quote(page.name.encode("utf-8"))),
 				"lastmod": nowdate()
 			})
 
 	for route, data in iteritems(get_public_pages_from_doctypes()):
 		links.append({
-			"loc": urljoin(host, quote((route or "").encode("utf-8"))),
+			"loc": get_url(quote((route or "").encode("utf-8"))),
 			"lastmod": get_datetime(data.get("modified")).strftime("%Y-%m-%d")
 		})
 

From 7bf69c62c1cc942d394d40484502c51b96e98b9f Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 30 Jul 2020 17:47:01 +0530
Subject: [PATCH 325/345] fix: suffix logger name with site

---
 frappe/utils/logger.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index c38e0e6997..1fbd54dd38 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -36,9 +36,11 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	else:
 		site = False
 
-	if module in frappe.loggers:
+	LOGGER_NAME = "{}-{}".format(module, site or "all")
+
+	if LOGGER_NAME in frappe.loggers:
 		try:
-			return frappe.loggers[module][site or "all"]
+			return frappe.loggers[LOGGER_NAME]
 		except:
 			pass
 
@@ -51,7 +53,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	LOG_FILENAME = os.path.join('..', 'logs', logfile)
 
-	logger = logging.getLogger(module)
+	logger = logging.getLogger(LOGGER_NAME)
 	logger.setLevel(frappe.log_level or default_log_level)
 	logger.propagate = False
 
@@ -73,11 +75,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	handler.setFormatter(formatter)
 
-	try:
-		frappe.loggers[module][site or "all"] = logger
-	except KeyError:
-		frappe.loggers[module] = {}
-		frappe.loggers[module][site or "all"] = logger
+	frappe.loggers[LOGGER_NAME] = logger
 
 	return logger
 

From 090b81f2f268447581eac496bb245af3a17224c5 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 30 Jul 2020 17:59:01 +0530
Subject: [PATCH 326/345] style: black + restructure

---
 frappe/utils/logger.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 1fbd54dd38..79ea93e3bd 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -30,7 +30,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	"""
 
 	if allow_site == True:
-		site = getattr(frappe.local, 'site', None)
+		site = getattr(frappe.local, "site", None)
 	elif allow_site:
 		site = allow_site
 	else:
@@ -48,21 +48,21 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 		module = "frappe"
 		with_more_info = True
 
-	logfile = module + '.log'
+	logfile = module + ".log"
 
-
-	LOG_FILENAME = os.path.join('..', 'logs', logfile)
+	LOG_FILENAME = os.path.join("..", "logs", logfile)
 
 	logger = logging.getLogger(LOGGER_NAME)
 	logger.setLevel(frappe.log_level or default_log_level)
 	logger.propagate = False
 
-	formatter = logging.Formatter('%(asctime)s %(levelname)s %(name)s %(message)s')
+	formatter = logging.Formatter("%(asctime)s %(levelname)s %(name)s %(message)s")
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
+	handler.setFormatter(formatter)
 	logger.addHandler(handler)
 
 	if site:
-		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
+		SITELOG_FILENAME = os.path.join(site, "logs", logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)
 		logger.addHandler(site_handler)
@@ -73,20 +73,23 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	if filter:
 		logger.addFilter(filter)
 
-	handler.setFormatter(formatter)
-
 	frappe.loggers[LOGGER_NAME] = logger
 
 	return logger
 
+
 class SiteContextFilter(logging.Filter):
 	"""This is a filter which injects request information (if available) into the log."""
+
 	def filter(self, record):
 		if "Form Dict" not in text_type(record.msg):
-			record.msg = text_type(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(getattr(frappe.local, 'site', None), getattr(frappe.local, 'form_dict', None))
+			site = getattr(frappe.local, "site", None)
+			form_dict = getattr(frappe.local, "form_dict", None)
+			record.msg = text_type(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(site, form_dict)
 			return True
 
+
 def set_log_level(level):
-	'''Use this method to set log level to something other than the default DEBUG'''
-	frappe.log_level = getattr(logging, (level or '').upper(), None) or default_log_level
+	"""Use this method to set log level to something other than the default DEBUG"""
+	frappe.log_level = getattr(logging, (level or "").upper(), None) or default_log_level
 	frappe.loggers = {}

From fac7f359ae0b49064003e7424989579d580b7535 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 30 Jul 2020 18:49:59 +0530
Subject: [PATCH 327/345] fix: original log format + EAFP

---
 frappe/utils/logger.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 79ea93e3bd..46269fe909 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -38,26 +38,24 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	LOGGER_NAME = "{}-{}".format(module, site or "all")
 
-	if LOGGER_NAME in frappe.loggers:
-		try:
-			return frappe.loggers[LOGGER_NAME]
-		except:
-			pass
+	try:
+		return frappe.loggers[LOGGER_NAME]
+	except KeyError:
+		pass
 
 	if not module:
 		module = "frappe"
 		with_more_info = True
 
 	logfile = module + ".log"
-
-	LOG_FILENAME = os.path.join("..", "logs", logfile)
+	log_filename = os.path.join("..", "logs", logfile)
 
 	logger = logging.getLogger(LOGGER_NAME)
 	logger.setLevel(frappe.log_level or default_log_level)
 	logger.propagate = False
 
-	formatter = logging.Formatter("%(asctime)s %(levelname)s %(name)s %(message)s")
-	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
+	formatter = logging.Formatter("%(asctime)s %(levelname)s {0} %(message)s".format(module))
+	handler = RotatingFileHandler(log_filename, maxBytes=100_000, backupCount=20)
 	handler.setFormatter(formatter)
 	logger.addHandler(handler)
 

From faa9a5466eacc4d07e19286309f36aeb8468f7ec Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 30 Jul 2020 19:04:04 +0530
Subject: [PATCH 328/345] fix: Slider

---
 frappe/utils/logger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 46269fe909..6d24eef9d3 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -29,7 +29,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
 	"""
 
-	if allow_site == True:
+	if allow_site is True:
 		site = getattr(frappe.local, "site", None)
 	elif allow_site:
 		site = allow_site

From 444e8225a46188137028f99cb12efcab195559b5 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 30 Jul 2020 19:50:36 +0530
Subject: [PATCH 329/345] fix: setup filters only if doctype is available

---
 frappe/public/js/frappe/widgets/widget_dialog.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js
index e3b4cc1d8c..2ca26d59e1 100644
--- a/frappe/public/js/frappe/widgets/widget_dialog.js
+++ b/frappe/public/js/frappe/widgets/widget_dialog.js
@@ -174,9 +174,9 @@ class ShortcutDialog extends WidgetDialog {
 				onchange: () => {
 					if (this.dialog.get_value("type") == "DocType") {
 						let doctype = this.dialog.get_value("link_to");
-						if (frappe.boot.single_types.includes(doctype)) {
+						if (doctype && frappe.boot.single_types.includes(doctype)) {
 							this.hide_filters();
-						} else {
+						} else if (doctype) {
 							this.setup_filter(doctype);
 							this.show_filters();
 						}

From 94116ae93c416958619e98aa47ad979481ec9dd1 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 31 Jul 2020 16:07:51 +0530
Subject: [PATCH 330/345] feat(logger): allow max_size and file_count params

---
 frappe/__init__.py     |  4 ++--
 frappe/utils/logger.py | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 7ea95ec3db..45f40f7783 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1559,10 +1559,10 @@ def get_doctype_app(doctype):
 
 loggers = {}
 log_level = None
-def logger(module=None, with_more_info=False, allow_site=True, filter=None):
+def logger(module=None, with_more_info=False, allow_site=True, filter=None, max_size=100_000, file_count=20):
 	'''Returns a python logger that uses StreamHandler'''
 	from frappe.utils.logger import get_logger
-	return get_logger(module=module, with_more_info=with_more_info, allow_site=allow_site, filter=filter)
+	return get_logger(module=module, with_more_info=with_more_info, allow_site=allow_site, filter=filter, max_size=max_size, file_count=file_count)
 
 def log_error(message=None, title=_("Error")):
 	'''Log error to Error Log'''
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 6d24eef9d3..b3295cccdf 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -16,14 +16,16 @@ import frappe
 default_log_level = logging.DEBUG
 
 
-def get_logger(module, with_more_info=False, allow_site=True, filter=None):
+def get_logger(module, with_more_info=False, allow_site=True, filter=None, max_size=100_000, file_count=20):
 	"""Application Logger for your given module
 
 	Args:
 		module (str): Name of your logger and consequently your log file.
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
 		allow_site ((str, bool), optional): Pass site name to explicitly log under it's logs. If True and unspecified, guesses which site the logs would be saved under. Defaults to True.
-		filter (function, optional): Add a filter function for your logger
+		filter (function, optional): Add a filter function for your logger. Defaults to None.
+		max_size (int, optional): Max file size of each log file in kB. Defaults to 100_000.
+		file_count (int, optional): Max count of log files to be retained via Log Rotation. Defaults to 20.
 
 	Returns:
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
@@ -36,10 +38,10 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	else:
 		site = False
 
-	LOGGER_NAME = "{}-{}".format(module, site or "all")
+	logger_name = "{0}-{1}".format(module, site or "all")
 
 	try:
-		return frappe.loggers[LOGGER_NAME]
+		return frappe.loggers[logger_name]
 	except KeyError:
 		pass
 
@@ -50,18 +52,18 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	logfile = module + ".log"
 	log_filename = os.path.join("..", "logs", logfile)
 
-	logger = logging.getLogger(LOGGER_NAME)
+	logger = logging.getLogger(logger_name)
 	logger.setLevel(frappe.log_level or default_log_level)
 	logger.propagate = False
 
 	formatter = logging.Formatter("%(asctime)s %(levelname)s {0} %(message)s".format(module))
-	handler = RotatingFileHandler(log_filename, maxBytes=100_000, backupCount=20)
+	handler = RotatingFileHandler(log_filename, maxBytes=max_size, backupCount=file_count)
 	handler.setFormatter(formatter)
 	logger.addHandler(handler)
 
 	if site:
-		SITELOG_FILENAME = os.path.join(site, "logs", logfile)
-		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
+		sitelog_filename = os.path.join(site, "logs", logfile)
+		site_handler = RotatingFileHandler(sitelog_filename, maxBytes=max_size, backupCount=file_count)
 		site_handler.setFormatter(formatter)
 		logger.addHandler(site_handler)
 
@@ -71,7 +73,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	if filter:
 		logger.addFilter(filter)
 
-	frappe.loggers[LOGGER_NAME] = logger
+	frappe.loggers[logger_name] = logger
 
 	return logger
 

From f04ce5dd7a7957d46ef12d2d5e2216bb93e753e1 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 31 Jul 2020 16:11:39 +0530
Subject: [PATCH 331/345] chore: Typo

---
 frappe/utils/logger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index b3295cccdf..451211b74b 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -24,7 +24,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None, max_s
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
 		allow_site ((str, bool), optional): Pass site name to explicitly log under it's logs. If True and unspecified, guesses which site the logs would be saved under. Defaults to True.
 		filter (function, optional): Add a filter function for your logger. Defaults to None.
-		max_size (int, optional): Max file size of each log file in kB. Defaults to 100_000.
+		max_size (int, optional): Max file size of each log file in bytes. Defaults to 100_000.
 		file_count (int, optional): Max count of log files to be retained via Log Rotation. Defaults to 20.
 
 	Returns:

From a87531e1d0a808f69ce9d12a7e2fc9a9bb962641 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 31 Jul 2020 17:26:37 +0530
Subject: [PATCH 332/345] fix(get_logger): allow None for module

---
 frappe/utils/logger.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 451211b74b..398cdd0bfc 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -16,11 +16,11 @@ import frappe
 default_log_level = logging.DEBUG
 
 
-def get_logger(module, with_more_info=False, allow_site=True, filter=None, max_size=100_000, file_count=20):
+def get_logger(module=None, with_more_info=False, allow_site=True, filter=None, max_size=100_000, file_count=20):
 	"""Application Logger for your given module
 
 	Args:
-		module (str): Name of your logger and consequently your log file.
+		module (str, optional): Name of your logger and consequently your log file. Defaults to None.
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
 		allow_site ((str, bool), optional): Pass site name to explicitly log under it's logs. If True and unspecified, guesses which site the logs would be saved under. Defaults to True.
 		filter (function, optional): Add a filter function for your logger. Defaults to None.

From c423eb7288623fb770216d712e923ee96c22e88f Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 31 Jul 2020 18:05:23 +0530
Subject: [PATCH 333/345] fix: text in MultiSelectList doesn't get truncated

---
 frappe/public/js/frappe/form/controls/multiselect_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/controls/multiselect_list.js b/frappe/public/js/frappe/form/controls/multiselect_list.js
index cd86bdd767..2a7ee5cb10 100644
--- a/frappe/public/js/frappe/form/controls/multiselect_list.js
+++ b/frappe/public/js/frappe/form/controls/multiselect_list.js
@@ -3,7 +3,7 @@ frappe.ui.form.ControlMultiSelectList = frappe.ui.form.ControlData.extend({
 		let template  = `
 			<div class="multiselect-list dropdown">
 				<div class="form-control cursor-pointer dropdown-toggle input-sm" data-toggle="dropdown" tabindex=0>
-					<span class="status-text ellipsis"></span>
+					<div class="status-text ellipsis"></div>
 				</div>
 				<ul class="dropdown-menu">
 					<li class="dropdown-input-wrapper">

From eab96ab904d9f39739111f8c486d0cecf4240638 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Sat, 1 Aug 2020 13:42:33 +0530
Subject: [PATCH 334/345] Revert "fix(image-with-blur): Set width, height in
 CSS"

---
 frappe/templates/includes/image_with_blur.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/templates/includes/image_with_blur.html b/frappe/templates/includes/image_with_blur.html
index dbddb9d8ef..20b0380b88 100644
--- a/frappe/templates/includes/image_with_blur.html
+++ b/frappe/templates/includes/image_with_blur.html
@@ -1,9 +1,7 @@
 {%- set res = frappe.utils.get_thumbnail_base64_for_image(src) if src else false -%}
 {%- if res and res['base64'].startswith('data:') -%}
 <img src="{{ res['base64'] }}" class="image-with-blur {{ resolve_class(class) }}"
-	data-src="{{ src or '' }}" alt="{{ alt or '' }}"
-	width="{{ res['width'] }}" height="{{ res['height'] }}"
-	style="width: {{ res['width'] }}px; height: {{ res['height'] }}px;" />
+	alt="{{ alt or '' }}" width="{{ res['width'] }}" height="{{ res['height'] }}" data-src="{{ src or '' }}" />
 {%- else -%}
 <img src="{{ src or '' }}" class="{{ resolve_class(class) }}" alt="{{ alt or '' }}" />
 {%- endif -%}

From 9445c115ecdf9ffbf5386adaf279935648a96754 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Mon, 3 Aug 2020 15:51:30 +0530
Subject: [PATCH 335/345] fix: check if is_standard is "Yes" (#11180)

---
 frappe/core/doctype/report/report.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/report/report.js b/frappe/core/doctype/report/report.js
index b4c30f5bbd..c410e9aa1a 100644
--- a/frappe/core/doctype/report/report.js
+++ b/frappe/core/doctype/report/report.js
@@ -1,6 +1,6 @@
 frappe.ui.form.on('Report', {
 	refresh: function(frm) {
-		if (frm.doc.is_standard && !frappe.boot.developer_mode) {
+		if (frm.doc.is_standard === "Yes" && !frappe.boot.developer_mode) {
 			// make the document read-only
 			frm.set_read_only();
 		}

From 4b93f75eba40625bba5b83cca2470aa179e3f082 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 3 Aug 2020 17:23:32 +0530
Subject: [PATCH 336/345] fix: Log site only if exists

---
 frappe/app.py          | 5 ++---
 frappe/utils/logger.py | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/app.py b/frappe/app.py
index 100b10e9ef..450e3b5f17 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -99,9 +99,8 @@ def application(request):
 		frappe.monitor.stop(response)
 		frappe.recorder.dump()
 
-		_site = get_site_name(request.host)
-		frappe.logger("frappe.web", allow_site=_site).info({
-			"site": _site,
+		frappe.logger("frappe.web", allow_site=frappe.local.site).info({
+			"site": get_site_name(request.host),
 			"remote_addr": getattr(request, "remote_addr", "NOTFOUND"),
 			"base_url": getattr(request, "base_url", "NOTFOUND"),
 			"full_path": getattr(request, "full_path", "NOTFOUND"),
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 398cdd0bfc..364ffa776d 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -11,6 +11,7 @@ from six import text_type
 
 # imports - module imports
 import frappe
+from frappe.utils import get_sites
 
 
 default_log_level = logging.DEBUG
@@ -33,7 +34,7 @@ def get_logger(module=None, with_more_info=False, allow_site=True, filter=None,
 
 	if allow_site is True:
 		site = getattr(frappe.local, "site", None)
-	elif allow_site:
+	elif allow_site in get_sites():
 		site = allow_site
 	else:
 		site = False

From 645331799af44feb4629ccc50f214278579be200 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Tue, 4 Aug 2020 12:17:33 +0530
Subject: [PATCH 337/345] fix: whitelist functions called through search widget
 (#11153)

---
 frappe/core/doctype/user_permission/user_permission.py        | 1 +
 .../permitted_documents_for_user.py                           | 1 +
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py        | 1 +
 frappe/desk/doctype/number_card/number_card.py                | 4 ++++
 frappe/email/__init__.py                                      | 1 +
 5 files changed, 8 insertions(+)

diff --git a/frappe/core/doctype/user_permission/user_permission.py b/frappe/core/doctype/user_permission/user_permission.py
index 48d4fcb5d4..325c41622d 100644
--- a/frappe/core/doctype/user_permission/user_permission.py
+++ b/frappe/core/doctype/user_permission/user_permission.py
@@ -119,6 +119,7 @@ def user_permission_exists(user, allow, for_value, applicable_for=None):
 
 	return has_same_user_permission
 
+@frappe.whitelist()
 def get_applicable_for_doctype_list(doctype, txt, searchfield, start, page_len, filters):
 	linked_doctypes_map = get_linked_doctypes(doctype, True)
 
diff --git a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
index 8b2d1e01fa..5ca21b811e 100644
--- a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
+++ b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
@@ -41,6 +41,7 @@ def get_columns_and_fields(doctype):
 
 	return columns, fields
 
+@frappe.whitelist()
 def query_doctypes(doctype, txt, searchfield, start, page_len, filters):
 	user = filters.get("user")
 	user_perms = frappe.utils.user.UserPermissions(user)
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index a25e0cab9e..7547efa234 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -344,6 +344,7 @@ def get_year_ending(date):
 	# last day of this month
 	return add_to_date(date, days=-1)
 
+@frappe.whitelist()
 def get_charts_for_user(doctype, txt, searchfield, start, page_len, filters):
 	or_filters = {'owner': frappe.session.user, 'is_public': 1}
 	return frappe.db.get_list('Dashboard Chart',
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 3eb08ec00a..f44893d950 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -124,11 +124,15 @@ def create_number_card(args):
 	doc.insert(ignore_permissions=True)
 	return doc
 
+@frappe.whitelist()
 def get_cards_for_user(doctype, txt, searchfield, start, page_len, filters):
 	meta = frappe.get_meta(doctype)
 	searchfields = meta.get_search_fields()
 	search_conditions = []
 
+	if not frappe.db.exists('DocType', doctype):
+		return
+
 	if txt:
 		for field in searchfields:
 			search_conditions.append('`tab{doctype}`.`{field}` like %(txt)s'.format(field=field, doctype=doctype, txt=txt))
diff --git a/frappe/email/__init__.py b/frappe/email/__init__.py
index d58b35040e..0b874a03bb 100644
--- a/frappe/email/__init__.py
+++ b/frappe/email/__init__.py
@@ -57,6 +57,7 @@ def relink(name, reference_doctype=None, reference_name=None):
 			communication_type = "Communication" and
 			name = %s""", (reference_doctype, reference_name, name))
 
+@frappe.whitelist()
 def get_communication_doctype(doctype, txt, searchfield, start, page_len, filters):
 	user_perms = frappe.utils.user.UserPermissions(frappe.session.user)
 	user_perms.build_permissions()

From 9b267027b5ce2c0674a4dd1cb476d5b80b873632 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Tue, 4 Aug 2020 13:25:49 +0530
Subject: [PATCH 338/345] feat: don't load user translation in
 make_dict_from_messages (#11120)

---
 frappe/translate.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/frappe/translate.py b/frappe/translate.py
index 2fc2d3f328..ee1f8fa5ff 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -119,7 +119,7 @@ def get_dict(fortype, name=None):
 			messages += frappe.db.sql("select 'Role:', name from tabRole")
 			messages += frappe.db.sql("select 'Module:', name from `tabModule Def`")
 
-		message_dict = make_dict_from_messages(messages)
+		message_dict = make_dict_from_messages(messages, load_user_translation=False)
 		message_dict.update(get_dict_from_hooks(fortype, name))
 		# remove untranslated
 		message_dict = {k:v for k, v in iteritems(message_dict) if k!=v}
@@ -127,6 +127,7 @@ def get_dict(fortype, name=None):
 		cache.hset("translation_assets", frappe.local.lang, translation_assets, shared=True)
 
 	translation_map = translation_assets[asset_key]
+
 	if fortype == "boot":
 		translation_map.update(get_user_translations(frappe.local.lang))
 
@@ -144,14 +145,17 @@ def get_dict_from_hooks(fortype, name):
 
 	return translated_dict
 
-def make_dict_from_messages(messages, full_dict=None):
+def make_dict_from_messages(messages, full_dict=None, load_user_translation=True):
 	"""Returns translated messages as a dict in Language specified in `frappe.local.lang`
 
 	:param messages: List of untranslated messages
 	"""
 	out = {}
 	if full_dict==None:
-		full_dict = get_full_dict(frappe.local.lang)
+		if load_user_translation:
+			full_dict = get_full_dict(frappe.local.lang)
+		else:
+			full_dict = load_lang(frappe.local.lang)
 
 	for m in messages:
 		if m[1] in full_dict:
@@ -189,11 +193,9 @@ def get_full_dict(lang):
 	try:
 		# get user specific transaltion data
 		user_translations = get_user_translations(lang)
-	except Exception:
-		user_translations = None
-
-	if user_translations:
 		frappe.local.lang_full_dict.update(user_translations)
+	except Exception:
+		pass
 
 	return frappe.local.lang_full_dict
 

From d5622f541021e9ecfa682bf30977baeb3e48f89b Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Tue, 4 Aug 2020 17:38:48 +0530
Subject: [PATCH 339/345] fix: Permission query in Dashboard Chart (#10981)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 .../dashboard_chart/dashboard_chart.py        | 25 ++++++++++++++-----
 .../desk/doctype/number_card/number_card.py   | 14 +++++++----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 7547efa234..88c9623945 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -28,15 +28,28 @@ def get_permission_query_conditions(user):
 	if "System Manager" in roles:
 		return None
 
-	allowed_doctypes = ['"%s"' % doctype for doctype in frappe.permissions.get_doctypes_with_read()]
-	allowed_reports = ['"%s"' % key if type(key) == str else key.encode('UTF8') for key in get_allowed_reports()]
+	doctype_condition = False
+	report_condition = False
+
+	allowed_doctypes = [frappe.db.escape(doctype) for doctype in frappe.permissions.get_doctypes_with_read()]
+	allowed_reports = [frappe.db.escape(key) if type(key) == str else key.encode('UTF8') for key in get_allowed_reports()]
+
+	if allowed_doctypes:
+		doctype_condition = '`tabDashboard Chart`.`document_type` in ({allowed_doctypes})'.format(
+			allowed_doctypes=','.join(allowed_doctypes))
+	if allowed_reports:
+		report_condition = '`tabDashboard Chart`.`report_name` in ({allowed_reports})'.format(
+			allowed_reports=','.join(allowed_reports))
 
 	return '''
-			`tabDashboard Chart`.`document_type` in ({allowed_doctypes})
-			or `tabDashboard Chart`.`report_name` in ({allowed_reports})
+			(`tabDashboard Chart`.`chart_type` in ('Count', 'Sum', 'Average')
+			and {doctype_condition})
+			or
+			(`tabDashboard Chart`.`chart_type` = 'Report'
+			and {report_condition})
 		'''.format(
-			allowed_doctypes=','.join(allowed_doctypes),
-			allowed_reports=','.join(allowed_reports)
+			doctype_condition=doctype_condition,
+			report_condition=report_condition
 		)
 
 
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index f44893d950..68ed79e64b 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -32,13 +32,17 @@ def get_permission_query_conditions(user=None):
 	if "System Manager" in roles:
 		return None
 
-	allowed_doctypes = ['"%s"' % doctype for doctype in frappe.permissions.get_doctypes_with_read()]
+	doctype_condition = False
+
+	allowed_doctypes = [frappe.db.escape(doctype) for doctype in frappe.permissions.get_doctypes_with_read()]
+
+	if allowed_doctypes:
+		doctype_condition = '`tabNumber Card`.`document_type` in ({allowed_doctypes})'.format(
+			allowed_doctypes=','.join(allowed_doctypes))
 
 	return '''
-			`tabNumber Card`.`document_type` in ({allowed_doctypes})
-		'''.format(
-			allowed_doctypes=','.join(allowed_doctypes)
-		)
+			{doctype_condition}
+		'''.format(doctype_condition=doctype_condition)
 
 def has_permission(doc, ptype, user):
 	roles = frappe.get_roles(user)

From dd157ba82255727e0095925eaf8d64fbfe89b275 Mon Sep 17 00:00:00 2001
From: gavin <gavin18d@gmail.com>
Date: Tue, 4 Aug 2020 17:39:35 +0530
Subject: [PATCH 340/345] fix: dont show git errors in terminal (#11064)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/utils/change_log.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/utils/change_log.py b/frappe/utils/change_log.py
index 53c83cfe99..c75b3289db 100644
--- a/frappe/utils/change_log.py
+++ b/frappe/utils/change_log.py
@@ -118,8 +118,9 @@ def get_versions():
 def get_app_branch(app):
 	'''Returns branch of an app'''
 	try:
+		null_stream = open(os.devnull, 'wb')
 		result = subprocess.check_output('cd ../apps/{0} && git rev-parse --abbrev-ref HEAD'.format(app),
-			shell=True)
+			shell=True, stdin=null_stream, stderr=null_stream)
 		result = safe_decode(result)
 		result = result.strip()
 		return result
@@ -128,8 +129,9 @@ def get_app_branch(app):
 
 def get_app_last_commit_ref(app):
 	try:
+		null_stream = open(os.devnull, 'wb')
 		result = subprocess.check_output('cd ../apps/{0} && git rev-parse HEAD --short 7'.format(app),
-			shell=True)
+			shell=True, stdin=null_stream, stderr=null_stream)
 		result = safe_decode(result)
 		result = result.strip()
 		return result

From 34fdf63b9097d5ad0cfb366121242c0f8480e460 Mon Sep 17 00:00:00 2001
From: Glen Whitney <glen@studioinfinity.org>
Date: Tue, 4 Aug 2020 05:10:06 -0700
Subject: [PATCH 341/345] fix(Link Card): refresh incomplete_dependencies as
 needed (#11169)

When _prepare_item in Workspace.get_cards notices that the dependencies
  for an item have been completed, it should clear the incomplete_dependencies
  field in case a value has been saved in that attribute.

  Fixes #11168.
---
 frappe/desk/desktop.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index 68b57a93d4..ae9d070976 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -221,6 +221,8 @@ class Workspace:
 				incomplete_dependencies = [d for d in item.dependencies if not _doctype_contains_a_record(d)]
 				if len(incomplete_dependencies):
 					item.incomplete_dependencies = incomplete_dependencies
+				else:
+					item.incomplete_dependencies = ""
 
 			if item.onboard:
 				# Mark Spotlights for initial

From f5c61d04da27d8258caad8631c5f7f4edf3ffa85 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Tue, 4 Aug 2020 17:40:18 +0530
Subject: [PATCH 342/345] fix: Patch to generate theme files in public folder
 (#11148)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/patches.txt                                |  1 +
 .../generate_theme_files_in_public_folder.py      | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 frappe/patches/v13_0/generate_theme_files_in_public_folder.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index b207a325cb..75750ab59c 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -296,3 +296,4 @@ frappe.patches.v13_0.update_duration_options
 frappe.patches.v13_0.replace_old_data_import # 2020-06-24
 frappe.patches.v13_0.create_custom_dashboards_cards_and_charts
 frappe.patches.v13_0.rename_is_custom_field_in_dashboard_chart
+frappe.patches.v13_0.generate_theme_files_in_public_folder
diff --git a/frappe/patches/v13_0/generate_theme_files_in_public_folder.py b/frappe/patches/v13_0/generate_theme_files_in_public_folder.py
new file mode 100644
index 0000000000..c5a64780cd
--- /dev/null
+++ b/frappe/patches/v13_0/generate_theme_files_in_public_folder.py
@@ -0,0 +1,15 @@
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+
+def execute():
+	themes = frappe.db.get_all(
+		"Website Theme", filters={"theme_url": ("not like", "/files/website_theme/%")}
+	)
+	for theme in themes:
+		doc = frappe.get_doc("Website Theme", theme.name)
+		doc.generate_bootstrap_theme()
+		doc.save()

From 0748312e3950516bb08c76f200359757cd2c6759 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 4 Aug 2020 17:41:34 +0530
Subject: [PATCH 343/345] fix(werkzeug): Avoid duplicate lines from werkzeug in
 bench start logs (#11171)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/app.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/app.py b/frappe/app.py
index 450e3b5f17..725bec183a 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -256,9 +256,11 @@ def serve(port=8000, profile=False, no_reload=False, no_threading=False, site=No
 		'SERVER_NAME': 'localhost:8000'
 	}
 
+	log = logging.getLogger('werkzeug')
+	log.propagate = False
+
 	in_test_env = os.environ.get('CI')
 	if in_test_env:
-		log = logging.getLogger('werkzeug')
 		log.setLevel(logging.ERROR)
 
 	run_simple('0.0.0.0', int(port), application,

From cc22350b04f73b6321e1fac6ccf62f57ee9776fb Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Tue, 4 Aug 2020 17:42:47 +0530
Subject: [PATCH 344/345] fix: remove Video DocType from Core module (#11151)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/automation/desk_page/tools/tools.json |   5 +-
 frappe/core/doctype/video/__init__.py        |   0
 frappe/core/doctype/video/test_video.py      |  10 --
 frappe/core/doctype/video/video.js           |   8 --
 frappe/core/doctype/video/video.json         | 106 -------------------
 frappe/core/doctype/video/video.py           |  10 --
 frappe/public/js/frappe/views/breadcrumbs.js |   1 -
 7 files changed, 3 insertions(+), 137 deletions(-)
 delete mode 100644 frappe/core/doctype/video/__init__.py
 delete mode 100644 frappe/core/doctype/video/test_video.py
 delete mode 100644 frappe/core/doctype/video/video.js
 delete mode 100644 frappe/core/doctype/video/video.json
 delete mode 100644 frappe/core/doctype/video/video.py

diff --git a/frappe/automation/desk_page/tools/tools.json b/frappe/automation/desk_page/tools/tools.json
index 2164a4ce38..3fbaf62d02 100644
--- a/frappe/automation/desk_page/tools/tools.json
+++ b/frappe/automation/desk_page/tools/tools.json
@@ -3,7 +3,7 @@
   {
    "hidden": 0,
    "label": "Tools",
-   "links": "[\n    {\n        \"description\": \"Documents assigned to you and by you.\",\n        \"label\": \"To Do\",\n        \"name\": \"ToDo\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Event and other calendars.\",\n        \"label\": \"Calendar\",\n        \"link\": \"List/Event/Calendar\",\n        \"name\": \"Event\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Private and public Notes.\",\n        \"label\": \"Note\",\n        \"name\": \"Note\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Files\",\n        \"name\": \"File\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Video\",\n        \"name\": \"Video\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Activity log of all users.\",\n        \"label\": \"Activity\",\n        \"name\": \"activity\",\n        \"type\": \"page\"\n    }\n]"
+   "links": "[\n    {\n        \"description\": \"Documents assigned to you and by you.\",\n        \"label\": \"To Do\",\n        \"name\": \"ToDo\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Event and other calendars.\",\n        \"label\": \"Calendar\",\n        \"link\": \"List/Event/Calendar\",\n        \"name\": \"Event\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Private and public Notes.\",\n        \"label\": \"Note\",\n        \"name\": \"Note\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Files\",\n        \"name\": \"File\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Activity log of all users.\",\n        \"label\": \"Activity\",\n        \"name\": \"activity\",\n        \"type\": \"page\"\n    }\n]"
   },
   {
    "hidden": 0,
@@ -29,10 +29,11 @@
  "docstatus": 0,
  "doctype": "Desk Page",
  "extends_another_page": 0,
+ "hide_custom": 0,
  "idx": 0,
  "is_standard": 1,
  "label": "Tools",
- "modified": "2020-04-20 18:21:14.152537",
+ "modified": "2020-07-21 19:32:18.480700",
  "modified_by": "Administrator",
  "module": "Automation",
  "name": "Tools",
diff --git a/frappe/core/doctype/video/__init__.py b/frappe/core/doctype/video/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/core/doctype/video/test_video.py b/frappe/core/doctype/video/test_video.py
deleted file mode 100644
index 0bed1e98d6..0000000000
--- a/frappe/core/doctype/video/test_video.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-# import frappe
-import unittest
-
-class TestVideo(unittest.TestCase):
-	pass
diff --git a/frappe/core/doctype/video/video.js b/frappe/core/doctype/video/video.js
deleted file mode 100644
index 36ea240a36..0000000000
--- a/frappe/core/doctype/video/video.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2020, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Video', {
-	// refresh: function(frm) {
-
-	// }
-});
diff --git a/frappe/core/doctype/video/video.json b/frappe/core/doctype/video/video.json
deleted file mode 100644
index 26a407c05c..0000000000
--- a/frappe/core/doctype/video/video.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
- "actions": [],
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:title",
- "creation": "2018-10-17 05:47:13.087395",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "title",
-  "provider",
-  "url",
-  "column_break_4",
-  "publish_date",
-  "duration",
-  "section_break_7",
-  "description"
- ],
- "fields": [
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Title",
-   "reqd": 1,
-   "unique": 1
-  },
-  {
-   "fieldname": "provider",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Provider",
-   "options": "YouTube\nVimeo",
-   "reqd": 1
-  },
-  {
-   "fieldname": "url",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "URL",
-   "reqd": 1
-  },
-  {
-   "fieldname": "column_break_4",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "publish_date",
-   "fieldtype": "Date",
-   "label": "Publish Date"
-  },
-  {
-   "fieldname": "duration",
-   "fieldtype": "Data",
-   "label": "Duration"
-  },
-  {
-   "fieldname": "section_break_7",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "in_list_view": 1,
-   "label": "Description",
-   "reqd": 1
-  }
- ],
- "links": [],
- "modified": "2020-04-22 12:09:49.057403",
- "modified_by": "Administrator",
- "module": "Core",
- "name": "Video",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "if_owner": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "All",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/frappe/core/doctype/video/video.py b/frappe/core/doctype/video/video.py
deleted file mode 100644
index fdbd3a1abe..0000000000
--- a/frappe/core/doctype/video/video.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-# import frappe
-from frappe.model.document import Document
-
-class Video(Document):
-	pass
diff --git a/frappe/public/js/frappe/views/breadcrumbs.js b/frappe/public/js/frappe/views/breadcrumbs.js
index 0058310e3f..dbe591f6fd 100644
--- a/frappe/public/js/frappe/views/breadcrumbs.js
+++ b/frappe/public/js/frappe/views/breadcrumbs.js
@@ -6,7 +6,6 @@ frappe.breadcrumbs = {
 
 	preferred: {
 		"File": "",
-		"Video": "",
 		"Dashboard": "Customization",
 		"Dashboard Chart": "Customization",
 		"Dashboard Chart Source": "Customization"

From 5d4feb5dbb264611d2d257eea8f8f45b9636fbae Mon Sep 17 00:00:00 2001
From: gavin <gavin18d@gmail.com>
Date: Tue, 4 Aug 2020 17:45:14 +0530
Subject: [PATCH 345/345] feat: Convenience APIs for tags (#11088)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/model/document.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/frappe/model/document.py b/frappe/model/document.py
index 69a781d6d1..316c576f55 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -1307,6 +1307,16 @@ class Document(BaseDocument):
 		users = set([assignment.owner for assignment in assignments])
 		return users
 
+	def add_tag(self, tag):
+		"""Add a Tag to this document"""
+		from frappe.desk.doctype.tag.tag import DocTags
+		DocTags(self.doctype).add(self.name, tag)
+
+	def get_tags(self):
+		"""Return a list of Tags attached to this document"""
+		from frappe.desk.doctype.tag.tag import DocTags
+		return DocTags(self.doctype).get_tags(self.name).split(",")[1:]
+
 def execute_action(doctype, name, action, **kwargs):
 	"""Execute an action on a document (called by background worker)"""
 	doc = frappe.get_doc(doctype, name)