Commit Graph

7616 Commits

Author SHA1 Message Date
Jose Antonio Tubau 33df87059b chore: refs #8594 add new delivery point 'Stark Tower' to fixtures
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-21 12:05:17 +01:00
Ivan Mas 69485dca75 Merge branch 'dev' into 8613-addFkClaimDestinationFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-21 10:47:23 +00:00
Guillermo Bonet 529ddc5098 Merge branch 'dev' into 8244-floricode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-21 11:15:35 +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
Jose Antonio Tubau 5c24a5684e refactor: refs #8645 update route kmStart and kmEnd, and include supplierRef in agency-term filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-21 09:51:26 +01:00
Ivan Mas 348cda6054 Merge branch 'dev' into 8613-addFkClaimDestinationFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 18:18:00 +00:00
Ivan Mas 723eaed19b refactor: refs #8613 add fk to claimEnd.claimDestinationFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 18:33:14 +01:00
Juan Ferrer c74714a825 ci(db): refs #6695 Allow 0.0.0.0
gitea/salix/pipeline/head This commit looks good Details
2025-02-20 17:20:04 +00:00
Javi Gallego 5eb981165e refactor: refs #7937 improve transaction handling in report_print procedure and enhance claimEnd filter
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 15:02:19 +01:00
Guillermo Bonet 2eafebbc53 Merge branch 'dev' into 8244-floricode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 12:51:24 +00:00
Javi Gallego 25ad28d019 Merge branch 'dev' into 7937-claimAgile
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 11:21:43 +01:00
Javi Gallego e18e51aa92 refactor: refs #7937 improve error handling and transaction management in report_print procedure 2025-02-20 11:20:47 +01:00
Guillermo Bonet 009eae44ef refactor: refs #7759 Update SQL permissions for 'vn' user to include DROP and clarify comments
gitea/salix/pipeline/head This commit looks good Details
2025-02-20 08:57:00 +01:00
Guillermo Bonet 59f243136d refactor: refs #7759 deprecate unused columns and tables in user and vn schemas
gitea/salix/pipeline/head This commit looks good Details
2025-02-20 08:48:49 +01:00
Guillermo Bonet bf83c9b460 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-20 07:49:51 +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
Juan Ferrer 6c2e0ba0c0 fix: refs #4409 tableId removed 2025-02-19 17:17:02 +01:00
Juan Ferrer dfaeafce4f fix: refs #4409 Pick procs renamed
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-19 14:50:15 +01:00
Juan Ferrer 04cd4b5dec fix: refs #4409 Sync proc splitted and renamed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-19 14:46:55 +01:00
Juan Ferrer f2030492f4 fix: refs #4409 Allow buy life insert value 2025-02-19 14:16:55 +01:00
Juan Ferrer beac086117 fix: refs #4409 Definer fixed, sync code clean
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-19 14:13:54 +01:00
Juan Ferrer 053d90b76a fix: refs #4409 Parallel sync
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-19 14:07:02 +01:00
Juan Ferrer 6001f416d0 fix: refs #4409 First sync working version
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-19 12:56:42 +01:00
Javi Gallego 9e64e4224a Merge branch 'dev' into 7937-claimAgile
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-19 12:52:27 +01:00
Javi Gallego ed61d6488d feat: refs #7937 add shelvingFk to claimEnd table and update related models and queries 2025-02-19 12:52:06 +01:00
Guillermo Bonet 720aff8c02 Merge branch 'dev' into 8244-floricode
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-19 11:36:37 +00:00
Ivan Mas c61ea07b6a Merge branch 'dev' into 8558-futureTicketsClaims
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-19 11:30:08 +00:00
Guillermo Bonet 8185343d12 feat: refs #8244 Added tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-19 09:51:04 +01:00
Pako Natek 0cb3de872f fix(available_refresh): refs #8408 availabled
gitea/salix/pipeline/pr-test There was a failure building this commit Details
refs#8408
2025-02-19 08:10:01 +01:00
Juan Ferrer 72a651afa5 fix: refs #4409 vn.buyOut sequence
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 19:34:38 +01:00
Juan Ferrer bd8af6172d fix: refs #4409 Default life value
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 16:20:09 +01:00
Juan Ferrer e98cc7daf2 fix: refs #4409 First working version
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-18 15:58: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
Guillermo Bonet 411868209e Merge branch 'dev' into 8244-floricode
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 12:58:10 +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
Guillermo Bonet 96cba1f24f feat: refs #8244 Last changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 13:21:29 +01:00
Guillermo Bonet a8469b403c Merge branch 'dev' into 8244-floricode
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 12:11:35 +00:00
Guillermo Bonet bf1770dcc5 feat: refs #8244 Floricode api
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 13:05:57 +01:00
Javi Gallego fd53142bff fix: refs #7937 update claimDestination and regularizeClaim methods for address handling 2025-02-18 12:53:43 +01:00
Juan Ferrer 6162cbe2c6 fix: refs #4409 t.isRaid
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 11:06:41 +01:00
Javi Gallego d974942ca3 Merge branch 'dev' into 7937-claimAgile 2025-02-18 10:17:32 +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
Javi Gallego 0b7bcd9e33 Merge branch 'dev' into 7937-claimAgile 2025-02-18 09:19:02 +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 e9244c8538 Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-18 08:33:22 +01:00
Juan Ferrer 17410202ad fix: refs #6695 Code refactor 2025-02-17 19:40:12 +01:00
Javi Gallego a30f12dd27 Merge branch 'dev' into 7937-claimAgile 2025-02-17 19:16:16 +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
Ivan Mas 48a28045fd Merge branch 'dev' into 8558-futureTicketsClaims
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-17 14:49:27 +00: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
Ivan Mas 60f31178cf Merge branch 'dev' into 8558-futureTicketsClaims
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-17 14:17:31 +00:00
Ivan Mas 0088460e63 feat: refs #8558 requested modifications
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-17 15:15:11 +01:00
Guillermo Bonet 1b0da71c9d feat: refs #8244 Floricode api
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-17 15:03:23 +01:00
Javi Gallego a04ddfdee3 Merge branch 'dev' into 7937-claimAgile
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-17 14:21:56 +01: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
Javi Gallego 7001076974 refactor: refs #7937 remove pickupAgencyFk and related constraints; update claimConfig and tests
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-17 09:05:34 +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
Ivan Mas 472e52bc8c feat: refs #8558 use shipped
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-14 15:03:58 +01:00
Ivan Mas 9cf6f8f031 feat: refs #8558 modify claim_beforeInsert
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-14 14:50:39 +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
Juan Ferrer c954ebbb5d feat: refs #4409 Small code fixes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-14 11:34:35 +01:00
Juan Ferrer a615174d62 feat: refs #4409 buyLot_refresh INSERT IGNORE fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-14 10:46:29 +01: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
Juan Ferrer 53059f5bb5 feat: refs #4409 buyLot and buyLot refresh fixes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-14 10:21:02 +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
Alex Moreno 44ed6254c3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-14 07:02:45 +01:00
Javier Segarra 9dd3f7198c fix: getSuggestedTickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-13 22:56:43 +01:00
Carlos Andrés 4e9bcf530b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2025-02-13 18:59:26 +01:00
Ivan Mas 13a76e5c70 Merge branch 'dev' into 8573-addFkExpeditionHost
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-13 15:43:56 +00:00
Ivan Mas caa921020d refactor: refs #8573 update before alter table
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-13 16:41:29 +01:00
Carlos Andrés 7f32a10c06 fix: facturacion por consignatario en el cierre nocturno y unificación de backs
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-13 15:22:37 +01:00
Guillermo Bonet 845ce8d6d8 feat: refs #8227 Minor changes
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2025-02-13 14:36:09 +01:00
Guillermo Bonet 4042679c9b feat: refs #8227 Grants
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2025-02-13 14:12:44 +01:00
Pako Natek 86091571cd Merge pull request 'fix(item_getBalance): refs #8408 availabled field prevails over landed' (!3449) from 8408-Disponible-por-zonas-y-horas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3449
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-13 12:39:29 +00:00
Guillermo Bonet bd53f7367c Merge branch 'test' into 8227-roadmapChanges
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-13 08:34:20 +00:00
Guillermo Bonet 92ab3648e7 feat: refs #8227 Fix tests
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-13 09:22:45 +01:00
Pablo Natek 4b7c20075b Merge pull request 'feat: refs #6897 add search method and enhance ACL permissions for Entry model' (!3448) from 6897-addItemSearch into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3448
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-13 07:59:58 +00:00
Pako Natek 3a1849326b fix(item_getBalance): refs #8408 availabled field prevails over landed
gitea/salix/pipeline/pr-dev This commit looks good Details
Refs: #8408
2025-02-13 08:41:13 +01:00
Pako Natek 317c152c66 Merge branch 'dev' into 8575-itemPackingType-Altillo
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-13 06:41:43 +00:00
Pablo Natek 514ddf1045 feat: refs #6897 add search method and enhance ACL permissions for Entry model
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-12 19:40:22 +01:00
Ivan Mas 5404f895b2 refactor: refs #8573 add fk to expedition.hostFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-12 17:08:45 +01:00
Guillermo Bonet 8959eb21f6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-12 14:37:34 +01:00
Guillermo Bonet 5543da2c80 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-12 14:37:10 +01:00
Guillermo Bonet ba3909a984 refactor: refs #6944 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-12 14:13:39 +01:00