verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 58 Releases Wiki Activity
15,629 Commits 260 Branches 0 Tags 124 MiB
Commit Graph

6612 Commits

Author SHA1 Message Date
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
Joan Sanchez 30a4356139 Merge pull request 'fixes #5184 InvoiceIn crear seccion invoiceIn serial' (!1414) from 5184-invoiceIn-serial into dev
gitea/salix/pipeline/head Build queued... Details 
Reviewed-on: #1414
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-03-30 05:18:44 +00:00
Joan Sanchez 6366af9a15 Merge pull request 'refs #5490 traducción corregida' (!1415) from 5490-arregloExpedition into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1415
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-30 05:18:21 +00:00
Vicent Llopis d066c4ea0b refs #4856 feat: se envia el registro a todos los teletrabajadores. Tmb se pone estado 'SENDED' cuando se da a 'Reenviar'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 11:27:48 +02:00
Vicent Llopis b8da868095 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro
gitea/salix/pipeline/head This commit looks good Details
2023-03-29 09:22:23 +02:00
Vicent Llopis 3b615d9879 refs #5275 fix: actualiza correctamete los elementos del checkedDummy
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 09:11:40 +02:00
Alexandre Riera 9a713d2753 refs #5184 stmts removed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 08:48:54 +02:00
Alexandre Riera 3ad85c0de3 refs #5184 subselect deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 08:44:35 +02:00
Vicent Llopis c53c54b6cd refs #5275 feat: modificar masivamente
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 14:59:08 +02:00
Carlos Satorres bf5f1011e8 refs #5490 traducción corregida
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 14:56:20 +02:00
Vicent Llopis b4e04fcdad refs #5275 feat: colorear fechas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 14:40:14 +02:00
Alexandre Riera 69be91b964 refs #5184 fix back test, added e2e
gitea/salix/pipeline/head This commit looks good Details
2023-03-28 13:45:26 +02:00
Pablo Natek 2c01ebf681 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 13:26:17 +02:00
Alexandre Riera 695444f6ae refs #5184 back and front tests added
gitea/salix/pipeline/head This commit looks good Details
2023-03-28 11:34:14 +02:00
Vicent Llopis fb1b39da17 refs #5275 fix: al añadir artículo desde cero se muestra el nombre y se establecen las fechas por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 10:30:02 +02:00
Carlos Satorres 809c24f6cf Merge branch '5250-observacionesWorker' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker
gitea/salix/pipeline/head This commit looks good Details
2023-03-28 10:07:18 +02:00
Carlos Satorres 564165dc0f refs #5250 Self.validatesPresenceOf 2023-03-28 10:07:14 +02:00
Vicent Llopis 06ac8f9910 refs #5275 fix: si tenia valor el minPrice el checkbox siempre se marcaba. El checkbox no funcionaba cuando le pulsabas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 09:41:39 +02:00
Alexandre Riera 05caf0c6d8 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-03-28 08:26:11 +02:00
Alexandre Riera 87d0dc3cec refs #5092 changed name to negative bases
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 08:25:41 +02:00
Alexandre Riera 6f2de903bc refs #5184 working on search panel
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 14:29:22 +02:00
Alexandre Riera 188e592d28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-27 11:20:05 +02:00
Carlos Satorres 1302665d98 refs #5436 showSucces
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 10:00:00 +02:00
Alexandre Riera 0c8fe855ac refs #5418 lateral search panel added, missing e2e
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 09:11:29 +02:00
Alexandre Riera 8b4121e021 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-27 08:38:35 +02:00
Alexandre Riera 39af68c3dc Merge branch 'dev' into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 05:39:22 +00:00
Carlos Satorres b199ca4a6e Merge branch 'dev' into 5250-observacionesWorker
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 11:48:31 +00:00
Carlos Satorres c68c78cc5b refs #5250 solucion error WorkerObserv
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 12:11:42 +01:00
Vicent Llopis a32dea0acd Merge branch 'dev' into 5395-travel.extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 11:00:22 +00:00
Vicent Llopis f689d35100 refs #5410 fix test
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 10:05:17 +01:00
Joan Sanchez 00a0f88dc4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 10:03:23 +01:00
Joan Sanchez e67a40714c Claim log hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 09:59:55 +01:00
Vicent Llopis 6c75853ce6 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-03-24 09:43:13 +01:00
Carlos Satorres fa78649607 refs #5439 url filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 08:54:03 +01:00
Vicent Llopis 5784f05fd4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 08:34:04 +01:00
Alexandre Riera 0baccc4745 refs #5206 fix tests front
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 08:25:37 +01:00
Alexandre Riera 8f2398bc8c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 08:12:50 +01:00
Vicent Llopis 92aed3eac1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 08:11:35 +01:00
Vicent Llopis a45308c6a5 refs #5342 fix: testFront
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 07:58:27 +01:00
Vicent Llopis 0f6092483c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 07:51:31 +01:00
Alexandre Riera 24d032910a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 14:58:31 +01:00
Vicent Llopis afdfe5e3f3 refs #5331 al filtrar por 'Pendiente' no muestra los estados 'Previa x'
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 14:55:19 +01:00
Vicent Llopis 2513377add Merge branch 'dev' into 5342-monitor.tickets_isFragile
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 13:38:08 +00:00
Joan Sanchez ea50da8a19 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-03-23 14:33:10 +01:00
Carlos Satorres 36af9d45e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-newFilterEnPeticionesDeCompra
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 11:56:40 +01:00
Vicent Llopis 805df64bb2 fallo cantidad reclamados
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 10:54:04 +01:00
Alexandre Riera c6fc2dee24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 10:53:11 +01:00
Alexandre Riera 4e5364dc0b refs #5036 fix tests logs
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 10:05:02 +01:00
Vicent Llopis 46e61543a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 09:29:03 +01:00
Carlos Satorres 79c42384ee refs #5439 role actualizado
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 08:26:06 +01:00
Joan Sanchez 7b5e0bae8e 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-03-23 08:20:33 +01:00
Carlos Satorres 3fd1e7a086 refs #5439 se elimina el filtro de fecha añadido
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 15:41:36 +01:00
Joan Sanchez fcd422eb49 added relation
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 14:55:54 +01:00
Carlos Satorres 1ab8570ed3 Merge branch 'dev' into 5425-modCamposBasicos(pesoycaja)
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 13:28:07 +00:00
Carlos Satorres b2cc79a98e Merge branch 'dev' into 5432-propiedadesBotonMas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 13:24:32 +00:00
Vicent Llopis 27bb50ad12 refs #5342 esta tabla ya se borra en el proc
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 12:17:48 +01:00
Alexandre Riera 60eabbf7a0 Merge branch 'test' into hotfix-added-grabUser-logs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 10:37:57 +00:00
Alexandre Riera 81472a5e50 removed duplicated log
gitea/salix/pipeline/head Build queued... Details
2023-03-22 11:36:28 +01:00
Alexandre Riera 59c3ef23de grabUser added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 11:03:13 +01:00
Vicent Llopis d276c7b611 refs #5342 unificados proc x_getWarnings
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 10:57:18 +01:00
Vicent Llopis 2559be8230 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile 2023-03-22 10:29:21 +01:00
Carlos Satorres fde854f5c2 refs #5250 campo de notes
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:21:15 +01:00
Vicent Llopis 18afcbabc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community 2023-03-22 10:20:55 +01:00
Vicent Llopis 1b1bca28bd refs #5410 add frontTest
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:13:59 +01:00
Vicent Llopis bf38098e5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked 2023-03-22 09:31:08 +01:00
Alexandre Riera 700151b500 refs #5092 amount <> 0
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 08:18:56 +01:00
Alexandre Riera ce67132d7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 07:21:20 +01:00
Vicent Llopis 41c79263c4 refs #5410 feat: envia email cuando se añade una nota
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 14:53:36 +01:00
Joan Sanchez d209b35071 Merge pull request 'refs #5423 añadido 3r decimal' (!1392) from #5423-tercerDecimalCoste into dev
gitea/salix/pipeline/head There was a failure building this commit Details 
Reviewed-on: #1392
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-21 10:22:37 +00:00
Alexandre Riera 1198ad3b01 refs #5056 wagonType backs and test
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 10:44:00 +01:00
Joan Sanchez 3a922b453f Merge branch 'dev' into 5241-virtual_pos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 09:10:34 +00:00
Joan Sanchez 12a9ff599b Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 10:05:27 +01:00
Joan Sanchez 3881e435f4 Renamed method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 09:55:45 +01:00
Vicent Llopis 46a6a5fc63 refs #5203 refactor: se le pasan los argumentos directamente y se corrige la transaccion
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 08:51:30 +01:00
Carlos Satorres 1bc3103d9f refs #5439 filtro comercial
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 08:44:28 +01:00
Joan Sanchez 634db7c7fc refactor(getTransactions): lilium customer transactions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-20 23:09:17 +01:00
Carlos Satorres da05140635 Merge branch '#5423-tercerDecimalCoste' of https://gitea.verdnatura.es/verdnatura/salix into #5423-tercerDecimalCoste
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 15:14:11 +01:00
Carlos Satorres 306573b1bf refs #5439 campos fecha y salesperson
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 15:11:55 +01:00
Carlos Satorres f0f2a8c731 refs #5432 quitar comentario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-20 13:41:32 +01:00
Carlos Satorres a670795f9d refs #5432 mod ng-show, add tooltip and disabled 2023-03-20 13:22:21 +01:00
Carlos Satorres 78d8bbd82a refs #5423 tercer decimal en entrada 2023-03-20 10:44:44 +01:00
Alexandre Riera 61a0d8bcb2 refs #5092 showing clients with multiple negative bases
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 10:15:18 +01:00
Alexandre Riera a94e47e622 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 09:54:02 +01:00
Carlos Satorres 9e42ab52ce refs #5425 modificación usuario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-17 09:32:20 +01:00
Robert Ferrús 1d697e1ac5 refs #4357 add operator model
gitea/salix/pipeline/head This commit looks good Details
2023-03-17 08:46:01 +01:00
Carlos Satorres 9565bb33f2 refs #5425 modificacion de los campos
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 14:12:54 +01:00
Vicent Llopis 6d04933fe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 14:01:19 +01:00
Vicent Llopis 5794ae5130 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked 2023-03-16 13:55:54 +01:00
Vicent Llopis bc47fc35d6 refs #5410 feat: añadido filtro a las columnas created y defaulterSinced
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 13:55:21 +01:00
Alexandre Riera a8f92b151d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 10:38:04 +01:00
Vicent Llopis 2f2d65bfd6 refs #5342 feat: añadido icono en los tickets que tengan sales fragiles
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 10:33:24 +01:00
Alexandre Riera 668fa73386 refs #4632 deleted return in definition
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 10:32:00 +01:00
Alexandre Riera 60162fe71f refs #4632 removed return
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 10:30:53 +01:00
Carlos Satorres aadb796adf Merge branch 'dev' into #5423-tercerDecimalCoste
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:12:56 +00:00
Alexandre Riera 3f356335db refs #5092 added popovers
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:47:58 +01:00
Alexandre Riera c46e15c8e4 refs #5092 changed section name
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:35:00 +01:00
Alexandre Riera 0b4a6874d1 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-03-16 09:16:50 +01:00
Alexandre Riera c0094d8047 Merge branch '4632-guardarFirmas-salix' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 09:07:21 +01:00
Alexandre Riera a0be5c50fc refs #4632 changed packed from boxed 2023-03-16 09:07:19 +01:00
Alexandre Riera f037575428 Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head Build queued... Details
2023-03-16 08:06:17 +00:00
Alexandre Riera 6e2269b428 refs #4632 removed alert level id from code
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:04:57 +01:00
Carlos Satorres 70beaf9b6c refs #5423 añadido 3r decimal
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:03:16 +01:00
Alexandre Riera a99bd2577a refs #4632 changed route from TicketDms to Ticket
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 08:24:34 +01:00
Alexandre Riera 387576d63a Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 06:42:39 +00:00
Joan Sanchez 8fda595c2e Merge pull request '4856-worker.time-control' (!1375) from 4856-worker.time-control into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1375
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-16 06:39:00 +00:00
Joan Sanchez d373d80b12 Merge pull request '5120-reports_loopback' (!1389) from 5120-reports_loopback into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1389
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-16 06:34:02 +00:00
Vicent Llopis a87e0c52d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control 2023-03-16 07:32:04 +01:00
Joan Sanchez a8049c5b2c Merge pull request '5380-m3/itemMaxSize' (!1377) from 5380-m3/itemMaxSize into dev
gitea/salix/pipeline/head There was a failure building this commit Details 
Reviewed-on: #1377
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-03-16 06:28:03 +00:00
Joan Sanchez e911f7a127 Merge pull request '4980-travel.extra-community_filterToReport' (!1391) from 4980-travel.extra-community_filterToReport into dev 
Reviewed-on: #1391
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-16 06:27:33 +00:00
Joan Sanchez d9296c139d Merge pull request 'fix: autocompletar el switf/bic' (!1388) from 5352-worker.create_swift/bic into dev
gitea/salix/pipeline/head Build queued... Details 
Reviewed-on: #1388
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-16 06:25:18 +00:00
Joan Sanchez 1f52326091 Merge pull request 'feat(print): added reusable pdf print functions' (!1390) from 5182-print_publish into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1390
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
 2023-03-16 06:22:45 +00:00
