Merge PR #123 into 16.0

Signed-off-by pedrobaeza
OCA · May 18, 2024 · b6d303d · b6d303d
2 parents 1a21cda + 0968402
commit b6d303d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/resource_booking/i18n/es.po b/resource_booking/i18n/es.po
@@ -203,7 +203,6 @@ msgstr "Activo"
 
 #. module: resource_booking
 #: model:ir.model.fields,field_description:resource_booking.field_resource_booking__activity_ids
-#: model:ir.model.fields,field_description:resource_booking.field_resource_booking__booking_activity_ids
 #: model:ir.model.fields,field_description:resource_booking.field_resource_booking_type__activity_ids
 msgid "Activities"
 msgstr "Actividades"
@@ -302,6 +301,11 @@ msgstr "Combinaciones de recursos reservables"
 msgid "Booking"
 msgstr "Reserva"
 
+#. module: resource_booking
+#: model:ir.model.fields,field_description:resource_booking.field_resource_booking__booking_activity_ids
+msgid "Booking Activities"
+msgstr "Actividades de reserva"
+
 #. module: resource_booking
 #: model:ir.model.fields,field_description:resource_booking.field_resource_booking_type__booking_count
 msgid "Booking Count"

diff --git a/resource_booking/i18n/resource_booking.pot b/resource_booking/i18n/resource_booking.pot
@@ -184,7 +184,6 @@ msgstr ""
 
 #. module: resource_booking
 #: model:ir.model.fields,field_description:resource_booking.field_resource_booking__activity_ids
-#: model:ir.model.fields,field_description:resource_booking.field_resource_booking__booking_activity_ids
 #: model:ir.model.fields,field_description:resource_booking.field_resource_booking_type__activity_ids
 msgid "Activities"
 msgstr ""
@@ -281,6 +280,11 @@ msgstr ""
 msgid "Booking"
 msgstr ""
 
+#. module: resource_booking
+#: model:ir.model.fields,field_description:resource_booking.field_resource_booking__booking_activity_ids
+msgid "Booking Activities"
+msgstr ""
+
 #. module: resource_booking
 #: model:ir.model.fields,field_description:resource_booking.field_resource_booking_type__booking_count
 msgid "Booking Count"

diff --git a/resource_booking/models/resource_booking.py b/resource_booking/models/resource_booking.py
@@ -252,7 +252,7 @@ class ResourceBooking(models.Model):
         tracking=True,
     )
     booking_activity_ids = fields.One2many(
-        "mail.activity", "booking_id", string="Activities"
+        "mail.activity", "booking_id", string="Booking Activities"
     )
 
     @api.depends("partner_ids")