From 296e7a5c48ed0b6e0be93307315a675829f36652 Mon Sep 17 00:00:00 2001
From: Edwin Betancourt <EdwinBetanc0urt@outlook.com>
Date: Mon, 2 Sep 2024 12:31:26 -0400
Subject: [PATCH] feat: Improve field search. (#2609)

* feat: Improve field search.

* add undefined query filters.
---
 .../BusinessPartnerInfo/PanelForm/index.vue   |   4 +-
 .../PanelForm/panelFooter.vue                 |  12 +-
 .../PanelForm/tableRecords.vue                |  14 +-
 .../PanelForm/useBusinessPartner.js           |   8 +-
 .../businessPartnersList.vue                  | 488 ---------------
 ...usinessPartnersList.vue => buttonList.vue} |  14 +-
 .../FieldSearch/BusinessPartnerInfo/index.vue |   6 +-
 .../{button.vue => buttonList.vue}            |  18 +-
 .../FieldSearch/GeneralInfoSearch/index.vue   |   6 +-
 .../InvoiceInfo/PanelForm/panelFooter.vue     |  14 +-
 .../InvoiceInfo/PanelForm/tableRecords.vue    |  14 +-
 .../FieldSearch/InvoiceInfo/buttonList.vue    |   8 +-
 .../FieldSearch/InvoiceInfo/mixinInvoice.js   |  12 +-
 .../Order/PanelForm/QueryCriteria/index.vue   |  14 +-
 .../FieldSearch/Order/PanelForm/index.vue     |  20 +-
 .../Order/PanelForm/panelFooter.vue           |  20 +-
 .../Order/PanelForm/tableRecords.vue          |  30 +-
 .../FieldSearch/Order/PanelForm/useOrder.js   |  14 +-
 .../Order/businessPartnersList.vue            | 556 ------------------
 ...usinessPartnersList.vue => buttonList.vue} |  27 +-
 .../FieldSearch/Order/index.vue               |  39 +-
 .../FieldSearch/Order/mixinOrder.js           |  15 +-
 .../Payment/PanelForm/QueryCriteria/index.vue |  14 +-
 .../Payment/PanelForm/tableRecords.vue        |  14 +-
 ...{buttonPaymentsList.vue => buttonList.vue} |   8 +-
 .../FieldSearch/Payment/index.vue             |   6 +-
 .../FieldSearch/Payment/mixinPayment.js       |  13 +-
 .../ProductInfo/PanelForm/tableRecords.vue    |  14 +-
 .../{buttonProductList.vue => buttonList.vue} |  12 +-
 .../FieldSearch/ProductInfo/index.vue         |   6 +-
 .../ADempiere/field/accountingCombination.js  |   6 +-
 .../field/search/businessPartnerSearch.js     |  12 +
 .../ADempiere/field/search/generalSearch.js   |   6 +-
 .../field/search/invoiceFieldSearch.js        |  12 +
 .../field/search/orderFieldSearch.js          |  24 +-
 .../field/search/paymentFieldSearch.js        |  12 +
 .../field/search/productFieldSearch.js        |  12 +
 .../dictionary/field/search/invoice.js        |   5 +-
 .../dictionary/field/search/order.js          |   7 +-
 39 files changed, 276 insertions(+), 1260 deletions(-)
 delete mode 100644 src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/businessPartnersList.vue
 rename src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/{buttonBusinessPartnersList.vue => buttonList.vue} (89%)
 rename src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/{button.vue => buttonList.vue} (89%)
 delete mode 100644 src/components/ADempiere/FieldDefinition/FieldSearch/Order/businessPartnersList.vue
 rename src/components/ADempiere/FieldDefinition/FieldSearch/Order/{buttonBusinessPartnersList.vue => buttonList.vue} (78%)
 rename src/components/ADempiere/FieldDefinition/FieldSearch/Payment/{buttonPaymentsList.vue => buttonList.vue} (94%)
 rename src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/{buttonProductList.vue => buttonList.vue} (91%)

diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/index.vue
index c3785d11322..1e32ff77ae3 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/index.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/index.vue
@@ -109,7 +109,7 @@ export default defineComponent({
     })
 
     const {
-      businessPartnerData,
+      infoData,
       isLoadedRecords,
       isLoadingRecords,
       isSalesTransactionContext,
@@ -133,7 +133,7 @@ export default defineComponent({
       }
     })
 
