Commit Graph

10971 Commits

Author SHA1 Message Date
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
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
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
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
Carlos Satorres a91ca3d648 fix: fix operator
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-14 13:56:58 +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
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
Jon Elias 2e04a38c66 Merge branch 'dev' into 8555-AddNewField
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-11 11:24:17 +00:00
Jon Elias 02f51a244d feat: refs #8555 added new filter field
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-11 12:19:15 +01:00
Javi Gallego 4f6917ce4c Merge branch 'dev' into 7937-claimAgile
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-10 13:17:21 +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
Javier Segarra e748c3ea68 feat: refs #6321 minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-07 22:40:00 +01:00
Javier Segarra fce6b13d2d Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-07 16:19:58 +01:00
Guillermo Bonet d7a25b06bf Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-07 15:05:41 +01:00
Guillermo Bonet 8261b35559 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-07 15:05:20 +01:00
Guillermo Bonet b56468d3aa fix: refs #7024 Test
gitea/salix/pipeline/head This commit looks good Details
2025-02-07 15:05:04 +01:00
Guillermo Bonet ec3210a5c0 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-07 14:28:28 +01:00
Guillermo Bonet b1d2441d2e Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-07 14:27:56 +01:00
Jon Elias 516f409ae5 Merge branch 'dev' into Hotfix-FixedPriceNameFilter
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-07 12:42:20 +00:00
Jon Elias d76db10e67 fix: fixed item name filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-07 13:39:53 +01:00
Javier Segarra 23134deab5 fix: before save checkAccessAcl
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-07 11:11:22 +01:00
Guillermo Bonet 6fd1c35819 Merge branch 'dev' into 8172-parkingCoordinates
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-07 10:36:35 +01:00
Javier Segarra f4dbddbe15 fix: refs #6321 dates in fixtures.before
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-07 09:54:55 +01:00
Javier Segarra 9322360979 fix: refs #6321 dates in fixtures.before
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-07 08:41:49 +01:00
Jon Elias a6de493271 Merge branch 'master' into Hotfix-InvoiceOutCompanyFilter
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-07 06:56:49 +00:00
Javier Segarra d185530839 Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-07 07:56:05 +01:00
Jon Elias 200f159c6b fix: style
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-07 07:55:08 +01:00
Javier Segarra 9390c0efed test: refs #6321 getSimilar.spec.js 2025-02-07 07:53:00 +01:00
Jon Elias ec01c6b0c2 fix: fixed company filter
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-07 07:51:18 +01:00
Javier Segarra c4e64db9b9 Merge branch '6321_negative_tickets' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-06 23:23:00 +01:00
Javier Segarra ba58746a03 fix: refs #6321 test 2025-02-06 23:22:58 +01:00
Jorge Penadés 6a83cec33f fix: add await
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-06 17:43:58 +01:00
Javier Segarra 8398a30e4f Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-06 14:58:55 +00:00
Javier Segarra 9626b6c0ff feat: refs #6321 update itemLackDetail 2025-02-06 15:19:39 +01:00
Javier Segarra 8170eafa36 feat: refs #6321 remove ticketConfig var 2025-02-06 15:19:07 +01:00
Robert Ferrús aa44d0e727 Merge branch 'dev' of https: refs #6702//gitea.verdnatura.es/verdnatura/salix into 6702-missageSaleCloned
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-06 14:31:37 +01:00
Guillermo Bonet 9f302fac24 Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2025-02-06 13:47:36 +01:00
Guillermo Bonet 92ca3a2582 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-06 13:47:17 +01:00
Javier Segarra 4c786be3af Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-06 12:34:41 +01:00
Javier Segarra 4c7b8212da feat: refs #6321 changes 2025-02-06 12:27:59 +01:00
Javier Segarra 3dd64e4257 feat: refs #6321 sql lackDetail step3 2025-02-06 10:31:43 +01:00
Javier Segarra e736c95fb6 feat: refs #6321 sql lackDetail step2 2025-02-06 10:29:48 +01:00
Javier Segarra 1af01ad747 feat: refs #6321 sql lackDetail step1 2025-02-06 10:26:38 +01:00
Jorge Penadés 9ba517b648 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-06 10:20:22 +01:00
Javier Segarra 24411f9af1 fix: refs #6321 revert change
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-06 08:17:03 +01:00
Javier Segarra b2cbded2dc feat: refs #6321 defaultAlertLevelCode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-06 01:06:02 +01:00
Javier Segarra 1f6f7b9975 feat: refs #6321 updates requested
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-06 00:34:08 +01:00
Carlos Andrés 37b735b988 feat: refs #8535 sistema de warnings
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-05 17:21:36 +01:00
Javier Segarra da90d43f7a Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-05 15:36:44 +01:00
Javier Segarra e02dcf23b7 feat: refs #6321 add columns ticketConfigs 2025-02-05 15:36:01 +01:00
Jose Antonio Tubau 0a25595ed5 Merge branch 'dev' into 8304-workerChangesAndFixes
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-05 13:00:44 +01:00
Alex Moreno e89c12f753 fix: refs #7943 better "relation": "business",
gitea/salix/pipeline/head This commit looks good Details
2025-02-05 10:52:20 +01:00
Alex Moreno f216166806 fix: refs #7943 better "relation": "business",
gitea/salix/pipeline/head This commit looks good Details
2025-02-05 10:16:14 +01:00
Pablo Natek 26faaad5b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-05 08:03:48 +01:00
Jon Elias 502b48718c Merge pull request '#7965 - unifyProblems' (!2990) from 7965-unifyProblems into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2990
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-02-05 06:51:54 +00:00
Pablo Natek e4cd30bc27 feat: refs #6897 add groupingMode and hasMinPrice parameters to getBuyList method
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-05 07:34:47 +01:00
Javier Segarra 55eb882754 Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 23:42:47 +01:00
Javier Segarra 272c7c0289 perf: refs #6321 minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 23:42:16 +01:00
Javier Segarra 5d209314f6 feat: refs #6321 use Date.vnNew
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 14:09:48 +01:00
Jon Elias b3aaac2f52 Merge branch 'dev' into 7127-ModifyDaysToAddSales
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 13:00:07 +00:00
Javier Segarra 0111373471 Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 14:00:00 +01:00
Jon Elias 5258e5ba2a refactor: refs #7127 modified checkAccessAcl instead of using VnRole
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 13:55:01 +01:00
Javier Segarra 550b0871f0 feat: refs #6321 changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-04 13:45:59 +01:00
Alex Moreno fe7a1c60cc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-04 13:03:17 +01:00
Guillermo Bonet ee5a93ba81 Merge branch 'dev' into 8515-fixTestOptimizePriority
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 10:54:06 +00:00
Javier Segarra 410f3e73dc Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-04 09:54:41 +01:00
Guillermo Bonet 49e5da5547 fix: refs #8515 Fix test optimizePriority
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 07:48:56 +01:00