Commit Graph

21106 Commits

Author SHA1 Message Date
Sergio De la torre d8da317339 Merge branch 'dev' into 6964_itemOlder
gitea/salix/pipeline/pr-dev Build started... Details
2024-03-21 10:10:57 +00:00
Javi Gallego a24d38128b feat: #7013 muestra solo clientes asegurados
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-21 10:48:43 +01:00
Javi Gallego c46e7227e7 feat: #7013 solo muestra clientes asegurados 2024-03-21 10:40:30 +01:00
Sergio De la torre 1d37d3d8bf refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 10:33:49 +01:00
Sergio De la torre 3fbf32bd52 refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-21 10:32:36 +01:00
Pablo Natek 130fb68d27 Merge pull request 'feat: refs #6302 delete after add to turn' (!2187) from 6302-delete-ticket-after-add-to-turn into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2187
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-21 09:28:39 +00:00
Javi Gallego 20a338f746 feat: #7120 specialPrice with new fiels 2024-03-21 10:25:08 +01:00
Ivan Mas db71e69317 Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 09:21:32 +00:00
Sergio De la torre 9eee26cbe9 refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 10:18:54 +01:00
Guillermo Bonet 1cd495df06 fix: refs #7018 Fix invoiceInTax_recalc
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-03-21 09:25:33 +01:00
Guillermo Bonet 844291fec9 Merge branch 'dev' into 6923-migratedProcs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 07:20:23 +00:00
Guillermo Bonet 2f87ba03b2 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-21 08:16:44 +01:00
Guillermo Bonet bbbd212547 build: refs #5846 HOTFIX Myt updated
gitea/salix/pipeline/head This commit looks good Details
2024-03-21 08:14:59 +01:00
Guillermo Bonet de83cef68c build: refs #5846 HOTFIX Myt updated
gitea/salix/pipeline/head There was a failure building this commit Details
2024-03-21 08:01:27 +01:00
Alex Moreno b087c35a36 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-21 08:01:05 +01:00
Alex Moreno 60ebe31b3f Merge pull request '2412_testToMaster' (!2185) from 2412_testToMaster into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2185
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-03-21 06:00:09 +00:00
Pablo Natek da8fbb5a92 fix: refs #6302 spec
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 21:14:01 +01:00
Pablo Natek f7b458d368 feat: refs #6302 delete after add to turn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-20 20:54:24 +01:00
Alex Moreno adddcc96aa Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-20 15:01:17 +01:00
Alex Moreno d89e35c429 Merge pull request 'hotFix(closeAll): fix debug' (!2179) from hotFix_closeAll_debug into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2179
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-20 13:55:45 +00:00
Carlos Satorres b352fc10e7 refs #6532 redirect grafana, remove mermas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 14:44:06 +01:00
Carlos Satorres 120419c423 Merge pull request 'refs #6842 remove sage' (!2182) from 6842-fixViewEmpresa into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2182
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-20 13:26:00 +00:00
Carlos Satorres 5a45cf7ea2 refs #6842 remove sage
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 13:39:26 +01:00
Guillermo Bonet d53a053ccb refactor: refs #6923 Deteted procs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 13:07:02 +01:00
Alex Moreno 7895a51e33 hotFix(closeAll): fix debug
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-20 12:15:41 +01:00
Guillermo Bonet a76b7c8535 Merge pull request 'feat: refs #6395 Added buyerFk in buy' (!2020) from 6395-buyBuyerFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2020
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-20 09:09:16 +00:00
Guillermo Bonet cdaa7999d1 Merge branch 'dev' into 6395-buyBuyerFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 07:55:05 +00:00
Guillermo Bonet 397b49db91 fix: refs #6232 Comment conveyorConfig lines
gitea/salix/pipeline/head This commit looks good Details
2024-03-20 08:02:11 +01:00
Guillermo Bonet b327120932 fix: refs #6232 Comment queueConfig lines
gitea/salix/pipeline/head There was a failure building this commit Details
2024-03-20 07:39:38 +01:00
Guillermo Bonet 41a4fa88ea Merge pull request 'refs #6232 Regularized config tables' (!2170) from 6232-refactorConfigTables into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2170
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-20 06:31:57 +00:00
Guillermo Bonet 8a96327d97 Merge branch 'dev' into 6232-refactorConfigTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 06:17:06 +00:00
Carlos Andrés 1315a854a9 fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-18 18:15:05 +01:00
Carlos Andrés 913b261f86 Merge branch 'dev' into 6549-ticket_close
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-18 17:55:54 +01:00
Pako Natek 8f54a7f12d deliveryDate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-18 14:03:16 +01:00
Alex Moreno fcb3a50640 Merge pull request 'hotFix(debug) varchar to text' (!2174) from hotFix_invoiceDebug_text into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2174
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-18 12:28:52 +00:00
Alex Moreno 4f90fb06d8 hotFix(debug) varchar to text
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-18 13:25:23 +01:00
Jon Elias 8e237f84c1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages 2024-03-18 11:55:55 +01:00
Jorge Penadés 3c3dd64da1 feat: refs #6951 test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-18 09:39:56 +01:00
Jorge Penadés 07326e502b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll 2024-03-18 08:23:47 +01:00
Alex Moreno fbf798e356 Merge pull request 'hotFix: try to debug closeAll' (!2173) from hotFix_invoiceDebug into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2173
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-15 14:58:55 +00:00
Jorge Penadés f044809f30 feat: refs #6951 to create back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 15:45:47 +01:00
Alex Moreno 8119106e69 hotFix: try to debug closeAll
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-15 15:40:54 +01:00
Guillermo Bonet 3aa81d27e7 refs #6875 Packing default 1
gitea/salix/pipeline/head This commit looks good Details
2024-03-15 14:53:31 +01:00
Jorge Penadés 0fd6a6360c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll 2024-03-15 14:18:02 +01:00
Jon Elias 6d4f07adc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages 2024-03-15 14:13:24 +01:00
Javier Segarra 6e045868c3 Merge pull request '#5858 - zoneCollisions' (!1853) from 5858-zone_Collisions into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1853
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-15 12:36:37 +00:00
Javier Segarra 0f4377ff5d refs #5858 test: fixtures
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 13:31:51 +01:00
Guillermo Bonet 5b546079b0 Merge branch '6232-refactorConfigTables' of https://gitea.verdnatura.es/verdnatura/salix into 6232-refactorConfigTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 12:38:34 +01:00
Guillermo Bonet 0867211573 refs #6403 Fix model mrwConfig 2024-03-15 12:38:33 +01:00
Javier Segarra 950cce22df Merge branch '5858-zone_Collisions' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-15 12:23:02 +01:00