Skip to content

Commit fa1ee08

Browse files
Fix: Format Date DataTable (adempiere#1844)
* Fix: Format Date DataTable * Update FieldDate.vue * minimal changes --------- Co-authored-by: Edwin Betancourt <[email protected]>
1 parent 3487583 commit fa1ee08

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/components/ADempiere/FieldDefinition/FieldDate.vue

+8-3
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,22 @@ export default {
110110
let format = ''
111111
if (!isEmptyValue(this.metadata.vFormat)) {
112112
format = this.metadata.vFormat
113-
.replace(/[Y]/gi, 'y')
114-
.replace(/[m]/gi, 'M')
115-
.replace(/[D]/gi, 'd')
116113
}
117114
if (isEmptyValue(format)) {
118115
format = 'yyyy-MM-dd'
116+
const { datePattern } = this.$store.getters['getCurrentLanguageDefinition']
117+
if (!isEmptyValue(datePattern)) {
118+
format = datePattern
119+
}
119120
}
121+
120122
if (this.typePicker.replace('range', '') === 'datetime') {
121123
format = format + ' hh:mm:ss A'
122124
}
123125
return format
126+
.replace(/[Y]/gi, 'y')
127+
.replace(/[m]/gi, 'M')
128+
.replace(/[D]/gi, 'd')
124129
},
125130
formatSend() {
126131
if (this.formatView) {

src/store/modules/settings.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const getters = {
4040
return state.autoSave
4141
},
4242
getFullGridMode: (state) => {
43-
return state.fullGridMocolNumde
43+
return state.fullGridMode
4444
},
4545
getFixedHeader: (state) => {
4646
return state.fixedHeader

0 commit comments

Comments
 (0)