verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity
15,788 Commits 261 Branches 0 Tags 123 MiB
Commit Graph

6660 Commits

Author SHA1 Message Date
Alexandre Riera bbf1c40987 Merge branch 'master' into hotfix-dms-hasFile
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 12:48:06 +00:00
Alexandre Riera 2975e7fae3 hotfix savesign
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 14:46:46 +02:00
Vicent Llopis e24366707b refactor: añadido focus a la seccion usuarios
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 14:26:12 +02:00
Vicent Llopis 2b74ab43ae refactor front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 14:12:53 +02:00
Vicent Llopis 9f04581862 refs #5542 "importar reclamacion" crea un registro en ticketRefund
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 14:00:28 +02:00
Vicent Llopis 38e5660e61 refs #5542 refactorizado "abono" para que siempre cree un único ticket abono 2023-04-21 13:59:28 +02:00
Vicent Llopis ea1035311e Merge branch 'dev' into 5128-client.credit-management
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 11:30:58 +00:00
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Carlos Satorres 397d8f658e refs #5540 error trad
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 10:41:50 +02:00
Vicent Llopis 83f71cdd36 refactor: mostrar en columnas visibles 'Frágil'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 10:31:23 +02:00
Vicent Llopis 5af961ac69 fix: maneja si se elimina la sale
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 09:53:21 +02:00
Alexandre Riera af1ad7e08c fixed e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 09:47:34 +02:00
Carlos Satorres d8b5659a5d refs #5540 client vies 2023-04-21 09:14:30 +02:00
Alexandre Riera b3a10698af hotfix negativeBases
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 08:20:38 +02:00
Pablo Natek de3b4f37c2 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 05:54:00 +00:00
Juan Ferrer 9694a35343 refs #5517 Added: Tests, filter panel, model and props titles
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 19:46:57 +02:00
Juan Ferrer 6f1744baff Merge branch 'dev' into 5517-improveLogs+translations 2023-04-20 16:30:24 +02:00
Carlos Satorres 33c296c34d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-inheritRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 14:31:46 +02:00
Vicent Llopis ec9a5722c2 refs #5128 añadido icono de grafana
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 13:58:49 +02:00
Carlos Satorres d6e6dab03b Merge branch 'dev'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 11:55:52 +02:00
Carlos Satorres b4183c2698 refs #5436 mod de error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 11:33:28 +02:00
Carlos Satorres c103eeab7f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5436-mensajeClienteSinCorreo 2023-04-20 10:40:22 +02:00
Alex Moreno 63e0031bc6 deploy(231401): test to master 2023-04-20 08:24:43 +02:00
Alexandre Riera aecde484f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 07:52:05 +02:00
Alexandre Riera 84c2512847 refs #5293 open lilium in the same page
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 07:51:25 +02:00
Vicent Llopis f6bf92b74b refs #5128 intentando poner icono grafana
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 15:21:59 +02:00
Vicent Llopis 6fbb734a34 quitado salto de linea
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 14:43:23 +02:00
Vicent Llopis 187ba032d2 refs #5128 rol por ACL 2023-04-19 14:43:15 +02:00
Vicent Llopis 34b360040b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 12:18:45 +02:00
Vicent Llopis 5ace66ebca refs #5318 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 09:54:54 +02:00
Vicent Llopis be8a11cafc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 09:52:28 +02:00
Carlos Satorres a559c1f648 refs #5575 mod3Decimal
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 09:02:04 +02:00
Joan Sanchez 6f2aa0f618 Worker note ACL
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 14:51:48 +02:00
Joan Sanchez 32c9e22d96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 11:41:55 +02:00
Joan Sanchez a0d8ed1433 E2e fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 11:33:36 +02:00
Alexandre Riera 2df362327f Merge branch 'dev' into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 08:33:15 +00:00
Joan Sanchez a5f6991511 continue
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 10:18:44 +02:00
Joan Sanchez aabc4ec58d fix(consumption): continue queue if client mailing fails
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 10:08:04 +02:00
Alexandre Riera 28a7722bb6 Merge branch 'dev' into 5518-log-user-role
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 08:01:42 +00:00
Joan Sanchez fded7d062b section fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:49:23 +02:00
Vicent Llopis b3e7cedd1e refs #5128 borrada línea por error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:49:12 +02:00
Vicent Llopis c5225cb632 refs #5128 borrado código innecesario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:23:19 +02:00
Vicent Llopis 48cd23750e refs #5128 add testBack
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:09:09 +02:00
Vicent Llopis c9dffe9175 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:39:43 +02:00
Joan Sanchez 6fd5c8ae2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-18 08:34:20 +02:00
Joan Sanchez 6d593a0937 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5213-minorBugs2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:32:22 +02:00
Pablo Natek 3636543f73 refs #5075
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:19:23 +02:00
Alex Moreno 560b5b374f Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 05:37:12 +00:00
Vicent Llopis d99815356a refs #5144 manejado que el usuario sea NULL
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 07:26:35 +02:00
Alex Moreno 0c475be10b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 14:23:02 +02:00
Alexandre Riera 7d8a0597c1 Merge branch 'dev' into 5518-log-user-role
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 09:53:36 +00:00
Alexandre Riera 2675c02d13 refs #5518 moved models to account
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 11:52:52 +02:00
Alexandre Riera 2bc190b01e Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:49:41 +00:00
Alexandre Riera 0dcbc9fc8b refs #5293 redirected claim.photos to lilium
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 10:46:26 +02:00
Carlos Satorres d399cda050 refs #5316 quitar comment
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 10:34:08 +02:00
Joan Sanchez 3ee29553b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 09:00:52 +02:00
Joan Sanchez 610f51aaf8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 08:59:49 +02:00
Joan Sanchez f53ebb7641 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:59:34 +02:00
Joan Sanchez 02c573bd23 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-17 08:57:24 +02:00
Carlos Satorres 60d3729b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes 2023-04-17 08:55:22 +02:00
Alex Moreno 0bfdbcb750 refs #4617 use temporary instead of vn
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:44:24 +02:00
Joan Sanchez 51e42e485b Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev
gitea/salix/pipeline/head There was a failure building this commit Details 
Reviewed-on: #1372
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-04-17 06:44:17 +00:00
Carlos Satorres af8603185c refs #5439 inheritedRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 08:35:44 +02:00
Juan Ferrer c5dcfd3cab refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing
gitea/salix/pipeline/head This commit looks good Details
2023-04-15 14:24:50 +02:00
Juan Ferrer 2af48b3049 refs #4480 Fix: VnUser before save hook removed -> setting password attribute 2023-04-15 01:51:38 +02:00
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Alexandre Riera ad3836552e refs #5518 sections added
gitea/salix/pipeline/head This commit looks good Details
2023-04-14 14:16:29 +02:00
Vicent Llopis 4c18efa589 refs #5128 creado método setRating
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-14 13:05:57 +02:00
Joan Sanchez 35f94c58b7 reafactor(image): upload image using gm library
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-14 13:04:40 +02:00
Vicent Llopis 83dd386eed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management 2023-04-14 10:39:16 +02:00
Alexandre Riera b9b52c6b1d Merge branch 'dev' into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-14 07:08:02 +00:00
Juan Ferrer b4ef49cf24 Merge branch 'dev' into 5546-codigo-registro
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 16:48:11 +00:00
Alexandre Riera 8ade602563 hotfix one sign for every ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 14:18:01 +02:00
Carlos Satorres a2ddbd8a66 refs #5284 test update
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 14:04:10 +02:00
Joan Sanchez 6d5167ab7f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 13:47:18 +02:00
Alexandre Riera ac4772e44e refs #5418 mistake doing git pull origin dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 13:46:29 +02:00
Carlos Satorres 90268a79b0 refs #5284 test createClaim
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 13:41:10 +02:00
Vicent Llopis 2ada64e1bf refs #5517 eliminadas traducciones duplicadas
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 08:49:50 +02:00
Alexandre Riera 71e202d586 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5546-codigo-registro
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 08:45:05 +02:00
Carlos Satorres 44eab101cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo 2023-04-13 08:44:56 +02:00
Vicent Llopis 3790e3457f refs #5517 añadidas más traducciones
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 08:43:42 +02:00
Carlos Satorres ad267c933c refs #5540 country.code
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 08:30:33 +02:00
Pablo Natek 9594bd68b5 refs #4795
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 21:10:50 +02:00
Juan Ferrer 7e1d6f4339 Merge branch 'dev' into 5522-loggable-deadlock
gitea/salix/pipeline/head This commit looks good Details
2023-04-12 15:33:23 +00:00
Vicent Llopis 2a2d03e05a refs #5517 añadidas traducciones de algunos modelos
gitea/salix/pipeline/head This commit looks good Details
2023-04-12 15:02:21 +02:00
Carlos Satorres 60103fa80a refs #5540 validacion nif
gitea/salix/pipeline/head This commit looks good Details
2023-04-12 14:39:40 +02:00
Carlos Satorres ef6e85532e refs #5213 cambios e2e, descriptor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 14:20:05 +02:00
Alexandre Riera 0666163ca0 refs #5546 deleted log property, fixed back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 12:33:14 +02:00
Carlos Satorres 117849f093 refs #5540 supplier js
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 12:03:55 +02:00
Vicent Llopis 58750aa065 refs #5318 eliminido triggers y añadido loggable en salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 10:02:06 +02:00
Pablo Natek 1456da58f5 refs #5075
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 15:41:45 +02:00
Pablo Natek c928274e24 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 13:19:54 +00:00
Carlos Satorres 1ce2705869 refs #5316 last kkentry
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 15:04:49 +02:00
Vicent Llopis d03ca01b73 refs #5128 añadida subseccion "Gestión de crédito"
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 14:57:56 +02:00
Pablo Natek ccf26c5413 Merge branch 'dev' into 5211-cleanItemShelvings
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 11:56:33 +00:00
Pablo Natek 1770b8c038 refs #5075
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 13:42:28 +02:00
Carlos Satorres d21ab7a5a7 refs #5316 primer kkeo
gitea/salix/pipeline/head This commit is unstable Details
2023-04-11 10:32:21 +02:00
Vicent Llopis ec03c6edfa fix intermittent backTest
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 10:23:33 +02:00
Alexandre Riera 161fc25c5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 10:01:21 +02:00
Alexandre Riera 53bd6cd729 Merge branch 'dev' into 5522-loggable-deadlock
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 07:52:16 +00:00
Alexandre Riera ce28339973 refs #5522 deleted trigger afterInsert, added hook beforeInsert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 09:48:31 +02:00
Joan Sanchez 5732f9a33b Merge pull request 'refs #5250 campo de notes' (!1407) from 5250-observacionesWorker into dev
gitea/salix/pipeline/head There was a failure building this commit Details 
Reviewed-on: #1407
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-04-11 07:07:55 +00:00
Joan Sanchez fe0d861dc0 Merge pull request '4856-worker.time-control_2' (!1418) from 4856-worker.time-control_2 into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1418
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-04-11 07:06:04 +00:00
Vicent Llopis ba31613ac9 Merge branch 'dev' into 5275-item.fixed-price_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-04-06 09:58:07 +00:00
Carlos Satorres b3f946e15f Merge branch 'dev' into 5250-observacionesWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:32:05 +00:00
Vicent Llopis d9ae24c927 Merge branch 'dev' into 4856-worker.time-control_2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:08:10 +00:00
Vicent Llopis 8a297469d6 refs #4856 añadido myOptions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 10:06:29 +02:00
Carlos Satorres 68a24b7335 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker 2023-04-06 09:33:50 +02:00
Alexandre Riera 5cbc826281 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk
gitea/salix/pipeline/head This commit looks good Details
2023-04-06 07:16:00 +00:00
Joan Sanchez b71ad207ff Merge pull request 'fixes #5437 Desactivar correos "Cliente con email/teléfono/móvil duplicados"' (!1420) from 5437-deactivate-mail-duplicated-client into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1420
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-04-06 07:07:35 +00:00
Joan Sanchez a8af280de5 Merge pull request '5439-newFilterEnPeticionesDeCompra' (!1406) from 5439-newFilterEnPeticionesDeCompra into dev
gitea/salix/pipeline/head Build queued... Details 
Reviewed-on: #1406
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-04-06 07:05:18 +00:00
Vicent Llopis 041590e541 refs #4856 maneja errores y notifica a los jefes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:54:12 +02:00
Vicent Llopis 6fc2867551 permite decimales
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:05:37 +02:00
Alexandre Riera c823a0d6f1 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 05:44:33 +00:00
Vicent Llopis a44a640d15 refs #4856 manejo errores
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 15:14:42 +02:00
Vicent Llopis 6a0bca1a94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 14:06:33 +02:00
David Domenech 44d4df9c21 Merge branch 'dev' into 5211-cleanItemShelvings
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 11:00:08 +00:00
Carlos Satorres 8741a9f913 Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra
gitea/salix/pipeline/head This commit looks good Details
2023-04-05 06:51:21 +00:00
Carlos Satorres 7d3c6a98f3 refs #5439 search panel solve
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 08:48:15 +02:00
Vicent Llopis fb5969a120 refs #5275 add test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 08:43:47 +02:00
Joan Sanchez ca30aaa18a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-04-05 08:39:43 +02:00
Carlos Satorres 77b91b77b2 refs #5439 requesterFk solve
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 08:19:50 +02:00
Vicent Llopis e97b5a9f80 refs #5275 fix backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 07:54:56 +02:00
Vicent Llopis 28a12d0706 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5275-item.fixed-price_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 07:36:53 +02:00
Carlos Andrés e342852ed8 Merge branch 'master' into 5529-invoicingFixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-04-04 13:05:49 +00:00
Carlos Andrés 0372d44415 fixes #5529 Fixes: missing awaits, buffer-to-file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 15:00:28 +02:00
Alexandre Riera eed1ecc208 refs #4954 trigger modified
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 14:47:13 +02:00
Vicent Llopis 35d19e586a add translatiojn
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 14:27:16 +02:00
Vicent Llopis 7a274e2721 Merge branch 'dev' into 5410-client.defaulter_getChecked
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 12:12:20 +00:00
Vicent Llopis 3630c7d398 refs #5410 creada ruta de back para enviar emails
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 14:09:55 +02:00
Joan Sanchez c126c6044a Updated format
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 13:55:44 +02:00
Vicent Llopis c89f95a33e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 13:40:12 +02:00
Alexandre Riera 9380b88460 refs #5437 back and test deprecated
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 12:40:03 +02:00
Vicent Llopis 0bfa4c54aa fix: inserta en workerTimeControlMail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 09:52:46 +02:00
Alexandre Riera 1a14c793cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 09:47:31 +02:00
Vicent Llopis 0db3bc5e26 refs #4856 fix test
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 09:29:51 +02:00
Vicent Llopis 21b7050cfd refs #4856 otros usuarios pueden actualizar el estado 2023-04-04 09:29:40 +02:00
Alexandre Riera 24f576a4b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 08:40:03 +02:00
Vicent Llopis d1100384bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2 2023-04-04 08:27:27 +02:00
Vicent Llopis 862101c4b0 refs #4856 feat: si se modifica una fichada actualiza el estado a 'SENDED' y notifica al trabajador
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-03 21:29:02 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:57:00 +02:00
Vicent Llopis 67689695e4 refs #5275 filtra por defecto por el this.vnConfig.warehouseFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:29:19 +02:00
Vicent Llopis e1bfdc3f3c eliminada variable que no se usa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 11:13:40 +02:00
Carlos Satorres 60383eda0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker
gitea/salix/pipeline/head This commit looks good Details
2023-03-30 08:26:45 +02:00
Carlos Satorres 4edb2463b8 refs #5250 eliminacion isEnabled 2023-03-30 08:23:53 +02:00
Vicent Llopis 5a67f47305 refs #4856 fix: actualizar estado a 'SENDED' movido al back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 08:14:17 +02:00
Joan Sanchez 6aca23e466 Merge pull request 'fixes #5056 Nuevo sistema de sacado de pedidos: Gestión de vagones' (!1386) from 5056-gestion-vagones into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1386
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-30 05:23:29 +00:00
Joan Sanchez cafb21d90b Merge pull request 'fixes #5206 travel buscador en el lateral' (!1384) from 5206-travel-buscadorLateral into dev 
Reviewed-on: #1384
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-30 05:21:24 +00:00
Joan Sanchez 26bddef5e5 Merge pull request 'refs #5425 modificacion de los campos' (!1394) from 5425-modCamposBasicos(pesoycaja) into dev 
Reviewed-on: #1394
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-03-30 05:19:50 +00:00
Joan Sanchez ea60e31361 Merge pull request '5432-propiedadesBotonMas' (!1396) from 5432-propiedadesBotonMas into dev 
Reviewed-on: #1396
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-03-30 05:19:28 +00:00