verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 63 Releases Wiki Activity

7863-devToTest_2434 #2852

Merged
alexm merged 129 commits from 7863-devToTest_2434 into test 2024-08-13 06:50:25 +00:00
Conversation 0 Commits 129 Files Changed 147 +2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4a76a7554e - Show all commits

2
modules/invoiceIn/back/methods/invoice-in/filter.js
View File

@ -119,6 +119,7 @@ module.exports = Self => {
} }
let correctings; let correctings;
let correcteds; let correcteds;
if (args.correctedFk) { if (args.correctedFk) {
correctings = await models.InvoiceInCorrection.find({ correctings = await models.InvoiceInCorrection.find({
@ -154,6 +155,7 @@ module.exports = Self => {
case 'awbCode': case 'awbCode':
return {'sub.code': value}; return {'sub.code': value};
case 'correctingFk': case 'correctingFk':
if (!correcteds.length && !args.correctingFk) return;
return args.correctingFk return args.correctingFk
? {'ii.id': {inq: correcteds.map(x => x.correctingFk)}} ? {'ii.id': {inq: correcteds.map(x => x.correctingFk)}}
: {'ii.id': {nin: correcteds.map(x => x.correctingFk)}}; : {'ii.id': {nin: correcteds.map(x => x.correctingFk)}};