Joan Sanchez 4f0ad00a6f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-03-16 07:20:18 +01:00
Joan Sanchez 596a017cfd Don't throw error on file unlink
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-03-16 07:18:29 +01:00
Joan Sanchez 0d5272de30 Merge branch 'dev' into 5182-print_publish
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-15 15:05:43 +00:00
Joan Sanchez a947666838 refactor(imageQueue): remplaced sharp with gm
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 14:24:30 +01:00
Vicent Llopis 1b8ed05f71 refs #5395 feat: modificado orderBy, añadida columna importa y corregidos errores
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 13:28:28 +01:00
Alexandre Riera 6609cce065 refs #5056 minHeightBetweenTrays
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 12:14:58 +01:00
Alexandre Riera f706b66efc refs #5056 added divisible in wagonType
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-15 11:57:09 +01:00
Alexandre Riera 53bca1e8a3 refs #5056 added fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 11:36:10 +01:00
Alexandre Riera 6a2542758b refs #5056 added fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-15 10:29:44 +01:00
Vicent Llopis 38bf49c0b6 refs #5410 fix: se mantenien los checkbox marcados al paginar
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 08:40:53 +01:00
Joan Sanchez bdb86a432f Merge branch '5182-print_publish' of https://gitea.verdnatura.es/verdnatura/salix into 5182-print_publish
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-15 08:07:17 +01:00
Joan Sanchez f052af92cd Proper template name 2023-03-15 08:07:14 +01:00
Joan Sanchez dc936fe690 Merge branch 'dev' into 5182-print_publish
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-15 07:05:14 +00:00
Pablo Natek 59a87ba519 Merge branch 'dev' into 5151-claim.descriptor-2-botones-mas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 14:02:25 +00:00
Vicent Llopis c51e542235 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 13:43:59 +01:00
Carlos Satorres 5f64c23495 Merge branch 'dev' into 5352-worker.create_swift/bic
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 11:12:04 +00:00
Vicent Llopis 1047ac0b64 refs #4980 fix: la sección no estaba filtrando por el filtro por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 10:18:59 +01:00
Vicent Llopis 50ccb61728 refactor: el report llama directamente al filtro de extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:59:29 +01:00
Carlos Andrés 67f9cae2f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:04:45 +01:00
Joan Sanchez 6495e016a8 Endpoints refactor
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 08:17:46 +01:00
Vicent Llopis 29df1ba894 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 08:00:02 +01:00
Vicent Llopis 4dc9e9e590 refs #4856 refactor: make agnostic the component calendar 2023-03-14 07:44:39 +01:00
Vicent Llopis 1693907ee0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 07:41:36 +01:00
Pablo Natek 584f25dd77 Merge branch 'dev' into 5151-claim.descriptor-2-botones-mas
gitea/salix/pipeline/head This commit looks good Details
2023-03-13 16:24:31 +00:00
Carlos Satorres e947672c69 Merge branch 'dev' into 5352-worker.create_swift/bic
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 14:36:51 +00:00
Joan Sanchez 63d7dafcde feat(print): added reusable pdf print functions
gitea/salix/pipeline/head There was a failure building this commit Details 
Refs #5182
 2023-03-13 15:05:19 +01:00
