From 8e563b64bf6e16837d964c85b898eb30fe427f77 Mon Sep 17 00:00:00 2001
From: RisvanaCybro <risvana@cybrosys.info>
Date: Mon, 6 May 2024 16:28:46 +0530
Subject: [PATCH] May 06: [FIX] Bug Fixed 'venue_booking_management'

---
 venue_booking_management/__manifest__.py                  | 2 +-
 venue_booking_management/doc/RELEASE_NOTES.md             | 6 ++++++
 venue_booking_management/models/venue_booking.py          | 7 ++++++-
 .../report/venue_booking_rerports.xml                     | 8 ++------
 .../wizards/check_venue_availability.py                   | 1 +
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/venue_booking_management/__manifest__.py b/venue_booking_management/__manifest__.py
index 8e20ca6fc..190a65125 100644
--- a/venue_booking_management/__manifest__.py
+++ b/venue_booking_management/__manifest__.py
@@ -21,7 +21,7 @@
 ###############################################################################
 {
     'name': 'Venue / Event Booking Management',
-    'version': '17.0.1.0.0',
+    'version': '17.0.1.0.1',
     'summary': 'Core Module for Managing Different Types of '
                'Venue/ Event Booking.',
     'description': 'Core Module for Managing Different Types of '
diff --git a/venue_booking_management/doc/RELEASE_NOTES.md b/venue_booking_management/doc/RELEASE_NOTES.md
index 68def998b..9075fb32d 100644
--- a/venue_booking_management/doc/RELEASE_NOTES.md
+++ b/venue_booking_management/doc/RELEASE_NOTES.md
@@ -3,3 +3,9 @@
 #### Version 17.0.1.0.0
 #### ADD
 - Initial Commit for Venue / Event Booking Management
+
+#### 06.05.2024
+#### Version 17.0.1.0.1
+##### UPDT
+- Bug Fix-Revised the validations for venue booking.
+
diff --git a/venue_booking_management/models/venue_booking.py b/venue_booking_management/models/venue_booking.py
index ee1e34877..8b8b055ad 100644
--- a/venue_booking_management/models/venue_booking.py
+++ b/venue_booking_management/models/venue_booking.py
@@ -157,8 +157,11 @@ class VenueBooking(models.Model):
             booking = self.env['venue.booking'].search(
                 [('start_date', '<', self.end_date),
                  ('end_date', '>', self.start_date),
-                 ('venue_id', '=', self.venue_id.id)])
+                 ('venue_id', '=', self.venue_id.id),
+                 ('state', 'in', ['confirm', 'invoice'])
+                 ])
             if booking:
+                print(booking.state)
                 raise ValidationError(
                     "Venue is not available for the selected time range.")
 
@@ -212,6 +215,7 @@ class VenueBooking(models.Model):
                 ('venue_id', '=', booking.venue_id.id),
                 ('start_date', '<', booking.end_date),
                 ('end_date', '>', booking.start_date),
+                ('state', 'in', ['confirm', 'invoice']),
                 ('id', '!=', booking.id),  # Exclude the current record itself
             ])
             if overlapping_bookings:
@@ -225,6 +229,7 @@ class VenueBooking(models.Model):
                 ('venue_id', '=', booking.venue_id.id),
                 ('start_date', '<', booking.end_date),
                 ('end_date', '>', booking.start_date),
+                ('state', 'in', ['confirm', 'invoice']),
                 ('id', '!=', booking.id),  # Exclude the current record itself
             ])
             if bookings:
diff --git a/venue_booking_management/report/venue_booking_rerports.xml b/venue_booking_management/report/venue_booking_rerports.xml
index 3e8b8cba8..d69bdb1e4 100644
--- a/venue_booking_management/report/venue_booking_rerports.xml
+++ b/venue_booking_management/report/venue_booking_rerports.xml
@@ -6,12 +6,8 @@
         <field name="name">Venue Booking</field>
         <field name="model">venue.booking</field>
         <field name="report_type">qweb-pdf</field>
-        <field name="report_name">
-            venue_booking_management.report_venue_booking
-        </field>
-        <field name="report_file">
-            venue_booking_management.report_venue_booking
-        </field>
+        <field name="report_name">venue_booking_management.report_venue_booking</field>
+        <field name="report_file">venue_booking_management.report_venue_booking</field>
         <field name="binding_model_id" ref="model_venue_booking"/>
         <field name="binding_type">report</field>
     </record>
diff --git a/venue_booking_management/wizards/check_venue_availability.py b/venue_booking_management/wizards/check_venue_availability.py
index 6bc59a3b1..8cf149eeb 100644
--- a/venue_booking_management/wizards/check_venue_availability.py
+++ b/venue_booking_management/wizards/check_venue_availability.py
@@ -52,6 +52,7 @@ class VenueAvailable(models.TransientModel):
             ('venue_id', '=', self.venue_id.id),
             ('start_date', '<', self.end_date),
             ('end_date', '>', self.start_date),
+            ('state', 'in', ['confirm', 'invoice'])
         ])
         if booking:
             raise ValidationError(