Commit Graph

14126 Commits

Author SHA1 Message Date
Vicent Llopis 0bd09ae366 fix: delete unnecessary column
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 12:06:51 +01:00
Vicent Llopis 1ea5ffa6d3 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 12:04:19 +01:00
Vicent Llopis be46f30dd7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 10:32:24 +01:00
Joan Sanchez f9eee431b4 fix(driver-route): routes with empty lines
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 10:27:00 +01:00
Vicent Llopis 574f2757f4 refactor code
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 10:19:27 +01:00
Vicent Llopis 79e9edcee9 delete: old code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-09 09:26:28 +01:00
Juan Ferrer 993ae11277 refs #3302
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 09:19:56 +01:00
Vicent Llopis 2ab475791c refactor code
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 09:16:58 +01:00
Vicent Llopis dbd0e77e12 feat: send mail with the invoice pdf
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 09:14:32 +01:00
Vicent Llopis 9bcfebcae6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 07:26:56 +01:00
Alex Moreno 8c137b57f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-09 07:10:35 +01:00
Alexandre Riera ff00066138 refs #4700 tests front y fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 15:56:58 +01:00
Guillermo Bonet 6744b3f797 added collection-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 14:40:38 +01:00
Pau 2fc12dff52 #4457 @1h notifications working, need refactor ACL
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-08 13:59:00 +01:00
Joan Sanchez 8607ab7ccc Merge pull request 'MASTER_hotfix_deleteTrashFiles2' (!1130) from MASTER_hotfix_deleteTrashFiles2 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1130
2022-11-08 12:52:06 +00:00
Vicent Llopis 9890db820b feat: borra los dms sin file y elimina registros aunq no se pueda eliminar la carpeta
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 12:48:09 +01:00
Pau e85505ee8e #4457 implement notification system, @1h 30m
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-08 12:26:01 +01:00
Pau f21907855f Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente 2022-11-08 10:04:47 +01:00
Pau 5dafdd5daa Merge pull request '4490-transfer-tickets-between-clients' (!1104) from 4490-transfer-tickets-between-clients into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1104
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-08 08:52:11 +00:00
Pau f45eaa07f9 refs #4511 fixed test, changed drop to rename @1h
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 09:45:56 +01:00
Pau d1be14605b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4511-kkear-expedition.itemFk 2022-11-08 09:32:09 +01:00
Pau 78e6c8da15 Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-08 09:08:06 +01:00
Pau f1e832ee66 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:06:30 +00:00
Vicent Llopis 9cd57bfde9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:56:56 +01:00
Vicent Llopis 4d81991d86 delete focus test
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:47:08 +01:00
Vicent Llopis 8d7296cc8f feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:46:47 +01:00
Vicent Llopis 11459bbd56 refactor: change column name 2022-11-08 08:46:36 +01:00
Vicent Llopis 1bc8cf52d5 add translate
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:20:36 +01:00
Vicent Llopis d34a4ae992 add translate
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:19:25 +01:00
Pau 0da6bd44e7 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:06:27 +00:00
Pau 2df195764d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:05:13 +01:00
Vicent Llopis a681cc03af Merge pull request 'hotFix-dev_updateDiscount' (!1126) from hotFix-dev_updateDiscount into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1126
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-08 07:01:37 +00:00
Pau ab3d0a2549 Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 06:59:45 +00:00
Vicent Llopis 51b047eacc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:40:31 +01:00
Alexandre Riera 896a7eb6f0 refs #4700 arreglar filtro y traducciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 15:55:17 +01:00
Alex Moreno fcf46ade7d feat: reset-password section
gitea/salix/pipeline/head This commit is unstable Details
2022-11-07 15:15:00 +01:00
Vicent Llopis 7fc18c89df feat: error handlers
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 13:57:54 +01:00
Vicent Llopis ffa0ff650e feat: add time control
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 12:21:14 +01:00
Joan Sanchez 77edbcbf39 Merge branch 'dev' into hotFix-dev_updateDiscount
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 10:39:53 +00:00
Joan Sanchez 92a2367db2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 10:52:53 +01:00
Joan be1fbc4d68 Added version 10502
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 10:49:17 +01:00
Joan 17d6308126 Already on prod 2022-11-07 10:48:38 +01:00
Joan Sanchez f65a90927f Merge pull request 'MASTER_hotFix: force apply changes' (!1127) from hotFix_applyChangesInMaster into master
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1127
2022-11-07 09:44:03 +00:00
Alex Moreno c3ee9da6c6 hotFix: force apply changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 10:18:32 +01:00
Vicent Llopis b1eb7d469f fix: error duplicated key
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-07 09:51:33 +01:00
Alex Moreno 2165ca0f34 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-07 09:34:24 +01:00
Alex Moreno 03ec8e27e6 feat(ticket_isEditable): use ticketWeekly
gitea/salix/pipeline/head This commit is unstable Details
2022-11-07 09:19:20 +01:00
Alex Moreno 5051f8b590 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-07 07:24:44 +01:00
Vicent Llopis 6858de83a3 feat: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 14:55:47 +01:00
Vicent Llopis 892094f85c feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 13:41:45 +01:00