Merge branch 'develop' into re-delete-after-deleting-dependent-doc

frappe/desk/query_report.py

@@ -349,6 +349,13 @@ def build_xlsx_data(data, visible_idx, include_indentation, ignore_visible_idx=F
 		datetime.timedelta,
 	)
 
+	if len(visible_idx) == len(data.result):
+		# It's not possible to have same length and different content.
+		ignore_visible_idx = True
+	else:
+		# Note: converted for faster lookups
+		visible_idx = set(visible_idx)
+
 	result = [[]]
 	column_widths = []
 

frappe/integrations/doctype/webhook/webhook.json

@@ -17,6 +17,7 @@
   "html_condition",
   "sb_webhook",
   "request_url",
+  "timeout",
   "is_dynamic_url",
   "cb_webhook",
   "request_method",
@@ -204,6 +205,14 @@
    "fieldname": "is_dynamic_url",
    "fieldtype": "Check",
    "label": "Is Dynamic URL?"
+  },
+  {
+   "default": "5",
+   "description": "The number of seconds until the request expires",
+   "fieldname": "timeout",
+   "fieldtype": "Int",
+   "label": "Request Timeout",
+   "reqd": 1
   }
  ],
  "links": [
@@ -212,7 +221,7 @@
    "link_fieldname": "webhook"
   }
  ],
- "modified": "2023-06-02 17:25:12.598232",
+ "modified": "2023-06-16 10:21:00.971833",
  "modified_by": "Administrator",
  "module": "Integrations",
  "name": "Webhook",

frappe/integrations/doctype/webhook/webhook.py

@@ -129,7 +129,7 @@ def enqueue_webhook(doc, webhook) -> None:
 				url=request_url,
 				data=json.dumps(data, default=str),
 				headers=headers,
-				timeout=5,
+				timeout=webhook.timeout or 5,
 			)
 			r.raise_for_status()
 			frappe.logger().debug({"webhook_success": r.text})