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
|
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 |
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 |
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 |
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 |
Pako Natek
|
e6e7876fb1
|
Merge branch 'dev' into 8030-newPriceComponent
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-30 10:26:54 +00:00 |
Jon Elias
|
eacc2d5d2a
|
Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix into 7884-AddLabelerField
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-30 12:07:56 +02:00 |
Jon Elias
|
c680c4a059
|
refactor: refs #7884 modified sql
|
2024-09-30 12:07:55 +02:00 |
Pako Natek
|
2962bd13c7
|
fix: refs #8030 buyer prefers to add multiple zoneGeoFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
Instead of choosing the deepest zoneGeo, buyer wants all to be merged
Refs: #8030
|
2024-09-30 11:59:22 +02:00 |
Sergio De la torre
|
a0a8a22ab0
|
fix: refs #5320 withoutHaving
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-30 11:13:12 +02:00 |
Pako Natek
|
de93e477f8
|
Merge pull request 'feat(previaDelta): refs #8030 new algorithym for coincident records' (!3036) from 8030-newPriceComponent into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3036
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
|
2024-09-30 08:32:44 +00:00 |
Pako Natek
|
1e64028b02
|
Merge branch 'dev' into 8030-newPriceComponent
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-30 08:25:27 +00:00 |
Pako Natek
|
25680994dd
|
feat(previaDelta): refs #8030 new algorithym for coincident records
gitea/salix/pipeline/pr-dev Build queued...
Details
when many records target the same zoneGeoFk, the deepest must be chosen
Refs: #8030
|
2024-09-30 10:24:45 +02:00 |
Sergio De la torre
|
a9b083a044
|
fix: refs #5320 withoutHaving
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-30 09:39:35 +02:00 |
Robert Ferrús
|
2d289bc8ac
|
Merge pull request 'feat: refs #7981 deprecated showAgencyName' (!3016) from 7981-showAgencyName into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3016
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-09-30 06:35:23 +00:00 |
Robert Ferrús
|
e6d950e33f
|
Merge branch 'dev' into 7981-showAgencyName
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-30 06:31:27 +00:00 |
Sergio De la torre
|
1f5c0d3e94
|
fix: refs #5320 withoutHaving
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-30 08:25:40 +02:00 |
Pako Natek
|
c2aa33bf3c
|
Merge pull request 'feat(priceDelta): refs #8030 new field zoneGeoFk' (!3032) from 8030-newPriceComponent into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3032
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
|
2024-09-30 06:25:05 +00:00 |
Pablo Natek
|
f7e13e8ac9
|
Merge branch 'dev' into 8030-newPriceComponent
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-30 06:21:51 +00:00 |
Pako Natek
|
95601b139b
|
feat(priceDelta): refs #8030 new field zoneGeoFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
Buyers need zone restriction field for the new component bonus
Refs: #8030
|
2024-09-30 08:15:57 +02:00 |
Alex Moreno
|
dbbd2c7947
|
feat(ClaimBeginning): throw error when quantity claimed is greater than quantity of line
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-30 08:04:01 +02:00 |
Pablo Natek
|
1f5c644e0f
|
Merge pull request 'Revert "Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev"' (!3030) from 7404-revert-commit into test
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3030
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-09-30 05:16:58 +00:00 |
Javier Segarra
|
35e4c0e76b
|
Merge branch 'test' into 7404-revert-commit
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-09-27 11:01:40 +00:00 |
Pako Natek
|
488427ec97
|
Merge pull request 'feat(components): refs #8030 new component bonus' (!3028) from 8030-master-HotFix-PriceDelta into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3028
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-09-27 10:04:31 +00:00 |
Pako Natek
|
bc2ed26fc3
|
Merge branch 'master' into 8030-master-HotFix-PriceDelta
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-27 10:02:20 +00:00 |
Pablo Natek
|
f858674c8a
|
Revert "Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev"
gitea/salix/pipeline/pr-test This commit looks good
Details
This reverts commit f6c5f41d44 , reversing
changes made to 5ee5da24e1 .
|
2024-09-27 12:01:54 +02:00 |
Carlos Andrés
|
4156a0f0fe
|
Merge pull request 'fix: refs #7779 refactor collection' (!3021) from 7779-refactor-collection into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3021
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Pako Natek <pako@verdnatura.es>
|
2024-09-27 09:29:36 +00:00 |
Robert Ferrús
|
a7c858dbba
|
Merge branch 'dev' into 7981-showAgencyName
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-27 08:13:35 +00:00 |
Sergio De la torre
|
c89a517593
|
Merge pull request 'fix: refs #5890 recovery ItemShelving_afterInsert' (!3022) from 5890-ItemShelving into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3022
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-09-27 06:45:15 +00:00 |
Pako Natek
|
86e421f21c
|
Merge branch 'master' into 8030-master-HotFix-PriceDelta
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-27 05:47:30 +00:00 |
Carlos Andrés
|
5270db2abe
|
fix: refs #7779 refactor collection
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-26 17:53:54 +02:00 |
Carlos Andrés
|
0ad1d838d9
|
fix: refs #7779 refactor collection
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-26 17:44:29 +02:00 |
Pako Natek
|
52b25f53b1
|
Merge pull request '8030-testPriceDelta' (!3026) from 8030-testPriceDelta into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
Reviewed-on: #3026
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-09-26 15:32:23 +00:00 |
Javi Gallego
|
6b4b5f2338
|
fix: e2e not necesary
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-26 16:26:50 +02:00 |
Javi Gallego
|
f68ed48081
|
feat: refs #9722 testFixed
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-09-26 15:25:51 +02:00 |
Javi Gallego
|
c825191823
|
feat: refs #9722 fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-26 15:22:40 +02:00 |