diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 5b0bd384ee..959be57c9c 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -259,79 +259,131 @@
             <!-- Order Number -->
             <div class="form-group">
               <label for="by_order_number" class="col-md-3 control-label">{{ trans('general.order_number') }}</label>
-              <div class="col-md-5 col-sm-8">
+              <div class="col-md-7">
                 <input class="form-control" type="text" name="by_order_number" value="" aria-label="by_order_number">
               </div>
             </div>
 
           <!-- Purchase Date -->
-            <div class="form-group purchase-range">
+            <div class="form-group purchase-range{{ ($errors->has('purchase_start') || $errors->has('purchase_end')) ? ' has-error' : '' }}">
               <label for="purchase_start" class="col-md-3 control-label">{{ trans('general.purchase_date') }} {{  trans('general.range') }}</label>
-              <div class="input-daterange input-group col-md-6" id="datepicker">
-                <input type="text" class="form-control" name="purchase_start" aria-label="purchase_start">
+              <div class="input-daterange input-group col-md-7" id="datepicker">
+                <input type="text" class="form-control" name="purchase_start" aria-label="purchase_start" value="{{ old('purchase_start') }}">
                 <span class="input-group-addon">to</span>
-                <input type="text" class="form-control" name="purchase_end" aria-label="purchase_end">
+                <input type="text" class="form-control" name="purchase_end" aria-label="purchase_end" value="{{ old('purchase_end') }}">
               </div>
