From 624f4707aca2ac1e13f2e5d97c8d1be816c2979e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 26 Jun 2024 10:43:02 +0200
Subject: [PATCH 1/2] feat: refs #7197 filter by correcting

---
 .../invoiceIn/back/methods/invoice-in/filter.js    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/invoiceIn/back/methods/invoice-in/filter.js b/modules/invoiceIn/back/methods/invoice-in/filter.js
index 0d3b5f14a..91d358016 100644
--- a/modules/invoiceIn/back/methods/invoice-in/filter.js
+++ b/modules/invoiceIn/back/methods/invoice-in/filter.js
@@ -82,7 +82,11 @@ module.exports = Self => {
             {
                 arg: 'correctedFk',
                 type: 'number',
-                description: 'The corrected invoice',
+                description: 'The rectified invoice',
+            },
+            {
+                arg: 'correctingFk',
+                type: 'Boolean',
             }
         ],
         returns: {
@@ -111,6 +115,7 @@ module.exports = Self => {
         }
 
         let correctings;
+        let correcteds;
         if (args.correctedFk) {
             correctings = await models.InvoiceInCorrection.find({
                 fields: ['correctingFk'],
@@ -118,6 +123,9 @@ module.exports = Self => {
             });
         }
 
+        if (args.correctingFk || args.correctingFk === false)
+            correcteds = await models.InvoiceInCorrection.find();
+
         const where = buildFilter(ctx.args, (param, value) => {
             switch (param) {
             case 'search':
@@ -141,6 +149,10 @@ module.exports = Self => {
                 return {[`ii.${param}`]: value};
             case 'awbCode':
                 return {'sub.code': value};
+            case 'correctingFk':
+                return args.correctingFk
+                    ? {'ii.id': {inq: correcteds.map(x => x.correctingFk)}}
+                    : {'ii.id': {nin: correcteds.map(x => x.correctingFk)}};
             case 'correctedFk':
                 return {'ii.id': {inq: correctings.map(x => x.correctingFk)}};
             }
-- 
2.40.1


From dce62245e9ffbe7cb639776b0785c8f0a262a0bb Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 4 Jul 2024 13:10:32 +0200
Subject: [PATCH 2/2] chore: refs #7197 add supplierActivityFk filter

---
 modules/invoiceIn/back/methods/invoice-in/filter.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/invoiceIn/back/methods/invoice-in/filter.js b/modules/invoiceIn/back/methods/invoice-in/filter.js
index 91d358016..d72d7fc63 100644
--- a/modules/invoiceIn/back/methods/invoice-in/filter.js
+++ b/modules/invoiceIn/back/methods/invoice-in/filter.js
@@ -87,6 +87,10 @@ module.exports = Self => {
             {
                 arg: 'correctingFk',
                 type: 'Boolean',
+            },
+            {
+                arg: 'supplierActivityFk',
+                type: 'string',
             }
         ],
         returns: {
@@ -155,6 +159,8 @@ module.exports = Self => {
                     : {'ii.id': {nin: correcteds.map(x => x.correctingFk)}};
             case 'correctedFk':
                 return {'ii.id': {inq: correctings.map(x => x.correctingFk)}};
+            case 'supplierActivityFk':
+                return {'s.supplierActivityFk': value};
             }
         });
 
-- 
2.40.1