diff --git a/src/components/ADempiere/FieldDefinition/index.vue b/src/components/ADempiere/FieldDefinition/index.vue
index 54b2de821b..953f1be710 100644
--- a/src/components/ADempiere/FieldDefinition/index.vue
+++ b/src/components/ADempiere/FieldDefinition/index.vue
@@ -410,6 +410,12 @@ export default {
       return 'border: 1px solid #fff;border-radius: 5px;'
     },
     isOperatior() {
+      if (this.$route.meta.type === 'report') {
+        const { is_jasper_report: isJasper } = store.getters.getStoredReport(this.containerUuid)
+        if (isJasper) {
+          return false
+        }
+      }
       const isBrowser = this.$route.meta.type === 'browser'
       const {
         isAdvancedQuery,
diff --git a/src/components/ADempiere/ReportManager/Setup/optionsReport.vue b/src/components/ADempiere/ReportManager/Setup/optionsReport.vue
index d0c1bbdb66..5f23980de4 100644
--- a/src/components/ADempiere/ReportManager/Setup/optionsReport.vue
+++ b/src/components/ADempiere/ReportManager/Setup/optionsReport.vue
@@ -23,74 +23,99 @@
         {{ $t('report.reportSettings') }}
       </b>
     </div>
-
-    <div class="text item">
-      <el-form
-        label-position="top"
-        label-width="10px"
-        @submit.native.prevent="notSubmitForm"
-      >
-        <el-row class="report-setup-preferences-fields" :gutter="20">
-          <el-col :span="8">
-            <el-form-item
-              :label="$t('report.printFormats')"
-              style="display: grid;"
-            >
-              <el-select
-                v-model="reportAsPrintFormatValue"
-                style="display: contents;"
-              >
-                <el-option
-                  v-for="(item, key) in reportAsPrintFormat.childs"
-                  :key="key"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item
-              :label="$t('report.reportViews')"
-              style="display: grid;"
-            >
-              <el-select
-                v-model="reportAsViewValue"
-                style="display: contents;"
-              >
-                <el-option
-                  v-for="(item, key) in reportAsView.childs"
-                  :key="key"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item
-              :label="$t('report.typeReport')"
-              style="display: grid;"
+    <el-collapse v-model="activeCollapse">
+      <el-collapse-item name="1">
+        <template slot="title">
+          <b style="font-size: 18px">
+            {{ $t('report.preference') }}
+            <i style="font-size: 18px;" class="el-icon-s-operation" />
+          </b>
+        </template>
+        <el-card class="box-card">
+          <div class="text item">
+            <el-form
+              label-position="top"
+              label-width="10px"
+              @submit.native.prevent="notSubmitForm"
             >
-              <el-select
-                v-model="reportTypeFormatValue"
-                style="display: contents;"
-              >
-                <el-option
-                  v-for="(item, key) in reportTypeFormat.childs"
-                  :key="key"
-                  :label="item.name"
-                  :value="item.type"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-
+              <el-row class="report-setup-preferences-fields" :gutter="20">
+                <el-col :span="8">
+                  <el-form-item
+                    :label="$t('report.printFormats')"
+                    style="display: grid;"
+                  >
+                    <el-select
+                      v-model="reportAsPrintFormatValue"
+                      style="display: contents;"
+                      @change="runReport()"
+                    >
+                      <el-option
+                        v-for="(item, key) in reportAsPrintFormat.childs"
+                        :key="key"
+                        :label="item.name"
+                        :value="item.id"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item
+                    :label="$t('report.reportViews')"
+                    style="display: grid;"
+                  >
+                    <el-select
+                      v-model="reportAsViewValue"
+                      style="display: contents;"
+                      @change="runReport()"
+                    >
+                      <el-option
+                        v-for="(item, key) in reportAsView.childs"
+                        :key="key"
+                        :label="item.name"
+                        :value="item.id"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item
+                    :label="$t('report.typeReport')"
+                    style="display: grid;"
+                  >
+                    <el-select
+                      v-model="reportTypeFormatValue"
+                      style="display: contents;"
+                      @change="runReport()"
+                    >
+                      <el-option
+                        v-for="(item, key) in reportTypeFormat.childs"
+                        :key="key"
+                        :label="item.name"
+                        :value="item.type"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </div>
+        </el-card>
+      </el-collapse-item>
+      <el-collapse-item name="2">
+        <template slot="title">
+          <b style="font-size: 18px">
+            {{ $t('actionMenu.changeParameters') }}
+            <i style="font-size: 18px;" class="el-icon-set-up" />
+          </b>
+        </template>
+        <component
+          :is="componentRender"
+          :container-uuid="containerUuid"
+          :container-manager="containerManagerReportViwer"
+          :is-tab-panel="true"
+        />
+      </el-collapse-item>
+    </el-collapse>
     <el-row
       style="
         position: absolute;
@@ -167,13 +192,31 @@ export default defineComponent({
     const reportAsViewValue = ref(undefined)
     const reportAsPrintFormatValue = ref(undefined)
     const reportTypeFormatValue = ref('')
-
+    const activeCollapse = ref(['1', '2'])
     const attributes = computed(() => {
       return store.getters.getConfigReport({
         containerUuid: props.containerUuid,
         columnName: 'reportType'
       })
     })
+    const storedPanelReport = computed(() => {
+      return store.getters.getModalDialogManager({
+        containerUuid: props.containerUuid
+      })
+    })
+    const containerManagerReportViwer = computed(() => {
+      const modalDialogStored = storedPanelReport.value
+      if (!isEmptyValue(modalDialogStored) && !isEmptyValue(modalDialogStored.containerManager)) {
+        return {
+          ...props.containerManager,
+          ...modalDialogStored.containerManager
+        }
+      }
+      return {
+        ...props.containerManager
+      }
+    })
+
     const reportAsView = computed(() => {
       const options = store.getters.getStoredActionsMenu({
         containerUuid: props.containerUuid
@@ -197,7 +240,9 @@ export default defineComponent({
       }
       return options
     })
-
+    const componentRender = computed(() => {
+      return () => import('@/components/ADempiere/PanelDefinition/index.vue')
+    })
     const reportTypeFormat = computed(() => {
       const options = store.getters.getStoredActionsMenu({
         containerUuid: props.containerUuid
@@ -259,7 +304,7 @@ export default defineComponent({
     }
 
     function runReport() {
-      store.dispatch('buildReport', {
+      store.dispatch('runReport', {
         containerUuid: props.containerUuid,
         isSummary: true
       })
@@ -303,12 +348,16 @@ export default defineComponent({
       reportAsView,
       reportAsPrintFormat,
       reportTypeFormat,
-      updatePrintFormat,
+      componentRender,
+      activeCollapse,
+      storedPanelReport,
       isShowSetupReport,
+      containerManagerReportViwer,
       // methods
       handleClose,
       actionClear,
-      runReport
+      runReport,
+      updatePrintFormat
     }
   }
 })
diff --git a/src/router/modules/ADempiere/staticRoutes.js b/src/router/modules/ADempiere/staticRoutes.js
index d89a34fe5c..1f9f512b8a 100644
--- a/src/router/modules/ADempiere/staticRoutes.js
+++ b/src/router/modules/ADempiere/staticRoutes.js
@@ -247,12 +247,12 @@ const staticRoutes = [
   },
 
   {
-    path: '/report-viewer/:reportId/:instanceUuid',
+    path: '/report-viewer/:reportId',
     component: Layout,
     hidden: true,
     children: [
       {
-        path: '/report-viewer/:reportId/:instanceUuid?',
+        path: '/report-viewer/:reportId?',
         component: () => import('@/views/ADempiere/ReportViewer'),
         name: REPORT_VIEWER_NAME,
         meta: {
diff --git a/src/store/modules/ADempiere/report/reportRun.js b/src/store/modules/ADempiere/report/reportRun.js
index 46d17432fd..eecc546547 100644
--- a/src/store/modules/ADempiere/report/reportRun.js
+++ b/src/store/modules/ADempiere/report/reportRun.js
@@ -38,7 +38,8 @@ import { isEmptyValue } from '@/utils/ADempiere'
 import { showNotification } from '@/utils/ADempiere/notification.js'
 
 const initState = {
-  reportRun: {}
+  reportRun: {},
+  isLoading: false
 }
 const reportRun = {
   state: initState,
@@ -46,6 +47,9 @@ const reportRun = {
   mutations: {
     scrollByetTest(state, contactSend) {
       state.reportRun = contactSend
+    },
+    setIsLoadingReportLegacy(state, isLoading) {
+      state.isLoading = isLoading
     }
   },
   actions: {
@@ -84,6 +88,7 @@ const reportRun = {
             tableName
           })
         }
+        commit('setIsLoadingReportLegacy', true)
         generateReportRequest({
           reportFormat,
           id: reportId,
@@ -120,9 +125,8 @@ const reportRun = {
               if (!REPORT_VIEWER_SUPPORTED_FORMATS.includes(reportFormat)) {
                 link.click()
               }
-
               router.push({
-                path: `/report-viewer/${reportDefinition.internal_id}/${instance_id}`,
+                path: `/report-viewer/${reportDefinition.internal_id}`,
                 name: REPORT_VIEWER_NAME,
                 params: {
                   reportId: reportDefinition.internal_id,
@@ -140,18 +144,17 @@ const reportRun = {
                 type: 'success'
               })
             }
-
             commit('setReportOutput', {
               ...output,
               reportId: reportDefinition.internal_id,
               reportUuid: reportDefinition.uuid,
-              instanceUuid: instance_id,
+              instanceUuid: reportDefinition.internal_id,
               parametersList,
               link,
               url: link.href,
               download: link.download
             })
-
+            commit('setIsLoadingReportLegacy', false)
             resolve(runReportRepsonse)
           })
           .catch(error => {
@@ -162,6 +165,9 @@ const reportRun = {
             })
             console.warn(`Error getting Get Report: ${error.message}. Code: ${error.code}.`)
           })
+          .finally(() => {
+            commit('setIsLoadingReportLegacy', false)
+          })
       })
     },
     reportOutput({ dispatch, getters }, {
@@ -191,6 +197,9 @@ const reportRun = {
   getters: {
     getReportRun: (state) => {
       return state.reportRun
+    },
+    getIsLoadingReportLegacy: (state) => {
+      return state.isLoading
     }
   }
 }
diff --git a/src/views/ADempiere/Report/Report.vue b/src/views/ADempiere/Report/Report.vue
index 31d53cca70..a628344b22 100644
--- a/src/views/ADempiere/Report/Report.vue
+++ b/src/views/ADempiere/Report/Report.vue
@@ -72,7 +72,7 @@ along with this program. If not, see <https:www.gnu.org/licenses/>.
       icon="el-icon-arrow-left"
       circle
       style="top: 50%; right: 0%; position: absolute;"
-      @click="handleOpem()"
+      @click="handleOpen()"
     />
     <panel-footer
       :container-uuid="reportUuid"
@@ -203,7 +203,7 @@ export default defineComponent({
       showPanelConfigReport(false)
     }
 
-    function handleOpem() {
+    function handleOpen() {
       showPanelConfigReport(!isShowPanelConfig.value)
     }
 
@@ -251,7 +251,7 @@ export default defineComponent({
       closeTagView,
       handleClose,
       closeReport,
-      handleOpem,
+      handleOpen,
       runReport
     }
   }
diff --git a/src/views/ADempiere/Report/ReportEngine.vue b/src/views/ADempiere/Report/ReportEngine.vue
index 31d53cca70..a628344b22 100644
--- a/src/views/ADempiere/Report/ReportEngine.vue
+++ b/src/views/ADempiere/Report/ReportEngine.vue
@@ -72,7 +72,7 @@ along with this program. If not, see <https:www.gnu.org/licenses/>.
       icon="el-icon-arrow-left"
       circle
       style="top: 50%; right: 0%; position: absolute;"
-      @click="handleOpem()"
+      @click="handleOpen()"
     />
     <panel-footer
       :container-uuid="reportUuid"
@@ -203,7 +203,7 @@ export default defineComponent({
       showPanelConfigReport(false)
     }
 
-    function handleOpem() {
+    function handleOpen() {
       showPanelConfigReport(!isShowPanelConfig.value)
     }
 
@@ -251,7 +251,7 @@ export default defineComponent({
       closeTagView,
       handleClose,
       closeReport,
-      handleOpem,
+      handleOpen,
       runReport
     }
   }
diff --git a/src/views/ADempiere/Report/index.vue b/src/views/ADempiere/Report/index.vue
index 853342044d..cf985d8ae1 100644
--- a/src/views/ADempiere/Report/index.vue
+++ b/src/views/ADempiere/Report/index.vue
@@ -75,7 +75,7 @@
       icon="el-icon-arrow-left"
       circle
       style="top: 50%; right: 0%; position: absolute;"
-      @click="handleOpem()"
+      @click="handleOpen()"
     />
     <panel-footer
       :container-uuid="reportUuid"
@@ -191,7 +191,7 @@ export default defineComponent({
       showPanelConfigReport(false)
     }
 
-    function handleOpem() {
+    function handleOpen() {
       showPanelConfigReport(!isShowPanelConfig.value)
     }
 
@@ -239,7 +239,7 @@ export default defineComponent({
       closeTagView,
       handleClose,
       closeReport,
-      handleOpem,
+      handleOpen,
       runReport
     }
   }
diff --git a/src/views/ADempiere/ReportViewer/index.vue b/src/views/ADempiere/ReportViewer/index.vue
index 49a6dc7039..73f2a51dda 100644
--- a/src/views/ADempiere/ReportViewer/index.vue
+++ b/src/views/ADempiere/ReportViewer/index.vue
@@ -17,7 +17,7 @@
 -->
 
 <template>
-  <div v-if="isLoading" key="report-viewer-loaded" style="min-height: inherit;">
+  <div key="report-viewer-loaded" v-loading="isLoading" style="min-height: inherit;">
     <el-row type="flex" style="min-height: inherit;">
       <el-col :span="24">
         <div class="content">
@@ -26,16 +26,9 @@
             :name="name"
             :help="help"
           />
-          <!-- <div v-if="!isEmptyValue(storedReportDefinition)" style="float: right;padding-left: 1%;">
-            <action-menu
-              :container-manager="containerManager"
-              :container-uuid="reportUuid"
-              :actions-manager="actionsManager"
-              :relations-manager="relationsManager"
-            />
-          </div> -->
           <file-render
             v-if="!isEmptyValue(storedReportOutput)"
+            :key="storedReportOutput.output_stream"
             :format="reportType"
             :content="reportContent"
             :src="link.href"
@@ -65,7 +58,7 @@
         :is-show-title="false"
       />
     </el-drawer>
-    <!-- <el-button
+    <el-button
       v-if="!isEmptyValue(storedReportDefinition)"
       type="primary"
       icon="el-icon-arrow-left"
@@ -75,14 +68,14 @@
         right: 0%;
         position: absolute;
       "
-      @click="handleOpem()"
-    /> -->
+      @click="handleOpen()"
+    />
   </div>
 
-  <loading-view
+  <!-- <loading-view
     v-else
     key="report-viewer-loading"
-  />
+  /> -->
 </template>
 
 <script>
@@ -98,7 +91,7 @@ import FileRender from '@/components/ADempiere/FileRender/index.vue'
 import LoadingView from '@/components/ADempiere/LoadingView/index.vue'
 import mixinReport from '@/views/ADempiere/Report/mixinReport.js'
 import ModalDialog from '@/components/ADempiere/ModalDialog/index.vue'
-import OptionsReport from '@/components/ADempiere/ReportManager/Setup/optionsReportViewer.vue'
+import OptionsReport from '@/components/ADempiere/ReportManager/Setup/optionsReport.vue'
 import TitleAndHelp from '@/components/ADempiere/TitleAndHelp/index.vue'
 
 // Constants
@@ -124,8 +117,9 @@ export default defineComponent({
 
   setup(props, { root }) {
     const storedReportOutput = computed(() => {
-      return store.getters.getReportOutput(root.$route.params.instanceUuid)
+      return store.getters.getReportOutput(root.$route.params.reportId)
     })
+
     let { reportId, reportUuid } = root.$route.params
     if (!isEmptyValue(storedReportOutput.value)) {
       if (isEmptyValue(reportId) || reportId <= 0) {
@@ -142,7 +136,9 @@ export default defineComponent({
       reportId,
       reportUuid
     })
-    const isLoading = ref(false)
+    const isLoading = computed(() => {
+      return store.getters.getIsLoadingReportLegacy
+    })
     const reportType = ref(DEFAULT_REPORT_TYPE)
     const reportContent = ref('')
 
@@ -172,7 +168,6 @@ export default defineComponent({
 
     function displayReport(reportOutput) {
       if (root.$route.params.isPos) {
-        isLoading.value = true
         return
       }
       if (!reportOutput.isError) {
@@ -180,8 +175,6 @@ export default defineComponent({
 
         reportType.value = isEmptyValue(format) ? 'pdf' : format
         reportContent.value = output
-
-        isLoading.value = true
       }
 
       // update name in tag view
@@ -194,7 +187,6 @@ export default defineComponent({
     // get report from vuex store or request from server
     function getReport() {
       if (root.$route.params.isPos) {
-        isLoading.value = true
         return
       }
       if (!isEmptyValue(storedReportDefinition.value)) {
@@ -283,7 +275,7 @@ export default defineComponent({
       showPanelConfigReport(false)
     }
 
-    function handleOpem() {
+    function handleOpen() {
       showPanelConfigReport(!isShowPanelConfig.value)
     }
 
@@ -304,7 +296,6 @@ export default defineComponent({
       getReport()
       root.$route.meta.reportType = reportType.value
     })
-
     return {
       reportUuid,
       isLoading,
@@ -323,7 +314,7 @@ export default defineComponent({
       storedReportOutput,
       storedReportDefinition,
       // Methods
-      handleOpem,
+      handleOpen,
       handleClose,
       showPanelConfigReport
     }
diff --git a/src/views/ADempiere/ReportViewerEngine/index.vue b/src/views/ADempiere/ReportViewerEngine/index.vue
index 12d305561f..224eb32629 100644
--- a/src/views/ADempiere/ReportViewerEngine/index.vue
+++ b/src/views/ADempiere/ReportViewerEngine/index.vue
@@ -65,7 +65,7 @@
         right: 0%;
         position: absolute;
       "
-      @click="handleOpem()"
+      @click="handleOpen()"
     />
   </div>
 
@@ -257,7 +257,7 @@ export default defineComponent({
       showPanelConfigReport(false)
     }
 
-    function handleOpem() {
+    function handleOpen() {
       showPanelConfigReport(!isShowPanelConfig.value)
     }
 
@@ -301,7 +301,7 @@ export default defineComponent({
       storedReportDefinition,
       containerUuid,
       // Methods
-      handleOpem,
+      handleOpen,
       handleClose,
       showPanelConfigReport
     }