-    if (isReadyFromGetData.value || isSalesTransactionContext.value !== businessPartnerData.value.isSalesTransaction) {
+    if (isReadyFromGetData.value || isSalesTransactionContext.value !== infoData.value.isSalesTransaction) {
       loadRecordsList({})
     }
 
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/panelFooter.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/panelFooter.vue
index fb2700f5cc2..6162a04fb7a 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/panelFooter.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/panelFooter.vue
@@ -61,7 +61,7 @@
           type="primary"
           class="button-base-icon"
           icon="el-icon-check"
-          @click="changeBusinessPartner()"
+          @click="changeRecord()"
         />
       </samp>
     </el-col>
@@ -124,7 +124,7 @@ export default defineComponent({
   setup(props) {
     const {
       blankValues,
-      businessPartnerData,
+      infoData,
       currentRow,
       isLoadingRecords,
       //
@@ -153,11 +153,11 @@ export default defineComponent({
     })
 
     const pageNumber = computed(() => {
-      return businessPartnerData.value.pageNumber
+      return infoData.value.pageNumber
     })
 
     const pageSize = computed(() => {
-      return businessPartnerData.value.pageSize
+      return infoData.value.pageSize
     })
 
     function clearCriteriaValues() {
@@ -174,7 +174,7 @@ export default defineComponent({
       closeList()
     }
 
-    function changeBusinessPartner() {
+    function changeRecord() {
       setValues(
         currentRow.value
       )
@@ -199,7 +199,7 @@ export default defineComponent({
       recordCount,
       selectedRecords,
       //
-      changeBusinessPartner,
+      changeRecord,
       clearCriteriaValues,
       clearParentValues,
       loadRecordsList,
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/tableRecords.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/tableRecords.vue
index 2478fa4bfb7..7c952c236a3 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/tableRecords.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/tableRecords.vue
@@ -19,7 +19,7 @@
 <template>
   <div>
     <el-table
-      ref="businessPartnerTable"
+      ref="tableRecords"
       v-loading="isLoadingRecords"
       class="business-partners-table"
       highlight-current-row
@@ -160,7 +160,7 @@ export default defineComponent({
   },
 
   setup(props) {
-    const businessPartnerTable = ref(null)
+    const tableRecords = ref(null)
 
     const {
       currentRow,
@@ -204,8 +204,8 @@ export default defineComponent({
     }
 
     watch(currentRow, (newValue, oldValue) => {
-      if (businessPartnerTable.value) {
-        businessPartnerTable.value.setCurrentRow(
+      if (tableRecords.value) {
+        tableRecords.value.setCurrentRow(
           newValue
         )
       }
@@ -213,8 +213,8 @@ export default defineComponent({
 
     onMounted(() => {
       nextTick(() => {
-        if (businessPartnerTable.value) {
-          businessPartnerTable.value.setCurrentRow(
+        if (tableRecords.value) {
+          tableRecords.value.setCurrentRow(
             currentRow.value
           )
         }
@@ -222,7 +222,7 @@ export default defineComponent({
     })
 
     return {
-      businessPartnerTable,
+      tableRecords,
       //
       currentRow,
       isLoadingRecords,
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/useBusinessPartner.js b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/useBusinessPartner.js
index 02d0976f518..07ef2ac58b3 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/useBusinessPartner.js
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/useBusinessPartner.js
@@ -81,19 +81,19 @@ export default ({
     return fieldAttributes.referenceTableName
   })
 
-  const businessPartnerData = computed(() => {
+  const infoData = computed(() => {
     return store.getters.getBusinessPartnerData({
       containerUuid: uuidForm
     })
   })
 
   const isLoadedRecords = computed(() => {
-    const { isLoaded } = businessPartnerData.value
+    const { isLoaded } = infoData.value
     return isLoaded
   })
 
   const isLoadingRecords = computed(() => {
-    const { isLoading } = businessPartnerData.value
+    const { isLoading } = infoData.value
     return isLoading
   })
 
@@ -283,7 +283,7 @@ export default ({
 
   return {
     blankValues,
-    businessPartnerData,
+    infoData,
     currentRow,
     isLoadedRecords,
     isLoadingRecords,
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/businessPartnersList.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/businessPartnersList.vue
deleted file mode 100644
index 6223ef5b5bb..00000000000
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/businessPartnersList.vue
+++ /dev/null
@@ -1,488 +0,0 @@
-<!--
-  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-main
-    v-shortkey="shortsKey"
-    v-loading="isLoadingFields"
-    class="business-partners-list-container"
-    style="padding-top: 0px"
-    @shortkey.native="keyAction"
-  >
-    <el-collapse v-model="activeAccordion" accordion class="business-partners-query-criteria">
-      <el-collapse-item name="query-criteria">
-        <template slot="title">
-          {{ title }}
-        </template>
-
-        <el-form
-          label-position="top"
-          size="mini"
-          @submit.native.prevent="notSubmitForm"
-        >
-          <el-row>
-            <field-definition
-              v-for="(field) in metadataList"
-              :key="field.columnName"
-              :metadata-field="field"
-              :container-uuid="'Business-Partner-List'"
-              :container-manager="containerManagerBPList"
-            />
-          </el-row>
-        </el-form>
-      </el-collapse-item>
-    </el-collapse>
-
-    <el-table
-      ref="businessPartnerTable"
-      v-loading="isLoadingRecords"
-      class="business-partners-table"
-      :data="recordsList"
-      highlight-current-row
-      border
-      fit
-      :max-height="300"
-      size="mini"
-      @current-change="handleCurrentChange"
-      @row-dblclick="changeBusinessPartner"
-    >
-      <p slot="empty" style="width: 100%;">
-        {{ $t('businessPartner.emptyBusinessPartner') }}
-      </p>
-
-      <index-column
-        :page-number="pageNumber"
-        :page-size="pageSize"
-      />
-
-      <el-table-column
-        v-for="(head, key) in labelTable"
-        :key="key"
-        :label="head.label"
-        prop="value"
-        header-align="center"
-      >
-        <template slot-scope="scope">
-          <!-- formatted displayed value -->
-          <cell-display-info
-            :parent-uuid="metadata.parentUuid"
-            :container-uuid="uuidForm"
-            :field-attributes="head"
-            :container-manager="containerManagerBPList"
-            :scope="scope"
-            :data-row="scope.row"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <el-row :gutter="24" class="business-partners-footer">
-      <el-col :span="14">
-        <custom-pagination
-          :container-manager="containerManagerBPList"
-          :total-records="businessPartnerData.recordCount"
-          :selection="selection"
-          :page-number="pageNumber"
-          :page-size="recordsList.length"
-          :handle-change-page-number="setPageNumber"
-          :handle-change-page-size="handleChangeSizePage"
-        />
-      </el-col>
-
-      <el-col :span="10">
-        <samp style="float: right; padding-top: 4px;">
-          <el-button
-            type="info"
-            class="button-base-icon"
-            plain
-            @click="clearFormValues(); searchBPartnerList();"
-          >
-            <svg-icon icon-class="layers-clear" />
-          </el-button>
-
-          <el-button
-            :loading="isLoadingRecords"
-            type="success"
-            class="button-base-icon"
-            icon="el-icon-refresh-right"
-            @click="searchBPartnerList();"
-          />
-
-          <el-button
-            type="danger"
-            class="button-base-icon"
-            icon="el-icon-close"
-            @click="closeList(); clearValues();"
-          />
-
-          <el-button
-            type="primary"
-            class="button-base-icon"
-            icon="el-icon-check"
-            @click="changeBusinessPartner()"
-          />
-        </samp>
-      </el-col>
-    </el-row>
-  </el-main>
-</template>
-
-<script>
-import store from '@/store'
-
-// Constants
-import { BUSINESS_PARTNERS_LIST_FORM } from '@/utils/ADempiere/dictionary/field/search/businessPartner.ts'
-import FIELDS_LIST from './fieldsListSearch'
-import { DISPLAY_COLUMN_PREFIX } from '@/utils/ADempiere/dictionaryUtils'
-import { IS_SO_TRX } from '@/utils/ADempiere/constants/systemColumns'
-
-// Components and Mixins
-import businessPartnerMixin from './mixinBusinessPartner'
-import fieldSearchMixin from '../mixinFieldSearch'
-import CellDisplayInfo from '@/components/ADempiere/DataTable/Components/CellDisplayInfo.vue'
-import CustomPagination from '@/components/ADempiere/DataTable/Components/CustomPagination.vue'
-import IndexColumn from '@/components/ADempiere/DataTable/Components/IndexColumn.vue'
-import FieldDefinition from '@/components/ADempiere/FieldDefinition/index.vue'
-
-// Utils and Helper Methods
-import { isEmptyValue, isSameValues } from '@/utils/ADempiere/valueUtils'
-import {
-  // createFieldFromDefinition,
-  createFieldFromDictionary
-} from '@/utils/ADempiere/lookupFactory'
-import { containerManager as containerManagerForm } from '@/utils/ADempiere/dictionary/form'
-
-// TODO: Deprecated component
-export default {
-  name: 'BusinessPartnersList',
-
-  components: {
-    CellDisplayInfo,
-    CustomPagination,
-    FieldDefinition,
-    IndexColumn
-  },
-
-  mixins: [
-    fieldSearchMixin,
-    businessPartnerMixin
-  ],
-
-  props: {
-    containerManager: {
-      type: Object,
-      default: () => ({
-        actionPerformed: () => {},
-        getFieldsLit: () => {},
-        setDefaultValues: () => {}
-      })
-    },
-    metadata: {
-      type: Object,
-      default: () => {
-        return {
-          containerUuid: BUSINESS_PARTNERS_LIST_FORM,
-          columnName: 'C_BPartner_ID'
-        }
-      }
-    },
-    showPopover: {
-      type: Boolean,
-      default: () => false
-    }
-  },
-
-  data() {
-    return {
-      activeAccordion: 'query-criteria',
-      fieldsList: FIELDS_LIST,
-      metadataList: [],
-      timeOutRecords: null,
-      isLoadingRecords: false,
-      timeOutFields: null,
-      isLoadingFields: false,
-      unsubscribe: () => {}
-    }
-  },
-
-  computed: {
-    title() {
-      let title = this.$t('form.pos.order.BusinessPartnerCreate.businessPartner')
-      if (!isEmptyValue(this.metadata.panelName) && !isSameValues(this.metadata.panelName, this.metadata.name)) {
-        title += ` (${this.metadata.panelName})`
-      }
-      return title
-    },
-    uuidForm() {
-      if (!isEmptyValue(this.metadata.containerUuid)) {
-        return this.metadata.columnName + '_' + this.metadata.containerUuid
-      }
-      return BUSINESS_PARTNERS_LIST_FORM
-    },
-    shortsKey() {
-      return {
-        close: ['esc'],
-        refreshList: ['f5']
-      }
-    },
-    selection() {
-      if (isEmptyValue(this.currentRow)) {
-        return 0
-      }
-      return 1
-    },
-    containerManagerBPList() {
-      return {
-        ...this.containerManager,
-        ...containerManagerForm,
-        setPageNumber: this.setPageNumber
-      }
-    },
-    labelTable() {
-      return this.metadataList.map(field => {
-        return {
-          label: field.name,
-          columnName: field.columnName
-        }
-      })
-    },
-    businessPartnerData() {
-      return store.getters.getBusinessPartnerData({
-        containerUuid: this.uuidForm
-      })
-    },
-    pageNumber() {
-      return this.businessPartnerData.pageNumber
-    },
-    pageSize() {
-      return this.businessPartnerData.pageSize
-    },
-    isReadyFromGetData() {
-      const { isLoaded } = this.businessPartnerData
-      return !isLoaded && this.showPopover
-    },
-    currentRow: {
-      set(rowSelected) {
-        store.commit('setBusinessPartnerSelectedRow', {
-          containerUuid: this.uuidForm,
-          currentRow: rowSelected
-        })
-      },
-      get() {
-        return store.getters.getBusinessPartnerCurrentRow({
-          containerUuid: this.uuidForm
-        })
-      }
-    },
-    isSOTrx() {
-      return this.$store.getters.getValueOfFieldOnContainer({
-        parentUuid: this.metadata.parentUuid,
-        containerUuid: this.metadata.containerUuid,
-        columnName: IS_SO_TRX
-      })
-    },
-    oldFilter() {
-      return this.$store.getters.getFilterList({ containerUuid: this.uuidForm })
-    }
-  },
-
-  watch: {
-    isReadyFromGetData(isToLoad) {
-      if (isToLoad) {
-        this.searchBPartnerList()
-      }
-    },
-    showPopover(value) {
-      if (value && isEmptyValue(this.metadataList)) {
-        clearTimeout(this.timeOutFields)
-        this.timeOutFields = setTimeout(() => {
-          this.setFieldsList()
-        }, 500)
-      }
-    }
-  },
-
-  created() {
-    this.unsubscribe = this.subscribeChanges()
-    if (
-      !isEmptyValue(this.oldFilter) &&
-      this.oldFilter !== this.isSOTrx
-    ) {
-      this.searchBPartnerList()
-    }
-    if (this.isReadyFromGetData) {
-      this.searchBPartnerList()
-    }
-  },
-
-  mounted() {
-    this.$nextTick(() => {
-      if (this.$refs.businessPartnerTable) {
-        this.$refs.businessPartnerTable.setCurrentRow(this.currentRow)
-      }
-    })
-
-    if (this.showPopover) {
-      clearTimeout(this.timeOutFields)
-      this.timeOutFields = setTimeout(() => {
-        this.setFieldsList()
-      }, 500)
-    }
-  },
-
-  beforeDestroy() {
-    this.unsubscribe()
-  },
-
-  methods: {
-    handleCurrentChange(row) {
-      this.currentRow = row
-    },
-    keyAction(event) {
-      switch (event.srcKey) {
-        case 'refreshList':
-          /**
-           * TODO: When refreshing you are making 2 list requests, you can be the
-           * observer that activates the second request
-          */
-          this.searchBPartnerList()
-          break
-
-        case 'close':
-          this.closeList()
-          break
-      }
-    },
-    changeBusinessPartner() {
-      if (!isEmptyValue(this.currentRow)) {
-        this.setValues(this.currentRow)
-        this.closeList()
-      }
-    },
-    closeList() {
-      store.commit('setBusinessPartnerShow', {
-        containerUuid: this.uuidForm,
-        show: false
-      })
-    },
-    setPageNumber(pageNumber) {
-      this.searchBPartnerList(pageNumber, this.pageSize)
-    },
-    subscribeChanges() {
-      return store.subscribe((mutation, state) => {
-        if (mutation.type === 'updateValueOfField') {
-          if (mutation.payload.containerUuid === this.uuidForm) {
-            this.searchBPartnerList()
-          }
-        }
-      })
-    },
-    setFieldsList() {
-      const list = []
-      this.isLoadingFields = true
-      this.fieldsList.forEach(element => {
-        createFieldFromDictionary(element)
-          .then(responseField => {
-            list.push({
-              ...responseField,
-              containerUuid: this.uuidForm
-            })
-          }).catch(error => {
-            console.warn(`LookupFactory: Get Field From Server (State) - Error ${error.code}: ${error.message}.`)
-          })
-          .finally(() => {
-            if (list.length === this.fieldsList.length) {
-              this.metadataList = list
-              this.isLoadingFields = false
-            }
-          })
-      })
-    },
-    searchBPartnerList(pageNumber = 0, pageSize) {
-      let parentUuid = this.metadata.parentUuid
-      if (isEmptyValue(parentUuid)) {
-        parentUuid = this.metadata.containerUuid
-      }
-
-      const filters = store.getters.getValuesView({
-        containerUuid: this.uuidForm,
-        format: 'array'
-      })
-        .filter(attribute => {
-          if (attribute.columnName.startsWith(DISPLAY_COLUMN_PREFIX)) {
-            return false
-          }
-          return !isEmptyValue(attribute.value)
-        })
-
-      this.isLoadingRecords = true
-      clearTimeout(this.timeOutRecords)
-      this.timeOutRecords = setTimeout(() => {
-        // search on server
-        this.containerManager.getSearchRecordsList({
-          parentUuid,
-          containerUuid: this.uuidForm,
-          contextColumnNames: this.metadata.reference.context_column_names,
-          tableName: this.searchTableName,
-          uuid: this.metadata.uuid,
-          id: this.metadata.id,
-          filters,
-          pageNumber,
-          pageSize
-        })
-          .then(response => {
-            this.$store.commit('setFiltersList', {
-              containerUuid: this.uuidForm,
-              isSOTrx: this.isSOTrx
-            })
-            if (isEmptyValue(response)) {
-              this.$message({
-                type: 'warning',
-                showClose: true,
-                message: this.$t('businessPartner.notFound')
-              })
-            }
-
-            this.$nextTick(() => {
-              if (this.$refs.businessPartnerTable) {
-                this.$refs.businessPartnerTable.setCurrentRow(this.currentRow)
-              }
-            })
-          })
-          .finally(() => {
-            this.isLoadingRecords = false
-          })
-      }, 500)
-    },
-    handleChangeSizePage(pageSize) {
-      this.searchBPartnerList(1, pageSize)
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.business-partners-list-container {
-  .business-partners-query-criteria {
-    // space between quey criteria and table
-    .el-collapse-item__content {
-      padding-bottom: 0px !important;
-    }
-  }
-}
-</style>
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/buttonBusinessPartnersList.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/buttonList.vue
similarity index 89%
rename from src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/buttonBusinessPartnersList.vue
rename to src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/buttonList.vue
index b48848210c8..47e4b7d2409 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/buttonBusinessPartnersList.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/buttonList.vue
@@ -19,15 +19,15 @@
 <template>
   <el-popover
     ref="businessPartnerListPopover"
-    v-model="showedPopoverBusinessPartnerList"
+    v-model="showedPopoverPanel"
     popper-class="business-partners-popover"
     placement="top"
     width="900"
     trigger="click"
   >
-    <business-partner-panel
-      v-if="showedPopoverBusinessPartnerList"
-      :show-popover="showedPopoverBusinessPartnerList"
+    <panel-form
+      v-if="showedPopoverPanel"
+      :show-popover="showedPopoverPanel"
       :container-manager="containerManager"
       :metadata="parentMetadata"
     />
@@ -48,7 +48,7 @@
 import store from '@/store'
 
 // Components and Mixins
-import BusinessPartnerPanel from './PanelForm/index.vue'
+import PanelForm from './PanelForm/index.vue'
 // import BusinessPartnerPanel from './businessPartnersList.vue'
 
 // Constants
@@ -61,7 +61,7 @@ export default {
   name: 'ButtonBusinessPartnersList',
 
   components: {
-    BusinessPartnerPanel
+    PanelForm
   },
 
   props: {
@@ -93,7 +93,7 @@ export default {
       }
       return BUSINESS_PARTNERS_LIST_FORM
     },
-    showedPopoverBusinessPartnerList: {
+    showedPopoverPanel: {
       get() {
         return store.getters.getBPShow({
           containerUuid: this.uuidForm
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/index.vue
index ceab08119af..e98689650d9 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/index.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/index.vue
@@ -52,7 +52,7 @@
       </span>
     </template>
 
-    <button-business-partners-list
+    <button-list
       slot="append"
       :parent-metadata="metadata"
       :container-manager="containerManager"
@@ -66,7 +66,7 @@
 import fieldMixin from '@/components/ADempiere/FieldDefinition/mixin/mixinField.js'
 import fieldSearchMixin from '@/components/ADempiere/FieldDefinition/FieldSearch/mixinFieldSearch.js'
 import businessPartnerMixin from './mixinBusinessPartner'
-import ButtonBusinessPartnersList from './buttonBusinessPartnersList.vue'
+import ButtonList from './buttonList.vue'
 
 // Constants
 import { TABLE_NAME, COLUMN_NAME } from '@/utils/ADempiere/dictionary/field/search/businessPartner.ts'
@@ -79,7 +79,7 @@ export default {
   name: 'BusinessPartnerInfoField',
 
   components: {
-    ButtonBusinessPartnersList
+    ButtonList
   },
 
   mixins: [
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/button.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/buttonList.vue
similarity index 89%
rename from src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/button.vue
rename to src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/buttonList.vue
index b7d10fab9b3..2dede00e253 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/button.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/buttonList.vue
@@ -19,14 +19,14 @@
 <template>
   <el-popover
     ref="generalSearchListPopover"
-    v-model="showedPopoverGeneralInfoPanel"
+    v-model="showedPopoverPanel"
     placement="top"
     width="900"
     trigger="click"
   >
-    <panel-general-info-search
-      v-if="showedPopoverGeneralInfoPanel"
-      :show-popover="showedPopoverGeneralInfoPanel"
+    <panel-form
+      v-if="showedPopoverPanel"
+      :show-popover="showedPopoverPanel"
       :metadata="parentMetadata"
       :container-manager="containerManager"
     />
@@ -48,7 +48,7 @@ import { defineComponent, computed, ref } from '@vue/composition-api'
 import store from '@/store'
 
 // Components and Mixins
-import PanelGeneralInfoSearch from './panel.vue'
+import PanelForm from './panel.vue'
 
 // Constants
 import { GENERAL_INFO_SEARCH_LIST_FORM } from '@/utils/ADempiere/dictionary/field/search/index.ts'
@@ -57,10 +57,10 @@ import { GENERAL_INFO_SEARCH_LIST_FORM } from '@/utils/ADempiere/dictionary/fiel
 import { isEmptyValue } from '@/utils/ADempiere/valueUtils'
 
 export default defineComponent({
-  name: 'GeneralInfoSearch',
+  name: 'ButtonList',
 
   components: {
-    PanelGeneralInfoSearch
+    PanelForm
   },
 
   props: {
@@ -102,7 +102,7 @@ export default defineComponent({
       return GENERAL_INFO_SEARCH_LIST_FORM
     })
 
-    const showedPopoverGeneralInfoPanel = computed({
+    const showedPopoverPanel = computed({
       get() {
         return store.getters.getGeneralInfoShow({
           containerUuid: uuidForm.value
@@ -120,7 +120,7 @@ export default defineComponent({
       generalSearchListPopover,
       // computeds
       uuidForm,
-      showedPopoverGeneralInfoPanel
+      showedPopoverPanel
     }
   }
 })
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/index.vue
index 71f522687c9..e17dacda9ce 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/index.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/index.vue
@@ -49,7 +49,7 @@
     </template>
 
     <template slot="append">
-      <button-general-info-search
+      <button-list
         :parent-metadata="metadata"
         :is-disabled="isDisabled"
         :container-manager="containerManager"
@@ -65,7 +65,7 @@ import store from '@/store'
 // Components and Mixins
 import fieldMixin from '@/components/ADempiere/FieldDefinition/mixin/mixinField.js'
 import fieldSearchMixin from '@/components/ADempiere/FieldDefinition/FieldSearch/mixinFieldSearch.js'
-import ButtonGeneralInfoSearch from './button.vue'
+import ButtonList from './buttonList.vue'
 
 // Constants
 import { RECORD_ROWS_BY_LIST } from '@/utils/ADempiere/dictionary/field/lookups'
@@ -77,7 +77,7 @@ export default {
   name: 'GeneralInfoSearchField',
 
   components: {
-    ButtonGeneralInfoSearch
+    ButtonList
   },
 
   mixins: [
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/PanelForm/panelFooter.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/PanelForm/panelFooter.vue
index c77122cc1cc..528235f59e9 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/PanelForm/panelFooter.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/PanelForm/panelFooter.vue
@@ -62,7 +62,7 @@
           type="primary"
           class="button-base-icon"
           icon="el-icon-check"
-          @click="changeBusinessPartner()"
+          @click="changeRecord()"
         />
       </samp>
     </el-col>
@@ -76,9 +76,9 @@ import store from '@/store'
 
 // Constants
 import {
-  BUSINESS_PARTNERS_LIST_FORM,
+  INVOICES_LIST_FORM,
   COLUMN_NAME
-} from '@/utils/ADempiere/dictionary/field/search/businessPartner.ts'
+} from '@/utils/ADempiere/dictionary/field/search/invoice'
 
 // Components and Mixins
 import CustomPagination from '@/components/ADempiere/DataTable/Components/CustomPagination.vue'
@@ -111,7 +111,7 @@ export default defineComponent({
       type: Object,
       default: () => {
         return {
-          containerUuid: BUSINESS_PARTNERS_LIST_FORM,
+          containerUuid: INVOICES_LIST_FORM,
           columnName: COLUMN_NAME
         }
       }
@@ -162,7 +162,7 @@ export default defineComponent({
     })
 
     function clearCriteriaValues() {
-      store.commit('setBusinessPartnerQueryFilters', {
+      store.commit('setInvoiceFieldQueryFilters', {
         containerUuid: props.uuidForm,
         queryFilters: {}
       })
@@ -175,7 +175,7 @@ export default defineComponent({
       closeList()
     }
 
-    function changeBusinessPartner() {
+    function changeRecord() {
       setValues(
         currentRow.value
       )
@@ -200,7 +200,7 @@ export default defineComponent({
       recordCount,
       selectedRecords,
       //
-      changeBusinessPartner,
+      changeRecord,
       clearCriteriaValues,
       clearParentValues,
       loadRecordsList,
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/PanelForm/tableRecords.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/PanelForm/tableRecords.vue
index 2016de511e7..d5304c4cb87 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/PanelForm/tableRecords.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/PanelForm/tableRecords.vue
@@ -19,7 +19,7 @@
 <template>
   <div>
     <el-table
-      ref="invoiceTable"
+      ref="tableRecords"
       v-loading="isLoadingRecords"
       class="invoices-table"
       highlight-current-row
@@ -206,7 +206,7 @@ export default defineComponent({
   },
 
   setup(props) {
-    const invoiceTable = ref(null)
+    const tableRecords = ref(null)
 
     const {
       currentRow,
@@ -240,8 +240,8 @@ export default defineComponent({
     }
 
     watch(currentRow, (newValue, oldValue) => {
-      if (invoiceTable.value) {
-        invoiceTable.value.setCurrentRow(
+      if (tableRecords.value) {
+        tableRecords.value.setCurrentRow(
           newValue
         )
       }
@@ -249,8 +249,8 @@ export default defineComponent({
 
     onMounted(() => {
       nextTick(() => {
-        if (invoiceTable.value) {
-          invoiceTable.value.setCurrentRow(
+        if (tableRecords.value) {
+          tableRecords.value.setCurrentRow(
             currentRow.value
           )
         }
@@ -258,7 +258,7 @@ export default defineComponent({
     })
 
     return {
-      invoiceTable,
+      tableRecords,
       //
       currentRow,
       isLoadingRecords,
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/buttonList.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/buttonList.vue
index 5ab5d90e785..d84ff1337de 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/buttonList.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/buttonList.vue
@@ -19,15 +19,15 @@
 <template>
   <el-popover
     ref="invoicesListPopover"
-    v-model="showedPopoverInvoiceList"
+    v-model="showedPopoverPanel"
     popper-class="invoices-popover"
     placement="top"
     width="1200"
     trigger="click"
   >
     <panel-form
-      v-if="showedPopoverInvoiceList"
-      :show-popover="showedPopoverInvoiceList"
+      v-if="showedPopoverPanel"
+      :show-popover="showedPopoverPanel"
       :container-manager="containerManager"
       :metadata="parentMetadata"
     />
@@ -92,7 +92,7 @@ export default {
       }
       return INVOICES_LIST_FORM
     },
-    showedPopoverInvoiceList: {
+    showedPopoverPanel: {
       get() {
         return store.getters.getFieldInvoceShow({
           containerUuid: this.uuidForm
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/mixinInvoice.js b/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/mixinInvoice.js
index b29c25375e3..4a8d19b4e6e 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/mixinInvoice.js
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/mixinInvoice.js
@@ -52,15 +52,15 @@ export default {
         [COLUMN_NAME]: undefined,
         id: undefined,
         uuid: undefined,
-        value: undefined,
-        tax_id: undefined,
-        name: undefined,
-        name2: undefined,
-        description: undefined
+        document_no: undefined,
+        account_name: undefined,
+        date_invoiced: undefined,
+        grand_total: undefined,
+        business_partner: undefined
       }
     },
     recordsList() {
-      return store.getters.getBusinessPartnerRecordsList({
+      return store.getters.getInvoiceRecordsList({
         containerUuid: this.uuidForm
       })
     }
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/QueryCriteria/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/QueryCriteria/index.vue
index 3ca52c1e95c..ff1da9ceeae 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/QueryCriteria/index.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/QueryCriteria/index.vue
@@ -20,11 +20,11 @@
   <el-collapse
     v-model="activeAccordion"
     accordion
-    class="business-partners-query-criteria"
+    class="orders-query-criteria"
   >
     <el-collapse-item
       :name="ACCORDION_KEY"
-      class="business-partners-query-criteria-collapse"
+      class="orders-query-criteria-collapse"
     >
       <template slot="title">
         {{ title }}
@@ -98,9 +98,9 @@ import store from '@/store'
 
 // Constants
 import {
-  BUSINESS_PARTNERS_LIST_FORM,
+  INVOICES_LIST_FORM,
   COLUMN_NAME
-} from '@/utils/ADempiere/dictionary/field/search/businessPartner.ts'
+} from '@/utils/ADempiere/dictionary/field/search/invoice'
 import { YES_NO_OPTIONS_LIST } from '@/utils/ADempiere/dictionary/field/yesNo'
 
 // Components and Mixins
@@ -139,7 +139,7 @@ export default defineComponent({
       type: Object,
       default: () => {
         return {
-          containerUuid: BUSINESS_PARTNERS_LIST_FORM,
+          containerUuid: INVOICES_LIST_FORM,
           columnName: COLUMN_NAME
         }
       }
@@ -204,8 +204,8 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
-.business-partners-query-criteria {
-  .business-partners-query-criteria-collapse {
+.orders-query-criteria {
+  .orders-query-criteria-collapse {
     .el-form-item {
       &.el-form-item--mini {
         margin-bottom: 6px;
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/index.vue
index e22a1652c6f..e04c77085ad 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/index.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/index.vue
@@ -19,7 +19,7 @@
 <template>
   <el-main
     v-shortkey="QUICK_KEY_ACCESS"
-    class="business-partners-container"
+    class="orders-container"
     @shortkey.native="keyAction"
   >
     <query-criteria
@@ -51,9 +51,9 @@ import store from '@/store'
 
 // Constants
 import {
-  BUSINESS_PARTNERS_LIST_FORM,
+  ORDERS_LIST_FORM,
   COLUMN_NAME
-} from '@/utils/ADempiere/dictionary/field/search/businessPartner.ts'
+} from '@/utils/ADempiere/dictionary/field/search/order'
 import {
   QUICK_KEY_ACCESS
 } from '@/utils/ADempiere/dictionary/field/search/index.ts'
@@ -89,7 +89,7 @@ export default defineComponent({
       type: Object,
       default: () => {
         return {
-          containerUuid: BUSINESS_PARTNERS_LIST_FORM,
+          containerUuid: ORDERS_LIST_FORM,
           columnName: COLUMN_NAME
         }
       }
@@ -105,11 +105,11 @@ export default defineComponent({
       if (!isEmptyValue(props.metadata.containerUuid)) {
         return props.metadata.columnName + '_' + props.metadata.containerUuid
       }
-      return BUSINESS_PARTNERS_LIST_FORM
+      return ORDERS_LIST_FORM
     })
 
     const {
-      businessPartnerData,
+      infoData,
       isLoadedRecords,
       isLoadingRecords,
       isSalesTransactionContext,
@@ -133,7 +133,7 @@ export default defineComponent({
       }
     })
 
-    if (isReadyFromGetData.value || isSalesTransactionContext.value !== businessPartnerData.value.isSalesTransaction) {
+    if (isReadyFromGetData.value || isSalesTransactionContext.value !== infoData.value.isSalesTransaction) {
       loadRecordsList({})
     }
 
@@ -149,11 +149,11 @@ export default defineComponent({
     const unsubscribeAccoutingFacts = subscribeAccoutingFacts()
 
     function setInitialValues() {
-      const storedBusinessPartnerData = store.getters.getOrderData({
+      const storedInfoData = store.getters.getOrderData({
         containerUuid: props.metadata.containerUuid
       })
       store.commit('setOrderFieldData', {
-        ...storedBusinessPartnerData,
+        ...storedInfoData,
         containerUuid: props.metadata.containerUuid
       })
     }
@@ -177,7 +177,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
-.business-partners-container {
+.orders-container {
   padding-top: 0px;
   padding-bottom: 0px;
 }
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/panelFooter.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/panelFooter.vue
index f397a43dde5..b5c9c9d421b 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/panelFooter.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/panelFooter.vue
@@ -17,7 +17,7 @@
 -->
 
 <template>
-  <el-row :gutter="24" class="business-partners-footer">
+  <el-row :gutter="24" class="orders-footer">
     <el-col :span="14">
       <custom-pagination
         :container-manager="containerManager"
@@ -62,7 +62,7 @@
           type="primary"
           class="button-base-icon"
           icon="el-icon-check"
-          @click="changeBusinessPartner()"
+          @click="changeRecord()"
         />
       </samp>
     </el-col>
@@ -76,9 +76,9 @@ import store from '@/store'
 
 // Constants
 import {
-  BUSINESS_PARTNERS_LIST_FORM,
+  ORDERS_LIST_FORM,
   COLUMN_NAME
-} from '@/utils/ADempiere/dictionary/field/search/businessPartner.ts'
+} from '@/utils/ADempiere/dictionary/field/search/order'
 
 // Components and Mixins
 import CustomPagination from '@/components/ADempiere/DataTable/Components/CustomPagination.vue'
@@ -111,7 +111,7 @@ export default defineComponent({
       type: Object,
       default: () => {
         return {
-          containerUuid: BUSINESS_PARTNERS_LIST_FORM,
+          containerUuid: ORDERS_LIST_FORM,
           columnName: COLUMN_NAME
         }
       }
@@ -125,7 +125,7 @@ export default defineComponent({
   setup(props) {
     const {
       blankValues,
-      businessPartnerData,
+      infoData,
       currentRow,
       isLoadingRecords,
       //
@@ -154,11 +154,11 @@ export default defineComponent({
     })
 
     const pageNumber = computed(() => {
-      return businessPartnerData.value.pageNumber
+      return infoData.value.pageNumber
     })
 
     const pageSize = computed(() => {
-      return businessPartnerData.value.pageSize
+      return infoData.value.pageSize
     })
 
     function clearCriteriaValues() {
@@ -175,7 +175,7 @@ export default defineComponent({
       closeList()
     }
 
-    function changeBusinessPartner() {
+    function changeRecord() {
       setValues(
         currentRow.value
       )
@@ -200,7 +200,7 @@ export default defineComponent({
       recordCount,
       selectedRecords,
       //
-      changeBusinessPartner,
+      changeRecord,
       clearCriteriaValues,
       clearParentValues,
       loadRecordsList,
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/tableRecords.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/tableRecords.vue
index 5b8f8d90936..4e2b9cf4abb 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/tableRecords.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/tableRecords.vue
@@ -19,9 +19,9 @@
 <template>
   <div>
     <el-table
-      ref="businessPartnerTable"
+      ref="tableRecords"
       v-loading="isLoadingRecords"
-      class="business-partners-table"
+      class="orders-table"
       highlight-current-row
       :border="true"
       fit
@@ -29,7 +29,7 @@
       :max-height="300"
       size="mini"
       @current-change="handleCurrentChange"
-      @row-dblclick="changeBusinessPartner"
+      @row-dblclick="changeRecord"
     >
       <p slot="empty" style="width: 100%;">
         {{ $t('field.order.emptyRecords') }}
@@ -143,9 +143,9 @@ import store from '@/store'
 
 // Constants
 import {
-  BUSINESS_PARTNERS_LIST_FORM,
+  ORDERS_LIST_FORM,
   COLUMN_NAME
-} from '@/utils/ADempiere/dictionary/field/search/businessPartner.ts'
+} from '@/utils/ADempiere/dictionary/field/search/order'
 
 // Components and Mixins
 import IndexColumn from '@/components/ADempiere/DataTable/Components/IndexColumn.vue'
@@ -181,7 +181,7 @@ export default defineComponent({
       type: Object,
       default: () => {
         return {
-          containerUuid: BUSINESS_PARTNERS_LIST_FORM,
+          containerUuid: ORDERS_LIST_FORM,
           columnName: COLUMN_NAME
         }
       }
@@ -189,7 +189,7 @@ export default defineComponent({
   },
 
   setup(props) {
-    const businessPartnerTable = ref(null)
+    const tableRecords = ref(null)
 
     const {
       currentRow,
@@ -214,7 +214,7 @@ export default defineComponent({
       currentRow.value = recordRow
     }
 
-    function changeBusinessPartner() {
+    function changeRecord() {
       const recordRow = currentRow.value
       if (!isEmptyValue(recordRow)) {
         setValues(recordRow)
@@ -223,8 +223,8 @@ export default defineComponent({
     }
 
     watch(currentRow, (newValue, oldValue) => {
-      if (businessPartnerTable.value) {
-        businessPartnerTable.value.setCurrentRow(
+      if (tableRecords.value) {
+        tableRecords.value.setCurrentRow(
           newValue
         )
       }
@@ -232,8 +232,8 @@ export default defineComponent({
 
     onMounted(() => {
       nextTick(() => {
-        if (businessPartnerTable.value) {
-          businessPartnerTable.value.setCurrentRow(
+        if (tableRecords.value) {
+          tableRecords.value.setCurrentRow(
             currentRow.value
           )
         }
@@ -241,14 +241,14 @@ export default defineComponent({
     })
 
     return {
-      businessPartnerTable,
+      tableRecords,
       //
       currentRow,
       isLoadingRecords,
       recordsList,
       //
       handleCurrentChange,
-      changeBusinessPartner,
+      changeRecord,
       formatDate,
       formatQuantity,
       convertBooleanToTranslationLang
@@ -258,7 +258,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
-.business-partners-table {
+.orders-table {
   &.el-table {
     .el-table__body {
       .el-table__row {
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/useOrder.js b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/useOrder.js
index e894fe8e012..24217a289ad 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/useOrder.js
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/useOrder.js
@@ -26,7 +26,7 @@ import {
   UNIVERSALLY_UNIQUE_IDENTIFIER_COLUMN_SUFFIX
 } from '@/utils/ADempiere/dictionaryUtils'
 import {
-  ORDER_LIST_FORM
+  ORDERS_LIST_FORM
 } from '@/utils/ADempiere/dictionary/field/search/order.js'
 import { ROWS_OF_RECORDS_BY_PAGE } from '@/utils/ADempiere/tableUtils'
 
@@ -39,7 +39,7 @@ import { isSalesTransaction } from '@/utils/ADempiere/contextUtils'
  * @returns
  */
 export default ({
-  uuidForm = ORDER_LIST_FORM,
+  uuidForm = ORDERS_LIST_FORM,
   parentUuid,
   containerUuid,
   containerManager,
@@ -75,19 +75,19 @@ export default ({
     return fieldAttributes.referenceTableName
   })
 
-  const businessPartnerData = computed(() => {
-    return store.getters.getBusinessPartnerData({
+  const infoData = computed(() => {
+    return store.getters.getOrderData({
       containerUuid: uuidForm
     })
   })
 
   const isLoadedRecords = computed(() => {
-    const { isLoaded } = businessPartnerData.value
+    const { isLoaded } = infoData.value
     return isLoaded
   })
 
   const isLoadingRecords = computed(() => {
-    const { isLoading } = businessPartnerData.value
+    const { isLoading } = infoData.value
     return isLoading
   })
 
@@ -260,7 +260,7 @@ export default ({
 
   return {
     blankValues,
-    businessPartnerData,
+    infoData,
     currentRow,
     isLoadedRecords,
     isLoadingRecords,
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/businessPartnersList.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/businessPartnersList.vue
deleted file mode 100644
index 343b9d0d688..00000000000
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/businessPartnersList.vue
+++ /dev/null
@@ -1,556 +0,0 @@
-<!--
-  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): Elsio Sanchez elsiosanches@gmail.com https://github.com/elsiosanchez
-  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-main
-    v-shortkey="shortsKey"
-    v-loading="isLoadingFields"
-    class="business-partners-list-container"
-    style="padding-top: 0px"
-    @shortkey.native="keyAction"
-  >
-    <el-collapse v-model="activeAccordion" accordion class="business-partners-query-criteria">
-      <el-collapse-item name="query-criteria">
-        <template slot="title">
-          {{ title }}
-        </template>
-
-        <el-form
-          label-position="top"
-          size="mini"
-          @submit.native.prevent="notSubmitForm"
-        >
-          <el-row>
-            <field-definition
-              v-for="(field) in metadataList"
-              :key="field.columnName"
-              :metadata-field="field"
-              :container-uuid="'Business-Partner-List'"
-              :container-manager="containerManagerBPList"
-            />
-          </el-row>
-        </el-form>
-      </el-collapse-item>
-    </el-collapse>
-
-    <el-table
-      ref="businessPartnerTable"
-      v-loading="isLoadingRecords"
-      class="business-partners-table"
-      :data="recordsList"
-      highlight-current-row
-      border
-      fit
-      :max-height="300"
-      size="mini"
-      @current-change="handleCurrentChange"
-      @row-dblclick="changeBusinessPartner"
-    >
-      <p slot="empty" style="width: 100%;">
-        {{ $t('field.invoice.emptyInvoice') }}
-      </p>
-
-      <index-column />
-
-      <el-table-column
-        prop="business_partner"
-        :label="$t('field.order.businessPartner')"
-        header-align="center"
-        width="200"
-      />
-      <el-table-column
-        prop="date_ordered"
-        :label="$t('field.order.orderDate')"
-        header-align="center"
-        width="160"
-      >
-        <span slot-scope="scope" class="cell-align-center">
-          {{ formatDate({ value: scope.row.date_ordered }) }}
-        </span>
-      </el-table-column>
-      <el-table-column
-        prop="document_no"
-        :label="$t('field.order.documentNo')"
-        header-align="center"
-        width="170"
-      />
-
-      <el-table-column
-        prop="currency"
-        :label="$t('field.order.currency')"
-        header-align="center"
-        width="110"
-      />
-
-      <el-table-column
-        :label="$t('field.order.grandTotal')"
-        header-align="center"
-        width="130"
-      >
-        <span slot-scope="scope" class="cell-align-right">
-          {{ formatQuantity({ value: scope.row.grand_total }) }}
-        </span>
-      </el-table-column>
-
-      <el-table-column
-        :label="$t('field.order.converted')"
-        header-align="center"
-        width="130"
-      >
-        <span slot-scope="scope" class="cell-align-right">
-          {{ formatQuantity({ value: scope.row.converted_amount }) }}
-        </span>
-      </el-table-column>
-
-      <el-table-column
-        prop="is_sales_transaction"
-        :label="$t('field.order.salesTransaction')"
-        header-align="center"
-        width="160"
-      >
-        <span slot-scope="scope" class="cell-align-right">
-          {{ convertBooleanToTranslationLang(scope.row.is_sales_transaction) }}
-        </span>
-      </el-table-column>
-
-      <el-table-column
-        prop="description"
-        :label="$t('field.order.description')"
-        header-align="center"
-        width="180"
-      />
-
-      <el-table-column
-        prop="po_reference"
-        :label="$t('field.order.businessPartnerOrderReference')"
-        header-align="center"
-        width="270"
-      />
-
-      <el-table-column
-        prop="is_delivered"
-        :label="$t('field.order.delivered')"
-        header-align="center"
-        width="130"
-      >
-        <span slot-scope="scope" class="cell-align-right">
-          {{ convertBooleanToTranslationLang(scope.row.is_delivered) }}
-        </span>
-      </el-table-column>
-
-      <el-table-column
-        prop="document_status"
-        :label="$t('field.order.documentStatus')"
-        header-align="center"
-        width="220"
-      />
-    </el-table>
-
-    <el-row :gutter="24" class="business-partners-footer">
-      <el-col :span="14">
-        <custom-pagination
-          :container-manager="containerManagerBPList"
-          :total-records="businessPartnerData.recordCount"
-          :selection="selection"
-          :page-number="pageNumber"
-          :page-size="recordsList.length"
-          :handle-change-page-number="setPageNumber"
-          :handle-change-page-size="handleChangeSizePage"
-        />
-      </el-col>
-
-      <el-col :span="10">
-        <samp style="float: right; padding-top: 4px;">
-          <el-button
-            type="info"
-            class="button-base-icon"
-            plain
-            @click="clearFormValues(); searchBPartnerList();"
-          >
-            <svg-icon icon-class="layers-clear" />
-          </el-button>
-
-          <el-button
-            :loading="isLoadingRecords"
-            type="success"
-            class="button-base-icon"
-            icon="el-icon-refresh-right"
-            @click="searchBPartnerList();"
-          />
-
-          <el-button
-            type="danger"
-            class="button-base-icon"
-            icon="el-icon-close"
-            @click="closeList(); clearValues();"
-          />
-
-          <el-button
-            type="primary"
-            class="button-base-icon"
-            icon="el-icon-check"
-            @click="changeBusinessPartner()"
-          />
-        </samp>
-      </el-col>
-    </el-row>
-  </el-main>
-</template>
-
-<script>
-import store from '@/store'
-
-// Constants
-import { BUSINESS_PARTNERS_LIST_FORM } from '@/utils/ADempiere/dictionary/field/search/businessPartner.ts'
-import FIELDS_LIST from './fieldsListSearch'
-import { DISPLAY_COLUMN_PREFIX } from '@/utils/ADempiere/dictionaryUtils'
-import { IS_SO_TRX } from '@/utils/ADempiere/constants/systemColumns'
-
-// Components and Mixins
-import OrderFieldMixin from './mixinOrder'
-import fieldSearchMixin from '../mixinFieldSearch'
-import CustomPagination from '@/components/ADempiere/DataTable/Components/CustomPagination.vue'
-import IndexColumn from '@/components/ADempiere/DataTable/Components/IndexColumn.vue'
-import FieldDefinition from '@/components/ADempiere/FieldDefinition/index.vue'
-
-// Utils and Helper Methods
-import { isEmptyValue, isSameValues } from '@/utils/ADempiere/valueUtils'
-import {
-  // createFieldFromDefinition,
-  createFieldFromDictionary
-} from '@/utils/ADempiere/lookupFactory'
-import { containerManager as containerManagerForm } from '@/utils/ADempiere/dictionary/form'
-
-// TODO: Deprecated component
-export default {
-  name: 'BusinessPartnersList',
-
-  components: {
-    CustomPagination,
-    FieldDefinition,
-    IndexColumn
-  },
-
-  mixins: [
-    fieldSearchMixin,
-    OrderFieldMixin
-  ],
-
-  props: {
-    containerManager: {
-      type: Object,
-      default: () => ({
-        actionPerformed: () => {},
-        getFieldsLit: () => {},
-        setDefaultValues: () => {}
-      })
-    },
-    metadata: {
-      type: Object,
-      default: () => {
-        return {
-          containerUuid: BUSINESS_PARTNERS_LIST_FORM,
-          columnName: 'C_BPartner_ID'
-        }
-      }
-    },
-    showPopover: {
-      type: Boolean,
-      default: () => false
-    }
-  },
-
-  data() {
-    return {
-      activeAccordion: 'query-criteria',
-      fieldsList: FIELDS_LIST,
-      metadataList: [],
-      timeOutRecords: null,
-      isLoadingRecords: false,
-      timeOutFields: null,
-      isLoadingFields: false,
-      unsubscribe: () => {}
-    }
-  },
-
-  computed: {
-    title() {
-      let title = this.$t('form.pos.order.BusinessPartnerCreate.businessPartner')
-      if (!isEmptyValue(this.metadata.panelName) && !isSameValues(this.metadata.panelName, this.metadata.name)) {
-        title += ` (${this.metadata.panelName})`
-      }
-      return title
-    },
-    uuidForm() {
-      if (!isEmptyValue(this.metadata.containerUuid)) {
-        return this.metadata.columnName + '_' + this.metadata.containerUuid
-      }
-      return BUSINESS_PARTNERS_LIST_FORM
-    },
-    shortsKey() {
-      return {
-        close: ['esc'],
-        refreshList: ['f5']
-      }
-    },
-    selection() {
-      if (isEmptyValue(this.currentRow)) {
-        return 0
-      }
-      return 1
-    },
-    containerManagerBPList() {
-      return {
-        ...this.containerManager,
-        ...containerManagerForm,
-        setPageNumber: this.setPageNumber
-      }
-    },
-    labelTable() {
-      return this.metadataList.map(field => {
-        return {
-          label: field.name,
-          columnName: field.columnName
-        }
-      })
-    },
-    businessPartnerData() {
-      return store.getters.getBusinessPartnerData({
-        containerUuid: this.uuidForm
-      })
-    },
-    pageNumber() {
-      return this.businessPartnerData.pageNumber
-    },
-    pageSize() {
-      return this.businessPartnerData.pageSize
-    },
-    isReadyFromGetData() {
-      const { isLoaded } = this.businessPartnerData
-      return !isLoaded && this.showPopover
-    },
-    currentRow: {
-      set(rowSelected) {
-        store.commit('setOrderFieldSelectedRow', {
-          containerUuid: this.uuidForm,
-          currentRow: rowSelected
-        })
-      },
-      get() {
-        return store.getters.getOrderCurrentRow({
-          containerUuid: this.uuidForm
-        })
-      }
-    },
-    isSOTrx() {
-      return this.$store.getters.getValueOfFieldOnContainer({
-        parentUuid: this.metadata.parentUuid,
-        containerUuid: this.metadata.containerUuid,
-        columnName: IS_SO_TRX
-      })
-    },
-    oldFilter() {
-      return this.$store.getters.getFilterList({ containerUuid: this.uuidForm })
-    }
-  },
-
-  watch: {
-    isReadyFromGetData(isToLoad) {
-      if (isToLoad) {
-        this.searchBPartnerList()
-      }
-    },
-    showPopover(value) {
-      if (value && isEmptyValue(this.metadataList)) {
-        clearTimeout(this.timeOutFields)
-        this.timeOutFields = setTimeout(() => {
-          this.setFieldsList()
-        }, 500)
-      }
-    }
-  },
-
-  created() {
-    this.unsubscribe = this.subscribeChanges()
-    if (
-      !isEmptyValue(this.oldFilter) &&
-      this.oldFilter !== this.isSOTrx
-    ) {
-      this.searchBPartnerList()
-    }
-    if (this.isReadyFromGetData) {
-      this.searchBPartnerList()
-    }
-  },
-
-  mounted() {
-    this.$nextTick(() => {
-      if (this.$refs.businessPartnerTable) {
-        this.$refs.businessPartnerTable.setCurrentRow(this.currentRow)
-      }
-    })
-
-    if (this.showPopover) {
-      clearTimeout(this.timeOutFields)
-      this.timeOutFields = setTimeout(() => {
-        this.setFieldsList()
-      }, 500)
-    }
-  },
-
-  beforeDestroy() {
-    this.unsubscribe()
-  },
-
-  methods: {
-    handleCurrentChange(row) {
-      this.currentRow = row
-    },
-    keyAction(event) {
-      switch (event.srcKey) {
-        case 'refreshList':
-          /**
-           * TODO: When refreshing you are making 2 list requests, you can be the
-           * observer that activates the second request
-          */
-          this.searchBPartnerList()
-          break
-
-        case 'close':
-          this.closeList()
-          break
-      }
-    },
-    changeBusinessPartner() {
-      if (!isEmptyValue(this.currentRow)) {
-        this.setValues(this.currentRow)
-        this.closeList()
-      }
-    },
-    closeList() {
-      store.commit('setOrderFieldShow', {
-        containerUuid: this.uuidForm,
-        show: false
-      })
-    },
-    setPageNumber(pageNumber) {
-      this.searchBPartnerList(pageNumber, this.pageSize)
-    },
-    subscribeChanges() {
-      return store.subscribe((mutation, state) => {
-        if (mutation.type === 'updateValueOfField') {
-          if (mutation.payload.containerUuid === this.uuidForm) {
-            this.searchBPartnerList()
-          }
-        }
-      })
-    },
-    setFieldsList() {
-      const list = []
-      this.isLoadingFields = true
-      this.fieldsList.forEach(element => {
-        createFieldFromDictionary(element)
-          .then(responseField => {
-            list.push({
-              ...responseField,
-              containerUuid: this.uuidForm
-            })
-          }).catch(error => {
-            console.warn(`LookupFactory: Get Field From Server (State) - Error ${error.code}: ${error.message}.`)
-          })
-          .finally(() => {
-            if (list.length === this.fieldsList.length) {
-              this.metadataList = list
-              this.isLoadingFields = false
-            }
-          })
-      })
-    },
-    searchBPartnerList(pageNumber = 0, pageSize) {
-      let parentUuid = this.metadata.parentUuid
-      if (isEmptyValue(parentUuid)) {
-        parentUuid = this.metadata.containerUuid
-      }
-
-      const filters = store.getters.getValuesView({
-        containerUuid: this.uuidForm,
-        format: 'array'
-      })
-        .filter(attribute => {
-          if (attribute.columnName.startsWith(DISPLAY_COLUMN_PREFIX)) {
-            return false
-          }
-          return !isEmptyValue(attribute.value)
-        })
-
-      this.isLoadingRecords = true
-      clearTimeout(this.timeOutRecords)
-      this.timeOutRecords = setTimeout(() => {
-        // search on server
-        this.containerManager.getSearchRecordsList({
-          parentUuid,
-          containerUuid: this.uuidForm,
-          contextColumnNames: this.metadata.reference.context_column_names,
-          tableName: this.searchTableName,
-          uuid: this.metadata.uuid,
-          id: this.metadata.id,
-          filters,
-          pageNumber,
-          pageSize
-        })
-          .then(response => {
-            this.$store.commit('setFiltersList', {
-              containerUuid: this.uuidForm,
-              isSOTrx: this.isSOTrx
-            })
-            if (isEmptyValue(response)) {
-              this.$message({
-                type: 'warning',
-                showClose: true,
-                message: this.$t('businessPartner.notFound')
-              })
-            }
-
-            this.$nextTick(() => {
-              if (this.$refs.businessPartnerTable) {
-                this.$refs.businessPartnerTable.setCurrentRow(this.currentRow)
-              }
-            })
-          })
-          .finally(() => {
-            this.isLoadingRecords = false
-          })
-      }, 500)
-    },
-    handleChangeSizePage(pageSize) {
-      this.searchBPartnerList(1, pageSize)
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.business-partners-list-container {
-  .business-partners-query-criteria {
-    // space between quey criteria and table
-    .el-collapse-item__content {
-      padding-bottom: 0px !important;
-    }
-  }
-}
-</style>
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/buttonBusinessPartnersList.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/buttonList.vue
similarity index 78%
rename from src/components/ADempiere/FieldDefinition/FieldSearch/Order/buttonBusinessPartnersList.vue
rename to src/components/ADempiere/FieldDefinition/FieldSearch/Order/buttonList.vue
index d0008e225ad..ee1e242499c 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/buttonBusinessPartnersList.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/buttonList.vue
@@ -18,16 +18,16 @@
 
 <template>
   <el-popover
-    ref="businessPartnerListPopover"
-    v-model="showedPopoverBusinessPartnerList"
-    popper-class="business-partners-popover"
+    ref="orderListPopover"
+    v-model="showedPopoverPanel"
+    popper-class="orders-popover"
     placement="top"
     width="1200"
     trigger="click"
   >
-    <business-partner-panel
-      v-if="showedPopoverBusinessPartnerList"
-      :show-popover="showedPopoverBusinessPartnerList"
+    <panel-form
+      v-if="showedPopoverPanel"
+      :show-popover="showedPopoverPanel"
       :container-manager="containerManager"
       :metadata="parentMetadata"
     />
@@ -49,20 +49,19 @@
 import store from '@/store'
 
 // Components and Mixins
-import BusinessPartnerPanel from './PanelForm/index.vue'
-// import BusinessPartnerPanel from './businessPartnersList.vue'
+import PanelForm from './PanelForm/index.vue'
 
 // Constants
 import {
-  BUSINESS_PARTNERS_LIST_FORM,
+  ORDERS_LIST_FORM,
   COLUMN_NAME
-} from '@/utils/ADempiere/dictionary/field/search/businessPartner.ts'
+} from '@/utils/ADempiere/dictionary/field/search/order'
 
 export default {
-  name: 'ButtonBusinessPartnersList',
+  name: 'ButtonOrdersList',
 
   components: {
-    BusinessPartnerPanel
+    PanelForm
   },
 
   props: {
@@ -92,9 +91,9 @@ export default {
       if (!this.isEmptyValue(this.parentMetadata.containerUuid)) {
         return this.parentMetadata.columnName + '_' + this.parentMetadata.containerUuid
       }
-      return BUSINESS_PARTNERS_LIST_FORM
+      return ORDERS_LIST_FORM
     },
-    showedPopoverBusinessPartnerList: {
+    showedPopoverPanel: {
       get() {
         return store.getters.getFieldOrderShow({
           containerUuid: this.uuidForm
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/index.vue
index 55c1120d80c..7676d13d694 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/index.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/index.vue
@@ -18,13 +18,13 @@
 
 <template>
   <el-autocomplete
-    ref="autocompleteBPartner"
+    ref="autocompleteOrder"
     v-model="displayedValue"
     v-bind="commonsProperties"
     value-key="name"
     clearable
     style="width: 100%;"
-    popper-class="custom-field-bpartner-info"
+    popper-class="custom-field-order-info"
     :trigger-on-focus="false"
     :fetch-suggestions="localSearch"
     :select-when-unmatched="true"
@@ -46,7 +46,7 @@
       </span>
     </template>
 
-    <button-business-partners-list
+    <button-list
       slot="append"
       :parent-metadata="metadata"
       :container-manager="containerManager"
@@ -60,7 +60,7 @@
 import fieldMixin from '@/components/ADempiere/FieldDefinition/mixin/mixinField.js'
 import fieldSearchMixin from '@/components/ADempiere/FieldDefinition/FieldSearch/mixinFieldSearch.js'
 import OrderFieldMixin from './mixinOrder'
-import ButtonBusinessPartnersList from './buttonBusinessPartnersList.vue'
+import ButtonList from './buttonList.vue'
 
 // Constants
 import { TABLE_NAME, COLUMN_NAME } from '@/utils/ADempiere/dictionary/field/search/order'
@@ -79,7 +79,7 @@ export default {
   name: 'OrderInfo',
 
   components: {
-    ButtonBusinessPartnersList
+    ButtonList
   },
 
   mixins: [
@@ -105,7 +105,7 @@ export default {
 
   computed: {
     cssClassCustomField() {
-      return ' custom-field-bpartner-info '
+      return ' custom-field-order-info '
     },
     // to recrods list overwrite
     uuidForm() {
@@ -127,27 +127,27 @@ export default {
       // TODO: Implement key enter event.
     },
     setInitialValues() {
-      const storedBusinessPartnerData = this.$store.getters.getOrderData({
+      const storedInfoData = this.$store.getters.getOrderData({
         containerUuid: this.metadata.containerUuid
       })
       this.$store.commit('setOrderFieldData', {
-        ...storedBusinessPartnerData,
+        ...storedInfoData,
         containerUuid: this.metadata.containerUuid
       })
     },
     searchFocus() {
       // if (this.recordsList.length <= 1) {
-      //   this.$refs.autocompleteBPartner.close()
+      //   this.$refs.autocompleteOrder.close()
       // } else {
-      //   this.$refs.autocompleteBPartner.getData()
+      //   this.$refs.autocompleteOrder.getData()
       // }
       if (!isEmptyValue(this.displayedValue)) {
-        this.$refs.autocompleteBPartner.$el.firstElementChild.firstElementChild.select()
+        this.$refs.autocompleteOrder.$el.firstElementChild.firstElementChild.select()
       }
       this.setNewDisplayedValue()
     },
     keyPressField() {
-      if (!this.isEmptyValue(this.$refs['autocompleteBPartner' + this.metadata.columnName])) {
+      if (!this.isEmptyValue(this.$refs['autocompleteOrder' + this.metadata.columnName])) {
         this.remoteSearch(this.displayedValue, true)
       }
     },
@@ -161,15 +161,14 @@ export default {
 
       // prevent losing display value with focus
       this.controlDisplayed = this.generateDisplayedValue(recordSelected)
-      this.$refs.autocompleteBPartner.activated = false
+      this.$refs.autocompleteOrder.activated = false
     },
     setValues(recordRow) {
-      const { columnName, elementName, isSameColumnElement, containerUuid, parentUuid } = this.metadata
-      const { uuid, id, document_no, date_ordered, grand_total } = recordRow
-      let displayValue = document_no
-      if (!isEmptyValue(date_ordered)) displayValue += '_' + this.formatDate({ value: date_ordered })
-      if (!isEmptyValue(grand_total)) displayValue += '_' + this.formatQuantity({ value: grand_total })
-      // console.log(displayValue)
+      const {
+        columnName, elementName, isSameColumnElement, containerUuid, parentUuid
+      } = this.metadata
+      const { uuid, id } = recordRow
+      const displayValue = this.generateDisplayedValue(recordRow)
 
       this.$store.commit('updateValueOfField', {
         parentUuid,
@@ -283,7 +282,7 @@ export default {
 </script>
 
 <style lang="scss" scope>
-.custom-field-bpartner-info {
+.custom-field-order-info {
   // items of lust
   li {
     line-height: normal;
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/mixinOrder.js b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/mixinOrder.js
index 0c148b7696e..47a90a855b1 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/mixinOrder.js
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/mixinOrder.js
@@ -21,10 +21,10 @@ import store from '@/store'
 // Constants
 import {
   COLUMN_NAME
-} from '@/utils/ADempiere/dictionary/field/search/businessPartner.ts'
+} from '@/utils/ADempiere/dictionary/field/search/order'
 
 // Utils and Helper Methods
-import { generateDisplayedValue } from '@/utils/ADempiere/dictionary/field/search/businessPartner.ts'
+import { generateDisplayedValue } from '@/utils/ADempiere/dictionary/field/search/order'
 
 export default {
   name: 'MixinOrder',
@@ -52,15 +52,14 @@ export default {
         [COLUMN_NAME]: undefined,
         id: undefined,
         uuid: undefined,
-        value: undefined,
-        tax_id: undefined,
-        name: undefined,
-        name2: undefined,
-        description: undefined
+        document_no: undefined,
+        date_ordered: undefined,
+        grand_total: undefined,
+        business_partner: undefined
       }
     },
     recordsList() {
-      return store.getters.getBusinessPartnerRecordsList({
+      return store.getters.getOrderRecordsList({
         containerUuid: this.uuidForm
       })
     }
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/PanelForm/QueryCriteria/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/PanelForm/QueryCriteria/index.vue
index d78baaff08f..54c64f189f0 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/PanelForm/QueryCriteria/index.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/PanelForm/QueryCriteria/index.vue
@@ -20,11 +20,11 @@
   <el-collapse
     v-model="activeAccordion"
     accordion
-    class="business-partners-query-criteria"
+    class="payments-query-criteria"
   >
     <el-collapse-item
       :name="ACCORDION_KEY"
-      class="business-partners-query-criteria-collapse"
+      class="payments-query-criteria-collapse"
     >
       <template slot="title">
         {{ title }}
@@ -100,9 +100,9 @@ import store from '@/store'
 
 // Constants
 import {
-  BUSINESS_PARTNERS_LIST_FORM,
+  ORDERS_LIST_FORM,
   COLUMN_NAME
-} from '@/utils/ADempiere/dictionary/field/search/businessPartner.ts'
+} from '@/utils/ADempiere/dictionary/field/search/order'
 import { YES_NO_OPTIONS_LIST } from '@/utils/ADempiere/dictionary/field/yesNo'
 
 // Components and Mixins
@@ -143,7 +143,7 @@ export default defineComponent({
       type: Object,
       default: () => {
         return {
-          containerUuid: BUSINESS_PARTNERS_LIST_FORM,
+          containerUuid: ORDERS_LIST_FORM,
           columnName: COLUMN_NAME
         }
       }
@@ -208,8 +208,8 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
-.business-partners-query-criteria {
-  .business-partners-query-criteria-collapse {
+.payments-query-criteria {
+  .payments-query-criteria-collapse {
     .el-form-item {
       &.el-form-item--mini {
         margin-bottom: 6px;
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/PanelForm/tableRecords.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/PanelForm/tableRecords.vue
index c647fe9f0bb..50587aa804b 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/PanelForm/tableRecords.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/PanelForm/tableRecords.vue
@@ -19,7 +19,7 @@
 <template>
   <div>
     <el-table
-      ref="paymentTable"
+      ref="tableRecords"
       v-loading="isLoadingRecords"
       class="payments-table"
       highlight-current-row
@@ -201,7 +201,7 @@ export default defineComponent({
   },
 
   setup(props) {
-    const paymentTable = ref(null)
+    const tableRecords = ref(null)
 
     const {
       currentRow,
@@ -235,8 +235,8 @@ export default defineComponent({
     }
 
     watch(currentRow, (newValue, oldValue) => {
-      if (paymentTable.value) {
-        paymentTable.value.setCurrentRow(
+      if (tableRecords.value) {
+        tableRecords.value.setCurrentRow(
           newValue
         )
       }
@@ -244,8 +244,8 @@ export default defineComponent({
 
     onMounted(() => {
       nextTick(() => {
-        if (paymentTable.value) {
-          paymentTable.value.setCurrentRow(
+        if (tableRecords.value) {
+          tableRecords.value.setCurrentRow(
             currentRow.value
           )
         }
@@ -253,7 +253,7 @@ export default defineComponent({
     })
 
     return {
-      paymentTable,
+      tableRecords,
       //
       currentRow,
       isLoadingRecords,
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/buttonPaymentsList.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/buttonList.vue
similarity index 94%
rename from src/components/ADempiere/FieldDefinition/FieldSearch/Payment/buttonPaymentsList.vue
rename to src/components/ADempiere/FieldDefinition/FieldSearch/Payment/buttonList.vue
index 36cd1892470..f7bcaae6f81 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/buttonPaymentsList.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/buttonList.vue
@@ -19,15 +19,15 @@
 <template>
   <el-popover
     ref="paymentListPopover"
-    v-model="showedPopoverPaymentList"
+    v-model="showedPopoverPanel"
     popper-class="payments-popover"
     placement="top"
     width="1200"
     trigger="click"
   >
     <payment-panel
-      v-if="showedPopoverPaymentList"
-      :show-popover="showedPopoverPaymentList"
+      v-if="showedPopoverPanel"
+      :show-popover="showedPopoverPanel"
       :container-manager="containerManager"
       :metadata="parentMetadata"
     />
@@ -93,7 +93,7 @@ export default {
       }
       return PAYMENT_LIST_FORM
     },
-    showedPopoverPaymentList: {
+    showedPopoverPanel: {
       get() {
         return store.getters.getFielPaymentShow({
           containerUuid: this.uuidForm
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/index.vue
index 2bb02fab7dc..ecbf08356bf 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/index.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/index.vue
@@ -46,7 +46,7 @@
       </span>
     </template>
 
-    <button-payments-list
+    <button-list
       slot="append"
       :parent-metadata="metadata"
       :container-manager="containerManager"
@@ -60,7 +60,7 @@
 import fieldMixin from '@/components/ADempiere/FieldDefinition/mixin/mixinField.js'
 import fieldSearchMixin from '@/components/ADempiere/FieldDefinition/FieldSearch/mixinFieldSearch.js'
 import PaymentFieldMixin from './mixinPayment'
-import ButtonPaymentsList from './buttonPaymentsList.vue'
+import ButtonList from './buttonList.vue'
 
 // Constants
 import { TABLE_NAME, COLUMN_NAME } from '@/utils/ADempiere/dictionary/field/search/payment'
@@ -79,7 +79,7 @@ export default {
   name: 'PaymentInfo',
 
   components: {
-    ButtonPaymentsList
+    ButtonList
   },
 
   mixins: [
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/mixinPayment.js b/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/mixinPayment.js
index 5b86b417a1c..bc656db3fb2 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/mixinPayment.js
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/mixinPayment.js
@@ -52,15 +52,16 @@ export default {
         [COLUMN_NAME]: undefined,
         id: undefined,
         uuid: undefined,
-        value: undefined,
-        tax_id: undefined,
-        name: undefined,
-        name2: undefined,
-        description: undefined
+        account_name: undefined,
+        document_no: undefined,
+        document_type: undefined,
+        date_payment: undefined,
+        info_to: undefined,
+        pay_amt: undefined
       }
     },
     recordsList() {
-      return store.getters.getBusinessPartnerRecordsList({
+      return store.getters.getPaymentRecordsList({
         containerUuid: this.uuidForm
       })
     }
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/tableRecords.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/tableRecords.vue
index c7ff8cde564..3ea4a3a12b3 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/tableRecords.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/tableRecords.vue
@@ -19,7 +19,7 @@
 <template>
   <div>
     <el-table
-      ref="recordsTable"
+      ref="tableRecords"
       :key="componentKey"
       v-loading="isLoadingRecords"
       class="products-table"
@@ -319,7 +319,7 @@ export default defineComponent({
   },
 
   setup(props) {
-    const recordsTable = ref(null)
+    const tableRecords = ref(null)
     const componentKey = ref(0)
 
     const {
@@ -383,8 +383,8 @@ export default defineComponent({
     }
 
     watch(currentRow, (newValue, oldValue) => {
-      if (recordsTable.value) {
-        recordsTable.value.setCurrentRow(
+      if (tableRecords.value) {
+        tableRecords.value.setCurrentRow(
           newValue
         )
       }
@@ -401,8 +401,8 @@ export default defineComponent({
 
     onMounted(() => {
       nextTick(() => {
-        if (recordsTable.value) {
-          recordsTable.value.setCurrentRow(
+        if (tableRecords.value) {
+          tableRecords.value.setCurrentRow(
             currentRow.value
           )
         }
@@ -411,7 +411,7 @@ export default defineComponent({
 
     return {
       componentKey,
-      recordsTable,
+      tableRecords,
       //
       currentRow,
       isLoadingRecords,
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/buttonProductList.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/buttonList.vue
similarity index 91%
rename from src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/buttonProductList.vue
rename to src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/buttonList.vue
index 5bfdb588fc0..d1df24b8fe4 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/buttonProductList.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/buttonList.vue
@@ -18,16 +18,16 @@
 
 <template>
   <el-popover
-    ref="businessPartnerListPopover"
-    v-model="showedPopoverProductList"
-    popper-class="business-partners-popover"
+    ref="productListPopover"
+    v-model="showedPopoverPanel"
+    popper-class="products-popover"
     placement="top"
     width="900"
     trigger="click"
   >
     <panel-form
-      v-if="showedPopoverProductList"
-      :show-popover="showedPopoverProductList"
+      v-if="showedPopoverPanel"
+      :show-popover="showedPopoverPanel"
       :container-manager="containerManager"
       :metadata="parentMetadata"
     />
@@ -92,7 +92,7 @@ export default {
       }
       return PRODUCT_LIST_FORM
     },
-    showedPopoverProductList: {
+    showedPopoverPanel: {
       get() {
         return store.getters.getProductSearchFieldShow({
           containerUuid: this.uuidForm
diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/index.vue
index ea27d9cc7af..92c11ff66b8 100644
--- a/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/index.vue
+++ b/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/index.vue
@@ -53,7 +53,7 @@
       </span>
     </template>
 
-    <button-products-list
+    <button-list
       slot="append"
       :parent-metadata="metadata"
       :container-manager="containerManager"
@@ -69,7 +69,7 @@ import store from '@/store'
 import fieldMixin from '@/components/ADempiere/FieldDefinition/mixin/mixinField.js'
 import fieldSearchMixin from '@/components/ADempiere/FieldDefinition/FieldSearch/mixinFieldSearch.js'
 import productMixin from './mixinProduct'
-import ButtonProductsList from './buttonProductList.vue'
+import ButtonList from './buttonList.vue'
 
 // Constants
 import { TABLE_NAME, COLUMN_NAME } from '@/utils/ADempiere/dictionary/field/search/product.ts'
@@ -82,7 +82,7 @@ export default {
   name: 'ProductInfoField',
 
   components: {
-    ButtonProductsList
+    ButtonList
   },
 
   mixins: [
diff --git a/src/store/modules/ADempiere/field/accountingCombination.js b/src/store/modules/ADempiere/field/accountingCombination.js
index 4a17c4ea31b..bb12d29820d 100644
--- a/src/store/modules/ADempiere/field/accountingCombination.js
+++ b/src/store/modules/ADempiere/field/accountingCombination.js
@@ -35,9 +35,9 @@ import { generatePageToken } from '@/utils/ADempiere/dataUtils'
 import { getContextAttributes } from '@/utils/ADempiere/contextUtils/contextAttributes'
 
 const initState = {
-  businessPartnerPopoverList: false,
+  accountCombinationsPopoverList: false,
   // container uuid: record uuid
-  emtpyBusinessPartnerData: {
+  emtpyAccoutingCombinationData: {
     parentUuid: undefined,
     containerUuid: undefined,
     contextKey: '',
@@ -266,7 +266,7 @@ const AccountCombinations = {
    */
     getAccountCombinationsData: (state) => ({ containerUuid }) => {
       return state.accountCombinations[containerUuid] || {
-        ...state.emtpyBusinessPartnerData,
+        ...state.emtpyAccoutingCombinationData,
         containerUuid
       }
     },
diff --git a/src/store/modules/ADempiere/field/search/businessPartnerSearch.js b/src/store/modules/ADempiere/field/search/businessPartnerSearch.js
index 06a19e1b0c1..cde330369b3 100644
--- a/src/store/modules/ADempiere/field/search/businessPartnerSearch.js
+++ b/src/store/modules/ADempiere/field/search/businessPartnerSearch.js
@@ -149,6 +149,12 @@ const businessPartner = {
       containerUuid,
       queryFilters
     }) {
+      if (isEmptyValue(state.businessPartnerData[containerUuid])) {
+        Vue.set(state.businessPartnerData, containerUuid, {
+          ...state.emtpyBusinessPartnerData,
+          containerUuid
+        })
+      }
       Vue.set(state.businessPartnerData[containerUuid], 'queryFilters', queryFilters)
     },
     setBusinessPartnerQueryFilterByAttribute(state, {
@@ -156,6 +162,12 @@ const businessPartner = {
       attributeKey,
       value
     }) {
+      if (isEmptyValue(state.businessPartnerData[containerUuid])) {
+        Vue.set(state.businessPartnerData, containerUuid, {
+          ...state.emtpyBusinessPartnerData,
+          containerUuid
+        })
+      }
       Vue.set(state.businessPartnerData[containerUuid].queryFilters, attributeKey, value)
     },
 
diff --git a/src/store/modules/ADempiere/field/search/generalSearch.js b/src/store/modules/ADempiere/field/search/generalSearch.js
index b40eed0c772..69956847caf 100644
--- a/src/store/modules/ADempiere/field/search/generalSearch.js
+++ b/src/store/modules/ADempiere/field/search/generalSearch.js
@@ -45,9 +45,9 @@ import { getContextAttributes } from '@/utils/ADempiere/contextUtils/contextAttr
 import { isSameSize } from '@/utils/ADempiere/formatValue/iterableFormat'
 
 const initState = {
-  businessPartnerPopoverList: false,
+  generalInfoSearchPopoverList: false,
   // container uuid: record uuid
-  emtpyBusinessPartnerData: {
+  emtpyGeneralData: {
     parentUuid: undefined,
     containerUuid: undefined,
     contextKey: '',
@@ -510,7 +510,7 @@ const generalInfoSearch = {
     */
     getGeneralInfoData: (state) => ({ containerUuid }) => {
       return state.generalInfoSearch[containerUuid] || {
-        ...state.emtpyBusinessPartnerData,
+        ...state.emtpyGeneralData,
         containerUuid
       }
     },
diff --git a/src/store/modules/ADempiere/field/search/invoiceFieldSearch.js b/src/store/modules/ADempiere/field/search/invoiceFieldSearch.js
index 0e8d6e16fa9..c1af34c7ae8 100644
--- a/src/store/modules/ADempiere/field/search/invoiceFieldSearch.js
+++ b/src/store/modules/ADempiere/field/search/invoiceFieldSearch.js
@@ -155,6 +155,12 @@ const fieldInvoice = {
       containerUuid,
       queryFilters
     }) {
+      if (isEmptyValue(state.invoiceData[containerUuid])) {
+        Vue.set(state.invoiceData, containerUuid, {
+          ...state.emtpyInvoiceData,
+          containerUuid
+        })
+      }
       Vue.set(state.invoiceData[containerUuid], 'queryFilters', queryFilters)
     },
     setInvoiceFieldQueryFilterByAttribute(state, {
@@ -162,6 +168,12 @@ const fieldInvoice = {
       attributeKey,
       value
     }) {
+      if (isEmptyValue(state.invoiceData[containerUuid])) {
+        Vue.set(state.invoiceData, containerUuid, {
+          ...state.emtpyInvoiceData,
+          containerUuid
+        })
+      }
       Vue.set(state.invoiceData[containerUuid].queryFilters, attributeKey, value)
     },
 
diff --git a/src/store/modules/ADempiere/field/search/orderFieldSearch.js b/src/store/modules/ADempiere/field/search/orderFieldSearch.js
index 2056e4d9d84..455deff75d4 100644
--- a/src/store/modules/ADempiere/field/search/orderFieldSearch.js
+++ b/src/store/modules/ADempiere/field/search/orderFieldSearch.js
@@ -154,6 +154,12 @@ const fieldOrder = {
       containerUuid,
       queryFilters
     }) {
+      if (isEmptyValue(state.orderData[containerUuid])) {
+        Vue.set(state.orderData, containerUuid, {
+          ...state.emtpyOrderData,
+          containerUuid
+        })
+      }
       Vue.set(state.orderData[containerUuid], 'queryFilters', queryFilters)
     },
     setOrderFieldQueryFilterByAttribute(state, {
@@ -161,6 +167,12 @@ const fieldOrder = {
       attributeKey,
       value
     }) {
+      if (isEmptyValue(state.orderData[containerUuid])) {
+        Vue.set(state.orderData, containerUuid, {
+          ...state.emtpyOrderData,
+          containerUuid
+        })
+      }
       Vue.set(state.orderData[containerUuid].queryFilters, attributeKey, value)
     },
 
@@ -199,18 +211,18 @@ const fieldOrder = {
     }) {
       return new Promise(resolve => {
         let pageToken
-        const storedBusinessPartnerData = getters.getOrderData({
+        const storedInfoData = getters.getOrderData({
           containerUuid
         })
 
         if (isEmptyValue(pageNumber) || pageNumber < 1) {
           const {
             pageNumber: storedPageNumber
-          } = storedBusinessPartnerData.pageNumber
+          } = storedInfoData.pageNumber
           // refresh with same page
           pageNumber = storedPageNumber
         }
-        if (!isEmptyValue(storedBusinessPartnerData.nextPageToken)) pageToken = storedBusinessPartnerData.nextPageToken + pageNumber
+        if (!isEmptyValue(storedInfoData.nextPageToken)) pageToken = storedInfoData.nextPageToken + pageNumber
 
         commit('setBusinessPartnerIsLoading', {
           containerUuid,
@@ -222,14 +234,14 @@ const fieldOrder = {
           containerUuid: containerUuid
         })
 
-        const { queryFilters } = storedBusinessPartnerData
+        const { queryFilters } = storedInfoData
         if (isSalesTransactionContext) {
           queryFilters.is_vendor = undefined
         } else {
           queryFilters.is_customer = undefined
         }
         commit('setOrderFieldData', {
-          ...storedBusinessPartnerData,
+          ...storedInfoData,
           containerUuid
         })
 
@@ -292,7 +304,7 @@ const fieldOrder = {
             }
 
             commit('setOrderFieldData', {
-              ...storedBusinessPartnerData,
+              ...storedInfoData,
               containerUuid,
               currentRow,
               recordsList,
diff --git a/src/store/modules/ADempiere/field/search/paymentFieldSearch.js b/src/store/modules/ADempiere/field/search/paymentFieldSearch.js
index 9bc61597435..ad93417b4f1 100644
--- a/src/store/modules/ADempiere/field/search/paymentFieldSearch.js
+++ b/src/store/modules/ADempiere/field/search/paymentFieldSearch.js
@@ -156,6 +156,12 @@ const fieldPayment = {
       containerUuid,
       queryFilters
     }) {
+      if (isEmptyValue(state.paymentData[containerUuid])) {
+        Vue.set(state.paymentData, containerUuid, {
+          ...state.emtpyPaymentData,
+          containerUuid
+        })
+      }
       Vue.set(state.paymentData[containerUuid], 'queryFilters', queryFilters)
     },
     setPaymentFieldQueryFilterByAttribute(state, {
@@ -163,6 +169,12 @@ const fieldPayment = {
       attributeKey,
       value
     }) {
+      if (isEmptyValue(state.paymentData[containerUuid])) {
+        Vue.set(state.paymentData, containerUuid, {
+          ...state.emtpyPaymentData,
+          containerUuid
+        })
+      }
       Vue.set(state.paymentData[containerUuid].queryFilters, attributeKey, value)
     },
     setOptionsListBusinessPartner(state, list) {
diff --git a/src/store/modules/ADempiere/field/search/productFieldSearch.js b/src/store/modules/ADempiere/field/search/productFieldSearch.js
index 9910936f04e..1c8587f7979 100644
--- a/src/store/modules/ADempiere/field/search/productFieldSearch.js
+++ b/src/store/modules/ADempiere/field/search/productFieldSearch.js
@@ -160,6 +160,12 @@ const productFieldSearch = {
       containerUuid,
       queryFilters = {}
     }) {
+      if (isEmptyValue(state.productData[containerUuid])) {
+        Vue.set(state.productData, containerUuid, {
+          ...state.emptyProductData,
+          containerUuid
+        })
+      }
       Vue.set(state.productData[containerUuid], 'queryFilters', queryFilters)
     },
     setProductSearchFieldQueryFilterByAttribute(state, {
@@ -167,6 +173,12 @@ const productFieldSearch = {
       attributeKey,
       value
     }) {
+      if (isEmptyValue(state.productData[containerUuid])) {
+        Vue.set(state.productData, containerUuid, {
+          ...state.emptyProductData,
+          containerUuid
+        })
+      }
       Vue.set(state.productData[containerUuid].queryFilters, attributeKey, value)
     },
 
diff --git a/src/utils/ADempiere/dictionary/field/search/invoice.js b/src/utils/ADempiere/dictionary/field/search/invoice.js
index 9981c737ce2..1f5e740388c 100644
--- a/src/utils/ADempiere/dictionary/field/search/invoice.js
+++ b/src/utils/ADempiere/dictionary/field/search/invoice.js
@@ -42,7 +42,9 @@ export function generateDisplayedValue(recordRow) {
   }
 
   // generate with standard columns
-  const { document_no, date_invoiced, grand_total } = recordRow
+  const {
+    business_partner, document_no, date_invoiced, grand_total
+  } = recordRow
 
   if (!isEmptyValue(document_no)) {
     displayedValue = document_no
@@ -72,7 +74,6 @@ export function generateDisplayedValue(recordRow) {
     }
   }
 
-  const { business_partner } = recordRow
   if (!isEmptyValue(business_partner)) {
     if (!isEmptyValue(displayedValue)) {
       displayedValue += ' _ ' + business_partner
diff --git a/src/utils/ADempiere/dictionary/field/search/order.js b/src/utils/ADempiere/dictionary/field/search/order.js
index c3ddbe6816d..0c7251df14d 100644
--- a/src/utils/ADempiere/dictionary/field/search/order.js
+++ b/src/utils/ADempiere/dictionary/field/search/order.js
@@ -25,7 +25,7 @@ export const TABLE_NAME = 'C_Order'
 
 export const COLUMN_NAME = 'C_Order_ID'
 
-export const ORDER_LIST_FORM = 'order-field-search-list'
+export const ORDERS_LIST_FORM = 'order-field-search-list'
 
 /**
  * Generate displayed value from values
@@ -42,7 +42,9 @@ export function generateDisplayedValue(recordRow) {
   }
 
   // generate with standard columns
-  const { document_no, date_ordered, grand_total } = recordRow
+  const {
+    document_no, date_ordered, grand_total, business_partner
+  } = recordRow
 
   if (!isEmptyValue(document_no)) {
     displayedValue = document_no
@@ -72,7 +74,6 @@ export function generateDisplayedValue(recordRow) {
     }
   }
 
-  const { business_partner } = recordRow
   if (!isEmptyValue(business_partner)) {
     if (!isEmptyValue(displayedValue)) {
       displayedValue += ' _ ' + business_partner