diff --git a/src/api/ADempiere/form/VAllocation.ts b/src/api/ADempiere/form/VAllocation.ts
index ba527ce485f..5052d5f3fc8 100644
--- a/src/api/ADempiere/form/VAllocation.ts
+++ b/src/api/ADempiere/form/VAllocation.ts
@@ -9,7 +9,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -43,6 +43,7 @@ export function listBusinessPartners({
       page_size: pageSize,
       page_token: pageToken,
       //  DSL Query
+      is_only_active_records: true,
       search_value: searchValue
     }
   })
@@ -63,6 +64,7 @@ export function requestListOrganizations({
       page_size: pageSize,
       page_token: pageToken,
       //  DSL Query
+      is_only_active_records: true,
       search_value: searchValue
     }
   })
@@ -80,6 +82,7 @@ export function requestListCurrencies({
       page_size: pageSize,
       page_token: pageToken,
       //  DSL Query
+      is_only_active_records: true,
       search_value: searchValue
     }
   })
@@ -167,6 +170,7 @@ export function requestListCharges({
       page_size: pageSize,
       page_token: pageToken,
       //  DSL Query
+      is_only_active_records: true,
       search_value: searchValue
     }
   })
@@ -185,6 +189,7 @@ export function requestListTransactionOrganizations({
       page_size: pageSize,
       page_token: pageToken,
       //  DSL Query
+      is_only_active_records: true,
       search_value: searchValue
     }
   })
diff --git a/src/components/ADempiere/FormDefinition/VAllocation/SearchCriteria/businessPartner.vue b/src/components/ADempiere/FormDefinition/VAllocation/SearchCriteria/businessPartner.vue
index 7e05efebef0..72bd0f4863f 100644
--- a/src/components/ADempiere/FormDefinition/VAllocation/SearchCriteria/businessPartner.vue
+++ b/src/components/ADempiere/FormDefinition/VAllocation/SearchCriteria/businessPartner.vue
@@ -19,11 +19,11 @@
 <template>
   <el-form-item
     v-if="!isEmptyValue(bPartnerField)"
-    style="width: 100%;"
+    :required="true"
   >
     <template slot="label">
       {{ bPartnerField.name }}
-      <span style="color: #f34b4b"> * </span>
+      <!-- <span style="color: #f34b4b"> * </span> -->
     </template>
 
     <el-select
