Commit Graph

10971 Commits

Author SHA1 Message Date
Jon Elias c6bfdb2cd7 Merge pull request '#7949: Added new field in sales' (!3501) from 7949-TicketModifications into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3501
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-27 14:01:36 +00:00
Jose Antonio Tubau 93862fecfc Merge branch 'dev' into 8645-addSupplierRefToAgencyTermFilter
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-27 11:21:09 +00:00
Pako Natek 7b8476b42c Merge pull request '8408-disponible-por-zonas' (!3495) from 8408-disponible-por-zonas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3495
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-27 11:03:02 +00:00
Alex Moreno 011fb3a99a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-27 12:01:31 +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
Alex Moreno a85771c1e7 fix: closure email
gitea/salix/pipeline/head This commit looks good Details
2025-02-27 12:00:59 +01:00
Jose Antonio Tubau 44dc7bbb58 Merge branch 'dev' into 8645-addSupplierRefToAgencyTermFilter
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-27 11:00:22 +00:00
Pako Natek ed054bfb3d Merge branch 'dev' into 8408-disponible-por-zonas
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2025-02-27 09:59:14 +00:00
Pako Natek d78288b778 fix(availabled): refs #8408 refs#8408 new price diference
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-27 10:30:24 +01:00
Jon Elias 01b78207a3 Merge branch 'dev' into 7949-TicketModifications
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-27 09:23:53 +00:00
Jon Elias 002a106774 feat: refs #7949 added new field in sales
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-27 09:13:23 +01:00
Guillermo Bonet 87b3abd4e2 fix: refs #8244 Path test
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-27 09:04:08 +01:00
Jose Antonio Tubau 201eca7765 Merge branch 'dev' into 8645-addSupplierRefToAgencyTermFilter
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-27 06:12:18 +00:00
Alex Moreno a9ae260409 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2025-02-26 07:31:33 +01:00
Alex Moreno e4a9ada838 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2025-02-26 07:31:18 +01:00
Alex Moreno fbdc715fa5 feat: enhance ticket closing process with email notifications and error handling 2025-02-25 14:59:49 +01:00
Carlos Satorres d6a520d81a Merge branch 'test' into 6553-workerBusinessV2
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-25 08:10:54 +00:00
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
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 35cfce552b fix: refs #6553 getWorkerBusiness
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-21 15:14:46 +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
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
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
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