Fix: Instance In Report Filter (#2892)

solop-develop · Oct 29, 2024 · 2d0498d · 2d0498d
1 parent 890f1f3
commit 2d0498d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/api/ADempiere/reportManagement/index.ts b/src/api/ADempiere/reportManagement/index.ts
@@ -125,7 +125,6 @@ export function getView({
   printFormatId,
   reportViewId,
   isSummary,
-  instanceId,
   // window
   tableName,
   recordId
@@ -143,8 +142,7 @@ export function getView({
       report_view_id: reportViewId,
       is_summary: isSummary,
       table_name: tableName,
-      record_id: recordId,
-      AD_PInstance_ID: instanceId
+      record_id: recordId
     }
   })
 }

diff --git a/src/store/modules/ADempiere/reportManager.js b/src/store/modules/ADempiere/reportManager.js
@@ -701,12 +701,17 @@ const reportManager = {
         type: 'info'
       })
       return new Promise((resolve, reject) => {
-        const filters = getOperatorAndValue({
+        let filters = getOperatorAndValue({
           format: 'array',
           containerUuid,
           fieldsList
         })
-
+        if (!isEmptyValue(instanceId)) {
+          const filtersArray = JSON.parse(filters)
+          const newFilter = { 'name': 'AD_PInstance_ID', 'operator': 'equal', 'values': instanceId }
+          filtersArray.push(newFilter)
+          filters = JSON.stringify(filtersArray)
+        }
         getView({
           printFormatId,
           reportViewId,