Commit Graph

10428 Commits

Author SHA1 Message Date
Guillermo Bonet 2f0a79da3f Merge branch 'test' into dev 2025-01-09 11:34:53 +01:00
Guillermo Bonet 1787cd3102 Merge branch 'master' into test 2025-01-09 11:34:41 +01:00
Jorge Penadés 50a95ed3c4 fix: correct variable name in canModifyAbsenceInPast method
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2025-01-08 18:30:33 +01:00
Jorge Penadés b12c3bb72f fix: enable tests for createAbsence and deleteAbsence methods
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-08 18:28:00 +01:00
Jorge Penadés 412638d590 fix: refactor access control for modifying past absences 2025-01-08 18:27:23 +01:00
Jorge Penadés 838617e3f6 fix: update access control for modifying absences in the past
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-08 15:47:53 +01:00
Jorge Penadés f557b41feb fix: tests
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-08 13:52:50 +01:00
Ivan Mas 14b88b1ad6 Merge branch 'dev' into 7343-modifyDriverRouteEmail
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-08 12:16:01 +00:00
Jorge Penadés c07e30a89c fix: prevent deleting absences for past dates
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2025-01-08 12:48:28 +01:00
Alex Moreno 60933216f7 fix: hotFix getMondayWeekYear
gitea/salix/pipeline/head This commit looks good Details
2025-01-08 11:42:32 +01:00
Alex Moreno ecc877e07d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-01-08 11:35:30 +01:00
Alex Moreno 9842f70bec fix: hotFix getMondayWeekYear
gitea/salix/pipeline/head This commit looks good Details
2025-01-08 11:25:07 +01:00
Alex Moreno c0c75c1bee Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2025-01-08 09:41:31 +01:00
Alex Moreno 5ab06ef6e4 fix: hotFix getStartDateOfWeekNumber
gitea/salix/pipeline/head This commit looks good Details
2025-01-08 09:39:55 +01:00
Ivan Mas 0940a31288 Merge branch 'dev' into 7343-modifyDriverRouteEmail
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-07 16:47:43 +00:00
Jon Elias c06f2c4e6f Merge branch 'dev' into 7202-AddCustomAgentFkColumn
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-07 09:00:26 +00:00
Javi Gallego 4f3c101e42 Merge branch 'dev' into 7832-ticketServiceModifyConcept
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-07 07:43:19 +00:00
Jon Elias ecee47f859 Merge branch 'dev' into 8246-ZoneListNewField
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-07 06:22:31 +00:00
Jon Elias ad0c1eb4c5 feat: refs #8246 added relation for the front's new field
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-07 07:12:33 +01:00
Pablo Natek 67c484cd87 feat: refs #7301 update SQL fixtures and enhance lastEntriesFilter logic
gitea/salix/pipeline/pr-test This commit looks good Details
2025-01-03 09:39:49 +01:00
Ivan Mas 8822fde7fb feat: refs #7343 delete sending to user
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-02 18:04:53 +01:00
Pablo Natek 98b68a2c74 Merge pull request 'fix: refs #7301 update SQL fixtures and improve lastEntriesFilter logic' (!3324) from 7301-removeRedundantInventories into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3324
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-02 09:54:10 +00:00
Jon Elias 5221b9254a Merge branch 'dev' of https: refs #7202//gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn 2025-01-02 08:39:57 +01:00
Javi Gallego 0ad26b336d fix: refs #7832 update ticketService model test suite to correct describe block
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-31 11:48:05 +01:00
Javi Gallego 1f23ebf6d5 feat: refs #7832 implement refund ticket restrictions and add unit tests for ticket service updates 2024-12-31 11:46:32 +01:00
Javi Gallego a26de63660 Merge branch 'dev' into 8167-incoiceOutCheckIsActive
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-30 13:35:17 +00:00
Javi Gallego 49d87ea44f Merge pull request 'feat: refs #7924 add isCustomInspectionRequired field to item and update related logic' (!3325) from 7924-itemInspection into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3325
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-29 09:10:51 +00:00
Javi Gallego 98e2483565 feat: refs #8167 update locale and improve invoicing logic with error handling
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-29 09:38:51 +01:00
Javi Gallego 5acd4520f8 Merge branch 'dev' into 8167-incoiceOutCheckIsActive 2024-12-29 09:36:44 +01:00
JOSE ANTONIO TUBAU RODRIGUEZ 0665453465 Merge branch 'dev' into 8266-changeExpeditionItemName
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-24 10:55:10 +00:00
JOSE ANTONIO TUBAU RODRIGUEZ a2218b41f8 feat: refs #8266 added itemFk and needed fixtures
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-23 14:49:44 +01:00
Jorge Penadés 549cb7633e Merge pull request 'test to dev' (!3326) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3326
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-12-19 14:51:13 +00:00
Jorge Penadés 6abbf3ec1d fix: refs #7936 update Spanish locale for SII terms
gitea/salix/pipeline/pr-test This commit looks good Details
2024-12-19 13:01:34 +01:00
Jorge Penadés 1f7dae2514 fix: refs #7936 locale
gitea/salix/pipeline/pr-test This commit looks good Details
2024-12-19 10:34:46 +01:00
Pablo Natek ea4b118015 feat: refs #7301 update lastEntriesFilter to include landedDate and enhance test cases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-19 10:26:53 +01:00
Javi Gallego a99d7adfe8 feat: refs #7924 add isCustomInspectionRequired field to item and update related logic
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-19 10:11:33 +01:00
Pablo Natek b838e988e0 fix: refs #7301 remove debug console log and update test cases in lastEntriesFilter
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-19 08:39:47 +01:00
Pablo Natek 49c30890e5 fix: refs #7301 update SQL fixtures and improve lastEntriesFilter logic
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-19 08:31:51 +01:00
Javi Gallego 9ae27e104e feat: refs #8167 update canBeInvoiced method to include active status check and improve test cases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-19 07:07:56 +01:00
Javi Gallego 6c2d7641f5 Merge pull request 'feat: refs #7235 add serialType parameter to getInvoiceDate and implement corresponding tests' (!3306) from 7235-InvoiceOut into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3306
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-12-18 12:34:56 +00:00
Jorge Penadés c0893f8684 feat: refs #7936 add locale
gitea/salix/pipeline/pr-test This commit looks good Details
2024-12-18 13:06:01 +01:00
Alex Moreno cfee497adb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 8315-devToTest
gitea/salix/pipeline/pr-test This commit looks good Details
2024-12-18 11:26:22 +01:00
Jorge Penadés 7a3339b623 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-18 10:18:43 +01:00
Jorge Penadés 8f1fb0a120 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-18 09:46:19 +01:00
JOSE ANTONIO TUBAU RODRIGUEZ 43d5243766 Merge pull request 'feat: refs #8293 include zone data' (!3309) from 8293-addZoneToClaimList into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #3309
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-18 07:45:05 +00:00
Jorge Penadés 52a0e718c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-17 13:44:11 +01:00
Jorge Penadés 31952725aa refactor: refs #6583 use warehouseId var
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-17 13:33:29 +01:00
Jorge Penadés 9ac8e60f0c fix: refs #6583 drop focus
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-17 12:58:57 +01:00
Jorge Penadés b935878dd6 feat: refs #6583 add tests
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-17 12:58:25 +01:00
Jorge Penadés f965f7aa52 fix: refs #6583 update onlyWithDestination logic to handle null values correctly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-17 12:46:48 +01:00