Commit Graph

6727 Commits

Author SHA1 Message Date
Alex Moreno 033e269a5d 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
2024-11-19 14:09:46 +01:00
Sergio De la torre feb11c123e feat: refs #8099 refs#8099 addComplmentSalary
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-19 11:45:40 +01:00
Sergio De la torre d21b42a567 feat: refs #8099 refs#8099 addComplmentSalary
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-19 11:24:00 +01:00
Robert Ferrús 7b5e474d24 feat: refs #8211 route_afterUpdate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-19 11:15:57 +01:00
Alex Moreno 7f39edf014 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-19 07:46:43 +01:00
Pablo Natek 0d205eb6ce Merge pull request 'fix: refs #7404 negative quantity' (!3214) from 7404-fixNegativeQuantity into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3214
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-19 06:16:09 +00:00
Sergio De la torre 2335ef754a Merge branch 'master' into 6861-itemShelvingSetQuantity
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-19 05:55:45 +00:00
Pablo Natek 33d9ba9b44 fix: refs #7404 negative quantity
gitea/salix/pipeline/pr-master Build queued... Details
2024-11-19 06:21:00 +01:00
Guillermo Bonet 8d4769d74d feat: refs #8057 More precision in getGeo
gitea/salix/pipeline/head This commit looks good Details
2024-11-18 13:34:20 +01:00
Guillermo Bonet cdcc5051d2 feat: refs #8057 Fix version
gitea/salix/pipeline/head This commit looks good Details
2024-11-18 13:09:33 +01:00
Guillermo Bonet 2b770c0201 feat: refs #8057 Fix version
gitea/salix/pipeline/head There was a failure building this commit Details
2024-11-18 12:56:37 +01:00
Guillermo Bonet aed4bc89c7 feat: refs #8057 Fix version
gitea/salix/pipeline/head There was a failure building this commit Details
2024-11-18 12:53:36 +01:00
Guillermo Bonet 66009ee0dd Merge branch 'dev' into 8057-geoFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-18 09:52:55 +00:00
Guillermo Bonet 754c0cb9ab Merge branch '8057-geoFk' of https://gitea.verdnatura.es/verdnatura/salix into 8057-geoFk
gitea/salix/pipeline/pr-dev Build queued... Details
2024-11-18 10:52:44 +01:00
Guillermo Bonet a64f9b74ec feat: refs #8057 Requested changes 2024-11-18 10:52:41 +01:00
Robert Ferrús 329488d700 Merge branch 'dev' into 8127-entry_updateComission
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-18 08:46:49 +00:00
Sergio De la torre 7d5928bc3d Merge pull request 'feat: refs #8135 refs#8135 updateTicketACL' (!3210) from 8135-ticketACL into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3210
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-18 08:21:18 +00:00
Guillermo Bonet e81727f3f8 Merge branch 'dev' into 8057-geoFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-18 07:58:51 +00:00
Guillermo Bonet 353ca659cd feat: refs #8057 Requested changes
gitea/salix/pipeline/pr-dev Build queued... Details
2024-11-18 08:58:38 +01:00
Guillermo Bonet b529ccfe29 feat: refs #7920 Added ItemShelving in shelvingLog
gitea/salix/pipeline/head This commit looks good Details
2024-11-15 12:43:15 +01:00
Robert Ferrús 923296e85e Merge branch 'dev' into 8127-entry_updateComission
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-15 10:34:34 +00:00
Guillermo Bonet a3945070f2 refactor: refs #7920 No changes in itemShelvingLog table
gitea/salix/pipeline/head This commit looks good Details
2024-11-15 11:34:18 +01:00
Robert Ferrús c5f1b05671 feat: refs #8127 quitar esquemas
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-15 11:32:20 +01:00
Robert Ferrús f7a5fc7e31 Merge branch 'dev' into 8127-entry_updateComission
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-15 10:06:45 +00:00
Sergio De la torre 07318656b7 feat: refs #8135 refs#8135 updateTicketACL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-15 08:47:30 +01:00
Guillermo Bonet e1a091535e refactor: refs #7920 Fix version
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2024-11-15 08:45:28 +01:00
Guillermo Bonet b5463e5560 refactor: refs #7920 Fix version
gitea/salix/pipeline/head There was a failure building this commit Details
2024-11-15 07:54:33 +01:00
Guillermo Bonet e49285ace8 refactor: refs #7920 Fix version
gitea/salix/pipeline/head There was a failure building this commit Details
2024-11-15 07:51:37 +01:00
Guillermo Bonet e344ae3bf2 refactor: refs #7920 Fix version
gitea/salix/pipeline/head There was a failure building this commit Details
2024-11-15 07:48:17 +01:00
Guillermo Bonet 48ffb80094 Merge branch 'dev' into 7920-itemShelving
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-15 06:40:41 +00:00
Guillermo Bonet d1c528c8fd Merge branch 'dev' into 7950-cmrModelUnify
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-15 06:03:36 +00:00
Guillermo Bonet 0fbef4c88a Merge pull request 'fix: refs #7244 Added collection ACL' (!3198) from 7244-collectionAcl into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3198
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-15 06:01:48 +00:00
Jorge Penadés 4b659c0b48 fix: refs #6818 use right col type
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 16:39:35 +01:00
Jorge Penadés f96b914649 fix: refs #6818 use right col type 2024-11-14 16:39:26 +01:00
Jorge Penadés 86c95e185c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-addDefaultChannel
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 16:32:40 +01:00
Jorge Penadés eff251fbb5 feat: refs #7874 add default type 2024-11-14 15:46:51 +01:00
Alex Moreno a8cb0b9eb8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-14 12:21:13 +01:00
Jorge Penadés a37332f7be fix: refs #6818 add defaultChannel
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 11:18:38 +01:00
Jorge Penadés 25b05637a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-addDefaultChannel
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-14 11:17:11 +01:00
Jorge Penadés c8ab5d4344 fix: refs #6818 add defaultChannel
gitea/salix/pipeline/pr-dev Build queued... Details
2024-11-14 11:16:45 +01:00
Guillermo Bonet d387486ea8 refactor: refs #7920 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 09:59:01 +01:00
Guillermo Bonet 8449a6c6d3 feat: refs #7244 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 09:42:59 +01:00
Guillermo Bonet 5f50d84213 feat: refs #7244 Requested changes
gitea/salix/pipeline/pr-dev Build queued... Details
2024-11-14 09:42:49 +01:00
Guillermo Bonet b9397c527d feat: refs #8057 Added data updates
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 09:32:02 +01:00
Guillermo Bonet bde192966e feat: refs #8057 Added data updates
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 09:30:36 +01:00
Guillermo Bonet cba1abad68 feat: refs #8057 Added data updates
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 09:27:38 +01:00
Guillermo Bonet d4b0da50d0 feat: refs #8057 Added data updates
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 09:00:19 +01:00
Guillermo Bonet b7655b4f92 feat: refs #8057 Added geoFk columns
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 08:24:42 +01:00
Guillermo Bonet 97e53b2ef8 Merge branch 'dev' into 7950-cmrModelUnify
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 06:57:26 +00:00
Ivan Mas e1b0fc298c feat: refs #8143 deprecate recoverPass and sync from account.user
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-13 20:26:54 +01:00