Commit Graph

2603 Commits

Author SHA1 Message Date
Alex Moreno 9a1669441f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 08:04:19 +01:00
Carlos Andrés b63f2e5539 Merge pull request 'hotfix-catalog_calculate-bonus-en-test' (!3521) from hotfix-catalog_calculate-bonus-en-test into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3521
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2025-03-04 06:43:32 +00:00
Carlos Andrés 4605a26b1f fix: comment out shipping time adjustments in beforeInsert and beforeUpdate triggers
gitea/salix/pipeline/pr-test This commit looks good Details
2025-03-04 07:41:04 +01:00
Alex Moreno b77961fb14 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-03-03 14:44:28 +01:00
Alex Moreno 75f5888741 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
2025-03-03 14:44:21 +01:00
Pako Natek 892c95f5f0 feat(availabled): refs #8048
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2025-03-03 14:01:30 +01:00
Pako Natek 8cc88453c4 fix(travel): new trigger for travel and new version to update it
stockRefresh and entryIn also updated

Refs: #8048
2025-03-03 13:29:20 +01:00
Pako Natek 99bc9b4698 fix(catalog_calculate): improves new option for not itemtype selected
Refs: #8674
2025-03-03 11:50:34 +01:00
Javier Segarra 6804cdd5a3 Merge branch 'dev' into fix_ticketNegative
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-03-03 10:41:21 +00:00
Pako Natek 9544894b17 Merge pull request 'fix(travel): refs #8048 resf#8048' (!3514) from 8048-vn.travel-updates into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3514
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-03-03 08:58:23 +00:00
Pako Natek b59070c69e fix(travel): refs #8048 refs#8048 remove empty lines
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-03-03 08:18:31 +01:00
Pako Natek 3905bb58cb fix(travel): refs #8048 resf#8048
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-03-03 08:16:13 +01:00
Guillermo Bonet 3871c9c505 Merge branch 'dev' into 7912-wasteCost
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-03-03 06:09:36 +00:00
Carlos Andrés bbcdff2c31 feat: refs #8700 update invoiceOut procedure to use new serial and ref handling; modify foreign key constraints
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-02 11:13:09 +01:00
Carlos Andrés 2ca8de1d2e feat: refs #8644 workerTimeControl add mandatory break times and update procedures
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-03-02 09:41:53 +01:00
Guillermo Bonet 076f4f3173 refactor: refs #7912 Requested changes
gitea/salix/pipeline/pr-dev Build queued... Details
2025-02-28 13:01:49 +01:00
Javier Segarra e9af527f30 Merge branch 'dev' into fix_ticketNegative
gitea/salix/pipeline/pr-test Build queued... Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-28 11:39:19 +00:00
Guillermo Bonet 4190dc7803 Merge branch 'dev' into 7912-wasteCost
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-28 11:07:44 +00:00
Guillermo Bonet e225d6d123 refactor: refs #7912 Item calc cost Ricardo
gitea/salix/pipeline/pr-dev Build queued... Details
2025-02-28 12:07:25 +01:00
Pako Natek 92e77ab604 fix(entrySource): refs #8048 refs#8048
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-28 08:28:38 +01:00
Pako Natek 054483cfdd Merge pull request '8408-disponible-por-zonas' (!3503) from 8408-disponible-por-zonas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3503
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-02-28 06:56:09 +00:00
Pako Natek 1103b0b257 fix(travel): refs #8408 refs#8408
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2025-02-28 07:27:41 +01:00
Pako Natek bfa315fc55 fix(item_getBalance): refs #8408 tickets without zone must be included
gitea/salix/pipeline/pr-test There was a failure building this commit Details
Refs: #8408
2025-02-28 07:09:34 +01:00
Juan Ferrer c050e39aae fix: refs #4409 Optimize stock_refreshAll
gitea/salix/pipeline/head This commit looks good Details
2025-02-27 19:50:54 +01:00
Pako Natek 7b8476b42c Merge pull request '8408-disponible-por-zonas' (!3495) from 8408-disponible-por-zonas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3495
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-27 11:03:02 +00:00
Alex Moreno 011fb3a99a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-27 12:01:31 +01:00
Pako Natek ed054bfb3d Merge branch 'dev' into 8408-disponible-por-zonas
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2025-02-27 09:59:14 +00:00
Pako Natek d78288b778 fix(availabled): refs #8408 refs#8408 new price diference
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-27 10:30:24 +01:00
Pako Natek 1b3e5a2576 feat(catalog_calculate): refs #8674 new field and modified proc
gitea/salix/pipeline/pr-master This commit looks good Details
Refs: #8674
2025-02-26 12:20:39 +01:00
Pako Natek a80614a46d feat(catalog_calculate): refs #8674 refs#8674
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-26 12:18:55 +01:00
Juan Ferrer 64b8265675 fix: refs #4409 tLotStatus alias fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-26 09:36:43 +01:00
Juan Ferrer a310b3e642 Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev Build queued... Details
2025-02-26 09:32:16 +01:00
Juan Ferrer 556a58fb11 fix: refs #4409 Requested changes from PR 3440
gitea/salix/pipeline/pr-dev Build started... Details
2025-02-26 09:31:36 +01:00
Pako Natek aa597870a4 feat(catalog_calculate): priceDelta.isHidden restriction
gitea/salix/pipeline/pr-dev This commit looks good Details
refs#8674
2025-02-26 08:33:39 +01:00
Juan Ferrer 9dca258a72 fix: refs #4409 stock_refreshAll comments merged
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 18:25:58 +01:00
Juan Ferrer 7ad97a49cb fix: refs #4409 Added ticket.isAlive, orderRow.isReserved
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 18:23:41 +01:00
Juan Ferrer 842e837ab6 fix: refs #4409 include/exclude logic clarified
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-25 14:04:46 +01:00
Juan Ferrer a4a2a3958d fix: refs #4409 stock_refreshAll added
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 12:46:21 +01:00
Juan Ferrer b85db29828 Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 11:24:57 +01:00
Juan Ferrer a88f41dd4b Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 11:18:19 +01:00
Juan Ferrer 38b1e9e493 fix: refs #4409 SQL convenion fixes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 10:49:58 +01:00
Pako Natek 722ce62d41 Merge branch 'dev' into 8408-disponible-por-zonas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2025-02-25 07:13:27 +01:00
Pako Natek c30fc8dc2e feat(available)!: refs #8408 new approach
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
All the procedures involved has been refactorized

BREAKING CHANGE: Refs: #8048
2025-02-25 07:04:48 +01:00
Juan Ferrer 7049933c6e fix: refs #4409 clean frozen sales and lost reserves
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 18:50:25 +01:00
Juan Ferrer 5e630562ce fix: refs #4409 don't cache parent ids
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 18:05:21 +01:00
Juan Ferrer 1c77e69ae4 fix: refs #4409 lotFk used for row identification
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 13:24:41 +01:00
Javier Segarra c8253aa0ff Merge branch 'dev' into fix_ticketNegative 2025-02-22 13:42:26 +01:00
Alex Moreno d1053642e9 Merge branch 'dev' into 7937-claimAgile
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-21 13:16:49 +00:00
Javier Segarra 273a1244fb Merge branch 'dev' into fix_ticketNegative 2025-02-21 11:57:50 +01:00
Guillermo Bonet c80e6f3240 fix: refs #7759 mockDate and increased myt version
gitea/salix/pipeline/head There was a failure building this commit Details
2025-02-21 10:38:28 +01:00