Commit Graph

1289 Commits

Author SHA1 Message Date
Sergio De la torre 13c7b34c98 Merge branch 'master' into 6861-ItemShelvingSaleReserve
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-14 14:15:51 +00:00
Sergio De la torre 4894cb140e Merge pull request 'fix: refs #6861 duplicatedTicketsInReserve' (!3053) from 6861-itemShelvingSaleDelete into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3053
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-10-08 05:41:54 +00:00
Sergio De la torre d164cccee5 fix: refs #6861 assignCollection
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-07 16:14:16 +02:00
Guillermo Bonet 4da63900a2 fix: refs #7760 collection_assing added global handler sqlexception
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-07 07:36:50 +02:00
Guillermo Bonet 6b7f161d9a fix: refs #7844 sale_problems llena
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-10-07 06:39:41 +02:00
Guillermo Bonet 4a17d9ec0e fix: refs #7760 collection_assing
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-10-06 09:07:48 +02:00
Carlos Andrés 5d7d9f8d9e fix: refs #6861 deleteAdded
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 13:07:54 +02:00
Sergio De la torre 324875ec1f fix: refs #6861 deleteAdded
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 10:42:33 +02:00
Guillermo Bonet 7aa8200fca fix: refs #7956 item_getSimilar
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 09:02:59 +02:00
Pablo Natek c203d5d5e7 Merge branch 'master' into 7781-fixPalletMerge
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 05:52:45 +00:00
Pablo Natek 72bab95be1 fix: refs #7781 leave early before any updates on the proc
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-04 07:52:13 +02:00
Carlos Andrés c683925403 Actualizar db/routines/vn/procedures/item_getSimilar.sql
gitea/salix/pipeline/head This commit looks good Details
2024-10-03 15:19:57 +00:00
Carlos Andrés 197517dfcc fix: refs #7956 item_getSimilar block db
gitea/salix/pipeline/head There was a failure building this commit Details
2024-10-03 17:02:40 +02:00
Guillermo Bonet f1bc959a49 fix: refs #7956 item_getSimilar block db
gitea/salix/pipeline/head This commit looks good Details
2024-10-03 12:40:52 +02:00
Sergio De la torre 32415d3616 fix: refs #6861 collectionGetTickets
gitea/salix/pipeline/pr-master Build started... Details
2024-10-03 11:56:36 +02:00
Sergio De la torre 82f8e84288 fix: refs #6861 collectionGetTickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-10-03 11:42:21 +02:00
Sergio De la torre bbcf71619c fix: refs #6861 duplicatedTicketsInReserve
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-10-02 09:56:36 +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 a48843a5cf feat: refs #8030 new field vn.priceDelta.zoneGeoFk 2024-10-02 07:30:49 +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
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 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 b4a2be660d fix: refs #6868 handleUser addIsOnReservationMode
gitea/salix/pipeline/pr-test This commit looks good Details
2024-10-01 07:08:11 +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
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
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
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
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
Pako Natek 0edae3c144 Merge branch 'test' into 8030-testPriceDelta
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-26 12:57:29 +00:00
Alex Moreno 326c1755d6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-25 12:07:57 +02:00
Pako Natek beb66cce1f feat(components): refs #8030 new component bonus
gitea/salix/pipeline/pr-master Build queued... Details
With table vn.priceDelta, buyers set a range of items to be affected for a price increasing

Refs: #8030
2024-09-25 07:43:29 +02:00
Pako Natek 2b6c604fcd feat(components): refs #8030 new component bonus
gitea/salix/pipeline/pr-test Build queued... Details
With table vn.priceDelta, buyers set a range of items to be affected for a price increasing

Refs: #8030
2024-09-25 07:37:52 +02:00
Sergio De la torre 98f33807dd fix: updateAvailable refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-24 16:48:48 +02:00
Alex Moreno afbf084535 Merge branch 'test' into 8032-devToTest_2440
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-24 09:29:38 +00:00
Alex Moreno ae97c8a035 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-24 11:29:09 +02:00
Robert Ferrús b34e8a7b7e Merge branch 'master' into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-23 08:18:49 +00:00
Pablo Natek cd545c0001 Merge pull request 'fix(shelving_clean): less time por shelving removal' (!2988) from fixShelvingClean into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2988
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-23 08:05:09 +00:00
Robert Ferrús e0e3201f78 Merge branch 'master' into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-23 05:37:43 +00:00
Carlos Andrés e25415f820 fix: refs#8011 previousSticker_get
gitea/salix/pipeline/head This commit looks good Details
2024-09-20 13:54:22 +02:00
Carlos Andrés 190c964ec2 fix: refs#8011 previousSticker_get
gitea/salix/pipeline/head This commit looks good Details
2024-09-20 13:50:08 +02:00
Carlos Andrés 7dce536f43 Merge pull request 'fix: refs #8011 Previas compo F' (!2995) from 8011-previas-campo-F into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2995
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-09-20 10:23:04 +00:00
Robert Ferrús 3bdd196fcc Merge branch 'master' into 8000-catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 08:38:12 +00:00
Pako Natek e9b93ff99b Merge branch 'dev' into 7999-longTermStorage
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-20 08:13:52 +00:00
Pako Natek e8add6e614 feat(TPV): refs #7999 new frmLongTermStorage
gitea/salix/pipeline/pr-dev This commit looks good Details
Parking table foreign key updated
Old proc removed

Refs: #7999
2024-09-20 10:12:24 +02:00
Carlos Andrés 633766e58b fix: recupero version anterior
gitea/salix/pipeline/head This commit looks good Details
2024-09-20 10:06:10 +02:00
Carlos Andrés 1a44d23239 Merge branch 'master' into solve_merge_problems
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-20 08:59:58 +02:00
Carlos Andrés 4c0e05fdab fix: refs #8011 Previas compo F
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-19 18:03:59 +02:00
Alex Moreno ccb60eee87 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-19 12:42:12 +02:00