Commit Graph

23814 Commits

Author SHA1 Message Date
Guillermo Bonet ae9472e092 Merge pull request 'refactor: refs #6453 order_confirmWithUser' (!2694) from 6453-orderConfirm into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2694
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-08-02 10:14:58 +00:00
Guillermo Bonet 6acba08a91 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 12:08:40 +02:00
Guillermo Bonet f6db62945d Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 12:08:22 +02:00
Guillermo Bonet dead585a1b Merge pull request 'fix: refs #7812 Added orders in item_getMinacum' (!2810) from 7812-radarOrder into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2810
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-08-02 10:01:55 +00:00
Guillermo Bonet afb2f8d111 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 11:50:26 +02:00
Guillermo Bonet 4c67daedec Merge branch 'master' into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 11:50:16 +02:00
Carlos Andrés 69d4c8bd6e Merge pull request 'fix: refs #7829 Error al calcular problemas de componentes' (!2828) from 7829-Error-calcular-problemas-componentes into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2828
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-08-02 09:45:06 +00:00
Carlos Andrés 29a50caaca fix: refs #7829 Error al calcular problemas de componentes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 11:43:30 +02:00
Carlos Andrés ddd5e4ffa4 fix: refs #7829 Error al calcular problemas de componentes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 10:28:50 +02:00
Guillermo Bonet 879d48eb27 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 10:00:35 +02:00
Guillermo Bonet 01df29b47c Merge branch 'master' into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 10:00:12 +02:00
Guillermo Bonet 97c1f8b321 Merge pull request 'feat: refs #7382 Changes' (!2826) from 7382-invoiceInBooking into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2826
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-08-02 07:54:48 +00:00
Guillermo Bonet d852d16ae4 feat: refs #7382 Changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 08:11:38 +02:00
Guillermo Bonet b56260af36 feat: refs #6453 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 07:58:45 +02:00
Alex Moreno 20caa5d9a1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-01 14:11:00 +02:00
Jon Elias 6620a1d119 Merge branch 'dev' into Worker_Migration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-01 11:56:06 +00:00
Jon Elias ed283cac46 feat: deleted worker module code & redirect to Lilium
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-01 13:15:11 +02:00
Robert Ferrús 619dd2fbe8 Merge pull request 'master' (!2823) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2823
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-08-01 05:05:14 +00:00
Sergio De la torre b75e54120d Merge pull request 'hotFix itemShelving refs #6861' (!2821) from 6861_triggerItemShelving into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2821
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-08-01 04:52:40 +00:00
Sergio De la torre 94d89f9c99 Merge branch 'master' into 6861_triggerItemShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 19:51:36 +00:00
Carlos Andrés 77f6e80066 Actualizar db/routines/vn/procedures/ticket_setRisk.sql
gitea/salix/pipeline/head This commit looks good Details
2024-07-31 17:38:50 +00:00
Carlos Andrés f0598d6cf1 Merge pull request 'hotfix: getBuys add field comment Ticket 207748' (!2822) from Ticket-207748-Hotfix-getBuys-add-field-comment into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2822
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-07-31 16:46:19 +00:00
Carlos Andrés 5b0dcee62d hotfix: getBuys add field comment Ticket 207748
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 18:41:18 +02:00
Sergio De la torre 70b931553b hotFix itemShelving refs #6861
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-31 18:14:09 +02:00
Sergio De la torre 65e9ed301f hotFix itemShelving refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 18:11:03 +02:00
Carlos Andrés ce8eba9b85 Merge pull request 'fix: refs #7213 componentLack y setRisk' (!2820) from 7213-Hotfix-calculo-problemas into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2820
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-31 14:05:31 +00:00
Carlos Andrés 6c0aae04c0 fix: refs #7213 componentLack y setRisk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 14:59:12 +02:00
Carlos Andrés 77fa4dd497 fix: refs #7213 componentLack y setRisk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 14:38:12 +02:00
Robert Ferrús 892a0ef960 Merge pull request 'fix: refs #7818 entry_splitByShelving' (!2818) from 7818-entry_splitByShelving into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2818
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-31 09:43:38 +00:00
Robert Ferrús dca7900ab2 fix: refs #7818 entry_splitByShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 11:31:02 +02:00
Pablo Natek a286c5dde5 Merge pull request 'hotFix model itemShelving refs #7805' (!2816) from 7805_model_itemShelving into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2816
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-31 08:46:53 +00:00
Jon Elias 524acea70c Merge branch 'InvoiceOut_Migration' of https://gitea.verdnatura.es/verdnatura/salix into InvoiceOut_Migration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-31 10:22:58 +02:00
Jon Elias 460b9899c0 refactor: deleted e2e & added back descriptor and summary 2024-07-31 10:22:56 +02:00
Jon Elias 1e711b63fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into InvoiceOut_Migration 2024-07-31 09:52:13 +02:00
Guillermo Bonet cc78355aad fix: refs #7821 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 09:26:55 +02:00
Guillermo Bonet 574529b920 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-31 09:00:31 +02:00
Guillermo Bonet 09da9129a6 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-31 09:00:12 +02:00
Guillermo Bonet cfebee86f3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-07-31 08:59:36 +02:00
Guillermo Bonet 07b6d2aca9 feat: refs #7644 Added comment if has itemOriginalFk 2024-07-31 08:59:33 +02:00
Robert Ferrús 1d22dc46f0 Merge branch 'dev' into 7646-deleteColumnsProductionConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-31 06:20:10 +00:00
Robert Ferrús 67764f4139 Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-31 06:13:42 +00:00
Alex Moreno fd00bfd175 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-31 08:11:21 +02:00
Alex Moreno eb135fc7f0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-31 08:11:03 +02:00
Alex Moreno 707b45f9a6 Merge pull request '7679-postCode_town_addRequireds' (!2804) from 7679-postCode_town_addRequireds into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2804
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-07-31 05:43:50 +00:00
Sergio De la torre 952b7a5054 hotFix model itemShelving refs #7805
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 07:10:38 +02:00
Sergio De la torre 3c62046277 feat workerActivity refs #6078
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-31 06:43:19 +02:00
Sergio De la torre eec7790a02 Merge pull request 'test' (!2815) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2815
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-30 16:13:13 +00:00
Sergio De la torre 57b87d527a Merge pull request 'master' (!2813) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2813
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-30 16:07:18 +00:00
Sergio De la torre 5bda4c86c7 Merge pull request 'hotFix getTickets refs #6861' (!2812) from 6861_getTickets_reservas into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2812
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-30 15:46:36 +00:00
Sergio De la torre 59df0b3886 feat workerActivity refs #6078
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-30 17:46:21 +02:00