Commit Graph

10923 Commits

Author SHA1 Message Date
Javier Segarra 0be1f7bf49 Merge branch 'dev' into fix_ticketNegative
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 12:31:47 +01:00
Javier Segarra 2719a9dea6 perf: update state ticket 2025-02-18 12:31:23 +01:00
Javier Segarra 62cb5d0d57 Merge branch 'dev' into fix_ticketNegative
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 10:42:57 +00:00
Jon Elias 16bb716abd Merge branch 'dev' into 8606-FixZoneModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 10:36:49 +00:00
Jorge Penadés e29e5e28ed Merge pull request 'fix: refs #8388 update booking status in toUnbook method' (!3462) from 8388-fixUnbook into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3462
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-18 09:31:22 +00:00
Javier Segarra f95da6d5de Merge branch 'dev' into fix_ticketNegative
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-17 17:43:02 +00:00
PAU ROVIRA ROSALENY f687ad35fd Merge pull request 'feat: #8497 added availabled on travel module' (!3469) from 8497-travelAvailabled into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3469
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-17 15:11:50 +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
PAU ROVIRA ROSALENY e7cc754f53 feat: refs #8497 added availabled on travel module 2025-02-17 14:50:22 +01:00
Javier Segarra 44a3059e91 fix: replace colour by inkFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-17 13:36:46 +01:00
Javier Segarra f7d953d392 fix: item_getLack
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-17 11:33:07 +01: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
Javier Segarra 5f123d45f2 test: fix itemLack
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-16 03:20:20 +01:00
Javier Segarra 7dd2cf80c0 Merge branch 'dev' into fix_ticketNegative
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-16 03:17:43 +01:00
Javier Segarra d6499175ad fix: minor bugs 2025-02-16 03:17:31 +01:00
Jorge Penadés f9d1a8c0c2 fix: refs #8388 update booking status in toUnbook method
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-14 14:23:43 +01:00
Jon Elias c8abd7b2a1 feat: refs #8606 show correct text of duplicate entry error
gitea/salix/pipeline/pr-dev Build queued... Details
2025-02-14 14:16:01 +01:00
Guillermo Bonet c79867188a Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2025-02-14 12:36:24 +01:00
Guillermo Bonet dce263992e fix: refs #8227 Roadmap columns
gitea/salix/pipeline/head This commit looks good Details
2025-02-14 12:36:06 +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
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
Carlos Andrés b06ffdff52 Actualizar modules/ticket/back/methods/ticket/closeAll.js
gitea/salix/pipeline/head This commit looks good Details
2025-02-13 16:42:20 +00: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
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
Carlos Andrés b2071994da fix: update closeAll method to improve date handling and ticket selection logic
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-13 13:28:14 +01:00
Carlos Satorres 1b7026fa00 fix: refs #6553 remove business
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-13 10:46:48 +01:00
Javier Segarra 81e941db4e fix: replace arg id by itemFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-13 10:07:01 +01: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 f12c47cdf8 Merge branch 'dev' into 8573-addFkExpeditionHost
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-12 16:11:53 +00: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
Jon Elias 307c8d92df Merge branch 'dev' into fix_ticketNegative
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-12 15:30:09 +00:00
Javier Segarra f631aa1314 fix: remotMethodCtx
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-12 16:26:01 +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
Carlos Andrés 65a4967d46 fix: update maxShipped to use toDate in closeAll method
gitea/salix/pipeline/head This commit looks good Details
2025-02-12 14:16:43 +01:00
Carlos Andrés 9785ab5a7d feat: enhance ticket closure process with error handling and email notifications
gitea/salix/pipeline/head This commit looks good Details
2025-02-12 13:23:57 +01:00
Carlos Andrés b40981aa03 feat: enhance ticket closure process with error handling and email notifications
gitea/salix/pipeline/head This commit looks good Details
2025-02-12 13:18:18 +01:00
Alex Moreno 5d155ef6bd Merge branch 'test' into hotFix_daily_addressInvoice_2
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-12 11:17:27 +00:00
Carlos Andrés 1c9417556b feat: enhance ticket closure process with error handling and email notifications
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2025-02-12 12:13:23 +01:00
Javi Gallego 1c8ad94ab8 fix: update SQL fixture values and enhance getVideoList method with transaction handling
gitea/salix/pipeline/head This commit looks good Details
2025-02-12 09:51:56 +01:00
Pablo Natek f347d9668f refactor: refs #6897 improve variable scope and query parameters in recalcEntryPrices.js
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-11 16:50:00 +01:00
Alex Moreno 3fbd740a2b fix: address invoice daily
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2025-02-11 14:31:26 +01:00
Pablo Natek 454fbcb7ce Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-11 12:38:42 +01:00
Pablo Natek 6110295cc2 fix: refs #6897 update entry_clone method to return newEntryId instead of result
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-10 11:40:54 +01:00
Pablo Natek 2f0cd27ed8 Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-09 18:26:52 +01:00