diff --git a/src/api/ADempiere/system-core.js b/src/api/ADempiere/system-core.js
index 66322b56..0b339911 100644
--- a/src/api/ADempiere/system-core.js
+++ b/src/api/ADempiere/system-core.js
@@ -124,7 +124,7 @@ export function requestCreateBusinessPartner({
   duns,
   naics,
   name,
-  lastName,
+  name2,
   description,
   contactName,
   eMail,
@@ -151,7 +151,7 @@ export function requestCreateBusinessPartner({
       duns,
       naics,
       name,
-      last_name: lastName,
+      last_name: name2,
       description,
       contact_name: contactName,
       e_mail: eMail,
diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/businessPartnerCreate.vue b/src/components/ADempiere/Form/VPOS/BusinessPartner/businessPartnerCreate.vue
index 6454e01d..aa00e97b 100644
--- a/src/components/ADempiere/Form/VPOS/BusinessPartner/businessPartnerCreate.vue
+++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/businessPartnerCreate.vue
@@ -9,8 +9,8 @@
       class="create-bp"
     >
       <el-row :gutter="24">
-        <field
-          v-for="(field) in metadataList"
+        <field-definition
+          v-for="(field) in fieldsList"
           :key="field.columnName"
           :metadata-field="field"
         />
@@ -39,21 +39,14 @@
 
 <script>
 import { requestCreateBusinessPartner } from '@/api/ADempiere/system-core.js'
+import formMixin from '@/components/ADempiere/Form/formMixin.js'
 import fieldsList from './fieldsListCreate.js'
 import BParterMixin from './mixinBusinessPartner.js'
-import {
-  // createFieldFromDefinition,
-  createFieldFromDictionary
-} from '@/utils/ADempiere/lookupFactory'
-import Field from '@/components/ADempiere/Field'
 
 export default {
   name: 'BusinessPartnerCreate',
-  components: {
-    Field
-  },
   mixins: [
-    // formMixin,
+    formMixin,
     BParterMixin
   ],
   props: {
@@ -66,11 +59,6 @@ export default {
           fieldsList
         }
       }
-    },
-    showField: {
-      type: Boolean,
-      default: true
-
     }
   },
   data() {
@@ -79,32 +67,21 @@ export default {
       isLoadingRecord: false,
       fieldsList,
       isCustomForm: true,
-      metadataList: [],
       unsubscribe: () => {}
     }
   },
   computed: {
     emptyMandatoryFields() {
       const field = this.$store.getters.getFieldsListEmptyMandatory({
-        containerUuid: this.containerUuid,
-        isValidate: true
+        containerUuid: this.containerUuid
       })
       return field
     }
   },
-  watch: {
-    showField(value) {
-      if (value && this.isEmptyValue(this.metadataList)) {
-        this.setFieldsList()
-      }
-    }
-  },
   beforeDestroy() {
     this.unsubscribe()
   },
-  // created()
   methods: {
-    createFieldFromDictionary,
     // TODO: Get locations values.
     createBusinessParter() {
       let values = this.$store.getters.getValuesView({
@@ -114,7 +91,12 @@ export default {
       if (this.isEmptyValue(values)) {
         return
       }
+      const name2 = this.$store.getters.getValueOfField({
+        containerUuid: this.containerUuid,
+        columnName: 'Name2'
+      })
       values = this.convertValuesToSend(values)
+      values.name2 = name2
       if (this.isEmptyValue(this.emptyMandatoryFields)) {
         this.isLoadingRecord = true
         requestCreateBusinessPartner(values)
@@ -210,23 +192,6 @@ export default {
           value: undefined
         }]
       })
-    },
-    setFieldsList() {
-      const list = []
-      // Product Code
-      this.fieldsList.forEach(element => {
-        this.createFieldFromDictionary(element)
-          .then(response => {
-            const data = response
-            list.push({
-              ...data,
-              containerUuid: 'Business-Partner-Create'
-            })
-          }).catch(error => {
-            console.warn(`LookupFactory: Get Field From Server (State) - Error ${error.code}: ${error.message}.`)
-          })
-      })
-      this.metadataList = list
     }
   }
 }
diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/fieldsListCreate.js b/src/components/ADempiere/Form/VPOS/BusinessPartner/fieldsListCreate.js
index d0b81458..ec94ef86 100644
--- a/src/components/ADempiere/Form/VPOS/BusinessPartner/fieldsListCreate.js
+++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/fieldsListCreate.js
@@ -5,6 +5,7 @@ export default [
     elementColumnName: 'Value',
     columnName: 'Value',
     isFromDictionary: true,
+    tabindex: '0',
     overwriteDefinition: {
       isCustomField: true,
       size: 24
@@ -14,6 +15,7 @@ export default [
     elementColumnName: 'Name',
     columnName: 'Name',
     tableName,
+    tabindex: '1',
     isFromDictionary: true,
     overwriteDefinition: {
       isCustomField: true,
@@ -24,6 +26,7 @@ export default [
     elementColumnName: 'Name2',
     columnName: 'Name2',
     tableName,
+    tabindex: '2',
     isFromDictionary: true,
     overwriteDefinition: {
       isCustomField: true,
@@ -34,6 +37,7 @@ export default [
     elementColumnName: 'EMail',
     columnName: 'EMail',
     tableName: 'AD_user',
+    tabindex: '3',
     isFromDictionary: true,
     overwriteDefinition: {
       isCustomField: true,
@@ -44,6 +48,7 @@ export default [
     elementColumnName: 'Phone',
     columnName: 'Phone',
     tableName: 'AD_user',
+    tabindex: '4',
     isFromDictionary: true,
     overwriteDefinition: {
       isCustomField: true,
@@ -54,6 +59,7 @@ export default [
     elementColumnName: 'C_Location_ID',
     columnName: 'C_Location_ID',
     tableName: 'C_BPartner_Location',
+    tabindex: '5',
     isFromDictionary: true,
     overwriteDefinition: {
       size: 24,