Commit Graph

25036 Commits

Author SHA1 Message Date
Pako Natek b53f6d4008 Merge branch 'dev' into 8069-Overstocking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-02 06:53:43 +00:00
Pako Natek 9d84c39fce feat: refs #8069 orderRow_updateOverstocking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-02 08:52:20 +02:00
Robert Ferrús 617c44a178 Merge pull request '#8012 -packagingIsActive' (!3049) from 8012-packagingIsActive into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #3049
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-10-02 06:45:49 +00:00
Robert Ferrús c3c386046d Merge branch 'master' into 8012-packagingIsActive
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-02 06:34:14 +00:00
Robert Ferrús 4ad070ab66 feat: refs #8012 cubos
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-02 08:26:38 +02:00
Pako Natek 34f1a43f1e Merge pull request 'feat: refs #8030 new field vn.priceDelta.zoneGeoFk' (!3050) from 8030-master-HotFix-PriceDelta into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3050
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-10-02 06:04:19 +00:00
Pako Natek 16d1dc3c11 Merge branch 'master' into 8030-master-HotFix-PriceDelta
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-02 06:02:44 +00:00
Robert Ferrús a3d79f3c56 feat: refs #8012 format
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-02 07:59:00 +02:00
Robert Ferrús 0dd9be96dd feat: refs #8012 restore
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-02 07:54:57 +02:00
Pako Natek 6c31c85d72 Merge pull request '8030-testPriceDelta' (!3048) from 8030-testPriceDelta into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3048
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-10-02 05:54:23 +00:00
Robert Ferrús 6e4244866c feat: refs #8012 create column 2024-10-02 07:53:53 +02:00
Pako Natek d87f940fff Merge branch 'test' into 8030-testPriceDelta
gitea/salix/pipeline/pr-test This commit looks good Details
2024-10-02 05:40:48 +00:00
Pako Natek 02ef314ed9 feat: refs #8030 new field vn.priceDelta.zoneGeoFk
gitea/salix/pipeline/pr-master Build queued... Details
2024-10-02 07:40:26 +02:00
Pako Natek 7d3c2a4a1c fix: refs #8030 schema missing in zoneGeo table
gitea/salix/pipeline/pr-test This commit looks good Details
2024-10-02 07:36:04 +02:00
Guillermo Bonet dc0a4f35f3 Merge branch 'dev' into 7886-buy_getVolumeByAgency
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-02 05:36:02 +00:00
Pako Natek 3c89d1e5e0 fix: refs #8030 foreign key zoneGeo 2024-10-02 07:34:57 +02:00
Pako Natek a48843a5cf feat: refs #8030 new field vn.priceDelta.zoneGeoFk 2024-10-02 07:30:49 +02:00
Jon Elias 2fbf8478c0 Merge pull request '#7884 added new filter field' (!2981) from 7884-AddLabelerField into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2981
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-02 05:04:17 +00:00
Robert Ferrús 0a0b2f9ba0 Merge branch 'master' into 8064-itemTagState
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-02 05:03:02 +00:00
Jon Elias 2267b2c6b1 Merge branch 'dev' into 7884-AddLabelerField
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-02 04:55:56 +00:00
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