diff --git a/src/api/ADempiere/businessData/runBusinessProcess.ts b/src/api/ADempiere/business-data/runBusinessProcess.ts similarity index 100% rename from src/api/ADempiere/businessData/runBusinessProcess.ts rename to src/api/ADempiere/business-data/runBusinessProcess.ts diff --git a/src/api/ADempiere/dictionary/window.js b/src/api/ADempiere/dictionary/form.js similarity index 77% rename from src/api/ADempiere/dictionary/window.js rename to src/api/ADempiere/dictionary/form.js index 6aaaf8c51b..45596f37a5 100644 --- a/src/api/ADempiere/dictionary/window.js +++ b/src/api/ADempiere/dictionary/form.js @@ -19,21 +19,22 @@ // Get Instance for connection import { request } from '@/utils/ADempiere/request' -export function requestReference({ - uuid, - columnName +/** + * Request dictionary Forms metadata + * @param {number} id, identifier + */ +export function requestForm({ + id: uuid, + // mandatory to open search + language, + dictionaryCode }) { return request({ - url: '/dictionary/reference', + url: `/dictionary/forms/${uuid}`, method: 'get', params: { - uuid, - column_name: columnName + language, + dictionary_code: dictionaryCode } }) - .then(validationResponse => { - const { convertReference } = require('@/utils/ADempiere/apiConverts/field.js') - - return convertReference(validationResponse) - }) } diff --git a/src/api/ADempiere/dictionary/index.ts b/src/api/ADempiere/dictionary/index.ts index 3e6749cf8e..e0c51d5f9e 100644 --- a/src/api/ADempiere/dictionary/index.ts +++ b/src/api/ADempiere/dictionary/index.ts @@ -41,59 +41,6 @@ export function requestReference({ }) } -/** - * GET Process or Report dictionary metadata definition - * @param {Number} id identifier - * @param {String} language language - * @param {Number} clientId client identifier - * @param {Number} roleId role identifier - * @param {Number} userId user identifier - * @returns - */ -export function requestProcessMetadata({ - id, - // mandatory to open search - language, - clientId, - roleId, - userId -}) { - return request({ - url: `/dictionary/processes/${id}`, - method: 'get', - params: { - language, - client_id: clientId, - role_id: roleId, - user_id: userId - } - }) -} - -/** - * Request dictionary Forms metadata - * @param {number} id, identifier - */ -export function requestForm({ - id, - // mandatory to open search - language, - clientId, - roleId, - userId -}) { - return request({ - url: `/dictionary/forms/${id}`, - method: 'get', - params: { - language, - client_id: clientId, - role_id: roleId, - user_id: userId - } - }) -} - /** * Reques GET Search Info Fields */ @@ -116,4 +63,3 @@ export function tableSearchFields({ } }) } - diff --git a/src/api/ADempiere/dictionary/process.js b/src/api/ADempiere/dictionary/process.js new file mode 100644 index 0000000000..4da9c181ed --- /dev/null +++ b/src/api/ADempiere/dictionary/process.js @@ -0,0 +1,45 @@ +/** + * ADempiere-Vue (Frontend) for ADempiere ERP & CRM Smart Business Solution + * Copyright (C) 2018-Present E.R.P. Consultores y Asociados, C.A. www.erpya.com + * Contributor(s): Edwin Betancourt EdwinBetanc0urt@outlook.com https://github.com/EdwinBetanc0urt + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +// Get Instance for connection +import { request } from '@/utils/ADempiere/request' + +/** + * GET Process or Report dictionary metadata definition + * @param {Number} id identifier + * @param {String} language language + * @param {Number} clientId client identifier + * @param {Number} roleId role identifier + * @param {Number} userId user identifier + * @returns + */ +export function requestProcessMetadata({ + id: uuid, + // mandatory to open search + language, + dictionaryCode +}) { + return request({ + url: `/dictionary/processes/${uuid}`, + method: 'get', + params: { + language, + dictionary_code: dictionaryCode + } + }) +} diff --git a/src/api/ADempiere/dictionary/smart-browser.js b/src/api/ADempiere/dictionary/smart-browser.js index 708bc74d99..4bef7f5263 100644 --- a/src/api/ADempiere/dictionary/smart-browser.js +++ b/src/api/ADempiere/dictionary/smart-browser.js @@ -25,20 +25,16 @@ import { request } from '@/utils/ADempiere/request' * @param {number} id, identifier */ export function requestBrowserMetadata({ - id, + id: uuid, language, - clientId, - roleId, - userId + dictionaryCode }) { return request({ - url: `/dictionary/browsers/${id}`, + url: `/dictionary/browsers/${uuid}`, method: 'get', params: { language, - client_id: clientId, - role_id: roleId, - user_id: userId + dictionary_code: dictionaryCode } }) } diff --git a/src/api/ADempiere/dictionary/window.ts b/src/api/ADempiere/dictionary/window.ts index b98fb56809..620924c1be 100644 --- a/src/api/ADempiere/dictionary/window.ts +++ b/src/api/ADempiere/dictionary/window.ts @@ -22,23 +22,19 @@ import { request } from '@/utils/ADempiere/request' /** * Request dictionary Window metadata * @param {number} id, identifier + * @param {string} language */ export function requestWindowMetadata({ - id, - // mandatory to open search + id: uuid, language, - clientId, - roleId, - userId + dictionaryCode }) { return request({ - url: `/dictionary/windows/${id}`, + url: `/dictionary/windows/${uuid}`, method: 'get', params: { language, - client_id: clientId, - role_id: roleId, - user_id: userId + dictionary_code: dictionaryCode } }) } @@ -48,11 +44,17 @@ export function requestWindowMetadata({ * @param {number} id */ export function requestTabMetadata({ - id, - windowId + id: uuid, + windowId, + language, + dictionaryCode }) { return request({ - url: `/dictionary/windows/${windowId}/tabs/${id}`, - method: 'get' + url: `/dictionary/windows/${windowId}/tabs/${uuid}`, + method: 'get', + params: { + language, + dictionary_code: dictionaryCode + } }) } diff --git a/src/api/ADempiere/security/index.ts b/src/api/ADempiere/security/index.ts index e0913aeaa0..bbc7027575 100644 --- a/src/api/ADempiere/security/index.ts +++ b/src/api/ADempiere/security/index.ts @@ -142,21 +142,27 @@ export function requestChangeRole({ /** * GET Menu + * @param {string} language + * @param {string} clientId + * @param {string} roleId + * @param {string} userUuid */ export function requestMenu({ language, + dictionaryCode, clientId, roleId, - userId + userUuid }) { return request({ url: '/security/menus', method: 'get', params: { language, + dictionary_code: dictionaryCode, role_id: roleId, client_id: clientId, - user_id: userId, + user_id: userUuid, page_size: 100 } }) diff --git a/src/components/ADempiere/DataTable/Components/ChangeRecord.vue b/src/components/ADempiere/DataTable/Components/ChangeRecord.vue index 6e1304de07..49e476d8dd 100644 --- a/src/components/ADempiere/DataTable/Components/ChangeRecord.vue +++ b/src/components/ADempiere/DataTable/Components/ChangeRecord.vue @@ -210,6 +210,7 @@ export default defineComponent({ parentUuid: props.parentUuid, containerUuid: props.containerUuid, tableName: tabAttributes.value.tableName, + tabId: tabAttributes.value.internal_id, recordUuid: recordUuid.value }) .then(() => { diff --git a/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/index.vue b/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/index.vue index bcee464349..2022f04df0 100644 --- a/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/index.vue +++ b/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/index.vue @@ -151,7 +151,7 @@ export default { contextColumnNames: this.metadata.reference.context_column_names, tableName: TABLE_NAME, uuid: this.metadata.uuid, - id: this.metadata.id, + id: this.metadata.internal_id, searchValue, pageNumber: 1, pageSize: RECORD_ROWS_BY_LIST diff --git a/src/components/ADempiere/FieldDefinition/FieldOptions/ContextInfo/index.vue b/src/components/ADempiere/FieldDefinition/FieldOptions/ContextInfo/index.vue index 3939cd5967..965ac816f1 100644 --- a/src/components/ADempiere/FieldDefinition/FieldOptions/ContextInfo/index.vue +++ b/src/components/ADempiere/FieldDefinition/FieldOptions/ContextInfo/index.vue @@ -22,7 +22,7 @@ {{ $t('field.field') }} {{ fieldAttributes.name }} - ({{ fieldAttributes.id }}, {{ fieldAttributes.column_name }}{{ !fieldAttributes.isSameColumnElement ? ', ' + fieldAttributes.element_name : '' }}) + ({{ fieldAttributes.internal_id }}, {{ fieldAttributes.column_name }}{{ !fieldAttributes.isSameColumnElement ? ', ' + fieldAttributes.element_name : '' }}) diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/useBusinessPartner.js b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/useBusinessPartner.js index 07ef2ac58b..7654515f89 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/useBusinessPartner.js +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/PanelForm/useBusinessPartner.js @@ -235,7 +235,7 @@ export default ({ contextColumnNames: fieldAttributes.reference.context_column_names, tableName: searchTableName.value, uuid: fieldAttributes.uuid, - id: fieldAttributes.id, + id: fieldAttributes.internal_id, // filters, pageNumber, pageSize diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/index.vue index e98689650d..705b40c44a 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/index.vue +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/index.vue @@ -165,7 +165,7 @@ export default { contextColumnNames: this.metadata.reference.context_column_names, tableName: TABLE_NAME, uuid: this.metadata.uuid, - id: this.metadata.id, + id: this.metadata.internal_id, searchValue, pageNumber: 1, pageSize: RECORD_ROWS_BY_LIST diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/index.vue index e17dacda9c..1295f0ee2d 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/index.vue +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/index.vue @@ -141,7 +141,7 @@ export default { tableName: this.searchTableName, columnName: this.metadata.column_name, uuid: this.metadata.uuid, - id: this.metadata.id, + id: this.metadata.internal_id, searchValue, pageNumber: 1, pageSize: RECORD_ROWS_BY_LIST diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/panel.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/panel.vue index 29b1dc0410..cc0d3b3579 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/panel.vue +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/panel.vue @@ -405,7 +405,7 @@ export default { const fieldsListTable = this.storedColumnsListTable if (isEmptyValue(fieldsListTable)) { this.containerManager.getSearchDefinition({ - id: this.metadata.id + id: this.metadata.internal_id }) .finally(() => { this.isLoadingFields = false @@ -443,7 +443,7 @@ export default { parentUuid: this.metadata.parentUuid, tableName: this.searchTableName, columnName: this.metadata.columnName, - id: this.metadata.id, + id: this.metadata.internal_id, contextColumnNames: this.metadata.reference.context_column_names, filters: values, pageNumber, diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/PanelForm/useInvoce.js b/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/PanelForm/useInvoce.js index b6ac6813fc..b331652ff8 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/PanelForm/useInvoce.js +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/PanelForm/useInvoce.js @@ -230,7 +230,7 @@ export default ({ columnName: fieldAttributes.column_name, tableName: searchTableName.value, uuid: fieldAttributes.uuid, - id: fieldAttributes.id, + id: fieldAttributes.internal_id, // filters, pageNumber, pageSize diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/index.vue index 89515974a0..86c4298f61 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/index.vue +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/InvoiceInfo/index.vue @@ -252,7 +252,7 @@ export default { tableName: TABLE_NAME, columnName: this.metadata.column_name, uuid: this.metadata.uuid, - id: this.metadata.id, + id: this.metadata.internal_id, searchValue, pageNumber: 1, pageSize: RECORD_ROWS_BY_LIST diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/useOrder.js b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/useOrder.js index 24217a289a..3e8160bffb 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/useOrder.js +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/PanelForm/useOrder.js @@ -228,7 +228,7 @@ export default ({ tableName: searchTableName.value, columnName: fieldAttributes.column_name, uuid: fieldAttributes.uuid, - id: fieldAttributes.id, + id: fieldAttributes.internal_id, // filters, pageNumber, pageSize diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/index.vue index 7676d13d69..ea06499fdb 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/Order/index.vue +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Order/index.vue @@ -250,7 +250,7 @@ export default { contextColumnNames: this.metadata.reference.context_column_names, tableName: TABLE_NAME, uuid: this.metadata.uuid, - id: this.metadata.id, + id: this.metadata.internal_id, searchValue, pageNumber: 1, pageSize: RECORD_ROWS_BY_LIST diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/PanelForm/usePayment.js b/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/PanelForm/usePayment.js index 3681b2d97e..fa2010306d 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/PanelForm/usePayment.js +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/PanelForm/usePayment.js @@ -227,7 +227,7 @@ export default ({ contextColumnNames: fieldAttributes.reference.context_column_names, tableName: searchTableName.value, uuid: fieldAttributes.uuid, - id: fieldAttributes.id, + id: fieldAttributes.internal_id, // filters, pageNumber, pageSize diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/index.vue index ecbf08356b..b26bd1a186 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/index.vue +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/Payment/index.vue @@ -251,7 +251,7 @@ export default { contextColumnNames: this.metadata.reference.context_column_names, tableName: TABLE_NAME, uuid: this.metadata.uuid, - id: this.metadata.id, + id: this.metadata.internal_id, searchValue, pageNumber: 1, pageSize: RECORD_ROWS_BY_LIST diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/useProduct.js b/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/useProduct.js index 2e0584ce65..e226202224 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/useProduct.js +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/useProduct.js @@ -244,7 +244,7 @@ export default ({ contextColumnNames: fieldAttributes.reference.context_column_names, tableName: searchTableName.value, uuid: fieldAttributes.uuid, - id: fieldAttributes.id, + id: fieldAttributes.internal_id, // filters, pageNumber, pageSize diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/index.vue index 92c11ff66b..80e853caac 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/index.vue +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/index.vue @@ -189,7 +189,7 @@ export default { contextColumnNames: this.metadata.reference.context_column_names, tableName: TABLE_NAME, uuid: this.metadata.uuid, - id: this.metadata.id, + id: this.metadata.internal_id, searchValue, pageNumber: 1, pageSize: RECORD_ROWS_BY_LIST diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/index.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/index.vue index 575314fcba..6248f33011 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/index.vue +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/index.vue @@ -142,7 +142,7 @@ export default { // load definition this.containerManager.getSearchDefinition({ uuid: this.metadata.uuid, - id: this.metadata.id + id: this.metadata.internal_id }) } } diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/mixinFieldSearch.js b/src/components/ADempiere/FieldDefinition/FieldSearch/mixinFieldSearch.js index d31829271a..133f9e7b04 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/mixinFieldSearch.js +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/mixinFieldSearch.js @@ -109,7 +109,7 @@ export default { contextColumnNames: this.metadata.reference.context_column_names, contextColumnNamesByDefaultValue: this.metadata.context_column_names, uuid: this.metadata.uuid, - id: this.metadata.id, + id: this.metadata.internal_id, // tableName: this.searchTableName, columnName: this.metadata.column_name, diff --git a/src/components/ADempiere/FieldDefinition/FieldSelect/index.vue b/src/components/ADempiere/FieldDefinition/FieldSelect/index.vue index 84a7340f03..c97f62d0c8 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSelect/index.vue +++ b/src/components/ADempiere/FieldDefinition/FieldSelect/index.vue @@ -105,7 +105,7 @@ export default { containerUuid: this.metadata.containerUuid, contextColumnNames: this.metadata.contextColumnNames, uuid: this.metadata.uuid, - id: this.metadata.id + id: this.metadata.internal_id }) ) }, @@ -374,7 +374,7 @@ export default { containerUuid: this.metadata.containerUuid, contextColumnNames: this.metadata.reference.context_column_names, uuid: this.metadata.uuid, - id: this.metadata.id, + id: this.metadata.internal_id, // tableName: this.metadata.referenceTableName, columnName: this.metadata.column_name, diff --git a/src/components/ADempiere/FieldDefinition/FieldSelect/mixinFieldSelect.js b/src/components/ADempiere/FieldDefinition/FieldSelect/mixinFieldSelect.js index 4005d0c77d..1460ed4e2f 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSelect/mixinFieldSelect.js +++ b/src/components/ADempiere/FieldDefinition/FieldSelect/mixinFieldSelect.js @@ -69,7 +69,7 @@ export default { containerUuid: this.metadata.containerUuid, contextColumnNames: this.metadata.reference.context_column_names, uuid: this.metadata.uuid, - id: this.metadata.id, + id: this.metadata.internal_id, // tableName: this.metadata.referenceTableName, columnName: this.metadata.columnName @@ -90,7 +90,7 @@ export default { contextColumnNames: this.metadata.reference.context_column_names, contextColumnNamesByDefaultValue: this.metadata.context_column_names, uuid: this.metadata.uuid, - id: this.metadata.id, + id: this.metadata.internal_id, // tableName: this.metadata.referenceTableName, columnName: this.metadata.columnName, diff --git a/src/components/ADempiere/FieldDefinition/FieldWarehouseLocator/API-COMPOSITION.vue b/src/components/ADempiere/FieldDefinition/FieldWarehouseLocator/API-COMPOSITION.vue index afa3dcc836..e0c4146589 100644 --- a/src/components/ADempiere/FieldDefinition/FieldWarehouseLocator/API-COMPOSITION.vue +++ b/src/components/ADempiere/FieldDefinition/FieldWarehouseLocator/API-COMPOSITION.vue @@ -197,6 +197,7 @@ export default defineComponent({ contextAttributesList: contextAttributesList.value, warehouseId: warehouseId.value, uuid: props.metadata.uuid, + id: props.metadata.internal_id, searchValue, pageNumber: 1 }) diff --git a/src/components/ADempiere/FieldDefinition/FieldWarehouseLocator/index.vue b/src/components/ADempiere/FieldDefinition/FieldWarehouseLocator/index.vue index 765f59950b..8c658ff706 100644 --- a/src/components/ADempiere/FieldDefinition/FieldWarehouseLocator/index.vue +++ b/src/components/ADempiere/FieldDefinition/FieldWarehouseLocator/index.vue @@ -158,7 +158,7 @@ export default { contextAttributesList, warehouseId: this.warehouseId, uuid: this.metadata.uuid, - id: this.metadata.id, + id: this.metadata.internal_id, searchValue, pageNumber: 1, pageSize: RECORD_ROWS_BY_LIST diff --git a/src/components/ADempiere/FieldDefinition/FieldWarehouseLocator/list.vue b/src/components/ADempiere/FieldDefinition/FieldWarehouseLocator/list.vue index 9a490ba8f7..dd482c2536 100644 --- a/src/components/ADempiere/FieldDefinition/FieldWarehouseLocator/list.vue +++ b/src/components/ADempiere/FieldDefinition/FieldWarehouseLocator/list.vue @@ -342,6 +342,7 @@ export default defineComponent({ contextAttributesList: contextAttributesList.value, warehouseId: currentWarehouseId.value, uuid: props.metadata.uuid, + id: props.metadata.internal_id, searchValue: searchValue.value, pageNumber, pageSize diff --git a/src/components/ADempiere/FieldDefinition/mixin/mixinField.js b/src/components/ADempiere/FieldDefinition/mixin/mixinField.js index 3be19b4212..7559deedfb 100644 --- a/src/components/ADempiere/FieldDefinition/mixin/mixinField.js +++ b/src/components/ADempiere/FieldDefinition/mixin/mixinField.js @@ -99,7 +99,7 @@ export default { contextColumnNames: this.metadata.contextColumnNames, // uuid: this.metadata.uuid, - id: this.metadata.id, + id: this.metadata.internal_id, defaultValue: this.metadata.default_value, value: this.value }) @@ -252,7 +252,7 @@ export default { rowUid: this.metadata.rowUid, // uuid: this.metadata.uuid, - id: this.metadata.id, + id: this.metadata.internal_id, columnName: this.metadata.column_name, value: this.value }) diff --git a/src/components/ADempiere/FieldDefinition/useFieldDefinition.js b/src/components/ADempiere/FieldDefinition/useFieldDefinition.js index ed3aced3ec..8815e1c5a2 100644 --- a/src/components/ADempiere/FieldDefinition/useFieldDefinition.js +++ b/src/components/ADempiere/FieldDefinition/useFieldDefinition.js @@ -151,7 +151,7 @@ export default function useFieldDefinition({ fieldMetadata, containerManager }) contextColumnNames: fieldMetadata.contextColumnNames, // uuid: fieldMetadata.uuid, - id: fieldMetadata.id, + id: fieldMetadata.internal_id, value: value.value }) }) @@ -194,7 +194,7 @@ export default function useFieldDefinition({ fieldMetadata, containerManager }) rowUid: fieldMetadata.rowUid, // uuid: fieldMetadata.uuid, - id: fieldMetadata.id, + id: fieldMetadata.internal_id, columnName: fieldMetadata.column_name, value: value.value }) diff --git a/src/components/ADempiere/PanelInfo/index.vue b/src/components/ADempiere/PanelInfo/index.vue index a40245b4f6..150f29ea4a 100644 --- a/src/components/ADempiere/PanelInfo/index.vue +++ b/src/components/ADempiere/PanelInfo/index.vue @@ -437,18 +437,18 @@ export default defineComponent({ } if (tab.name === 'listDashboard') { const { currentTab } = store.getters.getContainerInfo - if (isEmptyValue(storedWindow.value.id) || + if (isEmptyValue(storedWindow.value.internal_id) || (isEmptyValue(currentTab))) { return } const dashboardList = store.getters.getPanelDashboard({ - tabId: currentTab.id, + tabId: currentTab.internal_id, recordId: currentRecordId.value }) if (isEmptyValue(dashboardList)) { store.dispatch('listWindowDashboard', { - tabId: currentTab.id, - windowId: storedWindow.value.id, + tabId: currentTab.internal_id, + windowId: storedWindow.value.internal_id, recordId: currentRecordId.value, tableName: currentTab.table_name }) @@ -460,7 +460,7 @@ export default defineComponent({ store.dispatch('getReferencesFromServer', { tableName: currentTab.value.table_name, containerUuid: currentTab.value.containerUuid, - tabId: currentTab.value.id, + tabId: currentTab.value.internal_id, parentUuid: currentTab.value.parentUuid, recordId: currentRecordId.value, recordUuid: currentRecordUuid.value diff --git a/src/components/ADempiere/Process/ExportDictionaryDefinition.vue b/src/components/ADempiere/Process/ExportDictionaryDefinition.vue index 1bd9cd0785..3cf0c4c986 100644 --- a/src/components/ADempiere/Process/ExportDictionaryDefinition.vue +++ b/src/components/ADempiere/Process/ExportDictionaryDefinition.vue @@ -48,6 +48,7 @@ + + + + + + false } + requestRunBusinessProcess({ - id: 54692, + id: EXPORT_DICTIONARY_DEFINITION_PROCESS_ID, parameters: { ECA56_ExportMenu: isMenu.value, ECA56_ExportForms: isForm.value, @@ -279,15 +291,6 @@ export default defineComponent({