Commit Graph

19283 Commits

Author SHA1 Message Date
Guillermo Bonet ed8210d5da feat: refs #4734 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-16 14:16:11 +01:00
Carlos Satorres 49e915f5d1 Merge pull request 'refs #5525 mod yml y sql' (!1491) from 5525-ibanSEPA-CORE into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1491
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-01-16 13:14:37 +00:00
Guillermo Bonet 5bbeda4014 feat: refs #4734 Added viaexpress interdia
gitea/salix/pipeline/head This commit looks good Details
2024-01-16 13:05:16 +01:00
Carlos Satorres 8095b02835 refs #5525 move version
gitea/salix/pipeline/head This commit looks good Details
2024-01-16 12:48:40 +01:00
Carlos Satorres 7b9480f006 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE 2024-01-16 12:48:13 +01:00
Carlos Satorres 84134d671f refs #5525 remove as
gitea/salix/pipeline/head Build queued... Details
2024-01-16 12:47:58 +01:00
Carlos Satorres ce2bfc7cf1 refs #5525 insert
gitea/salix/pipeline/head This commit looks good Details
2024-01-16 12:46:53 +01:00
Carlos Satorres 037a178717 refs #6230 fix test back
gitea/salix/pipeline/head This commit looks good Details
2024-01-16 12:14:47 +01:00
Carlos Satorres 3ebeebc159 refs #6230 remove basic-data columns
gitea/salix/pipeline/head This commit looks good Details
2024-01-16 11:47:45 +01:00
Carlos Satorres b3e1c58918 refs #6313 remove restriction
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 14:50:08 +01:00
Carlos Satorres 371cc1e0a9 Merge pull request 'fixe2e' (!1934) from fixe2e into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1934
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-01-15 13:34:07 +00:00
Carlos Satorres 492c15eb73 Merge branch 'dev' into fixe2e
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 12:57:23 +00:00
Carlos Satorres f324ff5070 Merge pull request 'refs #6489 remove auth' (!1864) from 6489-authSupport into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1864
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-15 12:55:50 +00:00
Carlos Satorres f8939fb5cf Merge branch 'dev' into fixe2e
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 12:54:18 +00:00
Carlos Satorres 3cdf8b2011 Merge branch 'dev' into 6489-authSupport
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 12:42:05 +00:00
Carlos Satorres 55b5e4cfcd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6296-countryAddress
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 13:29:39 +01:00
Juan Ferrer 74a4e486aa refs #6661 Propagate changes from vn-database
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 13:12:15 +01:00
Carlos Satorres 7d7c6d7071 remove fdescribre
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 12:59:55 +01:00
Carlos Satorres 3ba5bc8fa1 refs #3979 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 12:59:19 +01:00
Juan Ferrer 51a4608390 feat: refs #5483 Gulp and back tests adjustments
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 12:35:23 +01:00
Juan Ferrer b7edbbe12f feat: refs #5483 Copy vn-database project 2024-01-15 12:31:03 +01:00
Guillermo Bonet f3e7162bfe Merge pull request 'feat: refs #6634 Modified collection-label' (!1932) from 6634-collectionLabelPrevia into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1932
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-15 09:53:43 +00:00
Javier Segarra 831d358e41 refs #6174 feat first approach 2024-01-15 10:52:02 +01:00
Guillermo Bonet 107e35001a fix: refs #6582 Solved log error
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 10:09:43 +01:00
Guillermo Bonet 4ead2345c4 Merge branch '6634-collectionLabelPrevia' of https://gitea.verdnatura.es/verdnatura/salix into 6634-collectionLabelPrevia
gitea/salix/pipeline/head Build queued... Details
2024-01-15 10:03:06 +01:00
Guillermo Bonet a900e0fff6 feat: refs #6634 Minor change 2024-01-15 10:03:05 +01:00
Guillermo Bonet 1cd9b85ddf Merge branch 'dev' into 6634-collectionLabelPrevia
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 09:00:08 +00:00
Guillermo Bonet be1a94c283 feat: refs #6634 Modified collection-label
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 09:59:32 +01:00
Jorge Penadés f5372cb801 Merge pull request 'hotfix ticket refund' (!1930) from hotfix-ticketRefund into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1930
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-01-15 08:40:22 +00:00
Carlos Satorres 107dded411 refs #6296 countryAddress
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 09:03:56 +01:00
Jorge Penadés fcca927adb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-ticketRefund
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 07:54:35 +01:00
Alex Moreno c20b9fe212 refs #6656 fix(updateTimeEntry): correct accessType (WRITE)
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 07:45:40 +01:00
Jorge Penadés 6236cf0621 hotfix ticketRefund
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 16:18:26 +01:00
Javier Segarra fe4c529bfe refs #5834 perf: remove front code
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-12 13:05:00 +01:00
Javier Segarra 3ace078705 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5834-billingDataAutoFillBic
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-12 12:53:49 +01:00
Alex Moreno 199656afb8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-12 12:41:52 +01:00
Jorge Penadés c309f52c6f Merge pull request 'fix: refs #6656 change acls' (!1929) from 6656-hotfix-workerTimeControl into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1929
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-12 11:24:11 +00:00
Carlos Satorres 1ca49d064e Merge pull request 'refs #6353 remove rating' (!1923) from 6353-ratingCatalog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1923
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-01-12 10:36:43 +00:00
Jorge Penadés 2a6b509a78 fix: refs #6656 change acls
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 09:54:18 +01:00
Alex Moreno 14fff571b5 Merge branch 'dev' into 6353-ratingCatalog
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 08:52:51 +00:00
Carlos Satorres b7a523074f Merge pull request 'refs #6322 importe' (!1921) from 6322-futureTicketImporte into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1921
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-12 07:55:18 +00:00
Carlos Satorres d0df880c32 Merge branch 'dev' into 6322-futureTicketImporte
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 07:47:23 +00:00
Javi Gallego 887f686767 Merge pull request '3979-abonarTicketsSinAlmacen' (!1910) from 3979-abonarTicketsSinAlmacen into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1910
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-11 12:39:27 +00:00
Alex Moreno b1530d049e refs #6398 hotFix: use userFk
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 13:29:03 +01:00
Javi Gallego c98baf21bf Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 12:17:59 +00:00
Juan Ferrer 46fe878f45 Merge pull request 'refs #6660 feat: update mariadb version 10.7.7→10.11.6' (!1926) from 6660-mariadbV10.11.6 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1926
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-01-11 11:28:13 +00:00
Juan Ferrer ce5e8c278f Merge branch 'dev' into 6660-mariadbV10.11.6
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 11:22:55 +00:00
Guillermo Bonet e2fd55d9fb Merge pull request 'fix: ticket 147437: Fix packages in incoterms' (!1927) from ticket147437-fixPackages into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1927
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-01-11 10:46:12 +00:00
Guillermo Bonet 4673145c58 fix: ticket 147437: Fix packages in incoterms
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 10:09:35 +01:00
Alex Moreno 9b15551013 refs #6675 fix: correct sql folder
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 09:00:45 +01:00