diff --git a/config-dist.php b/config-dist.php
index df69c012..a9a1f758 100644
--- a/config-dist.php
+++ b/config-dist.php
@@ -145,6 +145,7 @@ Setting('FEATURE_FLAG_CALENDAR', true);
 Setting('FEATURE_FLAG_STOCK_PRICE_TRACKING', true);
 Setting('FEATURE_FLAG_STOCK_LOCATION_TRACKING', true);
 Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING', true);
+Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD', true); // Activate the number pad in best-before-date fields on (supported) mobile browsers
 Setting('FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING', true);
 Setting('FEATURE_FLAG_STOCK_PRODUCT_FREEZING', true);
 Setting('FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS', true);
diff --git a/localization/strings.pot b/localization/strings.pot
index d31cd336..4a0da6ba 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -1765,3 +1765,6 @@ msgstr ""
 
 msgid "Store"
 msgstr ""
+
+msgid "Transaction successfully undone"
+msgstr ""
diff --git a/views/components/datetimepicker.blade.php b/views/components/datetimepicker.blade.php
index de2d227e..d3ca83bc 100644
--- a/views/components/datetimepicker.blade.php
+++ b/views/components/datetimepicker.blade.php
@@ -14,6 +14,7 @@
 @php if(!isset($nextInputSelector)) { $nextInputSelector = false; } @endphp
 @php if(empty($additionalAttributes)) { $additionalAttributes = ''; } @endphp
 @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp
+@php if(empty($activateNumberPad)) { $activateNumberPad = false; } @endphp
 
 <div id="datetimepicker-wrapper" class="form-group {{ $additionalGroupCssClasses }}">
 	<label for="{{ $id }}">{{ $__t($label) }}
@@ -24,7 +25,7 @@
 	</label>
 	<div class="input-group">
 		<div class="input-group date datetimepicker @if(!empty($additionalGroupCssClasses)){{ $additionalGroupCssClasses }}@endif" id="{{ $id }}" @if(!$noNameAttribute) name="{{ $id }}" @endif data-target-input="nearest">
-			<input {!! $additionalAttributes !!} type="text" @if($isRequired) @if($isRequired) required @endif @endif class="form-control datetimepicker-input @if(!empty($additionalCssClasses)){{ $additionalCssClasses }}@endif"
+			<input {!! $additionalAttributes !!} type="text" @if($activateNumberPad) inputmode="numeric" @endif @if($isRequired) @if($isRequired) required @endif @endif class="form-control datetimepicker-input @if(!empty($additionalCssClasses)){{ $additionalCssClasses }}@endif"
 				data-target="#{{ $id }}" data-format="{{ $format }}"
 				data-init-with-now="{{ BoolToString($initWithNow) }}"
 				data-init-value="{{ $initialValue }}"
diff --git a/views/inventory.blade.php b/views/inventory.blade.php
index f61a30f0..8b67637c 100644
--- a/views/inventory.blade.php
+++ b/views/inventory.blade.php
@@ -50,7 +50,8 @@
 				'shortcutLabel' => 'Never expires',
 				'earlierThanInfoLimit' => date('Y-m-d'),
 				'earlierThanInfoText' => $__t('The given date is earlier than today, are you sure?'),
-				'additionalGroupCssClasses' => $additionalGroupCssClasses
+				'additionalGroupCssClasses' => $additionalGroupCssClasses,
+				'activateNumberPad' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD
 			))
 			@php $additionalGroupCssClasses = ''; @endphp
 
diff --git a/views/purchase.blade.php b/views/purchase.blade.php
index 7a13f347..f8e38489 100644
--- a/views/purchase.blade.php
+++ b/views/purchase.blade.php
@@ -52,7 +52,8 @@
 				'shortcutLabel' => 'Never expires',
 				'earlierThanInfoLimit' => date('Y-m-d'),
 				'earlierThanInfoText' => $__t('The given date is earlier than today, are you sure?'),
-				'additionalGroupCssClasses' => $additionalGroupCssClasses
+				'additionalGroupCssClasses' => $additionalGroupCssClasses,
+				'activateNumberPad' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD
 			))
 			@php $additionalGroupCssClasses = ''; @endphp
 
diff --git a/views/stockentryform.blade.php b/views/stockentryform.blade.php
index dd66a4ff..97f372e3 100644
--- a/views/stockentryform.blade.php
+++ b/views/stockentryform.blade.php
@@ -40,7 +40,8 @@
 				'shortcutLabel' => 'Never expires',
 				'earlierThanInfoLimit' => date('Y-m-d'),
 				'earlierThanInfoText' => $__t('The given date is earlier than today, are you sure?'),
-				'additionalGroupCssClasses' => $additionalGroupCssClasses
+				'additionalGroupCssClasses' => $additionalGroupCssClasses,
+				'activateNumberPad' => GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD
 			))
 			@php $additionalGroupCssClasses = ''; @endphp