3adbc9c343
Merge branch 'dev' into 8077-sumDefaulter
78d3d01649
Merge pull request 'feat: refs #7821 isBooked with grants' (!3150) from 7821-entryIsBooked into dev
41b3f34158
fix: refs #7821 alias
53673f43b8
Merge branch 'dev' into 7821-entryIsBooked
0ecbef0c9f
Merge branch 'dev' into 7821-entryIsBooked
c6d0dbc318
Merge branch 'dev' into 8001-expeditionGrafana
6c866e48a0
Merge branch 'test' into dev
e04d77f55e
Merge pull request 'feat: refs#8087 Redadas en travel' (!984) from travelisRaidTest into test
5268140d8b
feat: refs#8087 Redadas en travel
977512cae0
Merge pull request 'feat: refs #8087 refs#8087 Redadas en travel' (!908) from 8087-nuevosCamposTravel into dev
robert
pushed to 7709-supplierPackaging_ReportSource_2 at verdnatura/salix
2024-11-22 05:38:02 +00:00
10b5eea686
Merge branch 'dev' into 7709-supplierPackaging_ReportSource_2
78d3d01649
Merge pull request 'feat: refs #7821 isBooked with grants' (!3150) from 7821-entryIsBooked into dev
41b3f34158
fix: refs #7821 alias
53673f43b8
Merge branch 'dev' into 7821-entryIsBooked
0ecbef0c9f
Merge branch 'dev' into 7821-entryIsBooked
6634c5ce9c
Merge branch 'dev' into 8077-sumDefaulterFront
71c26c2fa7
Merge pull request '#6999 added search when user tabs on a filter with value' (!888) from 6999-AddTabToFilter into dev
26ee54c488
Merge branch 'dev' into 6999-AddTabToFilter
eee5873283
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
98ac560b16
Merge pull request 'warmFix_vnSearchBar.spec' (!975) from warmFix_vnSearchBar.spec into test
26965c33de
Merge branch 'dev' into 8077-sumDefaulter
cde3c8c50a
Merge pull request 'feat: refs #8138 reduce credit on risk' (!3215) from 8138-feat-reduce-credit-on-risk into dev
42a27f3407
Merge branch 'test' into dev
d302a9c3ba
Merge branch 'master' into test
917e3128a9
Merge pull request 'fix: refs #8191 Deleted msg send rocket in getSales.js' (!3225) from 8191-getSales into master
846479f942
Merge branch 'dev' into 8077-sumDefaulter
60734136c3
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
f192b92c6a
Merge pull request 'feat: refs #8099 refs#8099 addComplmentSalary' (!3219) from 8099-addComplementSalary into test
feb11c123e
feat: refs #8099 refs#8099 addComplmentSalary
d21b42a567
feat: refs #8099 refs#8099 addComplmentSalary
7021c226b5
Merge branch 'dev' into 8077-sumDefaulterFront
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
a14cc29fc4
build: change package version
a43c28cb57
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
ff272ab6c3
Merge pull request 'fix(Supplier): change isSerious to isReal' (!966) from hotFix_supplier_isReal into master
8a1db719e3
fix(Supplier): change isSerious to isReal
fix(Supplier): change isSerious to isReal
b29053e850
Merge pull request 'feat: refs #8211 route_afterUpdate' (!3218) from 8211-hotFixRoute_afterUpdate into master
7b5e474d24
feat: refs #8211 route_afterUpdate
feat: refs #8211 route_afterUpdate
fix(Supplier): change isSerious to isReal
feat: refs #8211 route_afterUpdate
4e5b9e6a34
Merge branch '8077-sumDefaulter' of https://gitea.verdnatura.es/verdnatura/salix into 8077-sumDefaulter
76b32e1d25
feat: refs #8077 add description to sumAmount