Commit Graph

15250 Commits

Author SHA1 Message Date
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 f5109724bf refs #5073 adaptacion para solo el año
gitea/salix/pipeline/head This commit looks good Details
2023-03-17 11:39:16 +01:00
Joan Sanchez 40ccc4f409 Merge pull request 'refs #4357 add operator model' (!1395) from 4357-operatorSalix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1395
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-17 10:12:48 +00: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 98916bf5e1 refs #5410 add changelog
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 13:57:22 +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
Vicent Llopis 23ce51abf0 refs #5342 add changelog
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 11:34:57 +01:00
Juan Ferrer ed20927b52 Merge pull request 'fixes #4632 Llamar al nuevo método back de guardar firmas de salix' (!1346) from 4632-guardarFirmas-salix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1346
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-03-16 09:53:50 +00:00
Juan Ferrer f61c205a7b Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 09:53:16 +00:00
Alexandre Riera 1cd768f7b8 refs #5056 moved sql
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 10:39:02 +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
Joan Sanchez 1a79bb586c Added version 2312.01
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 09:07:59 +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 cd8695741c Merge pull request 'fixes #5036 Regularizar históricos' (!1244) from 5036-regularizar-historicos into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1244
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-03-16 07:26:31 +00: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
Vicent Llopis ab5a592434 refs #4856 add changelog
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 07:37:59 +01: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
Pablo Natek 0f0bec8769 Merge pull request 'refs #5151 botones' (!1383) from 5151-claim.descriptor-2-botones-mas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1383
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-03-15 13:50:32 +00:00
Pablo Natek defa1b660c test
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 14:40:49 +01: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