diff --git a/src/components/ADempiere/FormDefinition/VAllocation/SearchCriteria/currencyField.vue b/src/components/ADempiere/FormDefinition/VAllocation/SearchCriteria/currencyField.vue
new file mode 100644
index 00000000000..51b1ebf6f25
--- /dev/null
+++ b/src/components/ADempiere/FormDefinition/VAllocation/SearchCriteria/currencyField.vue
@@ -0,0 +1,153 @@
+<!--
+  ADempiere-Vue (Frontend) for ADempiere ERP & CRM Smart Business Solution
+  Copyright (C) 2018-Present E.R.P. Consultores y Asociados, C.A. www.erpya.com
+  Contributor(s): Edwin Betancourt EdwinBetanc0urt@outlook.com https://github.com/EdwinBetanc0urt
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program. If not, see <https:www.gnu.org/licenses/>.
+-->
+
+<template>
+  <el-form-item
+    style="width: 100%;"
+    :required="true"
+  >
+    <template slot="label">
+      {{ $t('form.VAllocation.searchCriteria.currency') }}
+      <!-- <span style="color: #f34b4b"> * </span> -->
+    </template>
+
+    <el-select
+      v-model="currentCurrencyValue"
+      clearable
+      style="width: 100%;"
+      filterable
+      :default-first-option="true"
+      remote
+      :remote-method="remoteSearchCurrencies"
+      @visible-change="findCurrencies"
+    >
+      <empty-option-select
+        :current-value="currentCurrencyValue"
+      />
+      <el-option
+        v-for="item in optionsCurrency"
+        :key="item.id"
+        :label="item.label"
+        :value="item.id"
+      />
+    </el-select>
+  </el-form-item>
+</template>
+
+<script>
+import { computed, defineComponent } from '@vue/composition-api'
+
+import store from '@/store'
+
+// Components and Mixins
+import EmptyOptionSelect from '@/components/ADempiere/FieldDefinition/FieldSelect/emptyOptionSelect.vue'
+
+// API Request Methods
+import {
+  requestListCurrencies
+} from '@/api/ADempiere/form/VAllocation.ts'
+
+// Utils and Helper Methods
+// import { isEmptyValue } from '@/utils/ADempiere/valueUtils'
+
+export default defineComponent({
+  name: 'CurrencyField',
+
+  components: {
+    EmptyOptionSelect
+  },
+
+  setup() {
+    const currentCurrencyValue = computed({
+      // getter
+      get() {
+        const { currencyId } = store.getters.getSearchFilter
+        return currencyId
+      },
+      // setter
+      set(id) {
+        // store.commit('setCurrency', id)
+        store.commit('updateAttributeCriteriaVallocation', {
+          attribute: 'currencyId',
+          criteria: 'searchCriteria',
+          value: id
+        })
+      }
+    })
+
+    const optionsCurrency = computed({
+      // getter
+      get() {
+        const { listCurrency } = store.getters.getSearchFilter
+        return listCurrency
+      },
+      // setter
+      set(list) {
+        store.commit('updateAttributeCriteriaVallocation', {
+          attribute: 'listCurrency',
+          criteria: 'searchCriteria',
+          value: list
+        })
+        // store.commit('setBusinessPartner', id)
+      }
+    })
+
+    function findCurrencies(isFind, searchValue) {
+      if (!isFind) {
+        return
+      }
+      requestListCurrencies({
+        searchValue
+      })
+        .then(response => {
+          const { records } = response
+          optionsCurrency.value = records.map(currency => {
+            const { id, uuid, values } = currency
+            return {
+              id,
+              uuid,
+              label: values.DisplayColumn
+            }
+          })
+        })
+    }
+
+    function remoteSearchCurrencies(searchValue) {
+      // if (!isEmptyValue(searchValue) && searchValue.length > 1) {
+      //   const result = optionsCurrency.value.filter((textValue) => {
+      //     const search = searchValue.toLowerCase()
+      //     return textValue.label.toLowerCase().includes(search)
+      //   })
+      //   if (isEmptyValue(result)) {
+      //     findCurrencies(true, searchValue)
+      //   }
+      // }
+      findCurrencies(true, searchValue)
+    }
+
+    return {
+      // Computeds
+      currentCurrencyValue,
+      optionsCurrency,
+      // Methods
+      findCurrencies,
+      remoteSearchCurrencies
+    }
+  }
+})
+</script>
diff --git a/src/components/ADempiere/FormDefinition/VAllocation/SearchCriteria/index.vue b/src/components/ADempiere/FormDefinition/VAllocation/SearchCriteria/index.vue
index d8f76810e4e..dc4f6666690 100644
--- a/src/components/ADempiere/FormDefinition/VAllocation/SearchCriteria/index.vue
+++ b/src/components/ADempiere/FormDefinition/VAllocation/SearchCriteria/index.vue
@@ -36,11 +36,9 @@
                 <el-col :span="12">
                   <el-form-item
                     :label="$t('form.VAllocation.searchCriteria.organization')"
-                    style="width: 100%;"
                   >
                     <el-select
                       v-model="organizationsId"
-                      style="width: 100%;"
                       filterable
                       clearable
                       :default-first-option="true"
@@ -63,44 +61,16 @@
 
               <el-row :gutter="20">
                 <el-col :span="12">
-                  <el-form-item
-                    style="width: 100%;"
-                  >
-                    <template slot="label">
-                      {{ $t('form.VAllocation.searchCriteria.currency') }}
-                      <span style="color: #f34b4b"> * </span>
-                    </template>
-                    <el-select
-                      v-model="currencyId"
-                      style="width: 100%;"
-                      filterable
-                      clearable
-                      :default-first-option="true"
-                      :remote-method="remoteSearchCurrencies"
-                      @visible-change="findCurrencies"
-                    >
-                      <empty-option-select
-                        :current-value="currencyId"
-                      />
-                      <el-option
-                        v-for="item in optionsCurrency"
-                        :key="item.id"
-                        :label="item.label"
-                        :value="item.id"
-                      />
-                    </el-select>
-                  </el-form-item>
+                  <currency-field />
                 </el-col>
 
                 <el-col :span="12">
                   <el-form-item
                     :label="$t('form.VAllocation.searchCriteria.date')"
