diff --git a/ayanova/src/components/custom-fields-control.vue b/ayanova/src/components/custom-fields-control.vue
index 0094c489..9e619e81 100644
--- a/ayanova/src/components/custom-fields-control.vue
+++ b/ayanova/src/components/custom-fields-control.vue
@@ -15,9 +15,9 @@
             xl="3"
             px-2
           >
-            <!-- CURRENCY -->
-            <div v-if="item.type === 8">
-              <gz-currency
+            <!-- DATETIME  -->
+            <div v-if="item.type === 1">
+              <gz-date-time-picker
                 v-model="_self[item.dataKey]"
                 :readonly="readOnly"
                 :label="lt(item.fld)"
@@ -26,8 +26,9 @@
                 :rules="[
                   form().customFieldsCheck(parentVM, item, _self, lt(item.fld))
                 ]"
-              ></gz-currency>
+              ></gz-date-time-picker>
             </div>
+
             <!-- DATE -->
             <div v-else-if="item.type === 2">
               <gz-date-picker
@@ -54,19 +55,6 @@
                 ]"
               ></gz-time-picker>
             </div>
-            <!-- DATETIME  -->
-            <div v-else-if="item.type === 1">
-              <gz-date-time-picker
-                v-model="_self[item.dataKey]"
-                :readonly="readOnly"
-                :label="lt(item.fld)"
-                :ref="item.fld"
-                :error-messages="form().serverErrors(parentVM, item.fld)"
-                :rules="[
-                  form().customFieldsCheck(parentVM, item, _self, lt(item.fld))
-                ]"
-              ></gz-date-time-picker>
-            </div>
             <!-- TEXT -->
             <div v-else-if="item.type === 4">
               <v-textarea
@@ -99,6 +87,19 @@
                 step="none"
               ></v-text-field>
             </div>
+            <!-- BOOL -->
+            <div v-else-if="item.type === 6">
+              <v-checkbox
+                v-model="_self[item.dataKey]"
+                :readonly="readOnly"
+                :label="lt(item.fld)"
+                :ref="item.fld"
+                :error-messages="form().serverErrors(parentVM, item.fld)"
+                :rules="[
+                  form().customFieldsCheck(parentVM, item, _self, lt(item.fld))
+                ]"
+              ></v-checkbox>
+            </div>
             <!-- DECIMAL -->
             <div v-else-if="item.type === 7">
               <gz-decimal
@@ -112,9 +113,9 @@
                 ]"
               ></gz-decimal>
             </div>
-            <!-- BOOL -->
-            <div v-else-if="item.type === 6">
-              <v-checkbox
+            <!-- CURRENCY -->
+            <div v-else-if="item.type === 8">
+              <gz-currency
                 v-model="_self[item.dataKey]"
                 :readonly="readOnly"
                 :label="lt(item.fld)"
@@ -123,7 +124,7 @@
                 :rules="[
                   form().customFieldsCheck(parentVM, item, _self, lt(item.fld))
                 ]"
-              ></v-checkbox>
+              ></gz-currency>
             </div>
             <div v-else>
               <span class="error"