Commit Graph

16654 Commits

Author SHA1 Message Date
Vicent Llopis 6010bc1253 refs #5554 movido codigo al vnLayout y parar el evento periódico
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 09:51:56 +02:00
Alex Moreno a0da78700b Merge branch 'dev' into 5678-sale-canEdit-notSale
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 07:49:40 +00:00
Alex Moreno 256f30987f refs #5730 new version 232401
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 09:46:39 +02:00
Alex Moreno 310536120e Merge pull request '232201_dev_to_test' (!1561) from 232201_dev_to_test into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1561
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-05-25 07:43:17 +00:00
Alex Moreno 33928aa406 refs #5730 correct folder
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 09:29:46 +02:00
Alex Moreno c5a9eeed44 Merge pull request '232201_test_to_dev' (!1560) from 232201_test_to_dev into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1560
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
2023-05-25 07:17:09 +00:00
Alex Moreno 37a3275b27 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 08:56:10 +02:00
Alex Moreno a052c363fa Merge pull request '232001_test_to_master' (!1559) from 232001_test_to_master into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1559
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-05-25 06:54:49 +00:00
Alex Moreno 02c331ddd6 refs # fix(SQL): wagon
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 08:37:06 +02:00
Carlos Satorres 1f24314ab2 refs #5635 fix back
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 08:24:01 +02:00
Alex Moreno e44fd294ae Merge pull request 'refs #5706 master to test' (!1558) from 232001_master_to_test into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1558
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-05-25 06:12:06 +00:00
Alex Moreno 0e6501f306 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_master 2023-05-25 07:42:58 +02:00
Alex Moreno e19ece6119 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5678-sale-canEdit-notSale
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 07:34:54 +02:00
Vicent Llopis fdd22ca2d8 refs #5554 codigo eliminado de vnLayout
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 07:32:30 +02:00
Alex Moreno 42a39b6778 refs #5706 master to test
gitea/salix/pipeline/head This commit looks good Details
2023-05-25 07:22:56 +02:00
Alex Moreno 43538a8e36 Merge pull request 'hotFix(closeAll): fix where' (!1557) from hotFix_fix_closeAll into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1557
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-05-25 05:16:41 +00:00
Alexandre Riera 0d223bb443 Merge pull request 'fixes #3628 item historical absoluto' (!1539) from 3628-item-historical-absoluto into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1539
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-25 05:05:06 +00:00
Carlos Satorres 4869d81d11 refs #5635 fix back & e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-24 16:17:43 +02:00
Alex Moreno 03e2b98485 hotFix(closeAll): fix where
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 15:50:59 +02:00
Vicent Llopis 2e69e4eea7 a
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 15:16:10 +02:00
Vicent Llopis 834a3aa959 refs #5554 fix: eliminada transacción en el back 'renewToken' 2023-05-24 15:16:04 +02:00
Vicent Llopis eab329b230 refs #554 feat: actualizar el token automáticamente
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 15:01:59 +02:00
Alexandre Riera de313b6418 refs #3628 Show what's before the inventory
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 13:40:26 +02:00
Alexandre Riera 74ba21b1b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 13:39:01 +02:00
Alex Moreno 292d9e038d typo
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 13:38:11 +02:00
Alexandre Riera 12aa9dee41 Merge pull request 'fixes #5677 Fallo portainer Ticket/SaveSign' (!1556) from 5677-fallo-saveSign into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1556
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-24 11:34:47 +00:00
Alexandre Riera 087fa137fd Merge branch 'dev' into 5677-fallo-saveSign
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 11:14:17 +00:00
Carlos Satorres d6a0db3fb8 Merge pull request '5297-newWorker_iban_not_required' (!1492) from 5297-newWorker_iban_not_required into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1492
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-24 11:05:14 +00:00
Alex Moreno 6b66eb3bb2 refs #5679 typo
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 12:59:58 +02:00
Carlos Satorres d6d72ed289 refs #5635 smart-table, counter, filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-24 12:35:07 +02:00
Alexandre Riera 49bd9c35b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 12:19:45 +02:00
Alexandre Riera 133c5dbca5 Merge branch 'dev' into 5677-fallo-saveSign
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 10:18:26 +00:00
Alexandre Riera 856dcf18cb refs #5677 locations
gitea/salix/pipeline/head Build queued... Details
2023-05-24 12:17:41 +02:00
Alexandre Riera 05fb0a7203 refs #5677 tickets without state fixed
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 12:16:19 +02:00
Alex Moreno 30c896c975 refs #5678 feat(sale_canEdit): handle exist sale
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 11:20:07 +02:00
Carlos Satorres 9b363bc7a4 refs #5635 remove vn, smart-table
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 10:57:51 +02:00
Carlos Satorres 1bd54765f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5635-contadotTicketExpedition 2023-05-24 10:05:38 +02:00
Carlos Satorres a99b7cd4f1 Merge branch 'dev' into 5297-newWorker_iban_not_required
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 08:02:33 +00:00
Carlos Satorres 6294fc0435 refs #5297 back&e2e fix changes
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 10:02:02 +02:00
Carlos Satorres 0f66e56390 Merge pull request 'refs #5639 smart-tabla defaulter' (!1550) from 5639-seccionesFormaPagoYPais(MOROSOS) into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1550
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-24 07:04:50 +00:00
Carlos Satorres 6cf2c38927 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 06:59:04 +00:00
Vicent Llopis e43e0a8f9f Merge pull request '5609-ticket.index_searchByFilter' (!1554) from 5609-ticket.index_searchByFilter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1554
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-05-24 06:39:46 +00:00
Carlos Satorres bb39724718 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required 2023-05-24 08:09:44 +02:00
Carlos Satorres e46caffe96 Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 06:05:44 +00:00
Alex Moreno a1bd051112 Merge branch 'dev' into salix-node20
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:52:49 +00:00
Vicent Llopis 3caef0c135 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 07:46:08 +02:00
Vicent Llopis 1ddad7a5ec Merge branch 'dev' into 5609-ticket.index_searchByFilter
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:45:04 +00:00
Alex Moreno 6a6d28efa0 Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 05:40:11 +00:00
Vicent Llopis 68c33efd9a refs #5609 fix: front test
gitea/salix/pipeline/head This commit looks good Details
2023-05-24 07:33:01 +02:00
Alexandre Riera b2f4c02b95 Merge pull request 'fixes #5581 ticket.sale transferir lineas' (!1549) from 5581-transferir-lineas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1549
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-24 05:17:26 +00:00