diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 6e7f243abcaa9f6d4b2485731f68d2c79ed51a46..faf6fe30dd8ed6ca6e7bfa46e30b665924bf3b00 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -926,7 +926,7 @@ def get_uoms(doctype, txt, searchfield, start, page_len, filters):
 		[
 			(v[0], v[1] and _("Must be a whole number"))
 			for v in list(uom_list)
-			if re.search(re.escape(txt) + ".*", _(v[0]), re.IGNORECASE)
+			if v[0] is not None and re.search(re.escape(txt) + ".*", _(v[0]), re.IGNORECASE)
 		]
 	)
 
diff --git a/erpnext/setup/setup_wizard/operations/company_setup.py b/erpnext/setup/setup_wizard/operations/company_setup.py
index 6e79bd71adf916c268277bc60dcec8ea49c31b09..544274773ff90bc4441c50f96636773e813cbde1 100644
--- a/erpnext/setup/setup_wizard/operations/company_setup.py
+++ b/erpnext/setup/setup_wizard/operations/company_setup.py
@@ -74,7 +74,6 @@ def create_accounting_journals(bank_account_name, company):
 				{"document_type": "Delivery Note"},
 				{"document_type": "Purchase Receipt"},
 				{"document_type": "Stock Entry"},
-				{"document_type": "Expense Claim"},
 			],
 		},
 		{
diff --git a/erpnext/venue/notification/reservation_de_ressource___notification_gestionnaire/reservation_de_ressource___notification_gestionnaire.html b/erpnext/venue/notification/reservation_de_ressource___notification_gestionnaire/reservation_de_ressource___notification_gestionnaire.html
index c37abc6e81af9a84e6f122035b5c99fbe99498a3..f1b1dd3c7954fd4c07ba26d0834764f48e0aa97a 100644
--- a/erpnext/venue/notification/reservation_de_ressource___notification_gestionnaire/reservation_de_ressource___notification_gestionnaire.html
+++ b/erpnext/venue/notification/reservation_de_ressource___notification_gestionnaire/reservation_de_ressource___notification_gestionnaire.html
@@ -1,7 +1,7 @@
 <p>{{ _("Hello") }},</p>
 
 {% set user = frappe.get_doc("User", doc.owner) %}
-<p>The following resources have been booked by {{ user.full_name }} {% if doc.customer != user.full_name%}({{ doc.customer_name }}){% endif %}:</p>
+<p>{{ _("The following resources have been booked by") }} {{ user.full_name }} {% if doc.customer != user.full_name%}({{ doc.customer_name }}){% endif %}:</p>
 
 <div>
     {% for item in doc.items %}
diff --git a/erpnext/venue/notification/reservation_de_ressource___notification_gestionnaire/reservation_de_ressource___notification_gestionnaire.json b/erpnext/venue/notification/reservation_de_ressource___notification_gestionnaire/reservation_de_ressource___notification_gestionnaire.json
index 5f83956c846161eb0467e84021a5104772e80000..a91ee5271fc6e76f8f39f4785a074b3d465f7f62 100644
--- a/erpnext/venue/notification/reservation_de_ressource___notification_gestionnaire/reservation_de_ressource___notification_gestionnaire.json
+++ b/erpnext/venue/notification/reservation_de_ressource___notification_gestionnaire/reservation_de_ressource___notification_gestionnaire.json
@@ -7,13 +7,13 @@
  "docstatus": 0,
  "doctype": "Notification",
  "document_type": "Sales Order",
- "enabled": 0,
+ "enabled": 1,
  "event": "Submit",
  "idx": 0,
  "is_standard": 1,
  "message": "<p>{{ _(\"Hello\") }},</p>\n\n{% set user = frappe.get_doc(\"User\", doc.owner) %}\n<p>The following resources have been booked by {{ user.full_name }} {% if doc.customer != user.full_name%}({{ doc.customer_name }}){% endif %}:</p>\n\n<div>\n    {% for item in doc.items %}\n        {% if item.item_booking %}\n        {% set booking = frappe.get_doc(\"Item Booking\", item.item_booking) %}\n        <div>{{ booking.item_name }}</div>\n        <div class=\"text-muted small\">{{ _(\"Start\") }}: {{ frappe.utils.format_datetime(booking.starts_on) }}</div>\n        <div class=\"text-muted small\">{{ _(\"End\") }}: {{ frappe.utils.format_datetime(booking.ends_on) }}</div>\n        {% if booking.notes %}\n        <div class=\"text-muted small\">{{ _(\"Notes\") }}: {{ booking.notes }}</div>\n        {% endif %}\n        {% endif%}\n    {% endfor %}\n</div>",
  "message_type": "HTML",
- "modified": "2024-02-02 14:26:34.227330",
+ "modified": "2024-02-03 14:26:34.227330",
  "modified_by": "Administrator",
  "module": "Venue",
  "name": "Reservation de ressource - Notification gestionnaire",
diff --git a/erpnext/venue/notification/reservation_de_ressources___notification_utilisateurs/reservation_de_ressources___notification_utilisateurs.html b/erpnext/venue/notification/reservation_de_ressources___notification_utilisateurs/reservation_de_ressources___notification_utilisateurs.html
index 9d79bca3d866c551b88e5597ebabb66df1875482..4a2d247e9f8454d2873de78a215b30801f8e874a 100644
--- a/erpnext/venue/notification/reservation_de_ressources___notification_utilisateurs/reservation_de_ressources___notification_utilisateurs.html
+++ b/erpnext/venue/notification/reservation_de_ressources___notification_utilisateurs/reservation_de_ressources___notification_utilisateurs.html
@@ -1,8 +1,8 @@
 <p>{{ _("Hello") }},</p>
 
-<p>Your request to book the following resources has been registered.</p>
+<p>{{ _("Your request to book the following resources has been registered.") }}</p>
 
-<p>Please find the details below.</p>
+<p>{{ _("Please find the details below.") }}</p>
 <div>
     {% for item in doc.items %}
         {% if item.item_booking %}
diff --git a/erpnext/venue/notification/reservation_de_ressources___notification_utilisateurs/reservation_de_ressources___notification_utilisateurs.json b/erpnext/venue/notification/reservation_de_ressources___notification_utilisateurs/reservation_de_ressources___notification_utilisateurs.json
index 922f06c05483183b0e28eaf99e9d4f172c6f066e..79bdec7669aa8972acd6f5a9b2f9cdc2553181b1 100644
--- a/erpnext/venue/notification/reservation_de_ressources___notification_utilisateurs/reservation_de_ressources___notification_utilisateurs.json
+++ b/erpnext/venue/notification/reservation_de_ressources___notification_utilisateurs/reservation_de_ressources___notification_utilisateurs.json
@@ -7,13 +7,13 @@
  "docstatus": 0,
  "doctype": "Notification",
  "document_type": "Sales Order",
- "enabled": 1,
+ "enabled": 0,
  "event": "Submit",
  "idx": 0,
  "is_standard": 1,
  "message": "<p>{{ _(\"Hello\") }},</p>\n\n<p>Your request to book the following resources has been registered.</p>\n\n<p>Please find the details below.</p>\n<div>\n    {% for item in doc.items %}\n        {% if item.item_booking %}\n        {% set booking = frappe.get_doc(\"Item Booking\", item.item_booking) %}\n        <div>{{ booking.item_name }}</div>\n        <div class=\"text-muted small\">{{ _(\"Start\") }}: {{ frappe.utils.format_datetime(booking.starts_on) }}</div>\n        <div class=\"text-muted small\">{{ _(\"End\") }}: {{ frappe.utils.format_datetime(booking.ends_on) }}</div>\n        {% if booking.notes %}\n        <div class=\"text-muted small\">{{ _(\"Notes\") }}: {{ booking.notes }}</div>\n        {% endif %}\n        {% if booking.status in (\"Confirmed\", \"Not confirmed\") %}\n        <div><span class=\"indicator-pill small {{ \"green\" if booking.status==\"Confirmed\" else \"orange\" }}\">{{ booking.status }}</span></div>\n        {% endif%}\n        {% endif%}\n    {% endfor %}\n</div>",
  "message_type": "HTML",
- "modified": "2024-02-02 14:26:26.319836",
+ "modified": "2024-02-03 14:26:26.319836",
  "modified_by": "Administrator",
  "module": "Venue",
  "name": "Reservation de ressources - Notification utilisateurs",