File tree 2 files changed +9
-4
lines changed
components/ADempiere/FieldDefinition
2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -110,17 +110,22 @@ export default {
110
110
let format = ''
111
111
if (!isEmptyValue(this.metadata.vFormat)) {
112
112
format = this.metadata.vFormat
113
- .replace(/[Y]/gi, 'y')
114
- .replace(/[m]/gi, 'M')
115
- .replace(/[D]/gi, 'd')
116
113
}
117
114
if (isEmptyValue(format)) {
118
115
format = 'yyyy-MM-dd'
116
+ const { datePattern } = this.$store.getters['getCurrentLanguageDefinition']
117
+ if (!isEmptyValue(datePattern)) {
118
+ format = datePattern
119
+ }
119
120
}
121
+
120
122
if (this.typePicker.replace('range', '') === 'datetime') {
121
123
format = format + ' hh:mm:ss A'
122
124
}
123
125
return format
126
+ .replace(/[Y]/gi, 'y')
127
+ .replace(/[m]/gi, 'M')
128
+ .replace(/[D]/gi, 'd')
124
129
},
125
130
formatSend() {
126
131
if (this.formatView) {
Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ const getters = {
40
40
return state . autoSave
41
41
} ,
42
42
getFullGridMode : ( state ) => {
43
- return state . fullGridMocolNumde
43
+ return state . fullGridMode
44
44
} ,
45
45
getFixedHeader : ( state ) => {
46
46
return state . fixedHeader
You can’t perform that action at this time.
0 commit comments