diff --git a/src/components/ADempiere/ContextMenu/contextMenuMixin.js b/src/components/ADempiere/ContextMenu/contextMenuMixin.js index f82c2c74..f6419674 100644 --- a/src/components/ADempiere/ContextMenu/contextMenuMixin.js +++ b/src/components/ADempiere/ContextMenu/contextMenuMixin.js @@ -518,6 +518,12 @@ export const contextMixin = { reportType: this.$store.getters.getReportType, option: action.option } + if (this.isEmptyValue(updateReportParams.instanceUuid)) { + updateReportParams.instanceUuid = this.$route.params.instanceUuid + } + if (this.isEmptyValue(updateReportParams.processId)) { + updateReportParams.processId = this.$route.params.processId + } this.$store.dispatch('getReportOutputFromServer', updateReportParams) .then(response => { if (!response.isError) { diff --git a/src/store/modules/ADempiere/processControl.js b/src/store/modules/ADempiere/processControl.js index bbd05602..0db4f966 100644 --- a/src/store/modules/ADempiere/processControl.js +++ b/src/store/modules/ADempiere/processControl.js @@ -449,7 +449,7 @@ const processControl = { if (reportType !== 'pdf' && reportType !== 'html') { link.click() } - + const contextMenuMetadata = rootGetters.getContextMenu(processResult.processUuid) // Report views List to context menu const reportViewList = { name: language.t('views.reportView'), @@ -472,7 +472,6 @@ const processControl = { reportViewList.childs = responseReportView if (reportViewList.childs.length) { // Get contextMenu metadata and concat print report views with contextMenu actions - const contextMenuMetadata = rootGetters.getContextMenu(processResult.processUuid) contextMenuMetadata.actions.push(reportViewList) } }) @@ -500,10 +499,14 @@ const processControl = { printFormatList.childs = printFormarResponse if (printFormatList.childs.length) { // Get contextMenu metadata and concat print Format List with contextMenu actions - const contextMenuMetadata = rootGetters.getContextMenu(processResult.processUuid) contextMenuMetadata.actions.push(printFormatList) } }) + } else { + var index = contextMenuMetadata.actions.findIndex(action => action.option === 'printFormat') + if (index !== -1) { + contextMenuMetadata.actions[index] = printFormatList + } } // Drill Tables to context menu @@ -529,7 +532,6 @@ const processControl = { drillTablesList.childs = drillTablesResponse if (drillTablesList.childs.length) { // Get contextMenu metadata and concat print Format List with contextMenu actions - const contextMenuMetadata = rootGetters.getContextMenu(processResult.processUuid) contextMenuMetadata.actions.push(drillTablesList) } }) diff --git a/src/utils/ADempiere/dictionaryUtils.js b/src/utils/ADempiere/dictionaryUtils.js index e0141106..1673a13b 100644 --- a/src/utils/ADempiere/dictionaryUtils.js +++ b/src/utils/ADempiere/dictionaryUtils.js @@ -252,6 +252,7 @@ export function generateProcess({ processToGenerate, containerUuidAssociated = u type: 'summary', action: '', childs: [], + option: 'printFormat', uuid: processToGenerate.uuid, id: processToGenerate.id, description: processToGenerate.description,