Commit Graph

24966 Commits

Author SHA1 Message Date
Pablo Natek 48c387be75 Merge pull request 'refactor: refs #7404 deprecated stockBuyed' (!3046) from 7404-deprecateStockBuyedAndRelatedProcs into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3046
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-01 13:57:53 +00:00
Javi Gallego 1cf14035d5 feat: existingRefund without ticketRefund
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 15:51:30 +02:00
Javi Gallego 40512ca67e feat: existingRefund without ticketRefunds
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 15:49:51 +02:00
Jon Elias d73f790221 Merge branch 'dev' into 7884-AddLabelerField
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-01 13:10:19 +00:00
Jon Elias b7b5334a99 refactor: refs #7884 modified filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-01 15:08:42 +02:00
Pablo Natek c6a823e6aa Merge branch 'dev' into 7404-deprecateStockBuyedAndRelatedProcs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-01 13:05:54 +00:00
Pablo Natek 435fec03da refactor: refs #7404 deprecated stockBuyed
gitea/salix/pipeline/pr-dev Build queued... Details
2024-10-01 15:05:02 +02:00
Pako Natek 03ea7580d8 feat: refs #8069 new proc 2024-10-01 15:02:24 +02:00
Pako Natek fd262e32c1 feat: refs #8069 new trigger hedera.orderRow_afterInsert 2024-10-01 14:25:10 +02:00
Pako Natek 304992e7cf feat: refs #8069 starting branch 2024-10-01 13:40:33 +02:00
Guillermo Bonet e2d30ef933 Merge pull request 'fix: refs #7935 Fix boolens' (!3044) from 7935-fixBool into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3044
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-01 10:48:36 +00:00
Guillermo Bonet 0525081c52 Merge branch 'dev' into 7935-fixBool
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-01 10:46:48 +00:00
Javi Gallego aba70f4a82 Merge pull request 'feat: refs #6722 fixtures' (!3027) from 9722-travelThermographTrigger into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3027
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-01 10:41:20 +00:00
Carlos Satorres 99bd78db36 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7366-travelMigration 2024-10-01 12:40:12 +02:00
Carlos Satorres 0740acfb91 fix: refs #7366 remove back Travel 2024-10-01 12:38:52 +02:00
Carlos Satorres 5c3d1ca531 Merge pull request 'feat: refs #7354 deleted code and redirect to Lilium' (!2906) from 7354_ZoneMigration_End into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2906
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-01 10:32:45 +00:00
Carlos Satorres 9b41b3e54b Merge branch 'dev' into 7354_ZoneMigration_End
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-01 10:31:19 +00:00
Javi Gallego 4c9a199418 Merge branch 'dev' into 9722-travelThermographTrigger
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-01 12:29:55 +02:00
Alex Moreno f54a9a1348 fix(fixtures): revert bad merge master to test
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 12:27:16 +02:00
Javi Gallego d31340ff25 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 12:22:36 +02:00
Javi Gallego fe741fa7e1 fix: getSimilar daysInForward 2024-10-01 12:22:33 +02:00
Carlos Satorres 48ade26595 Merge branch 'dev' into 7354_ZoneMigration_End
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-01 10:20:59 +00:00
Javi Gallego 863c9ec068 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 12:19:53 +02:00
Javi Gallego 6685ade299 fix: getSimilar daysInforward 2024-10-01 12:19:51 +02:00
Carlos Satorres ca8cffff94 Merge branch 'dev' into 7354_ZoneMigration_End
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-01 09:37:19 +00:00
Alex Moreno c2e89002cd Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 11:31:47 +02:00
Guillermo Bonet 19dcedbce5 fix: refs #7935 Fix boolens
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-01 11:31:35 +02:00
Alex Moreno f916509b86 fix(StockBought): revert bad merge master to test
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 11:30:34 +02:00
Guillermo Bonet 4243cdbf50 fix: refs #7817 Tests back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-01 09:18:16 +02:00
Guillermo Bonet f94ace05cc Merge branch 'dev' into 7817-isChecked
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-01 06:59:43 +00:00
Guillermo Bonet 45e87a5d94 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 08:53:10 +02:00
Guillermo Bonet 2b4504c954 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 08:52:41 +02:00
Guillermo Bonet 452324191c fix: refs #7759 Changed definer
gitea/salix/pipeline/head This commit looks good Details
2024-10-01 08:51:03 +02:00
Guillermo Bonet 94636e1c19 Merge branch 'dev' into 7817-isChecked
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-10-01 05:56:48 +00:00
Sergio De la torre 3ccc0c9b32 Merge pull request 'fix: refs #6868 handleUser addIsOnReservationMode' (!3042) from 6868-HandleUser into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3042
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-01 05:47:04 +00:00
Robert Ferrús 982c1dd67b feat: refs #8064 itemTagState
gitea/salix/pipeline/pr-master Build queued... Details
2024-10-01 07:42:06 +02:00
Sergio De la torre d5db317259 Merge pull request 'fix: refs #5320 withoutHaving' (!3033) from 5320-RefactorCollectionGetTickets into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3033
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-01 05:11:18 +00:00
Sergio De la torre b4a2be660d fix: refs #6868 handleUser addIsOnReservationMode
gitea/salix/pipeline/pr-test This commit looks good Details
2024-10-01 07:08:11 +02:00
Javi Gallego fbba2e3fea fix: option Error
gitea/salix/pipeline/head This commit looks good Details
2024-09-30 15:52:18 +02:00
Javi Gallego 329920389d fix: option Error
gitea/salix/pipeline/head This commit looks good Details
2024-09-30 15:49:46 +02:00
Javi Gallego 36e1cfd51a fix: myOptions error
gitea/salix/pipeline/head This commit looks good Details
2024-09-30 15:47:50 +02:00
Alex Moreno 61f806b0c9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-30 14:40:35 +02:00
Alex Moreno 75d0c298a1 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-09-30 14:38:17 +02:00
Carlos Andrés 41af809917 feat: ref#7902 Triggers vn.ticketRefund to control deleted tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-30 14:33:58 +02:00
Jon Elias b55db4bdc0 feat: refs #7010 added subquery to avoid using group by in sql
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-30 14:09:57 +02:00
Alex Moreno 568a77aa19 Merge pull request 'feat(ClaimBeginning): throw error when quantity claimed is greater than quantity of line' (!3031) from hotFix_claimBeginning_quantity into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3031
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-30 12:05:13 +00:00
Pako Natek de3d7fc925 Merge pull request 'feat(collection_new): refs #8058 urgent state' (!3038) from 8058-Tickets-Urgentes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3038
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-30 12:01:16 +00:00
Pako Natek 54d9125c21 feat(collection_new): refs #8058 urgent state
gitea/salix/pipeline/pr-dev This commit looks good Details
Urgent tickets will be priorized as asigned ones

Refs: #8058
2024-09-30 13:49:06 +02:00
Jon Elias c4f26094d5 fix: refs #7884 fixed filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-30 12:46:41 +02:00
Pako Natek 477c7f7903 Merge pull request 'fix: refs #8030 buyer prefers to add multiple zoneGeoFk' (!3037) from 8030-newPriceComponent into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3037
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-09-30 10:30:47 +00:00