Commit Graph

7529 Commits

Author SHA1 Message Date
Carlos Andrés 10a2dc484b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into fixlostTestMaster
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-04 09:50:04 +01:00
Carlos Andrés dd0bcd66cf fix: comment out time adjustment logic in beforeInsert and beforeUpdate triggers 2025-03-04 09:45:24 +01:00
Carlos Andrés 06068c41c9 Actualizar db/routines/vn/procedures/item_getMinacum.sql
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 08:38:44 +00:00
Carlos Andrés b7d972593a Actualizar db/routines/vn/procedures/item_getBalance.sql
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 08:36:35 +00:00
Carlos Andrés 3b1e906a87 Actualizar db/routines/vn/procedures/item_getStock.sql
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 08:20:30 +00:00
Carlos Andrés 8e82a6d0f1 Actualizar db/routines/cache/procedures/available_refresh.sql
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 08:03:59 +00:00
Alex Moreno 2037c3d1fb build: dump db
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 08:51:41 +01: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 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
Carlos Andrés 7908507825 feat: refs #8700 update XDiario table structure
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-02 13:06:43 +01: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
Guillermo Bonet 156b965c24 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-28 12:22:51 +01:00
Juan Ferrer d680dc8da7 fix: refs #8689 Drop foreign key cache.last_buy_FK_1
gitea/salix/pipeline/head This commit looks good Details
2025-02-27 19:23:21 +01:00
Alex Moreno 7715a50724 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-27 12:01:13 +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
Carlos Satorres aace7fc8ad Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusinessV2
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-21 15:19:02 +01:00
Carlos Satorres ebfba823b0 fix: refs #6553 workerBusiness, workerDescriptor
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-21 14:59:02 +01:00
Guillermo Bonet c254f31da2 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-20 07:49:39 +01:00
Guillermo Bonet f414ababb2 fix: refs #8227 Added localPalletM3
gitea/salix/pipeline/head This commit looks good Details
2025-02-20 07:29:38 +01:00
Carlos Andrés b8a216444c Actualizar db/routines/cache/procedures/available_refresh.sql
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 13:11:27 +00:00
Alex Moreno 7ec29d1972 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 13:38:10 +01:00
Carlos Andrés 5488a229c1 Merge pull request 'fix: priceOptimum error' (!3471) from PriceOptimum-error into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3471
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-18 08:50:27 +00:00
Alex Moreno 664ba03425 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 09:26:30 +01:00
Alex Moreno 08b4d0a4fa build: refs #8622 dump db
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-18 09:16:31 +01:00
Alex Moreno f83055057e fix: expeditionTruck use editorFk
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 09:14:08 +01:00
Alex Moreno 669b7cd67f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 08:45:19 +01:00
Alex Moreno 6e4667a563 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-02-18 08:45:11 +01:00
Alex Moreno 7d08c1796a fix: update ticket_setState procedure to include created timestamp in ticketTracking insert
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 08:44:07 +01:00
Juan Ferrer 17410202ad fix: refs #6695 Code refactor 2025-02-17 19:40:12 +01:00
Carlos Andrés a73199e70b fix: priceOptimum error
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-17 18:52:31 +01:00
Javier Segarra dbd298b7d8 Merge branch 'dev' into fix_getSuggestedTickets_byFixtures
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-17 14:39:01 +00:00
Pako Natek 991ed813e3 Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-17 12:15:48 +00:00
Pako Natek bd1a4b35aa fix(item_getBalance): refs #8408 alias for shipped field
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-17 13:12:22 +01:00
Alex Moreno 2d7c677f0a Merge branch 'dev' into 6695-save_builds_and_Db
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-17 11:57:55 +00:00
Carlos Andrés 52c22608a5 Actualizar db/routines/vn/procedures/productionControl.sql
gitea/salix/pipeline/head This commit looks good Details
2025-02-17 11:38:48 +00:00
Pablo Natek e0c2a497d2 Merge pull request 'fix: refs #6897 change user field to nickname in getStockBought method' (!3465) from 6897-fixE2eAndStockBought into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3465
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-17 10:29:27 +00:00
Pablo Natek 3093f8aef8 fix: refs #6897 change user field to nickname in getStockBought method
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-17 10:50:21 +01:00
Alex Moreno 8ef13e3d9c feat: refs #6695 add Dockerfile for MariaDB and update Jenkinsfile for database build stage
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-17 08:34:04 +01:00
Carlos Andrés a874b96c5e revert a119d9f7fb
gitea/salix/pipeline/head There was a failure building this commit Details
revert feat: invoiceIn move deductible field from head to lines
2025-02-14 11:32:45 +00:00
Carlos Andrés a119d9f7fb feat: invoiceIn move deductible field from head to lines
gitea/salix/pipeline/head This commit looks good Details
2025-02-14 12:29:56 +01:00
Guillermo Bonet 309a287748 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-14 12:08:43 +01:00
Guillermo Bonet aca49505bd Merge branch 'test' into 8227-roadmapChanges
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-14 10:52:40 +00:00
Guillermo Bonet 28deadfbad fix: refs #8573 version
gitea/salix/pipeline/head This commit looks good Details
2025-02-14 10:37:08 +01:00
Guillermo Bonet d6f08d7e27 feat: refs #8227 update roadmap triggers and views, remove obsolete trigger and column
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-14 10:04:04 +01:00
Javier Segarra 609060f100 Merge branch 'dev' into fix_getSuggestedTickets_byFixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-14 08:45:27 +00:00
Ivan Mas 5a37bd332e Merge branch 'dev' into 8573-addFkExpeditionHost
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-14 06:55:47 +00:00