Merge branch 'develop'

frappe/__version__.py

@@ -1 +1 @@
-__version__ = "4.9.2"
+__version__ = "4.9.3"

frappe/hooks.py

@@ -3,7 +3,7 @@ app_title = "Frappe Framework"
 app_publisher = "Web Notes Technologies Pvt. Ltd."
 app_description = "Full Stack Web Application Framework in Python"
 app_icon = "assets/frappe/images/frappe.svg"
-app_version = "4.9.2"
+app_version = "4.9.3"
 app_color = "#3498db"
 app_email = "support@frappe.io"
 

frappe/public/js/frappe/form/control.js

@@ -868,7 +868,12 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
 			this.$input_area.find(".btn-new").on("click", function() {
 				var doctype = me.get_options();
 				if(!doctype) return;
-				me.frm.new_doc(doctype, me);
+
+				if (me.frm) {
+					me.frm.new_doc(doctype, me);
+				} else {
+					new_doc(doctype);
+				}
 			});
 		} else {
 			this.$input_area.find(".btn-new").remove();

frappe/public/js/frappe/views/calendar.js

@@ -199,15 +199,19 @@ frappe.views.Calendar = Class.extend({
 		var args = {
 			name: event[this.field_map.id]
 		};
-		args[this.field_map.start]
-			= frappe.datetime.get_datetime_as_string(event.start);
-
-		if(this.field_map.end)
-			args[this.field_map.end] = frappe.datetime.get_datetime_as_string(event.end);
+		args[this.field_map.start] = frappe.datetime.get_datetime_as_string(event.start);
 
 		if(this.field_map.allDay)
 			args[this.field_map.allDay] = event.allDay ? 1 : 0;
 
+		if(this.field_map.end) {
+			if (args[this.field_map.allDay]) {
+				args[this.field_map.end] = frappe.datetime.get_datetime_as_string(event.start);
+			} else {
+				args[this.field_map.end] = frappe.datetime.get_datetime_as_string(event.end);
+			}
+		}
+
 		args.doctype = event.doctype || this.doctype;
 
 		return { args: args, field_map: this.field_map };

frappe/website/render.py

@@ -17,7 +17,7 @@ class PageNotFoundError(Exception): pass
 
 def render(path, http_status_code=None):
 	"""render html page"""
-	path = resolve_path(path.strip("/"))
+	path = resolve_path(path.strip("/ "))
 
 	try:
 		data = render_page(path)

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "4.9.2"
+version = "4.9.3"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()