79d6f133a1
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
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
6f1e6a3bfa
Merge branch 'dev' into 8036-arrayData_exprBuilder_after
1e04ead780
perf: refs #8036 currentFilter
5b9f9d38a2
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
a14cc29fc4
build: change package version
a43c28cb57
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
b26028c6a5
Merge pull request '8144-devToTest_2448' (!963) from 8144-devToTest_2448 into test
9c271eee08
Merge pull request '#7346 manualInvoice' (!793) from 7346-manualInvoice into dev
a44ea9384a
Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
3c5472ad4a
Merge pull request 'Fix: changed route.query' (!959) from Fix-OrderCatalogCategoryFilter into dev
0c0b9ca648
fix: changed route.query
dd490888cf
merge test in dev
09be2d4d41
Merge pull request 'solveConflicts_test_to_dev' (!957) from solveConflicts_test_to_dev into dev
433f883700
Merge pull request 'feat: refs #6869 define model' (!3172) from 6869-createGetDetails into dev
dd637b9333
fix: refs #6869 use id as primaryKey
5e78317b5e
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6869-createGetDetails
2b97c18412
Merge branch 'dev' into 6869-createGetDetails
7a4455d6d0
feat: refs #6869 refs#6869 itemShelving_get
feat: refs #6869 define model
5e78317b5e
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6869-createGetDetails
5e21e4e368
Merge pull request 'feat: refs #8127 entry_getCommission' (!3128) from 8127-entry_updateComission into dev
329488d700
Merge branch 'dev' into 8127-entry_updateComission
923296e85e
Merge branch 'dev' into 8127-entry_updateComission
c5f1b05671
feat: refs #8127 quitar esquemas
72ce3615d0
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
80770b1165
Merge pull request '#8185 Fix LeftMenu to avoid duplicates' (!952) from 8185-DuplicateLeftMenu into dev
3d8aa3cff9
Merge branch 'dev' into 8185-DuplicateLeftMenu
2bc219a09b
refactor: refs #8185 modified LeftMenu to avoid duplicates