Merge PR #131 into 15.0

Signed-off-by pedrobaeza
OCA · Jun 27, 2024 · ed492e8 · ed492e8
2 parents 9f491dd + 04e684d
commit ed492e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/resource_booking/tests/test_backend.py b/resource_booking/tests/test_backend.py
@@ -821,7 +821,7 @@ def test_event_show_as_free(self):
         rb_f.start = "2021-03-01 09:30:00"
         rb_f.duration = 0.5
         rb_f.partner_ids.add(self.partner.copy())
-        with self.assertRaises(AssertionError):
+        with self.assertRaises(ValidationError):
             rb_f.save()
 
     def test_resource_is_available(self):

diff --git a/resource_booking/views/resource_booking_views.xml b/resource_booking/views/resource_booking_views.xml
@@ -153,7 +153,7 @@
                                 <field
                                     name="combination_id"
                                     class="oe_inline"
-                                    attrs="{'required': [('start', '!=', False)], 'readonly': [('combination_auto_assign', '=', True)]}"
+                                    attrs="{'required': [('combination_auto_assign', '=', False)], 'readonly': [('combination_auto_assign', '=', True)]}"
                                 />
                             </div>
                             <field name="categ_ids" widget="many2many_tags" />