Fixed merge conflict

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '10.1.1'
+__version__ = '10.1.2'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/page/desktop/desktop.js

@@ -314,7 +314,7 @@ $.extend(frappe.desktop, {
 			}
 
 			// if module found
-			if(module._id.indexOf('/')===-1) {
+			if(module._id.indexOf('/')===-1 && !module._report) {
 				var notifier = $(".module-count-" + module._id);
 				if(notifier.length) {
 					notifier.toggle(sum ? true : false);

frappe/model/rename_doc.py

@@ -443,7 +443,8 @@ def get_fetch_fields(doctype, linked_to, ignore_doctypes=None):
 	for d in product_list:
 		linked_doctype_info = frappe._dict()
 		if d[0]['parent'] == d[1]['parent'] \
-				and (not ignore_doctypes or d[0]['parent'] not in ignore_doctypes):
+				and (not ignore_doctypes or d[0]['parent'] not in ignore_doctypes) \
+				and not d[1]['issingle']:
 			linked_doctype_info['doctype'] = d[0]['parent']
 			linked_doctype_info['master_fieldname'] = d[0]['fieldname']
 			linked_doctype_info['linked_to_fieldname'] = d[1]['fieldname']

frappe/public/js/frappe/form/controls/dynamic_link.js

@@ -13,7 +13,7 @@ frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({
 			let input = null;
 			if (cur_list) {
 				// for list page
-				input = cur_list.filter_area.standard_filters_wrapper.find(selector);
+				input = cur_list.wrapper.find(selector);
 			}
 			if (cur_page) {
 				input = $(cur_page.page).find(selector);

frappe/public/js/frappe/ui/filters/filters.js

@@ -280,8 +280,7 @@ frappe.ui.Filter = Class.extend({
 
 		this.flist.remove(this);
 		this.flist.push_new_filter(f[0], f[1], f[2], f[3]);
-		this.wrapper.remove();
-		this.flist.update_filters();
+		this.remove();
 	},
 
 	remove: function(dont_run) {
@@ -499,7 +498,7 @@ frappe.ui.Filter = Class.extend({
 		});
 
 		this.$btn_group.find(".toggle-filter").on("click", function() {
-			$(this).closest('.show_filters').find('.filter_area').show()
+			$(this).closest('.show_filters').find('.filter_area').show();
 			me.wrapper.toggle();
 		})
 		this.wrapper.toggle(false);

frappe/public/js/frappe/views/communication.js

@@ -554,7 +554,7 @@ frappe.views.CommunicationComposer = Class.extend({
 	},
 
 	is_print_letterhead_checked: function() {
-		if($(this.frm.wrapper).find('.form-print-wrapper').is(':visible')){
+		if (this.frm && $(this.frm.wrapper).find('.form-print-wrapper').is(':visible')){
 			return $(this.frm.wrapper).find('.print-letterhead').prop('checked');
 		} else {
 			return (frappe.model.get_doc(":Print Settings", "Print Settings") ||

frappe/public/js/frappe/views/reports/grid_report.js

@@ -669,6 +669,8 @@ frappe.views.GridReportWithPlot = frappe.views.GridReport.extend({
 		if (in_list(["Daily", "Weekly"], this.filter_inputs.range.val())) {
 			this.chart_area.toggle(false);
 			return;
+		} else {
+			this.chart_area.toggle(true);
 		}
 		var chart_data = this.get_chart_data ? this.get_chart_data() : null;
 

frappe/sessions.py

@@ -52,7 +52,7 @@ def clear_cache(user=None):
 def clear_global_cache():
 	frappe.model.meta.clear_cache()
 	frappe.cache().delete_value(["app_hooks", "installed_apps",
-		"app_modules", "module_app", "notification_config", 'system_settings'
+		"app_modules", "module_app", "notification_config", 'system_settings',
 		'scheduler_events', 'time_zone', 'webhooks', 'active_domains', 'active_modules'])
 	frappe.setup_module_map()