diff --git a/src/components/ADempiere/Form/VPOS/Collection/index.vue b/src/components/ADempiere/Form/VPOS/Collection/index.vue
index f75f32cf..3551d19f 100644
--- a/src/components/ADempiere/Form/VPOS/Collection/index.vue
+++ b/src/components/ADempiere/Form/VPOS/Collection/index.vue
@@ -361,8 +361,7 @@ export default {
       const containerUuid = this.containerUuid
       const fieldsEmpty = this.$store.getters.getFieldsListEmptyMandatory({
         containerUuid,
-        fieldsList: this.fieldsList,
-        isValidate: true
+        fieldsList: this.fieldsList
       })
       const amount = this.$store.getters.getValueOfField({
         containerUuid,
diff --git a/src/store/modules/ADempiere/panel/getters.js b/src/store/modules/ADempiere/panel/getters.js
index 2a4b1e24..ef64629b 100644
--- a/src/store/modules/ADempiere/panel/getters.js
+++ b/src/store/modules/ADempiere/panel/getters.js
@@ -41,16 +41,14 @@ const getters = {
     const fieldsList = getters.getFieldsListFromPanel(containerUuid)
 
     const fieldNotReadyToSend = fieldsList.find(fieldItem => {
-      const isMandatory = fieldItem.isMandatory || fieldItem.isMandatoryFromLogic
-      const isDisplayed = fieldIsDisplayed(fieldItem) && (fieldItem.isShowedFromUser || isMandatory)
-
       const { columnName } = fieldItem
-
       // Omit log columns list only created or updated record, this is manage for backend
       if (fieldItem.panelType === 'window' && LOG_COLUMNS_NAME_LIST.includes(columnName)) {
         return false
       }
 
+      const isMandatory = fieldItem.isMandatory || fieldItem.isMandatoryFromLogic
+      const isDisplayed = fieldIsDisplayed(fieldItem) && (fieldItem.isShowedFromUser || isMandatory)
       if (isDisplayed && isMandatory) {
         let value
         // used when evaluate data in table
@@ -82,26 +80,20 @@ const getters = {
   getFieldsListEmptyMandatory: (state, getters) => ({
     containerUuid,
     fieldsList,
-    formatReturn = 'name',
-    isValidate = false
+    formatReturn = 'name'
   }) => {
     if (isEmptyValue(fieldsList)) {
       fieldsList = getters.getFieldsListFromPanel(containerUuid)
     }
-    const fieldsEmpty = []
-    // all optionals (not mandatory) fields
+
+    // all mandatory and empty fields value
     const fieldsNameEmpty = fieldsList.filter(fieldItem => {
       const value = getters.getValueOfField({
         parentUuid: fieldItem.parentUuid,
         containerUuid,
         columnName: fieldItem.columnName
       })
-      if (isValidate && isEmptyValue(value)) {
-        const isMandatory = fieldItem.isMandatory || fieldItem.isMandatoryFromLogic
-        if (fieldIsDisplayed(fieldItem) && isMandatory) {
-          fieldsEmpty.push(fieldItem.name)
-        }
-      }
+
       if (isEmptyValue(value)) {
         const isMandatory = fieldItem.isMandatory || fieldItem.isMandatoryFromLogic
         if (fieldIsDisplayed(fieldItem) && isMandatory) {
@@ -109,11 +101,9 @@ const getters = {
         }
       }
     })
-    if (isValidate) {
-      return fieldsEmpty
-    }
-    if (formatReturn) {
-      return fieldsList.map(fieldItem => {
+
+    if (!isEmptyValue(formatReturn)) {
+      return fieldsNameEmpty.map(fieldItem => {
         return fieldItem[formatReturn]
       })
     }