Commit Graph

8758 Commits

Author SHA1 Message Date
Jorge Penadés d8aad86c92 feat: refs #6085 add acl authenticated
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 13:42:02 +01:00
Sergio De la torre 2a976664ec refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 12:05:34 +01:00
Sergio De la torre 5135bee2d2 refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 12:02:57 +01:00
Sergio De la torre 1d37d3d8bf refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 10:33:49 +01:00
Sergio De la torre 3fbf32bd52 refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-21 10:32:36 +01:00
Pablo Natek 130fb68d27 Merge pull request 'feat: refs #6302 delete after add to turn' (!2187) from 6302-delete-ticket-after-add-to-turn into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2187
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-21 09:28:39 +00:00
Sergio De la torre 9eee26cbe9 refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 10:18:54 +01:00
Alex Moreno b087c35a36 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-21 08:01:05 +01:00
Pablo Natek da8fbb5a92 fix: refs #6302 spec
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 21:14:01 +01:00
Pablo Natek f7b458d368 feat: refs #6302 delete after add to turn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-20 20:54:24 +01:00
Alex Moreno adddcc96aa Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-20 15:01:17 +01:00
Carlos Satorres b352fc10e7 refs #6532 redirect grafana, remove mermas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 14:44:06 +01:00
Alex Moreno 7895a51e33 hotFix(closeAll): fix debug
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-20 12:15:41 +01:00
Jorge Penadés 3c3dd64da1 feat: refs #6951 test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-18 09:39:56 +01:00
Jorge Penadés f044809f30 feat: refs #6951 to create back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 15:45:47 +01:00
Alex Moreno 8119106e69 hotFix: try to debug closeAll
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-15 15:40:54 +01:00
Javier Segarra bfdbbc0fdf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-03-15 12:22:57 +01:00
Jorge Penadés 6281ba352b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 10:38:08 +01:00
Javier Segarra 6989299593 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 08:26:45 +00:00
Carlos Satorres 1457884252 Merge branch 'dev' into 6755-restoreRefactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 08:54:06 +00:00
Carlos Satorres dd7c700130 refs #6755 fix test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 09:53:50 +01:00
Alex Moreno 4ad562a4da fix: refs #6925 transalation
gitea/salix/pipeline/head Build queued... Details
2024-03-14 09:12:19 +01:00
Alex Moreno 974c95b961 Merge branch 'dev' into 6925-fix_translations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 08:00:29 +00:00
Alex Moreno 0ad052c34a refs #7033 deploy(2412): dev to test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-14 08:36:19 +01:00
Carlos Satorres 24c1ab541d Merge branch 'dev' into 6913-routeKm
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 07:31:31 +00:00
Alex Moreno 977181f156 Merge branch 'dev' into 6925-fix_translations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 07:27:16 +00:00
Carlos Satorres 33bd21d40b refs #6755 fix model
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 16:29:05 +01:00
Carlos Satorres 1315bfda88 refs #6755 fix test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 14:18:53 +01:00
Carlos Satorres 92cf8fc5e1 refs #6755 remove console
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 11:46:43 +01:00
Javier Segarra 99f01a1dbd refs #6930 perf: add accessScopes to account.logout
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 13:39:21 +01:00
Carlos Satorres a6d1c5b6db refs #6755 remove
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 13:33:14 +01:00
Carlos Satorres 106296be7b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 12:55:56 +01:00
Carlos Satorres ed57212618 refs #6755 fix restore
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 12:55:14 +01:00
Carlos Satorres 93170dd82f Merge branch 'dev' into 6913-routeKm
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 11:48:49 +00:00
Javier Segarra 486b51bcfa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia 2024-03-12 12:46:46 +01:00
Sergio De la torre 375b690063 Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 09:12:45 +00:00
Javier Segarra 63a22a50f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-03-12 09:37:41 +01:00
Carlos Satorres 6627c7a16a refs #6913 routeKm
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 08:25:01 +01:00
Alex Moreno 35ef9b53c2 Merge branch 'dev' into 6925-fix_translations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 12:49:34 +00:00
Guillermo Bonet a34be6ca02 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-11 12:21:54 +01:00
Jorge Penadés 4e8e7d3f4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 08:59:26 +01:00
Alex Moreno 51fa0e1a75 fix: refs #6925 refund invoice transaltions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 08:12:29 +01:00
Javier Segarra 18773f34de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-09 11:27:57 +01:00
Carlos Satorres 879adfaac8 refs #6755 restore fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-08 14:59:33 +01:00
Carlos Satorres 8a16c24245 refs #6755 fix ticket 2024-03-08 12:27:47 +01:00
Javier Segarra a8420cd650 refs #7004 feat: translate label newSupplier
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-08 10:39:54 +01:00
Javier Segarra 238099311b refs #7004 fix: bug 2024-03-08 10:39:34 +01:00
Jorge Penadés ea18d3ef6f feat: refs #5186 add locale
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-08 09:25:07 +01:00
Alex Moreno 8cda12a9da feat: refs #6925 check incoterms in closure and makeInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-08 07:49:00 +01:00
Alex Moreno c2ecedca71 feat: refs #6925 check incoterms in closure and makeInvoice 2024-03-08 07:48:55 +01:00
Jorge Penadés 1e3967a4fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 15:56:02 +01:00
Alex Moreno 2f2aba1cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction 2024-03-07 11:42:35 +01:00
Alex Moreno dbbebbe73c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 11:39:03 +01:00
Alex Moreno 01cd2709cc deploy: refs #6995 skip test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-07 11:38:30 +01:00
Carlos Satorres d4d3fdceb5 refs #6755 fix canRestoreTicket 2024-03-07 11:36:30 +01:00
Jorge Penadés a94fd1a61c fix: refs #6744 change error kind
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 09:29:51 +01:00
Carlos Satorres 64d82d92d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor 2024-03-07 09:28:32 +01:00
Jorge Penadés 05f3a3f31b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 08:43:01 +01:00
Sergio De la torre 69ad44c0bd Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 07:18:16 +01:00
Guillermo Bonet 39b4e5db28 Merge branch 'dev' into 6948-bank
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 06:17:26 +00:00
Javier Segarra 6c06f70121 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 18:18:34 +00:00
Carlos Satorres 2e4a5029b8 refs #6755 fix restore 2024-03-06 14:52:49 +01:00
Carlos Satorres a14ab90d5a refs #6755 fix restore add fixtures 2024-03-06 14:41:58 +01:00
Alex Moreno 9ab0228714 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction 2024-03-06 13:58:10 +01:00
Carlos Satorres 1b3a8ddbdd refs #6755 fix restore 2024-03-06 12:03:35 +01:00
Javier Segarra 7999a9bf93 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 11:42:09 +01:00
Jorge Penadés f600a99708 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-03-06 10:55:05 +01:00
Carlos Satorres a45aebf582 Merge branch 'dev' into 6980-validateIBANRefactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 08:22:51 +00:00
Alex Moreno 31dc2db838 Merge branch 'dev' into 6336-claimState_removeSome
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 08:08:25 +00:00
Carlos Satorres 70096e7a76 refs #6755 fix restore 2024-03-05 14:24:32 +01:00
Carlos Satorres 0156bb09d1 Merge branch 'dev' into 6980-validateIBANRefactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 11:54:20 +00:00
Guillermo Bonet 00d5d06c6a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-05 12:38:15 +01:00
Guillermo Bonet 85d3508848 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-03-05 12:37:06 +01:00
Carlos Satorres 16fc446b85 refs #6755 fix method 2024-03-05 10:46:15 +01:00
Guillermo Bonet 55ba315858 refactor: refs #6948 Bank to Accouting
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 10:30:25 +01:00
Guillermo Bonet e0732835d0 refactor: refs #6948 Bank to Accouting
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 10:25:23 +01:00
Carlos Satorres 2b299eb32b refs #6980 fix iban
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 09:48:53 +01:00
Carlos Satorres cac388f986 refs #6755 fix ticket 2024-03-05 09:43:07 +01:00
Carlos Satorres 893320b114 refs #6755 model ticketlog, restore 2024-03-04 15:00:43 +01:00
Alex Moreno d979e36686 refs #6336 feat(claimState): delete without using & refactor: unnecessary test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 14:13:37 +01:00
Alex Moreno b761c258a1 refs #6336 feat(claimState): delete without using 2024-03-04 14:12:56 +01:00
Javier Segarra 753525d0ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 11:57:16 +01:00
Jorge Penadés 854a9b62af fix: refs #6276 refactor updateInTime & changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 09:21:41 +01:00
Jorge Penadés 7d8d31022b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 12:29:55 +01:00
Jorge Penadés 657430d28b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 12:15:49 +01:00
Pablo Natek 6aa68afd8f Merge pull request 'remove(claimRma): refs #6349 remove' (!2100) from 6349-deleteClaimRma into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2100
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-01 07:39:06 +00:00
Jorge Penadés 7b0bed209e feat: refs #5186 add acl & model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 16:27:42 +01:00
Jorge Penadés c54c9ce913 fix: refs #5186 create parkingLog & add sector relation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 14:43:37 +01:00
Jorge Penadés c79bdeb3f4 fix: refs #6744 drop to set emailVerified
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 13:41:27 +01:00
Jorge Penadés 1658838c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 12:41:24 +01:00
Alex Moreno e844a3f8fb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build started... Details
2024-02-29 09:45:07 +01:00
Alex Moreno 3f6ec13fa5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-29 09:43:44 +01:00
Javier Segarra 8e976d2e4f refs #5858 feat: remove Schedule system
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 09:28:27 +01:00
Javier Segarra becd2e6f48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-29 07:49:24 +01:00
Javier Segarra 599e8761c1 hotfix fix: replace pdf with csv
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-29 06:26:21 +00:00
Javier Segarra 6b7dc67c3e hotfix fix: replace pdf with csv 2024-02-29 06:25:41 +00:00
Javier Segarra a1a80259a2 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 06:41:17 +00:00
Jorge Penadés cbb7bd0028 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 15:50:47 +01:00
Carlos Satorres 482805de4b Merge branch 'dev' into 5858-fiscalData-validations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 12:01:36 +00:00
Alex Moreno 7874762da9 Merge pull request 'master' (!2102) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2102
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-27 11:38:02 +00:00