Skip to content
This repository has been archived by the owner on Nov 25, 2024. It is now read-only.

Commit

Permalink
Minimal changes
Browse files Browse the repository at this point in the history
  • Loading branch information
elsiosanchez committed Nov 19, 2024
1 parent 4790742 commit 403c370
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 34 deletions.
27 changes: 0 additions & 27 deletions src/components/ADempiere/FieldDefinition/FieldButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -398,30 +398,3 @@ export default {
}
}
</script>

<style lang="scss">
.custom-field-text {
max-height: 36px;
}
.el-input.is-disabled .el-input__inner {
background-color: #dfe5f078;
border-color: #dfe4ed;
color: #76797e;
cursor: not-allowed;
font-weight: 630;
}

// indicates if the textarea is adjustable
.el-textarea__inner {
&.field-in-table {
resize: none !important;
}
}

// does not superimpose the character counter on the input text
.el-textarea {
>.el-input__count {
line-height: 10px;
}
}
</style>
12 changes: 5 additions & 7 deletions src/components/ADempiere/Report/Data/DataCells.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ import { zoomIn } from '@/utils/ADempiere/coreUtils.js'
import { isSalesTransaction } from '@/utils/ADempiere/contextUtils'
import { DATE } from '@/utils/ADempiere/references.js'
import { formatDate as formatDateTemp, getDateFormat } from '@/utils/ADempiere/formatValue/dateFormat'
import { formatField } from '@/utils/ADempiere/valueFormat.js'
// API Request Methods
import { listZoomWindowsRequest } from '@/api/ADempiere/fields/zoom.js'

Expand Down Expand Up @@ -224,14 +225,11 @@ export default defineComponent({
const { display_value, value: currentValue } = rowData
if (!isEmptyValue(display_value) || isLookup(field.display_type)) {
if (field.display_type === DATE.id) {
return formatDateTemp({
return formatField({
value: display_value,
isTime: false,
format: getDateFormat({
format: undefined,
isTime: false,
isDate: true
})
displayedValue: display_value,
displayType: field.display_type,
columnName: field.column_name
})
}
return display_value
Expand Down

0 comments on commit 403c370

Please sign in to comment.