Fix: Format Date DataTable (#1844)

* Fix: Format Date DataTable * Update FieldDate.vue * minimal changes --------- Co-authored-by: Edwin Betancourt <[email protected]>
solop-develop · Jan 13, 2024 · fa1ee08 · fa1ee08
1 parent 3487583
commit fa1ee08
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/components/ADempiere/FieldDefinition/FieldDate.vue b/src/components/ADempiere/FieldDefinition/FieldDate.vue
@@ -110,17 +110,22 @@ export default {
       let format = ''
       if (!isEmptyValue(this.metadata.vFormat)) {
         format = this.metadata.vFormat
-          .replace(/[Y]/gi, 'y')
-          .replace(/[m]/gi, 'M')
-          .replace(/[D]/gi, 'd')
       }
       if (isEmptyValue(format)) {
         format = 'yyyy-MM-dd'
+        const { datePattern } = this.$store.getters['getCurrentLanguageDefinition']
+        if (!isEmptyValue(datePattern)) {
+          format = datePattern
+        }
       }
+
       if (this.typePicker.replace('range', '') === 'datetime') {
         format = format + ' hh:mm:ss A'
       }
       return format
+        .replace(/[Y]/gi, 'y')
+        .replace(/[m]/gi, 'M')
+        .replace(/[D]/gi, 'd')
     },
     formatSend() {
       if (this.formatView) {

diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
@@ -40,7 +40,7 @@ const getters = {
     return state.autoSave
   },
   getFullGridMode: (state) => {
-    return state.fullGridMocolNumde
+    return state.fullGridMode
   },
   getFixedHeader: (state) => {
     return state.fixedHeader