Commit Graph

10950 Commits

Author SHA1 Message Date
Javi Gallego dbe58c6630 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-24 13:09:57 +01:00
Javi Gallego a021383df0 fix: update shipped property assignment in refund ticket creation 2025-02-24 13:09:53 +01:00
Alex Moreno ffbc368dc7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-24 12:35:55 +01:00
Alex Moreno d12553bbd4 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-24 12:35:46 +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 a410432365 Merge branch 'dev' into 7764-createClienteAsSupplier
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-21 12:17:20 +00:00
Javi Gallego a15cf04a4c refactor: refs #7764 include options parameter in role retrieval for user creation tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-21 12:53:08 +01:00
Javier Segarra 581a7393d4 fix: add param shipped
gitea/salix/pipeline/pr-master This commit looks good Details
2025-02-21 11:41:37 +01:00
Javi Gallego 63a36139c2 refactor: refs #7937 update test descriptions to English for clarity in importToNewRefundTicket specs
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-21 11:12:13 +01:00
Javi Gallego 6f5a966c55 refactor: refs #7764 add role assignment for supplier during user creation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-21 10:32:14 +01: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
PAU ROVIRA ROSALENY 69e63fd6d0 Merge branch 'dev' into 8612-shelvinge2e
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 12:00:51 +00:00
PAU ROVIRA ROSALENY 9f391bba27 fix: refs #8612 changed translations
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-20 13:00:00 +01: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
Carlos Satorres 4c0169aba3 Merge branch 'dev' into fix-workerSection2
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-19 15:19:56 +00:00
PAU ROVIRA ROSALENY ff3268b6e9 fix: refs #8612 handled duplicate code error in shelving & parking 2025-02-19 12:53:29 +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
Alex Moreno f316349ac2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 13:38:21 +01:00
Javi Gallego 26af667727 Merge branch 'dev' into 7937-claimAgile 2025-02-18 12:53:53 +01:00
Javi Gallego fd53142bff fix: refs #7937 update claimDestination and regularizeClaim methods for address handling 2025-02-18 12:53:43 +01:00
Jon Elias 6118154ef9 Merge branch 'dev' into 8555-AddNewField
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 11:44:01 +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
Alex Moreno dc989cb075 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8627-devToTest
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-18 10:35:00 +01: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
Alex Moreno 2386874a96 fix: refs #8627 add claim in getSales
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-18 10:28:00 +01:00
Alex Moreno 06c123d7f2 fix: refs #8627 ticket isTaxDataChecked 2025-02-18 10:15:28 +01:00
Alex Moreno a8c03548d9 fix: refs #8627 update stateFk assignment to use code instead of id
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-18 09:51:08 +01:00
Javi Gallego a30f12dd27 Merge branch 'dev' into 7937-claimAgile 2025-02-17 19:16:16 +01: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
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