Commit Graph

14298 Commits

Author SHA1 Message Date
Alexandre Riera 8314f48b8d Merge pull request 'fixes #5061 Cambios en Tickets a Futuro' (!1256) from 5061-cambios-ticketsFuturo into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1256
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-01-17 06:56:04 +00:00
Alex Moreno ff39a81b8c Merge branch 'dev' into 4523-item_fixed-price_rate2
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 06:07:14 +00:00
Alexandre Riera dab94ff535 refs #5061 refresh structure
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 14:48:45 +01:00
Alexandre Riera 7da42a30f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5061-cambios-ticketsFuturo
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 14:34:34 +01:00
Alexandre Riera 30e8abcc8a Merge branch '4930-add-zone' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 14:27:47 +01:00
Alexandre Riera 57c5ea98bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone 2023-01-16 14:27:40 +01:00
Alexandre Riera 4d12e29b3d refs #5061 fix filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 14:24:53 +01:00
Alexandre Riera 0c8a99793c Merge branch 'dev' into 4930-add-zone
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 13:16:46 +00:00
Guillermo Bonet 5d81cfc121 Merge pull request '4975-mdbVersion-last-method' (!1245) from 4975-mdbVersion-last-method into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1245
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-16 11:40:22 +00:00
Guillermo Bonet 5ebe31c9e5 Merge branch '4975-mdbVersion-last-method' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 12:26:19 +01:00
Guillermo Bonet 3d4600d70d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method 2023-01-16 12:26:10 +01:00
Alexandre Riera b78bebf27c refs #5061 added hour in date, changed ipt filter
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 12:22:22 +01:00
Alex Moreno ecfad94057 refactor(worker_new): remove roleFk and profileType
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 12:19:03 +01:00
Alex Moreno 1db69d4183 Merge pull request 'fixes #4839 - docuware_send' (!1254) from 4839-docuware_send into dev
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 07:20:08 +00:00
Pau 34508425a9 Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 07:08:19 +00:00
Alex Moreno 73c3f05377 refactor(docuware_upload): simplify json
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 07:36:06 +01:00
Guillermo Bonet 7186b76063 Merge branch 'dev' into 4975-mdbVersion-last-method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 06:04:17 +00:00
Pau 05dfcfd864 Merge branch '4605-Create-Model-PackagingMistake' of https://gitea.verdnatura.es/verdnatura/salix into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 15:42:02 +01:00
Pau a8e4c9e1de cambiar fks por relaciones 2023-01-13 15:42:00 +01:00
Alex Moreno 2cc89d9ae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 13:54:16 +01:00
Alex Moreno 8a53758254 Merge branch '4839-docuware_send' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 13:52:21 +01:00
Alex Moreno 2918c9c71d skip intermittent test 2023-01-13 13:52:19 +01:00
Alex Moreno 9a3fea99ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send 2023-01-13 13:45:10 +01:00
Alex Moreno d413d705dd Merge branch 'dev' into 4839-docuware_send
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 12:36:23 +00:00
Alex Moreno def41c011c feat(docuware_upload): send to trash last file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 13:33:59 +01:00
Joan Sanchez 02316cf8c4 Merge pull request '4943-MASTER_closeTickets3' (!1252) from 4943-MASTER_closeTickets3 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1252
2023-01-13 11:21:16 +00:00
Joan Sanchez 0e39cea56c Merge pull request '4548 MASTER-fix(print_invoiceIn): translation invoice to receipt' (!1253) from hotFix_change_invoice_for_receipt into master
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1253
2023-01-13 11:20:44 +00:00
Alexandre Riera 7720c32bc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 09:58:03 +01:00
Alex Moreno d7e8c4fafd fix(print_invoiceIn): translation invoice to receipt
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 09:28:44 +01:00
Joan Sanchez c489c4c6a9 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-01-13 08:55:01 +01:00
Vicent Llopis 1c532d81e8 fix: permite cerrar varios estados
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 08:38:03 +01:00
Guillermo Bonet 868c2aaaef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 15:25:51 +01:00
Alex Moreno 5bb66fec3f test(docuware): back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 15:16:38 +01:00
Vicent Llopis 6a8e7873fa fix: sólo cierra caus que el último mensaje sea una respuesta. Cierra caus con el estado 'Abierto' y 'En espera'º
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 15:07:48 +01:00
Pau 176005fcdc requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 13:54:22 +01:00
Joan Sanchez 54356ece7d fix(monitor): refresh monitor when using ng-for track
gitea/salix/pipeline/head This commit looks good Details
Refs: #5083
2023-01-12 13:53:38 +01:00
Pau dfd264ff82 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 13:29:45 +01:00
Joan Sanchez a1ef67157d Merge pull request '#5081-hotfix-sms-faltas' (!1250) from #5081-hotfix-sms-faltas into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1250
2023-01-12 12:06:56 +00:00
Pau e05fa7c747 Merge branch 'master' into #5081-hotfix-sms-faltas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 13:00:01 +01:00
Pau d5a7691b9c add controller function
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 12:56:51 +01:00
Joan Sanchez 7f29b0c5f9 Merge pull request '5080-mdbApp_primaryKey' (!1249) from 5080-mdbApp_primaryKey into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1249
2023-01-12 11:47:50 +00:00
Pau 2678d59191 front test expected old value
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:57:20 +01:00
Vicent Llopis da8b6b7f2d fix: comprueba que hay registros
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:52:27 +01:00
Pau b6de50848a refs #5081 fix sms faltas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:48:44 +01:00
Vicent Llopis ed90957ab5 fix: corregida primaryKey de mdbApp
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:45:11 +01:00
Joan Sanchez fe6211e965 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 09:56:59 +01:00
Vicent Llopis 2451d00998 Merge branch 'dev' into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 07:59:43 +00:00
Vicent Llopis e4603a06f2 refacotor: borrados los await para que devuelva la promesa
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 08:59:24 +01:00
Vicent Llopis 4b60aacbbe refactor: añadidos valores a piñon a la tabla workerTimeControlConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 08:50:03 +01:00
Joan Sanchez 7f080241f3 Merge pull request 'MASTER_4943-osticket_closeTicket' (!1242) from MASTER_4943-osticket_closeTicket into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1242
2023-01-12 07:41:04 +00:00