From 256af254488fd4d89b207aed4db2d14bbf9f57e9 Mon Sep 17 00:00:00 2001
From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com>
Date: Fri, 23 Apr 2021 18:20:11 -0400
Subject: [PATCH] add validation the isDisplayedGrid to table (#783)

* add validation the isDisplayedGrid to table

* minimalchanges
---
 .../ADempiere/ContextMenu/contextMenuDesktop.vue       |  4 ++++
 .../ADempiere/ContextMenu/contextMenuMixin.js          | 10 +++-------
 .../ADempiere/ContextMenu/contextMenuMobile.vue        |  4 ++++
 .../ADempiere/DataTable/dataTables-Script.js           |  6 ++++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue b/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue
index 01cde879..1885faa7 100644
--- a/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue
+++ b/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue
@@ -248,6 +248,10 @@ export default {
       return 'skill'
     }
   },
+  created() {
+    this.generateContextMenu()
+    this.getReferences()
+  },
   methods: {
     clickRelation(item) {
       this.$router.push({
diff --git a/src/components/ADempiere/ContextMenu/contextMenuMixin.js b/src/components/ADempiere/ContextMenu/contextMenuMixin.js
index bbad136c..b542d171 100644
--- a/src/components/ADempiere/ContextMenu/contextMenuMixin.js
+++ b/src/components/ADempiere/ContextMenu/contextMenuMixin.js
@@ -276,12 +276,6 @@ export default {
       }
     }
   },
-  created() {
-    this.generateContextMenu()
-  },
-  mounted() {
-    this.getReferences()
-  },
   methods: {
     showNotification,
     actionContextMenu(event) {
@@ -427,7 +421,9 @@ export default {
             return item
           }
         })
-        this.$store.dispatch('setOrder', processAction)
+        if (processAction) {
+          this.$store.dispatch('setOrder', processAction)
+        }
       }
       if (this.isWindow && this.isEmptyValue(this.actions.find(element => element.action === 'recordAccess'))) {
         this.$store.dispatch('addAttribute', {
diff --git a/src/components/ADempiere/ContextMenu/contextMenuMobile.vue b/src/components/ADempiere/ContextMenu/contextMenuMobile.vue
index cec0e121..c7dc7ec1 100644
--- a/src/components/ADempiere/ContextMenu/contextMenuMobile.vue
+++ b/src/components/ADempiere/ContextMenu/contextMenuMobile.vue
@@ -202,6 +202,10 @@ export default {
       return 'skill'
     }
   },
+  created() {
+    this.generateContextMenu()
+    this.getReferences()
+  },
   methods: {
     clickRelation(item) {
       this.$router.push({
diff --git a/src/components/ADempiere/DataTable/dataTables-Script.js b/src/components/ADempiere/DataTable/dataTables-Script.js
index 8d14d6b1..d993c346 100644
--- a/src/components/ADempiere/DataTable/dataTables-Script.js
+++ b/src/components/ADempiere/DataTable/dataTables-Script.js
@@ -344,10 +344,12 @@ export default {
       })
     },
     headerLabel(field) {
-      if (field.isMandatory || field.isMandatoryFromLogic) {
+      if (field.isMandatory || field.isMandatoryFromLogic && field.isDisplayedGrid) {
         return '* ' + field.name
       }
-      return field.name
+      if (field.isDisplayedGrid) {
+        return field.name
+      }
     },
     /**
      * @param {object} row, row data