Commit Graph

16753 Commits

Author SHA1 Message Date
Alex Moreno 2d1420e3f8 Merge branch 'dev' into 5836-clientDefaulterisWorker
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 09:51:48 +00:00
Carlos Satorres 3b346d673b Merge pull request 'refs #5753 db export and fix fixtures' (!1643) from 5753_232401_db_dump into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1643
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-07-03 09:49:11 +00:00
Carlos Satorres 4d03ef8f09 Merge branch 'dev' into 5836-clientDefaulterisWorker
gitea/salix/pipeline/head Build queued... Details
2023-07-03 09:47:43 +00:00
Carlos Satorres c3ef642017 refs #5836 fix fk
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 11:45:05 +02:00
Alex Moreno 7fe8698b6f refs #5753 fix ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 10:04:03 +02:00
Carlos Satorres 5e68363312 refs #5334 onsearch postlink
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 09:38:36 +02:00
Alex Moreno d1fb2859be Merge branch 'dev' into 5753_232401_db_dump
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 06:59:42 +00:00
Carlos Satorres dc10c20fe3 refs #5334 email validate
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 07:29:58 +02:00
Carlos Satorres dc36c6fd9d refs #5334 basicData solve e2e
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 13:52:46 +02:00
Alex Moreno f636c3b1ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 11:57:56 +02:00
Carlos Satorres e6ed834bf0 refs #5836 remove case
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 10:07:29 +02:00
Carlos Satorres 3d93043b98 Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 09:40:15 +02:00
Carlos Satorres 83b096c206 refs #5334 fix errors 2023-06-30 09:40:12 +02:00
Carlos Satorres 6b4501146d refs #5334 fix errors 2023-06-30 09:39:48 +02:00
Alex Moreno 6fcbf69f60 refs #5753 isNotEditableCredit to zeroCreditEditor
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 08:26:51 +02:00
Alex Moreno ff320895a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5753_232401_db_dump 2023-06-30 08:23:00 +02:00
Alex Moreno 5f42ee5f60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-30 07:55:47 +02:00
Alex Moreno e651ddc4a0 refs #5816 unfocus e2e
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 15:53:09 +02:00
Alex Moreno 02aafbc7f4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 15:50:52 +02:00
Alex Moreno fc39b8f692 refs #5816 comment e2e
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 15:50:33 +02:00
Alex Moreno 7eb8460ba0 refs #5816 remove unforeseen dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 15:38:49 +02:00
Guillermo Bonet 82e762ac09 Merge pull request 'refs #5816 Remove duplicated logs' (!1634) from 5900-removeDuplicatedLogs into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1634
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-29 13:35:49 +00:00
Alex Moreno 0441bc29b7 refs #5475 correct SQL folder
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 15:24:41 +02:00
Alex Moreno b062cec747 refs #5475 fix setPassword options/cb
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 15:01:24 +02:00
Alex Moreno c6bee8f2f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 14:50:06 +02:00
Javi Gallego bc4058512a Merge branch 'test' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 12:43:16 +00:00
Carlos Satorres af91630852 refs #5836 e2e fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 13:22:51 +02:00
Alex Moreno 273c06a210 refs #5833 deploy: test to master 232601
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 12:54:56 +02:00
Vicent Llopis 1093d29fb6 Merge pull request 'test_hotfix_renewToken' (!1645) from test_hotfix_renewToken into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1645
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-29 10:47:46 +00:00
Vicent Llopis 79823605f6 refs #5554 fix: no te tira al hacer F5
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 12:15:32 +02:00
Vicent Llopis 3bd890c343 refs #5554 fix: solo llama al back cuando se tiene q renovar
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 12:11:16 +02:00
Pablo Natek be1c145d9a refs #5347
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 10:41:41 +02:00
Carlos Andrés 1d993c74e5 refs #5590 fix total invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 10:39:07 +02:00
Carlos Satorres bb4951bbc8 Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 07:47:41 +00:00
Carlos Satorres 9dc52b6011 refs #5334 fix labels trad
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 09:44:21 +02:00
Pablo Natek 89b63f47fc Merge branch '5347-clientCreate-→-client_create' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 08:14:10 +02:00
Pablo Natek c9c20711b9 refs #5347 2023-06-29 08:13:44 +02:00
Pablo Natek bbc5ed2683 Merge branch 'dev' into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-29 05:22:06 +00:00
Alex Moreno 840a88bdc1 refs #5833 remove console.logs
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 07:14:45 +02:00
Juan Ferrer d200a1a695 refs #5900 CSS fixes
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 16:08:12 +02:00
Juan Ferrer 12481b5f3d refs #5900 CSS fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 16:07:24 +02:00
Vicent Llopis 33e1d9e3f2 Merge pull request '5774-ticket.lines_evitarCantidadNegativa' (!1597) from 5774-ticket.lines_evitarCantidadNegativa into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1597
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-28 12:51:44 +00:00
Vicent Llopis c5660a21a1 Merge branch 'dev' into 5774-ticket.lines_evitarCantidadNegativa
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 12:41:26 +00:00
Vicent Llopis a6fba97b7d Merge pull request '5808-client.credit-management' (!1640) from 5808-client.credit-management into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1640
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-28 12:35:08 +00:00
Vicent Llopis e3e0c7e97a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 14:31:54 +02:00
Alex Moreno 8723cf2958 refs #5753 fix legacy bugs
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 14:10:21 +02:00
Pablo Natek 54e75dc850 Merge branch '5347-clientCreate-→-client_create' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 14:07:38 +02:00
Pablo Natek 6e52b3b968 refs #5347 2023-06-28 14:07:37 +02:00
Vicent Llopis 3128601027 Merge branch 'dev' into 5808-client.credit-management
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 11:47:39 +00:00
Vicent Llopis 65e5c95c07 Merge pull request '5688-worker.calendar_workCenter' (!1580) from 5688-worker.calendar_workCenter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1580
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-28 11:38:49 +00:00