+
+                @if ($errors->has('purchase_start') || $errors->has('purchase_end'))
+                    <div class="col-md-9 col-lg-offset-3">
+                        {!! $errors->first('purchase_start', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                        {!! $errors->first('purchase_end', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                    </div>
+                @endif
+
             </div>
 
             <!-- Created Date -->
-            <div class="form-group purchase-range">
+            <div class="form-group purchase-range{{ ($errors->has('created_start') || $errors->has('created_end')) ? ' has-error' : '' }}">
               <label for="created_start" class="col-md-3 control-label">{{ trans('general.created_at') }} {{  trans('general.range') }}</label>
-              <div class="input-daterange input-group col-md-6" id="datepicker">
-                <input type="text" class="form-control" name="created_start" aria-label="created_start">
+              <div class="input-daterange input-group col-md-7" id="datepicker">
+                <input type="text" class="form-control" name="created_start" aria-label="created_start" value="{{ old('created_start') }}">
                 <span class="input-group-addon">to</span>
-                <input type="text" class="form-control" name="created_end" aria-label="created_end">
+                <input type="text" class="form-control" name="created_end" aria-label="created_end" value="{{ old('created_end') }}">
               </div>
+
+                @if ($errors->has('created_start') || $errors->has('created_end'))
+                    <div class="col-md-9 col-lg-offset-3">
+                        {!! $errors->first('created_start', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                        {!! $errors->first('created_end', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                    </div>
+                @endif
             </div>
 
           <!-- Checkout Date -->
-          <div class="form-group checkout-range">
+          <div class="form-group checkout-range{{ ($errors->has('checkout_date_start') || $errors->has('checkout_date_end')) ? ' has-error' : '' }}">
               <label for="checkout_date" class="col-md-3 control-label">{{ trans('general.checkout') }} {{  trans('general.range') }}</label>
-              <div class="input-daterange input-group col-md-6" id="datepicker">
-                  <input type="text" class="form-control" name="checkout_date_start" aria-label="checkout_date_start">
+              <div class="input-daterange input-group col-md-7" id="datepicker">
+                  <input type="text" class="form-control" name="checkout_date_start" aria-label="checkout_date_start" value="{{ old('checkout_date_start') }}">
                   <span class="input-group-addon">to</span>
-                  <input type="text" class="form-control" name="checkout_date_end" aria-label="checkout_date_end">
+                  <input type="text" class="form-control" name="checkout_date_end" aria-label="checkout_date_end" value="{{ old('checkout_date_end') }}">
               </div>
+
+              @if ($errors->has('checkout_date_start') || $errors->has('checkout_date_end'))
+                  <div class="col-md-9 col-lg-offset-3">
+                      {!! $errors->first('checkout_date_start', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                      {!! $errors->first('checkout_date_end', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                  </div>
+              @endif
+
           </div>
 
           <!-- Last Checkin Date -->
-          <div class="form-group checkin-range">
+          <div class="form-group checkin-range{{ ($errors->has('checkin_date_start') || $errors->has('checkin_date_end')) ? ' has-error' : '' }}">
               <label for="checkin_date" class="col-md-3 control-label">{{ trans('admin/hardware/table.last_checkin_date') }}</label>
-              <div class="input-daterange input-group col-md-6" id="datepicker">
-                  <input type="text" class="form-control" name="checkin_date_start" aria-label="checkin_date_start">
+              <div class="input-daterange input-group col-md-7" id="datepicker">
+                  <input type="text" class="form-control" name="checkin_date_start" aria-label="checkin_date_start" value="{{ old('checkin_date_start') }}">
                   <span class="input-group-addon">{{ strtolower(trans('general.to')) }}</span>
-                  <input type="text" class="form-control" name="checkin_date_end" aria-label="checkin_date_end">
+                  <input type="text" class="form-control" name="checkin_date_end" aria-label="checkin_date_end" value="{{ old('checkin_date_end') }}">
               </div>
+
+              @if ($errors->has('checkin_date_start') || $errors->has('checkin_date_end'))
+                  <div class="col-md-9 col-lg-offset-3">
+                      {!! $errors->first('checkin_date_start', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                      {!! $errors->first('checkin_date_end', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                  </div>
+              @endif
           </div>
 
             <!-- Expected Checkin Date -->
-            <div class="form-group expected_checkin-range">
+            <div class="form-group expected_checkin-range{{ ($errors->has('expected_checkin_start') || $errors->has('expected_checkin_end')) ? ' has-error' : '' }}">
               <label for="expected_checkin_start" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label>
-              <div class="input-daterange input-group col-md-6" id="datepicker">
-                <input type="text" class="form-control" name="expected_checkin_start" aria-label="expected_checkin_start">
+              <div class="input-daterange input-group col-md-7" id="datepicker">
+                <input type="text" class="form-control" name="expected_checkin_start" aria-label="expected_checkin_start" value="{{ old('expected_checkin_start') }}">
                 <span class="input-group-addon">to</span>
-                <input type="text" class="form-control" name="expected_checkin_end" aria-label="expected_checkin_end">
+                <input type="text" class="form-control" name="expected_checkin_end" aria-label="expected_checkin_end" value="{{ old('expected_checkin_end') }}">
               </div>
+
+                @if ($errors->has('expected_checkin_start') || $errors->has('expected_checkin_end'))
+                    <div class="col-md-9 col-lg-offset-3">
+                        {!! $errors->first('expected_checkin_start', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                        {!! $errors->first('expected_checkin_end', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                    </div>
+                @endif
+
             </div>
 
               <!-- Last Audit Date -->
-              <div class="form-group last_audit-range">
+              <div class="form-group last_audit-range{{ ($errors->has('last_audit_start') || $errors->has('last_audit_end')) ? ' has-error' : '' }}">
                   <label for="last_audit_start" class="col-md-3 control-label">{{ trans('general.last_audit') }}</label>
-                  <div class="input-daterange input-group col-md-6" id="datepicker">
-                      <input type="text" class="form-control" name="last_audit_start" aria-label="last_audit_start">
+                  <div class="input-daterange input-group col-md-7" id="datepicker">
+                      <input type="text" class="form-control" name="last_audit_start" aria-label="last_audit_start" value="{{ old('last_audit_start') }}">
                       <span class="input-group-addon">to</span>
-                      <input type="text" class="form-control" name="last_audit_end" aria-label="last_audit_end">
+                      <input type="text" class="form-control" name="last_audit_end" aria-label="last_audit_end" value="{{ old('last_audit_end') }}">
                   </div>
+
+                  @if ($errors->has('last_audit_start') || $errors->has('last_audit_end'))
+                      <div class="col-md-9 col-lg-offset-3">
+                          {!! $errors->first('last_audit_start', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                          {!! $errors->first('last_audit_end', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                      </div>
+                  @endif
               </div>
 
               <!-- Next Audit Date -->
-              <div class="form-group next_audit-range">
+              <div class="form-group next_audit-range{{ ($errors->has('next_audit_start') || $errors->has('next_audit_end')) ? ' has-error' : '' }}">
                   <label for="next_audit_start" class="col-md-3 control-label">{{ trans('general.next_audit_date') }}</label>
-                  <div class="input-daterange input-group col-md-6" id="datepicker">
-                      <input type="text" class="form-control" name="next_audit_start" aria-label="nex_audit_start">
+                  <div class="input-daterange input-group col-md-7" id="datepicker">
+                      <input type="text" class="form-control" name="next_audit_start" aria-label="next_audit_start" value="{{ old('next_audit_start') }}">
                       <span class="input-group-addon">to</span>
-                      <input type="text" class="form-control" name="next_audit_end" aria-label="next_audit_end">
+                      <input type="text" class="form-control" name="next_audit_end" aria-label="next_audit_end" value="{{ old('next_audit_end') }}">
                   </div>
+
+                  @if ($errors->has('next_audit_start') || $errors->has('next_audit_end'))
+                      <div class="col-md-9 col-lg-offset-3">
+                          {!! $errors->first('next_audit_start', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                          {!! $errors->first('next_audit_end', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                      </div>
+                  @endif
               </div>
 
             <div class="col-md-9 col-md-offset-3">