2ba931bedb
Merge branch 'dev' of https: refs #7301//gitea.verdnatura.es/verdnatura/salix into 7301-itemLastEntries
78d3d01649
Merge pull request 'feat: refs #7821 isBooked with grants' (!3150) from 7821-entryIsBooked into dev
e92ce939b8
refactor: refs #7301 update entry and item filter tests to validate results against specific criteria
0cefe391cb
Merge pull request 'Hotfix: Show only the correct path of the search' (!954) from Hotfix-ZoneLocationsTree into master
c17069a909
Merge branch 'dev' of https: refs #7301//gitea.verdnatura.es/verdnatura/salix into 7301-itemLastEntries
fee9bbe387
Merge pull request 'refactor: refs #7690 unify workerTimeControlParams with workerTimeControlConfig' (!3191) from 7690-renameConfigTables into dev
9cd16981e6
Merge pull request '#6924 Notify absences only to department boss' (!3175) from 6924-NotifyOnlyToBoss into dev
3bc5c9bd6a
Merge pull request '#8162 - E2E Tickets' (!951) from wbuezas/salix-front-mindshore-fork2:8162-E2ETickets into dev
e943838dbe
Merge pull request '#8038 added new functionality in VnSelect and refactored styles' (!871) from 8038-ImproveAndCorrectVnTable into dev
feat: refs #7301 add exclude inventory supplier from list
feat: refs #7301 add inventory-config and acl
pablone
deleted branch 8138-feat-reduce-credit-on-risk from verdnatura/salix
2024-11-20 11:21:12 +00:00
cde3c8c50a
Merge pull request 'feat: refs #8138 reduce credit on risk' (!3215) from 8138-feat-reduce-credit-on-risk into dev
feat: refs #8138 reduce credit on risk
ad345a0b91
Merge pull request 'feat: refs#8087 Redadas en travel' (!3177) from 8087-nuevosCamposTravel into dev
63c0747304
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8087-nuevosCamposTravel
cbdce8f474
Merge pull request '#8138 add-component-ticketProblems' (!962) from 8138-add-component-ticketProblems into dev
479c428edf
Merge branch '8138-add-component-ticketProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into 8138-add-component-ticketProblems
pablone
pushed to 8138-add-component-ticketProblems at verdnatura/salix-front
2024-11-20 05:02:15 +00:00
bc73996dfe
Merge pull request 'fix: refs #8166 show zone error' (!972) from 8166-fixAdvanceTickets into dev
8e9e8a8c78
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8166-fixAdvanceTickets
pablone
pushed to 8138-add-component-ticketProblems at verdnatura/salix-front
2024-11-19 12:54:51 +00:00
19cb781800
Merge pull request '#8036 - arrayData_exprBuilder_after' (!845) from 8036-arrayData_exprBuilder_after into dev
88d2384c35
Merge branch 'dev' of https: refs #8036//gitea.verdnatura.es/verdnatura/salix-front into 8036-arrayData_exprBuilder_after