Commit Graph

18230 Commits

Author SHA1 Message Date
Sergio De la torre f774297321 Merge pull request 'refs #5867 fix: tickets sql' (!1800) from 5867-Driver-Route-Pdf into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1800
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-11 06:05:07 +00:00
Sergio De la torre 64ecf2e229 Merge branch 'dev' into 5867-Driver-Route-Pdf
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 05:48:21 +00:00
Javier Segarra b86c73777f Update back/tests.js
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 19:05:54 +00:00
Javier Segarra 081a339b5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations 2023-12-07 14:23:05 +01:00
Carlos Satorres 7e9134ecc3 refs #5971 change sql address
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 13:47:07 +01:00
Sergio De la torre 9937fbed5e REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 11:59:01 +01:00
Sergio De la torre 67994188ee Merge branch 'dev' into 6028_routesByWorkerEmail
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 10:42:30 +00:00
Sergio De la torre fa65cc84a9 REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-07 11:39:22 +01:00
Sergio De la torre 61ed53bd1d REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 10:37:06 +01:00
Carlos Satorres f5ef6c66a4 Merge pull request 'refs #6010 remove pending' (!1876) from 6010-testBackPending into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1876
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-07 08:41:03 +00:00
Javier Segarra d37083b3a4 Merge pull request 'Merge dev - test' (!1881) from dev into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1881
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-07 08:28:24 +00:00
Carlos Satorres 3abbae7612 Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 07:16:17 +00:00
Javi Gallego be5df940bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 08:01:20 +01:00
Javi Gallego 58ba1c10d0 ci: dev-test 2023-12-07 08:01:16 +01:00
Sergio De la torre 0263d880ca refs #6028 add:email in ByWorker
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 08:00:17 +01:00
Carlos Satorres 3c9c221220 Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-07 06:59:38 +00:00
Carlos Satorres c75ee22345 Merge pull request 'refs #6318 quantity' (!1875) from 6318-negativeQuantity into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1875
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-07 06:59:24 +00:00
Sergio De la torre c9bcd672c9 refs #6028 add:email in ByWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-07 07:59:21 +01:00
Carlos Satorres c7d960229d Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 06:34:32 +00:00
Carlos Satorres acfa0fd857 Merge branch 'dev' into 6318-negativeQuantity
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 06:31:21 +00:00
Javi Gallego 7ff8ec93ff Merge pull request 'test' (!1879) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1879
2023-12-06 07:54:13 +00:00
Javier Segarra a5fb07bf12 refs #6264 perf remove unnecessary code
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-05 13:05:26 +01:00
Carlos Satorres f55e85a189 refs #6010 remove pending
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 10:35:48 +01:00
Carlos Satorres af07a531ed refs #6318 quantity
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 08:49:55 +01:00
Sergio De la torre 3692021b12 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 07:26:22 +00:00
Sergio De la torre 318f7e3c0d REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 08:20:55 +01:00
Javier Segarra a8b0a7a5b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-04 14:46:21 +01:00
Javier Segarra 5656ed7a2b refs #6264 perf: use functions extracted previously 2023-12-04 14:46:05 +01:00
Javier Segarra b9671c0b67 refs #6264 perf: remove files related to token 2023-12-04 14:44:50 +01:00
Pablo Natek 303b6f5240 fix(expencefk): refs #6398 expenceFk to expenseFk
gitea/salix/pipeline/head This commit looks good Details
2023-12-01 13:48:56 +01:00
Pablo Natek bec1ff71ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk 2023-12-01 13:43:27 +01:00
Robert Ferrús 2a93dcf5b8 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2023-12-01 10:20:08 +00:00
Jorge Penadés 0b1bbbaaa6 Merge pull request 'refs #5835 rate added' (!1865) from 5835-summaryRate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1865
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-01 07:22:26 +00:00
Pablo Natek 758b468c68 Merge pull request 'test' (!1873) from test into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1873
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-12-01 06:11:22 +00:00
Jorge Penadés 611b45bae0 Merge branch 'dev' into 5835-summaryRate
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 15:16:18 +00:00
David Domenech eb0766bafd Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 14:08:47 +00:00
Alex Moreno 6699f5d5a6 Merge pull request 'fix(getFiltered): refs #3271 fix to event filter' (!1872) from 3271-zoneGetFilterdFix into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1872
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-30 13:49:55 +00:00
Pablo Natek 72283005b8 remove(console.log): refs #3271 remove console.log
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 14:43:14 +01:00
David Domenech 8ab981907d refactor(ticketTracking.userFk): refs #6398 workerFk to userFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 14:25:00 +01:00
Pablo Natek c457b5c4d2 Merge branch 'test' into 3271-zoneGetFilterdFix
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:39:26 +00:00
Alex Moreno ee7dd66ce9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:49:42 +01:00
Alex Moreno 35e74a7635 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:48:27 +01:00
Alex Moreno ab69dcd4fe refs #6524 fix: fixtures and feat: new changelog format
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:32:41 +01:00
Javier Segarra b241efc961 Merge pull request 'refs #6434 feat: improve signIn method' (!1867) from 6434-signInLog_improve_test into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1867
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-11-30 11:20:57 +00:00
Alex Moreno 016e4ae37c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix 2023-11-30 12:20:50 +01:00
Pablo Natek 3f22f48df7 fix(getFiltered): refs #3271 fix to event filter
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:13:12 +01:00
Carlos Satorres e7d3ef0763 Merge pull request 'refs #6065 remove workcenter' (!1871) from hotfix-hoursFetch into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1871
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-11-30 09:20:26 +00:00
Jorge Penadés 6121eeaa3a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-summaryRate
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 09:44:05 +01:00
Carlos Satorres 9cdb7c3cca refs #6065 remove workcenter
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 09:18:00 +01:00
Javi Gallego 69e555e7b4 Merge pull request '5652-fixtures-fix' (!1870) from 5652-fixtures-fix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1870
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-30 08:13:05 +00:00