Commit Graph

22785 Commits

Author SHA1 Message Date
Ivan Mas a8f5993c21 Merge branch 'dev' into 7536-TPV_Wrong_abajo_field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 10:12:45 +00:00
Javi Gallego e77bc87a2a Merge pull request 'feat: refs #7203 remove numbres alertLevel' (!2546) from 7203-alertLevel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2546
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-06 09:48:29 +00:00
Carlos Andrés 4a0d32eb60 Merge pull request 'Hotfix modificar entradas contabilizadas Ticket 191417' (!2551) from Hotfix-modificar-entradas-contabilizadas-Ticket-191417 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2551
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-06 09:21:18 +00:00
Jon Elias 34fd7cb78d Merge pull request '#6753 fix saveSign' (!2533) from 6753-TicketsSaveSign into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2533
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-06 07:53:08 +00:00
Jon Elias c2e80060b3 Merge branch 'dev' into 6753-TicketsSaveSign
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 07:51:23 +00:00
Robert Ferrús 7f23c81756 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 07:28:40 +02:00
Jorge Penadés 14afd8246a feat: refs #6273 add back test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 17:38:48 +02:00
Jorge Penadés 8188bdbcb0 fix: refs #6273 use userId
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 17:12:37 +02:00
Jorge Penadés a79285cd3d feat: refs #6273 register freelance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 16:27:00 +02:00
Carlos Andrés b78ef97813 Hotfix modificar entradas contabilizadas Ticket 191417
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-05 15:50:16 +02:00
Carlos Andrés 638a5e9a1e Hotfix modificar entradas contabilizadas Ticket 191417
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-05 15:44:11 +02:00
Ivan Mas 8458651ce0 Merge branch 'dev' into 7536-TPV_Wrong_abajo_field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 12:57:47 +00:00
Ivan Mas 71ea1d1467 refs #7536 modify itemShelvingRadar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 14:53:59 +02:00
Guillermo Bonet feda14a21b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 14:23:09 +02:00
Guillermo Bonet c2fecde1b8 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 14:22:59 +02:00
Robert Ferrús debfe15784 Merge pull request 'fix: refs #7335 hotFix cmrTicket' (!2549) from 7335-hotFixCmrTicket into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2549
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-05 11:50:25 +00:00
Robert Ferrús 40d40bd0bb fix: refs #7335 hotFix cmrTicket
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-05 13:42:21 +02:00
Alex Moreno a33f14ffa5 feat(transferInvoice): makePdf of refund
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-05 12:44:28 +02:00
Javi Gallego 1fa22e71a9 feat: refs #7203 nombre variables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-05 12:42:55 +02:00
Guillermo Bonet e4e7ae1699 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 11:16:15 +02:00
Guillermo Bonet ceda2718d5 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 11:15:56 +02:00
Guillermo Bonet 82954ed299 hotfix: ticket #176792
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 11:13:40 +02:00
Carlos Andrés 8b584a08dc Hotfix: midnight deterministic refs #7213
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-05 10:11:04 +02:00
Carlos Andrés f2b443021f hotfix: midnight deterministis refs #7213 2024-06-05 10:03:37 +02:00
Robert Ferrús e52da5117a Merge branch 'dev' into 7496-ticketIsLabeled
gitea/salix/pipeline/pr-dev Build queued... Details
2024-06-05 07:57:34 +00:00
Robert Ferrús a0e79a778d feat: refs #7496 deprecated ticket.isLabeled 2024-06-05 09:57:15 +02:00
Robert Ferrús 5d857696b5 Merge pull request 'feat: refs #7039 deleteVirtualColumnCountry' (!2532) from 7039-deleteVirtualColumnCountry into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2532
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-05 07:00:06 +00:00
Robert Ferrús fd011428d5 Merge branch 'dev' into 7039-deleteVirtualColumnCountry
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 06:48:20 +00:00
Guillermo Bonet 3dab181bff Merge pull request 'refactor: refs #6701 New table clientRate' (!2536) from 6701-clientRate into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2536
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-05 06:17:10 +00:00
Javi Gallego 130d2b6b47 feat: refs #7203 remove numbres alertLevel
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 08:05:46 +02:00
Javi Gallego 9b8fef2f20 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 07:07:18 +02:00
Javi Gallego 143930bc86 fix: warmFix setDeleted checks ticketRequest not answered 2024-06-05 07:07:13 +02:00
Juan Ferrer feaf5f8f5a Merge pull request 'test' (!2545) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2545
2024-06-04 21:05:47 +00:00
Juan Ferrer f903d7cd2a Merge pull request 'master' (!2538) from master into test
gitea/salix/pipeline/pr-dev Build queued... Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2538
2024-06-04 21:05:27 +00:00
Juan Ferrer 3b4cbe9e6c ci(Jenkinsfile): refs #7442 Remove ci from back tests
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
2024-06-04 22:59:33 +02:00
Carlos Andrés 3a68cfef77 Merge pull request 'hotfix: ledger_next transacciones refs #7523' (!2540) from 7523-ledger_next-transacciones into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
Reviewed-on: #2540
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-04 17:14:51 +00:00
Carlos Andrés 35b4255505 Hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-04 16:45:42 +02:00
Carlos Andrés e4969f7061 Hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-04 16:43:09 +02:00
Sergio De la torre f70605e565 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-04 16:03:37 +02:00
Carlos Andrés a9eb5f7d1e hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-04 15:45:54 +02:00
Carlos Andrés e2adadb8da hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-04 15:43:32 +02:00
Carlos Andrés c57f4db623 hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-04 15:41:53 +02:00
Carlos Andrés 1927fbce45 hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-04 15:39:02 +02:00
Javi Gallego 8f7b034aa7 Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-04 14:24:55 +02:00
Javi Gallego 4089c7deb3 feat: refs #4560 minorChanges
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-04 12:23:28 +02:00
Robert Ferrús 81e461d7b1 Merge pull request 'feat refs #7296 routesMonitor.expeditionTruckFk to routesMonitor.roadmapStopFk' (!2510) from 7296-expeditionTruckToRoadmapStop into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2510
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-04 10:03:56 +00:00
Javi Gallego da1b4649bb feat: refs #4560 sin expeditionTruck 2024-06-04 11:58:39 +02:00
Robert Ferrús 6b9c1b7f54 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-04 09:58:07 +00:00
Alex Moreno a997ca0c58 build: add new version
gitea/salix/pipeline/head This commit looks good Details
2024-06-04 10:08:17 +02:00
Alex Moreno f354fe1b1f Merge pull request '7525-devToTest' (!2542) from 7525-devToTest into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2542
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-06-04 07:59:33 +00:00