Merge branch 'develop' of https://github.com/frappe/frappe into fix-energy-point-ui

cypress.json

@@ -1,4 +1,3 @@
 {
-  "baseUrl": "http://test_site_ui:8000",
-  "projectId": "92odwv"
+  "baseUrl": "http://test_site_ui:8000"
 }

frappe/core/doctype/prepared_report/prepared_report.py

@@ -37,6 +37,15 @@ class PreparedReport(Document):
 
 def run_background(instance):
 	report = frappe.get_doc("Report", instance.ref_report_doctype)
+
+	report.custom_columns = []
+
+	if report.report_type == 'Custom Report':
+		custom_report_doc = report
+		reference_report = custom_report_doc.reference_report
+		report = frappe.get_doc("Report", reference_report)
+		report.custom_columns = custom_report_doc.json
+
 	result = generate_report_result(report, filters=instance.filters, user=instance.owner)
 	create_json_gz_file(result['result'], 'Prepared Report', instance.name)
 

frappe/public/js/frappe/request.js

@@ -30,7 +30,8 @@ frappe.call = function(opts) {
 			indicator: 'orange',
 			message: __('You are not connected to Internet. Retry after sometime.')
 		}, 3);
-		return;
+		opts.always && opts.always();
+		return $.ajax();
 	}
 	if (typeof arguments[0]==='string') {
 		opts = {

package.json

@@ -4,7 +4,7 @@
     "build": "node rollup/build.js",
     "production": "FRAPPE_ENV=production node rollup/build.js",
     "watch": "node rollup/watch.js",
-    "cypress:run": "cypress run --record --key 14ddd919-b01f-4d5f-b9d1-5af54d34c7f3",
+    "cypress:run": "cypress run",
     "cypress:open": "cypress open"
   },
   "repository": {