Joan Sanchez b58135f611 Merge pull request '5035-tryToSolve_intermittentBackTest' (!1379) from 5035-tryToSolve_intermittentBackTest into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1379
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-13 09:37:42 +00:00
Joan Sanchez 6cc7017475 Merge branch 'dev' into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good Details
2023-03-13 09:22:36 +00:00
Alexandre Riera 0248c3c9e0 refs #5056 models and tables added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 07:34:49 +01:00
Alexandre Riera eee4c815e7 Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head This commit looks good Details
2023-03-13 06:10:51 +00:00
Joan Sanchez 1b984f4325 Event callback
gitea/salix/pipeline/head This commit looks good Details
2023-03-12 20:51:22 +01:00
Vicent Llopis 5cb28036c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 14:25:55 +01:00
Joan Sanchez 9bc86b1617 Added missing relation
gitea/salix/pipeline/head This commit looks good Details
2023-03-10 13:29:11 +01:00
Pablo Natek 8a4d9bd2bf refs #5211
gitea/salix/pipeline/head This commit looks good Details
2023-03-10 12:52:51 +01:00
Alexandre Riera efcf224962 Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 11:50:11 +00:00
Alexandre Riera c4d6a19666 refs #5092 download as csv button
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 12:49:20 +01:00
Alexandre Riera 874fd0656c refs #5206 url gets params
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 10:05:16 +01:00
Alexandre Riera 0cac62da76 Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 09:02:54 +00:00