From a6ca0e177408a1b11b3a5dae02f53d819ec5d4b3 Mon Sep 17 00:00:00 2001
From: Charles-Henri Decultot <chdecultot@dokos.io>
Date: Tue, 25 Mar 2025 14:10:08 +0100
Subject: [PATCH] feat(Bookings): option to display subscriptions in the
 booking calendar

---
 erpnext/venue/doctype/item_booking/item_booking.py     |  3 +++
 .../venue/doctype/venue_settings/venue_settings.json   | 10 +++++++++-
 erpnext/venue/doctype/venue_settings/venue_settings.py |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/erpnext/venue/doctype/item_booking/item_booking.py b/erpnext/venue/doctype/item_booking/item_booking.py
index ad6660a2ab..218f4012fe 100644
--- a/erpnext/venue/doctype/item_booking/item_booking.py
+++ b/erpnext/venue/doctype/item_booking/item_booking.py
@@ -1285,6 +1285,8 @@ def _get_subscriptions_as_events(start, end, item=None, user=None, fields=None,
 	subscriptions = _get_booking_subscriptions_between(
 		start, end, item=item, user=user, fields=fields, filters=filters
 	)
+	display_subscriptions = bool(frappe.db.get_single_value("Venue Settings", "display_subscriptions_in_calendar"))
+
 	events = []
 	for sub in subscriptions:
 		qty = sub["qty"]
@@ -1319,6 +1321,7 @@ def _get_subscriptions_as_events(start, end, item=None, user=None, fields=None,
 					"all_day": 1,
 					"startEditable": False,
 					"durationEditable": False,
+					"display": 'auto' if display_subscriptions else 'none'
 				}
 			)
 		)
diff --git a/erpnext/venue/doctype/venue_settings/venue_settings.json b/erpnext/venue/doctype/venue_settings/venue_settings.json
index d6028eeb61..bfa33cb20f 100644
--- a/erpnext/venue/doctype/venue_settings/venue_settings.json
+++ b/erpnext/venue/doctype/venue_settings/venue_settings.json
@@ -13,6 +13,7 @@
   "no_overlap_per_item",
   "sync_with_google_calendar",
   "allow_event_cancellation",
+  "display_subscriptions_in_calendar",
   "cancellation_delay",
   "role_allowed_to_skip_cart",
   "event_registration_section",
@@ -185,6 +186,13 @@
    "label": "Conversion Table",
    "options": "Venue UOM Conversion"
   },
+  {
+    "default": "1",
+    "description": "If checked, the subscriptions linked to a resource will be displayed on the desk calendar",
+    "fieldname": "display_subscriptions_in_calendar",
+    "fieldtype": "Check",
+    "label": "Display subscriptions in the booking calendar"
+   }, 
   {
    "fieldname": "column_break_jmrs",
    "fieldtype": "Column Break"
@@ -198,7 +206,7 @@
  ],
  "issingle": 1,
  "links": [],
- "modified": "2024-02-28 15:25:05.173966",
+ "modified": "2024-03-24 15:25:05.173966",
  "modified_by": "Administrator",
  "module": "Venue",
  "name": "Venue Settings",
diff --git a/erpnext/venue/doctype/venue_settings/venue_settings.py b/erpnext/venue/doctype/venue_settings/venue_settings.py
index 5d1aa156a4..62facbdc1b 100644
--- a/erpnext/venue/doctype/venue_settings/venue_settings.py
+++ b/erpnext/venue/doctype/venue_settings/venue_settings.py
@@ -39,6 +39,7 @@ class VenueSettings(Document):
 		clear_item_booking_draft_duration: DF.Int
 		confirm_booking_after_payment: DF.Check
 		day_uom: DF.Link | None
+		display_subscriptions_in_calendar: DF.Check
 		enable_multi_companies: DF.Check
 		enable_simultaneous_booking: DF.Check
 		minute_uom: DF.Link | None
-- 
GitLab