Commit Graph

25182 Commits

Author SHA1 Message Date
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
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 216b81adda Merge pull request 'refactor: refs #7920 Main change' (!3194) from 7920-itemShelving into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3194
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-15 06:44:16 +00: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 96b85701d8 Merge pull request 'refactor: refs #7950 Created cmr model' (!3180) from 7950-cmrModelUnify into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3180
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-15 06:07:16 +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
Guillermo Bonet 3b48cf3d5d Merge pull request 'feat: refs #8151 moveExpeditions' (!3200) from 8151-moveExpeditions into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3200
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-15 05:59:19 +00:00
Jorge Penadés 7e2194df41 Merge pull request 'fix: refs #6818 add defaultChannel' (!3205) from 6818-addDefaultChannel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3205
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-14 15:41:10 +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 f3e640e4a0 Merge pull request 'refactor: refs #7641 entry report style' (!3178) from 7641-refactorEntryReport into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3178
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-14 15:29:14 +00:00
Jorge Penadés 1ca737fd13 Merge branch 'dev' into 7641-refactorEntryReport
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 15:22:00 +00:00
Jorge Penadés e242320eed Merge pull request '#7874 setDefaultTypeNote' (!3209) from 7874-setDefaultTypeNote into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3209
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-14 15:21:19 +00:00
Jorge Penadés 4766d25dda feat: refs #7874 use name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 15:54:53 +01:00
Jorge Penadés eff251fbb5 feat: refs #7874 add default type 2024-11-14 15:46:51 +01:00
Jorge Penadés ab2e88806e fix: refs #7641 drop boilerplate code
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 15:29:54 +01:00
Jorge Penadés c4375b2505 feat: refs #7641 fine tunning 2024-11-14 15:29:18 +01:00
Jorge Penadés 47ae1b59c1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7641-refactorEntryReport
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 15:22:22 +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
Ivan Mas 0a11997250 Merge pull request 'feat: refs #8143 deprecate recoverPass and sync from account.user' (!3203) from 8143-deprecateColumnsFromUser into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3203
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-11-14 10:16:55 +00: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
Ivan Mas 96a13af02c Merge branch 'dev' into 8143-deprecateColumnsFromUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 10:11:37 +00:00
Guillermo Bonet 54da1a713a Merge branch '8151-moveExpeditions' of https://gitea.verdnatura.es/verdnatura/salix into 8151-moveExpeditions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 10:53:15 +01:00
Guillermo Bonet b3dcaf4cf5 feat: refs #8151 Requested changes 2024-11-14 10:53:13 +01:00
Guillermo Bonet b7cb420c72 Merge branch 'dev' into 8151-moveExpeditions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-14 09:46:00 +00:00
Guillermo Bonet 534b50f51a feat: refs #8151 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-14 10:45:28 +01:00
Pablo Natek b4406a69d8 Merge pull request 'feat: refs #6403 add debug on cancel shipment' (!3197) from 6403-add-debug-on-cancelShipment into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3197
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-14 09:16:08 +00: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 2f7de633bd Merge branch 'dev' into 7244-collectionAcl
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 08:43:25 +00: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
Carlos Satorres cd7ed6987a Merge pull request 'fix: refs #7283 remove' (!2907) from 7283-itemsMigration3 into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2907
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-11-14 08:40:50 +00:00
Carlos Satorres b0812139cb Merge branch '7283-itemsMigration3' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 09:26:16 +01:00
Carlos Satorres 155616e622 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3 2024-11-14 09:26:13 +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
Guillermo Bonet 9c0af7f7c6 refactor: refs #7950 Requested changes
gitea/salix/pipeline/pr-dev Build queued... Details
2024-11-14 07:57:13 +01: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
Ivan Mas 26be6c6920 Merge pull request 'feat: refs #7994 new version script fix' (!3202) from 7994-newVersionScriptFix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3202
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-11-13 16:34:59 +00:00
Ivan Mas 21693cfd71 feat: refs #7994 new version script fix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-13 14:33:52 +01:00
Guillermo Bonet d4a60f63c9 feat: refs #8151 Added test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-13 14:05:03 +01:00
Guillermo Bonet 018393fa93 feat: refs #8151 Added test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-13 14:04:02 +01:00
Guillermo Bonet 344427da45 feat: refs #8151 moveExpeditions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-13 13:46:40 +01:00
Guillermo Bonet 72e067ff81 fix: refs #7244 Added collection ACL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-13 12:53:18 +01:00