verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branch 'master' into test
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Guillermo Bonet 2024-09-09 11:35:08 +02:00
parent b0f1cc69af 723ec2b453
commit 3c6b7cd224
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitor/back/methods/sales-monitor/salesFilter.js
View File

@ -285,7 +285,7 @@ module.exports = Self => {
if (hasProblems === true) { if (hasProblems === true) {
whereProblems = {or: [ whereProblems = {or: [
{'tp.isFreezed': true}, {'tp.isFreezed': true},
{'tp.risk': {lt: 0}}, {'tp.hasRisk': true},
{'tp.hasTicketRequest': true}, {'tp.hasTicketRequest': true},
{'tp.hasComponentLack': true}, {'tp.hasComponentLack': true},
{'tp.isTaxDataChecked': false}, {'tp.isTaxDataChecked': false},
@ -295,7 +295,7 @@ module.exports = Self => {
} else if (hasProblems === false) { } else if (hasProblems === false) {
whereProblems = {and: [ whereProblems = {and: [
{'tp.isFreezed': false}, {'tp.isFreezed': false},
{'tp.risk': 0}, {'tp.hasRisk': false},
{'tp.hasTicketRequest': false}, {'tp.hasTicketRequest': false},
{'tp.hasComponentLack': false}, {'tp.hasComponentLack': false},
{'tp.isTaxDataChecked': true}, {'tp.isTaxDataChecked': true},

2
modules/ticket/back/methods/ticket/filter.js
View File

@ -343,7 +343,7 @@ module.exports = Self => {
const problems = {[condition]: [ const problems = {[condition]: [
{'tp.isFreezed': hasProblem}, {'tp.isFreezed': hasProblem},
{'tp.risk': hasProblem}, {'tp.hasRisk': hasProblem},
{'tp.hasTicketRequest': hasProblem}, {'tp.hasTicketRequest': hasProblem},
{'tp.itemShortage': range}, {'tp.itemShortage': range},
{'tp.hasRounding': hasProblem} {'tp.hasRounding': hasProblem}

2
modules/ticket/back/methods/ticket/getTicketsFuture.js
View File

@ -196,7 +196,7 @@ module.exports = Self => {
const problems = { const problems = {
[condition]: [ [condition]: [
{'tp.isFreezed': hasProblem}, {'tp.isFreezed': hasProblem},
{'tp.risk': hasProblem}, {'tp.hasRisk': hasProblem},
{'tp.hasTicketRequest': hasProblem}, {'tp.hasTicketRequest': hasProblem},
{'tp.itemShortage': range}, {'tp.itemShortage': range},
{'tp.hasComponentLack': hasProblem}, {'tp.hasComponentLack': hasProblem},