-                    style="width: 100%;"
                   >
                     <el-date-picker
                       v-model="currentDate"
                       type="date"
-                      style="width: 100%;"
                     />
                   </el-form-item>
                 </el-col>
@@ -186,6 +156,7 @@ import store from '@/store'
 // Components and Mixins
 import BusinessPartner from '@/components/ADempiere/FormDefinition/VAllocation/SearchCriteria/businessPartner.vue'
 import Carousel from '@/components/ADempiere/Carousel'
+import CurrencyField from '@/components/ADempiere/FormDefinition/VAllocation/SearchCriteria/currencyField.vue'
 import FieldDefinition from '@/components/ADempiere/FieldDefinition/index.vue'
 import EmptyOptionSelect from '@/components/ADempiere/FieldDefinition/FieldSelect/emptyOptionSelect.vue'
 
@@ -198,8 +169,7 @@ import {
 
 // API Request Methods
 import {
-  requestListOrganizations,
-  requestListCurrencies
+  requestListOrganizations
 } from '@/api/ADempiere/form/VAllocation.ts'
 
 // Utils and Helper Methods
@@ -211,6 +181,7 @@ export default defineComponent({
   components: {
     BusinessPartner,
     Carousel,
+    CurrencyField,
     FieldDefinition,
     EmptyOptionSelect
   },
@@ -289,23 +260,6 @@ export default defineComponent({
       }
     })
 
-    const optionsCurrency = computed({
-      // getter
-      get() {
-        const { listCurrency } = store.getters.getSearchFilter
-        return listCurrency
-      },
-      // setter
-      set(list) {
-        store.commit('updateAttributeCriteriaVallocation', {
-          attribute: 'listCurrency',
-          criteria: 'searchCriteria',
-          value: list
-        })
-        // store.commit('setBusinessPartner', id)
-      }
-    })
-
     // const businessPartner = computed(() => {
     //   return store.getters.getValueOfFieldOnContainer({
     //     parentUuid: '',
@@ -334,23 +288,6 @@ export default defineComponent({
       }
     })
 
-    const currencyId = computed({
-      // getter
-      get() {
-        const { currencyId } = store.getters.getSearchFilter
-        return currencyId
-      },
-      // setter
-      set(id) {
-        // store.commit('setCurrency', id)
-        store.commit('updateAttributeCriteriaVallocation', {
-          attribute: 'currencyId',
-          criteria: 'searchCriteria',
-          value: id
-        })
-      }
-    })
-
     const currentDate = computed({
       // getter
       get() {
@@ -404,26 +341,6 @@ export default defineComponent({
         })
     }
 
-    function findCurrencies(isFind, searchValue) {
-      if (!isFind) {
-        return
-      }
-      requestListCurrencies({
-        searchValue
-      })
-        .then(response => {
-          const { records } = response
-          optionsCurrency.value = records.map(currency => {
-            const { id, uuid, values } = currency
-            return {
-              id,
-              uuid,
-              label: values.DisplayColumn
-            }
-          })
-        })
-    }
-
     function remoteSearchOrganizations(query) {
       if (!isEmptyValue(query) && query.length > 2) {
         const result = optionsOrganizations.value.filter(findFilter(query))
@@ -433,15 +350,6 @@ export default defineComponent({
       }
     }
 
-    function remoteSearchCurrencies(query) {
-      if (!isEmptyValue(query) && query.length > 2) {
-        const result = optionsCurrency.value.filter(findFilter(query))
-        if (isEmptyValue(result)) {
-          findCurrencies(true, query)
-        }
-      }
-    }
-
     function findFilter(queryString) {
       return (query) => {
         const search = queryString.toLowerCase()
@@ -539,7 +447,6 @@ export default defineComponent({
       // List Option
       currentTypeTransaction,
       optionsOrganizations,
-      optionsCurrency,
       // businessPartners,
       organizations,
       currency,
@@ -548,12 +455,9 @@ export default defineComponent({
       labelPayablesOnly,
       organizationsId,
       currentDate,
-      currencyId,
       // Methods,
       remoteSearchOrganizations,
-      remoteSearchCurrencies,
       findOrganizations,
-      findCurrencies,
       findFilter,
       //
       isMandatoryField,