diff --git a/resources/assets/js/components/AkauntingDate.vue b/resources/assets/js/components/AkauntingDate.vue
index a68b86e91..f083c93ac 100644
--- a/resources/assets/js/components/AkauntingDate.vue
+++ b/resources/assets/js/components/AkauntingDate.vue
@@ -87,6 +87,7 @@ export default {
     created() {
         if (this.locale !== 'en') {
             const lang = require(`flatpickr/dist/l10n/${this.locale}.js`).default[this.locale];
+
             this.config.locale = lang;
         }
     },
diff --git a/resources/views/common/reports/edit.blade.php b/resources/views/common/reports/edit.blade.php
index 0a13e0067..22f428ba2 100644
--- a/resources/views/common/reports/edit.blade.php
+++ b/resources/views/common/reports/edit.blade.php
@@ -40,6 +40,7 @@
                         @elseif ($type == 'dateGroup')
                             {{ Form::$type($field['name'], $field['title'], $field['icon'], array_merge([
                                    'data-field' => 'settings',
+                                   'show-date-format' => company_date_format(),
                                ],
                                $field['attributes']),
                                isset($report->settings->{$field['name']}) ? $report->settings->{$field['name']}: null
diff --git a/resources/views/modals/documents/payment.blade.php b/resources/views/modals/documents/payment.blade.php
index 56c0023a2..6549259dc 100644
--- a/resources/views/modals/documents/payment.blade.php
+++ b/resources/views/modals/documents/payment.blade.php
@@ -10,7 +10,7 @@
     <base-alert type="warning" v-if="typeof form.response !== 'undefined' && form.response.error" v-html="form.response.message"></base-alert>
 
     <div class="row">
-        {{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
+        {{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'show-date-format' => company_date_format(), 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
 
         {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], $document->grand_total) }}
 
diff --git a/resources/views/partials/form/date_group.blade.php b/resources/views/partials/form/date_group.blade.php
index 8603b9c1a..73d09f6ff 100644
--- a/resources/views/partials/form/date_group.blade.php
+++ b/resources/views/partials/form/date_group.blade.php
@@ -40,7 +40,7 @@
             maxDate: {{ $attributes['max-date'] }}
             @endif
         }"
-        
+
         locale="{{ language()->getShortCode() }}"
 
         @if (!empty($attributes['v-model']))
diff --git a/resources/views/partials/form/date_time_group.blade.php b/resources/views/partials/form/date_time_group.blade.php
index 43c1dcac3..ea9adb367 100644
--- a/resources/views/partials/form/date_time_group.blade.php
+++ b/resources/views/partials/form/date_time_group.blade.php
@@ -43,7 +43,7 @@
             maxDate: {{ $attributes['max-date'] }}
             @endif
         }"
-        
+
         locale="{{ language()->getShortCode() }}"
 
         @if (!empty($attributes['v-model']))
diff --git a/resources/views/partials/reports/fields.blade.php b/resources/views/partials/reports/fields.blade.php
index 7cd807a25..68b3c64b2 100644
--- a/resources/views/partials/reports/fields.blade.php
+++ b/resources/views/partials/reports/fields.blade.php
@@ -11,7 +11,8 @@
         {{ Form::$type($field['name'], $field['title']) }}
     @elseif ($type == 'dateGroup')
         {{ Form::$type($field['name'], $field['title'], $field['icon'], array_merge([
-               'model' => 'form.settings'.'.'.$field['name']
+               'model' => 'form.settings'.'.'.$field['name'],
+               'show-date-format' => company_date_format(),
            ],
            $field['attributes'])
        ) }}
diff --git a/resources/views/settings/modules/edit.blade.php b/resources/views/settings/modules/edit.blade.php
index 5bcf9b468..ff4c2a094 100644
--- a/resources/views/settings/modules/edit.blade.php
+++ b/resources/views/settings/modules/edit.blade.php
@@ -34,7 +34,7 @@
                         @elseif ($type == 'fileGroup')
                             {{ Form::$type($field['name'], trans($field['title']), $field['attributes']) }}
                         @elseif ($type == 'dateGroup')
-                            {{ Form::$type($field['name'], trans($field['title']), $field['icon'], array_merge(['id' => $field['name'], 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], $field['attributes']), Date::parse($setting[$field['name']] ?? now())->toDateString()) }}
+                            {{ Form::$type($field['name'], trans($field['title']), $field['icon'], array_merge(['id' => $field['name'], 'date-format' => 'Y-m-d', 'show-date-format' => company_date_format(), 'autocomplete' => 'off'], $field['attributes']), Date::parse($setting[$field['name']] ?? now())->toDateString()) }}
                         @elseif ($type == 'accountSelectGroup')
                             {{ Form::selectGroup($field['name'], trans_choice('general.accounts', 1), 'university', $accounts, setting($module->getAlias() . '.' . $field['name']), $field['attributes']) }}
                         @elseif ($type == 'categorySelectGroup')