Commit Graph

7420 Commits

Author SHA1 Message Date
Alexandre Riera a468fb2c66 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head Build queued... Details
2023-02-10 09:02:44 +01:00
Alexandre Riera 9dc07d88d6 fixing e2e
gitea/salix/pipeline/head This commit looks good Details
2023-02-10 08:56:30 +01:00
Alexandre Riera 194069c0c2 refs #5194 fixed stock, lines 2023-02-10 08:46:54 +01:00
Vicent Llopis 5b22096567 refactor: actuializada consulta par obtener los clientes a facturar. Excluido impresion pdfs de la transaccion
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-09 14:57:08 +01:00
Alex Moreno f496242fcb fix description
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-09 10:28:37 +01:00
Alex Moreno bbf68a88a7 feat: sendEmail checkBox and docuware open clientBalanceCreate with default data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-09 10:26:55 +01:00
Joan Sanchez ebee9144b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 09:16:30 +01:00
Joan Sanchez 461799f137 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 08:56:30 +01:00
Vicent Llopis 222032aae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-02-09 08:38:08 +01:00
Alexandre Riera 725b7b9bce Merge branch 'master' into hotFix-ticketFutureAdvance-warehouse
gitea/salix/pipeline/head This commit looks good Details
2023-02-08 12:48:23 +00:00
Alexandre Riera ef5b29d6f3 hotfix ticketFutureAdvance warehouse
gitea/salix/pipeline/head This commit looks good Details
2023-02-08 13:47:35 +01:00
Alexandre Riera 4413c8828b refs #5152 added confirmation popup
gitea/salix/pipeline/head This commit looks good Details
2023-02-08 10:54:21 +01:00
Vicent Llopis b70311999d refactor: eliminado codigo innecesario y quitado update que se hará directamente en producción
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-08 09:41:09 +01:00
Javi Gallego 4a562c3110 unificado todo a claimState isEditable 2023-02-07 15:40:03 +01:00
Pau 86e6672e49 Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-07 13:39:36 +00:00
Vicent Llopis cec7602e1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-07 13:44:53 +01:00
Vicent Llopis 6cb3930be0 feat: añadido icono info, que indica de que almacén se saca la información
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-07 13:40:39 +01:00
Alexandre Riera 9f2ff4e4b7 addFilter
gitea/salix/pipeline/head This commit looks good Details
2023-02-07 12:30:30 +01:00
Alexandre Riera d3564209ba findById
gitea/salix/pipeline/head This commit looks good Details
2023-02-07 08:05:48 +01:00
Vicent Llopis 2e8aabab14 fix: type relation in models
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 14:32:54 +01:00
Vicent Llopis 499c9fa706 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 14:03:38 +01:00
Vicent Llopis a2f93e68b1 feat: add 'parking' column
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 13:57:04 +01:00
Vicent Llopis 4f76465246 fix: no recarga cada vez
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-06 12:24:26 +01:00
Alexandre Riera 68b4d269ff Merge branch 'dev' into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 09:18:13 +00:00
Alexandre Riera 3879dfc89b Merge branch '5074-ticket-balance-null' of https://gitea.verdnatura.es/verdnatura/salix into 5074-ticket-balance-null
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 08:19:16 +01:00
Alexandre Riera f2f8a4eb04 fix test 2023-02-06 08:19:13 +01:00
Alexandre Riera 2c946b38d4 Merge branch 'dev' into 5074-ticket-balance-null
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-06 07:08:50 +00:00
Alexandre Riera df3e818182 refs #5074 refactor this.receipt.description
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-06 08:07:50 +01:00
Alex Moreno c11df75a82 Merge branch 'master' into hotFix_invoiceIn_supplier_email
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 06:30:56 +00:00
Alexandre Riera fd31547b22 Merge branch 'dev' into 3291-entryLatestBuys-buscador
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 06:00:41 +00:00
Alexandre Riera 546b3f6c9b refs #3291 lateral menu added, fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 15:21:27 +01:00
Alex Moreno 2717c6420c fix(invoiceIn_descriptor): supplier.email
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 14:58:58 +01:00
Joan Sanchez d773837740 Removed user model
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-03 14:44:00 +01:00
Vicent Llopis ba5616055b feat: item.descriptor en summary coge el warehouse por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-03 14:31:50 +01:00
Joan Sanchez 38f34adc9a Merge pull request 'master → test' (!1305) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1305
2023-02-03 12:44:42 +00:00
Vicent Llopis c32a627fe5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4873-zone.delivery-day 2023-02-03 13:23:42 +01:00
Guillermo Bonet ca24de7ee5 refs #4975 Changed description
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 12:50:19 +01:00
Guillermo Bonet dddeca0832 refs #4975 Added property dsName in mdbBranch tab
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 12:46:01 +01:00
Alexandre Riera 0c91f95762 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos 2023-02-03 12:03:16 +01:00
Alexandre Riera 141ae7b11c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 11:56:09 +01:00
Alex Moreno 575784c870 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-03 10:03:59 +01:00
Juan Ferrer f4fc597c2c Merge pull request 'master to test' (!1302) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1302
2023-02-03 08:12:09 +00:00
Pau 6c8609e180 Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 07:52:14 +00:00
Vicent Llopis 508bce73bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-03 08:41:35 +01:00
Pau e3de54b811 changed styles on summary
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 08:35:15 +01:00
Pau 199dd2ba8d Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 06:09:38 +00:00
Alex Moreno 8a50c56284 fix(updateWorkCenter): use vnNew()
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 14:52:40 +01:00
Alex Moreno 6c772643a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-02 11:55:11 +01:00
Joan Sanchez eded1ebf20 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-02-02 11:42:48 +01:00
Alexandre Riera 16a6167db0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 10:39:26 +01:00
Pau cadd525380 Merge branch 'dev' into 5174-refactor-ticket-weekly
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:36:07 +00:00
Joan Sanchez d45c0cb99a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:59:39 +01:00
Joan Sanchez 4477486f8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-02-02 08:58:44 +01:00
Alexandre Riera 5f656a894f buscador
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:52:38 +01:00
Joan Sanchez 85bde58752 Merge pull request 'fixes #4927 supplier.fiscal-data permitir 'Razón social' duplicada' (!1230) from 4927-permitir-razonSocial-duplicada into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1230
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-02 07:47:38 +00:00
Alexandre Riera 780018e4df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:40:49 +01:00
Alexandre Riera 52a3f77bc5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:39:28 +01:00
Alex Moreno 5b228c5e71 Merge branch 'master' into hotFix_getRate2
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 07:35:34 +00:00
Joan Sanchez 7a700de5c2 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-02-02 08:23:17 +01:00
Joan Sanchez 644d98ec1c syncUser() and setPassword() changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 07:32:38 +01:00
Alexandre Riera 547c7a336b Merge branch 'dev' into 5072-comprobar-email-clientFiscalData
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:52:17 +00:00
Pau ec73b512fc Merge branch 'dev' into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 09:26:25 +01:00
Alexandre Riera 73b7a1d761 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5138-cambiarOrdenCampos-routeSummary
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:52:53 +01:00
Alexandre Riera 62766706b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData 2023-02-01 08:52:03 +01:00
Alexandre Riera 7d7e1a74da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:46:28 +01:00
Alexandre Riera d17f9396ad refs #3291 save button
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:43:13 +01:00
Alex Moreno 00ffc82f8d use CURDATE() in rawSQL
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 08:34:14 +01:00
Pau dcd74bacc0 refs #5181 @1h30
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 08:32:22 +01:00
Alex Moreno ae6e0f0772 Merge branch 'master' into hotFix_getRate2
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 06:20:48 +00:00
Alex Moreno 2528b2d3ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:10:51 +01:00
Guillermo Bonet 909f0c3532 Merge branch 'master' into 4975-mdbConfig-and-upload
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 06:09:44 +00:00
Alexandre Riera 11a605ea04 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 15:40:54 +01:00
Alexandre Riera c6f87f9084 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5131-cambios-ticketAdvance
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:39:03 +01:00
Alexandre Riera 349829e5ed refs #5131 fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:29:00 +01:00
Alexandre Riera 3622eda589 refs #5131 added lines liters to origin ticket
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:09:16 +01:00
Joan Sanchez e34d64361b Account refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 14:57:24 +01:00
Guillermo Bonet 18168b07bb refs #4975 Changes
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:47:24 +01:00
Pau 5c0354bc17 add method to check if the ticket has refunds
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 14:26:57 +01:00
Alexandre Riera 19d7e7e610 refs #5131 totalWithVat order
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:23:40 +01:00
Alexandre Riera b70557ee86 refs #5131 agencies icon
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:20:08 +01:00
Juan Ferrer 5045a8f670 #5175 TpvTransaction.confirm(): Return response
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:00:10 +01:00
Guillermo Bonet e12f183968 refs #4975 Added chat/send in mdbVersion/upload
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:46:42 +01:00
Juan Ferrer 5a4ae7d742 refs #5174 TpvTransaction: Methods start & end added, fixes & refactor
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:29:17 +01:00
Alexandre Riera 87bef62e35 refs #5131 hasStock refers to origin
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:21:51 +01:00
Alexandre Riera e5b7ebd8b4 refs #5131 IPT null or value
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:06:58 +01:00
Alexandre Riera 331b278726 refs #5131 checkbox pending origin destination
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 13:00:25 +01:00
Pau 20ffcff219 Merge branch 'dev' into 5174-refactor-ticket-weekly
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:57:56 +00:00
Alexandre Riera 906f80da5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5104-convert-prices
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:56:41 +01:00
Alexandre Riera 9d0891e080 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:43:49 +01:00
Alexandre Riera c121f184b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:43:26 +01:00
Alexandre Riera 1b12770655 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:31:01 +01:00
Alex Moreno 292898708b result not null
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:24:09 +01:00
Alex Moreno 320ceb3e2c fix: getRate2
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:17:31 +01:00
Alexandre Riera ca967a7223 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5138-cambiarOrdenCampos-routeSummary
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:15:46 +01:00
Alex Moreno 62cd6ab0c9 Merge branch 'dev' into fix_e2e_state_and_date
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 09:39:08 +00:00
Alex Moreno 4740cdbbb9 fix: e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:37:18 +01:00
Vicent Llopis 19120ef102 feat: el descriptor coge el warehouseFk dependiendo de la sección
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 09:28:28 +01:00
Alexandre Riera 7d617c0ac4 refs #5129 translations and userErrors added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 09:04:45 +01:00
Juan Ferrer 82bc7307f0 #5174 Signature verification fixed & enabled
gitea/salix/pipeline/head Build queued... Details
2023-01-31 00:41:36 +01:00
Juan Ferrer 424dcb954c refs #5174 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 20:23:52 +01:00
Juan Ferrer 64d8ae1f49 refs #5174 Hotfix
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-01-30 20:22:52 +01:00
Juan Ferrer 339cdab3c4 refs #5174 Debug enabled
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 19:59:46 +01:00
Juan Ferrer d6794cb4c8 #5174 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 19:51:01 +01:00
Juan Ferrer b20194b6d0 #5174 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 17:45:36 +01:00
Juan Ferrer 5744759d53 refs #5122 Hotfix: Signature verification
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 17:33:15 +01:00
Alexandre Riera 444d2ae4c4 refs #5104 grouping/packing unified
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 15:28:47 +01:00
Alex Moreno a74fb31b5b fix: vn.time
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 15:15:27 +01:00
Alexandre Riera 5a72398393 Merge branch 'dev' into 5074-ticketBalance-null
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 14:01:17 +00:00
Alex Moreno c990b9a564 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-30 14:37:24 +01:00
Vicent Llopis a1e86f2bd6 Merge branch 'dev' into fix_e2e_item.tags
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 13:28:50 +00:00
Alex Moreno d2b21d401a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-30 14:27:22 +01:00
Joan Sanchez 8969882793 Removed where property dependency
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 14:13:38 +01:00
Pau 2218197188 Merge branch 'dev' into 5070-route-tickets-link-maps
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 12:51:38 +00:00
Alexandre Riera c3346ebb93 Merge branch 'dev' into 5074-ticketBalance-null
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 12:35:07 +00:00
Alexandre Riera 9cb363e4e5 refs #5074 deleted null in reference
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 13:34:08 +01:00
Vicent Llopis 0d044b3a73 Merge branch 'dev' into fix_e2e_item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 11:51:10 +00:00
Vicent Llopis 3b94f916b7 refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 12:49:01 +01:00
Vicent Llopis 903a42683d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-01-30 12:45:17 +01:00
Juan Ferrer 109556ae2e refs #5122 Hotfix: Basic implementation for payment confirmation
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 12:39:47 +01:00
Pau 6709012e59 refs #5070 @2h refactor goToBuscaman method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 12:33:28 +01:00
Alexandre Riera 8119b301c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-30 12:21:54 +01:00
Alexandre Riera 77742d94d7 refs #5138 summary changed like route/tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 12:19:11 +01:00
Vicent Llopis 0ffbb5fe2c feat: actualizada visualizacion de datos
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-01-30 12:13:01 +01:00
Robert Ferrús 7614b48c9a refs #5115 transfer_sales
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 11:44:14 +01:00
Pau cf64de39f9 refs #5146 @1h add step to vn-inputs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 09:01:20 +01:00
Alexandre Riera 7e5f50e637 refs #5072 email validation added
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 08:30:39 +01:00
Alex Moreno 4e65e88621 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 07:56:12 +01:00
Vicent Llopis 79bf1739ba fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 13:52:14 +01:00
Vicent Llopis 29c6ca35ff fix: test e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-27 13:39:19 +01:00
Pau b1de5bc94e refs #5174, fix banch being created from another branch and not from dev
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 10:06:46 +01:00
Alexandre Riera 0f1f671b84 Merge branch 'dev' into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 09:06:08 +00:00
Alexandre Riera 35157207dd refs #5077 hours set 00:00:00 only when date change
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-27 10:05:03 +01:00
Joan Sanchez 9bf4cd5cff Merge branch 'dev' into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-27 08:20:32 +00:00
Alex Moreno 7d9e7d93e5 Merge branch 'dev' into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:12:32 +00:00
Vicent Llopis 7bcddf73c6 Merge branch 'dev' into 4860-route.index_downloadZip
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:07:19 +00:00
Vicent Llopis eb00d98885 Merge branch 'dev' into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:01:25 +00:00
Vicent Llopis fe3d81ddd3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4873-zone.delivery-day
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:59:52 +01:00
Vicent Llopis f7969c616c fix: tiene el cuenta zonEvent.type
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:59:28 +01:00
Alexandre Riera fccfabdcd1 hotfix viewReceipt clientBalance
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:31:14 +01:00
Vicent Llopis 67a64582e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:21:30 +01:00
Alexandre Riera d69b204c4c refs #5036 loggable refactored, tests fixed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 15:49:30 +01:00
Vicent Llopis 17b3e8c396 Merge branch 'dev' into 4860-route.index_downloadZip
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 13:36:50 +00:00
Alexandre Riera 25f0c0d9e3 refs #5141 province added
gitea/salix/pipeline/head This commit looks good Details
2023-01-26 14:16:30 +01:00
Vicent Llopis 366748a136 fix: se la pasa la fecha shipped para calcular el visible y disponible
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 14:00:29 +01:00
Vicent Llopis f7fa082294 refator: name endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 13:49:09 +01:00
Vicent Llopis 67127554f9 feat: solo muestra los clientes con error y muestra los datos de manera distinta
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 13:12:53 +01:00
Vicent Llopis 0ba95bd163 feat: mostrar error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 09:25:52 +01:00
Alex Moreno 0a096bc96f fix: updateWorkCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 15:29:01 +01:00
Vicent Llopis caf1dcd690 feat: añadido almacén por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 15:19:33 +01:00
Pau ef6b06e147 added logs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 14:44:00 +01:00
Joan Sanchez 12cf79ab39 Updated e2e 2023-01-25 14:14:55 +01:00
Vicent Llopis 77340c8459 refactor: html
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 10:14:37 +01:00
Vicent Llopis 6ea1415895 refactor: traducciones
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 09:46:08 +01:00
Vicent Llopis 4a73e4ae5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 09:24:55 +01:00
Alexandre Riera b72cce9d06 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 08:56:07 +01:00
Vicent Llopis f22f045444 refactor: add css
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 08:27:39 +01:00
Vicent Llopis 06b4e03320 feat: muestra en número de clientes en vez de su id
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 08:15:50 +01:00
Alex Moreno 1f52d04d4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-24 15:01:26 +01:00
Vicent Llopis 61b0aa079a refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 12:40:43 +01:00
Joan Sanchez 2676e09b2b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-01-24 12:34:00 +01:00
Alexandre Riera ca7154bff1 hotfix itemName
gitea/salix/pipeline/head This commit looks good Details
2023-01-24 12:16:10 +01:00
Joan Sanchez 388af5110f Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2023-01-24 11:57:08 +01:00
Joan Sanchez f0b44a2992 Updated back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 10:35:21 +01:00
Vicent Llopis facaee6f95 feat: añadido contador y porcetaje
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 09:45:52 +01:00
Joan Sanchez 3456438485 Model fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 09:20:02 +01:00
Joan Sanchez 0208b31f44 Naming rollback
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 09:12:26 +01:00
Joan Sanchez 3076123c04 Updated models relation
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 09:05:50 +01:00
Joan Sanchez 89eb065f6d Updated models 2023-01-24 09:04:43 +01:00
Vicent Llopis 1154179ddf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 08:11:46 +01:00
Vicent Llopis ec5e2a21f7 feat: añadido icono carro
gitea/salix/pipeline/head This commit looks good Details
2023-01-24 08:09:35 +01:00
Vicent Llopis 084a3f0398 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4860-route.index_downloadZip
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 08:05:18 +01:00
Joan Sanchez ee1ce21bb9 refactor(account): account model refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 15:24:00 +01:00
Alex Moreno fe656aa125 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 14:10:20 +01:00
Alexandre Riera 07d3fef8f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 13:44:19 +01:00
Alexandre Riera 635e787cce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 13:26:05 +01:00
Alex Moreno ce06274d0a Merge branch 'dev' into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 07:12:26 +00:00
Alex Moreno 8a844917ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 08:07:14 +01:00
Pau b446f5cf5f Merge branch 'dev' into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 07:21:53 +01:00
Pau 2e988ea701 doPhoto updated on item upload
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 13:34:36 +01:00
Vicent Llopis 9523991b04 fix: mostrar descriptor worker en vez de item
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 12:45:02 +01:00
Vicent Llopis ab1a9389cb fix: cambiados de donde coge el item id
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 12:37:41 +01:00
Vicent Llopis b1be6addd1 fix: delete unnecessary code
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 12:16:06 +01:00
Alexandre Riera a473d3a6f9 refs #4945 changed input-number for autocomplete
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 12:01:13 +01:00
Alexandre Riera 199fabbb1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-20 10:11:52 +01:00
Alexandre Riera 89700f71f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-20 10:05:42 +01:00
Alexandre Riera f30b1ecff1 refs #4927 changed hook for validateAsync
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 10:03:00 +01:00
Vicent Llopis 7148da7b72 feat: cuando se descarga una sola factura, no descarga el zip
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:53:30 +01:00
Vicent Llopis f7b314daf4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4860-route.index_downloadZip 2023-01-20 08:32:54 +01:00
Alex Moreno a674169ddb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:30:30 +01:00
Vicent Llopis ef7a0508ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:29:42 +01:00
Vicent Llopis 5d19da48e2 refactor: actualizada consulta sql
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:16:02 +01:00
Joan Sanchez 781c751229 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 07:42:36 +01:00
Alexandre Riera 292372395e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-20 07:15:03 +01:00
Vicent Llopis eefafb3ac2 fix: available is cero
gitea/salix/pipeline/head This commit looks good Details
2023-01-19 15:14:31 +01:00
Vicent Llopis dfcacdad71 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4903-workerTimeControl_sendMail
gitea/salix/pipeline/head This commit looks good Details
2023-01-19 08:56:39 +01:00
Vicent Llopis 921b5cf3fb add excluded test
gitea/salix/pipeline/head This commit looks good Details
2023-01-19 08:54:36 +01:00
Vicent Llopis 92a9004d98 fix: borrada propiedad transaction cuando se hace commit 2023-01-19 08:54:26 +01:00
Vicent Llopis 38e4349e17 borrado comentario
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 14:25:24 +01:00
Vicent Llopis 2c995208d1 fix: transaccionado por trabajador y día
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 14:23:05 +01:00
Alexandre Riera e6d6e85217 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-18 13:19:56 +01:00
Alexandre Riera 200a256016 Merge branch 'dev' into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-18 12:15:12 +00:00
Alexandre Riera be5f987b0a refs #4945 added defaultTag, validPriorities, defaultPriority in itemConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 13:14:49 +01:00
Vicent Llopis 7368b572a0 fix: añadidos await y actualizado condicional permissionRate
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 13:05:02 +01:00
Alexandre Riera 98d6322b0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5020-borradoLogico-IPT
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 08:00:20 +01:00
Vicent Llopis ae051c73f2 feat: añadir clientes al principio del array y borrarlos si han sido OK
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-01-18 07:26:57 +01:00
Vicent Llopis 849f4e1a6d fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 14:24:04 +01:00
Vicent Llopis ea36c0deb5 feat: el pdf de las rutas se descarga en un zip
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-17 14:06:18 +01:00
Vicent Llopis b7004e6a76 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-01-17 12:50:34 +01:00
Joan Sanchez 1597c40a16 Merge branch 'dev' into 4930-add-zone
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 11:33:56 +00:00
Vicent Llopis 41914f9e4f feat: añadido desplegable impresora
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:46:16 +01:00
Alex Moreno bc9510a317 Merge branch 'dev' into 4523-item_fixed-price_rate2
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:46:16 +00:00
Pau 99338bb6f8 isPhotoRequired implemented 2023-01-17 10:11:41 +01:00
Alexandre Riera 2b7383af74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:11:19 +01:00
Alexandre Riera 77eb9c8013 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:10:23 +01:00
Alexandre Riera 4e1c43eb4d refs #4945 nombre temporal removed
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:01:49 +01:00
Pau 3a1aea2afd Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:01:45 +00:00
Vicent Llopis eef926d09d fix: fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:34:51 +01:00
Alexandre Riera e97a02a871 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-17 09:02:27 +01:00
Alexandre Riera c47cac7d55 refs #5020 isActive column added, filter in front
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 08:54:26 +01:00
Alexandre Riera fea76f29e7 Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 07:31:45 +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
Alex Moreno e27a559416 refactor: replace all Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 15:18:24 +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 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
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
Alexandre Riera b3c6443277 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 10:33:35 +01: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
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 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 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
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
Alexandre Riera 41671e8a3a refs #4927 modified hook to check name & country
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 08:38:29 +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
Alexandre Riera f01b729a61 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-12 14:09:39 +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 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
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 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 882cf6b9c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-01-12 08:36:24 +01:00
Vicent Llopis 352fba9acf Merge branch 'dev' into 5035-intermittent_backTest
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 07:32:44 +00:00
Alex Moreno c2f4648b5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 07:54:09 +01:00
Joan Sanchez 3f7dee63ac Merge branch 'dev' into 4873-zone.delivery-day
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 06:17:58 +00:00
Guillermo Bonet d448f41ac1 refs #4975 Changed description of last method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-11 15:39:33 +01:00
Alex Moreno 9f324483d6 refactor(docuware): only use axios and refactor all
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 15:19:09 +01:00
Pau c908a71ebf Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 13:22:40 +00:00
Alexandre Riera a0491de9f9 refs #5036 refactor transaction and fixing ticket logs
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 13:24:55 +01:00
Vicent Llopis f7ee6c18ca refactor: movido codigo que imprime pdf dentro del try
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 13:04:56 +01:00
Vicent Llopis 1df6ce170d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head Build queued... Details
2023-01-11 12:38:47 +01:00
Vicent Llopis 9042eaaf9f add fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 12:38:37 +01:00
Vicent Llopis caff537f2e feat: imprime las facturas
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 12:29:03 +01:00
Vicent Llopis 020068006c fix: manejado error si no se selecciona una empresa
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 11:57:52 +01:00
Pau 30524e382b Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 09:23:40 +00:00
Alex Moreno b8fe919b2a feat(docuware): upload deliveryNote file
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 15:03:23 +01:00
Vicent Llopis 3e920e6a2f corregida traduccion
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 14:34:25 +01:00
Vicent Llopis ae3b26b202 Merge branch 'dev' into 4873-zone.delivery-day
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 13:14:12 +00:00
Vicent Llopis 6f94987392 Merge branch 'dev' into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 13:11:06 +00:00
Pau e0cf45546e Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-10 12:57:39 +00:00
Pau 4f2472ea90 Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-10 13:56:15 +01:00
Pau d540e278eb refs #4605 @30min
gitea/salix/pipeline/head This commit is unstable Details
2023-01-10 13:52:30 +01:00
Vicent Llopis 484b8d42e1 fix: corregido sql
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 13:31:20 +01:00
Vicent Llopis 984a3294f9 Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 11:58:00 +00:00
Alexandre Riera 9f1c6e6d1d Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 10:48:10 +00:00
Alexandre Riera 6bdbd77640 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone 2023-01-10 10:15:41 +01:00
Vicent Llopis ac3e68d846 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-intermittent_backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-10 10:14:46 +01:00
Vicent Llopis ff653ad834 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 09:18:02 +01:00
Alexandre Riera 28ac2677a3 Merge branch 'dev' into 4937-marcar-verRecibo
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 08:02:51 +00:00
Joan Sanchez 4cfa63918f Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 07:41:26 +00:00
Vicent Llopis eb3ed95b22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked 2023-01-10 08:32:44 +01:00
Alexandre Riera 07fc5b69ad Merge branch 'dev' into 4926-add-itemPackingOut
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 07:32:03 +00:00
Vicent Llopis cdee85e1e8 refacotor: change description
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 08:31:32 +01:00
Guillermo Bonet f23eb9f4ad refs #4975 Added call to last method in upload
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-09 18:28:09 +01:00
Alex Moreno 382aad2622 feat(docuware): upload and send pdf
gitea/salix/pipeline/head This commit looks good Details
2023-01-09 15:11:53 +01:00
Vicent Llopis e659f0f020 refacotor: delete duplicated variable
gitea/salix/pipeline/head This commit looks good Details
2023-01-09 14:55:25 +01:00
Vicent Llopis 84788afc10 delete: old button
gitea/salix/pipeline/head This commit looks good Details
2023-01-09 14:51:41 +01:00
Vicent Llopis 5a5e4c5afb feat: solo coge los tickets que no esten eliminados
gitea/salix/pipeline/head This commit looks good Details
2023-01-09 14:47:52 +01:00
Guillermo Bonet 2803de9445 refs #4975 Return JSON {version:xxx}
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-05 14:20:47 +01:00
Robert Ferrús 6891da4863 refactor(invoiceOut): updated translation
gitea/salix/pipeline/head This commit looks good Details
Refs #4857
2023-01-05 11:43:08 +01:00
Vicent Llopis 1aa21c16b5 refactor: borrado join a worker
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 11:42:21 +01:00
Vicent Llopis 810a1afcd9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel 2023-01-05 11:40:25 +01:00
Vicent Llopis d16235cba9 fix: show error when is negative base
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 10:55:56 +01:00
Vicent Llopis 3abbfc4fa7 refacotr
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 10:35:55 +01:00
Vicent Llopis fd9ca3a4c1 add test 2023-01-05 10:35:49 +01:00
Pau f0761a92a2 reactivate working tests 2023-01-05 09:26:11 +01:00
Alex Moreno 46f36e1de1 try
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-04 15:03:45 +01:00
Alex Moreno 021c475de7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2023-01-04 09:39:26 +01:00
Alex Moreno 9c044dc95b fix: phone
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 09:38:43 +01:00
Alex Moreno 9b98249398 test: front test and e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 09:23:18 +01:00
Alexandre Riera 6ff17f0af0 Merge branch 'dev' into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 13:51:28 +00:00
Alex Moreno ef437f2fee test: e2e and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 14:50:29 +01:00
Vicent Llopis ac5aa815f1 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-01-03 14:35:18 +01:00
Vicent Llopis 21a62a0fab refactor
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 13:29:44 +01:00
Vicent Llopis fec965a8dd refs 4925 refactor: borrados console.log y actualizada descripción 2023-01-03 13:29:27 +01:00
Pau 56354ba771 reactivate test 2023-01-03 13:24:44 +01:00
Vicent Llopis 22d0da273e refs #4925 fix: coge únicamente los últimos cambios aplicados
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 13:21:51 +01:00
Alexandre Riera ac56744244 Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:15:26 +00:00
Vicent Llopis ddfee57470 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 13:09:02 +01:00
Vicent Llopis 415fa04e3b refs #2952 feat: add chips
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 13:06:30 +01:00
Vicent Llopis 25dad4b358 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked 2023-01-03 13:03:36 +01:00
Alexandre Riera c6ad9a6aff Merge branch 'dev' into 4937-marcar-verRecibo
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:00:39 +00:00
Pau 4dee2313f4 Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:53:03 +01:00
Alexandre Riera 2eea1e68e8 Merge branch 'dev' into 4926-add-itemPackingOut
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 11:45:35 +00:00
Alex Moreno 29483bcc1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2023-01-03 12:28:55 +01:00
Vicent Llopis fa58ac2462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 09:13:47 +01:00
Vicent Llopis fe7f388f3d Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:07:31 +00:00
Alexandre Riera 9887f87dd3 refs #5051 pending added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:34:46 +01:00
Alex Moreno 46c3d87dab feat(worker_create): add vn-acl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:09:46 +01:00
Alex Moreno aa5cfde1ae test(worker_new): add back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 14:52:03 +01:00
Alexandre Riera 96f2e4b542 refs #5051 skipped tests and changed fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-02 13:35:33 +01:00
Alexandre Riera 7fcc787a69 Merge branch 'dev' 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-02 07:14:59 +01:00
Alexandre Riera f027a7b07f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4937-marcar-verRecibo 2023-01-02 07:12:10 +01:00
Alexandre Riera 7d61933a3c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 07:07:09 +01:00
Vicent Llopis 3792a80ad5 refs #4925 feat: añadido back para editar tags
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-29 14:24:32 +01:00
Vicent Llopis 2b62e16164 fix: test
gitea/salix/pipeline/head This commit looks good Details
2022-12-29 11:47:12 +01:00
Vicent Llopis dc93454ac3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2022-12-29 11:34:54 +01:00
Pau edcc55df26 refs #4875 @3h disable random to be able to test with some kind of reliability
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-29 10:01:38 +01:00
Vicent Llopis 3801436dc0 feat: mostrar fallos, mostrar más datos y actualizar estilo
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-29 08:15:04 +01:00
Vicent Llopis 4579758ba6 refactor: add translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-29 07:20:07 +01:00
Alexandre Riera 502461fde5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4926-add-itemPackingOut
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 13:25:10 +01:00
Vicent Llopis d5b626434b refactor: add translations, change css...
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:42:51 +01:00
Vicent Llopis ab0af27f8b refactor: delete changes in ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:23:41 +01:00
Vicent Llopis d0ae97e41b refactor: move changes from ticket.sale-checked to ticket.sale-tracking
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:16:23 +01:00
Vicent Llopis ba7e5d6a91 refator: se usa loopback cuando se puede
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 11:56:34 +01:00
Alex Moreno 2c5e42d408 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-28 11:49:16 +01:00
Alexandre Riera 9971611a0b Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 09:31:33 +00:00
Alexandre Riera b6e17d3489 Merge branch 'dev' into 4971-filtrar-articulo
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 09:16:14 +00:00
Alexandre Riera 30197e9e15 Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 09:07:26 +00:00
Vicent Llopis eed6d05e23 delete console.log
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 08:51:39 +01:00
Vicent Llopis eb4cb318ed refactor: evitar join innecesarios en el filter general
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 08:43:02 +01:00
Alex Moreno bee65f9c69 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2022-12-28 07:24:08 +01:00
Vicent Llopis 3dd0c79629 feat: add ItemShelvingSales/filter
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 15:00:49 +01:00
Vicent Llopis 4295ae0108 delete
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-27 14:17:16 +01:00
Vicent Llopis 7b8a9791b4 refactor: code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-27 13:50:10 +01:00
Vicent Llopis b406551f52 delete: old section
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-27 12:21:12 +01:00
Vicent Llopis e324716f2f feat: add subsection Global invoicing 2022-12-27 12:21:04 +01:00
Alexandre Riera c06c3dc6a7 refs #4957 saleChecked deleted
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 11:50:58 +01:00
Alexandre Riera 5eda1388ef refs #4927 unique key added
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 10:26:56 +01:00
Alexandre Riera 96a6f0b9d9 refs #4926 packingOut added
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 07:48:09 +01:00
Pau 1c1cc93ef4 Merge branch 'master' into Hotfix-crear-report-Factura-Electronica
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-26 06:18:47 +00:00
Alexandre Riera d827795441 refs #4930 agency changed for zone
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:38:05 +01:00
Vicent Llopis fb325d5e65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 12:34:51 +01:00
Vicent Llopis 29e66157ea fix: se excluyen los test de back que fallan intermitente
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:29:28 +01:00
Vicent Llopis d3a9e9ac89 delete: columnas que ya no existen en la tabla
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:17:24 +01:00
Alexandre Riera 7d1b8c8c56 refs #4971 itemSearchFunc added
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:11:24 +01:00
Vicent Llopis 16c20e4700 feat: add itemShelvingSale popup
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:08:16 +01:00
Alexandre Riera 53b5ef6d78 refs #4937 viewReceipt added
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 11:48:59 +01:00
Vicent Llopis 682b6d8961 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 09:59:21 +01:00
Alexandre Riera cf527dd8be refs #4588 hook added
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 09:37:19 +01:00
Joan Sanchez 93c98e05fc fix(discount): handle error for a worker without business contract
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 08:27:03 +01:00
Alexandre Riera aec22fad9d Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 08:16:36 +01:00
Joan Sanchez 606bacbad7 Merge branch 'dev' into 4531-monitor_duplicates
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 10:37:48 +00:00
Vicent Llopis 7f80c7ed2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 09:30:35 +01:00
Pau 314bd69d6e Merge branch 'master' into Hotfix-crear-report-Factura-Electronica
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-22 06:13:01 +00:00
Guillermo Bonet 5a25b0ef4c refs #4975 Added model MdbVersionTree
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 07:12:44 +01:00
Guillermo Bonet d97a2738a4 refs #4975 Upload method modified and addedd model
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 07:12:09 +01:00
Vicent Llopis 8880a83b89 feat: añadido saleTracking
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 15:03:41 +01:00
Alex Moreno 7e6cdc9152 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 13:47:54 +01:00
Alex Moreno 502a692521 test(item_fixedPrice_rate2): backTest and e2e
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 12:55:11 +01:00
Vicent Llopis 630890cd04 fix: colum name in model
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 12:23:16 +01:00
Vicent Llopis 06075aa17b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms 2022-12-21 12:15:21 +01:00
Vicent Llopis 3a33750890 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 10:11:37 +01:00
Vicent Llopis a1134879e6 Merge branch 'master' into hotfix_4961-travel.extra-community
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:57:59 +00:00
Vicent Llopis 7261415e16 fix: añadido length
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 09:36:31 +01:00
Alex Moreno b4b7b8e204 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2022-12-21 09:08:39 +01:00
Alexandre Riera 081ef7fc99 Merge branch 'dev' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 07:30:17 +00:00
Vicent Llopis 1d7145d74b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:05:19 +01:00
Vicent Llopis 5a4a78d045 Merge branch 'dev' into 3951-invoiceOut.index_downloadZip
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 07:02:12 +00:00
Pau c9b4e1ab9a Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 06:38:20 +00:00
Vicent Llopis 799c26796e feat: añadidos chips
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 15:19:05 +01:00
Pau 90b36bf1ab Fix missing report for the invoice electronic notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 14:21:01 +01:00
Alexandre Riera 62152d1668 Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 12:16:40 +01:00
Alexandre Riera 721123381c Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:54:22 +01:00
Alexandre Riera 4c6a735235 refs #4962 moved sql and methods to ticket
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:53:54 +01:00
Alexandre Riera 8403af7db5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:37:40 +01:00
Alexandre Riera 342eec1e41 refs #3963 autoload fixed
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:36:58 +01:00
Alexandre Riera b356839148 refs #3963 autoload fixed 2022-12-20 11:36:37 +01:00
Vicent Llopis 8b5f5d928e fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 10:40:39 +01:00
Vicent Llopis b7100873a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadZip
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 10:11:52 +01:00
Alexandre Riera 284f9f418b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 09:54:47 +01:00
Alexandre Riera 6ef282feda refs #4962 updated merge, changed autoload, changed tf->Future
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 09:54:28 +01:00
Vicent Llopis 63343998d8 refactor: cambiada la forma en que se descarga el zip
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 09:48:58 +01:00
Joan Sanchez c063c0e72f fix(pagination): duplicated rows on paginate
gitea/salix/pipeline/head This commit looks good Details
Refs: #4531
2022-12-20 09:48:41 +01:00
Vicent Llopis 1a616fa1d4 refactor: delete transaction
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 09:09:21 +01:00
Pau d8cae400a8 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 07:11:59 +00:00
Alexandre Riera cd71a59dfe Merge branch 'dev' into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 07:01:45 +00:00
Alex Moreno 5d2b69d063 test(item_fixedPrice): front recalculateRate2
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 15:06:59 +01:00
Alex Moreno f82870bec6 feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 14:39:38 +01:00
Pau 5a01e49f27 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-19 12:25:58 +00:00
Guillermo Bonet dc82e610b7 refs #4975 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 11:24:18 +01:00
Alex Moreno 17a3896c1c Merge branch 'dev' into 4548-invoiceIn-pdf-2
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:32:52 +00:00
Guillermo Bonet a46c2ced7c refs #4975: Added last mdbVersion/last method
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:26:07 +01:00
Pau 28e0d0566c Merge branch 'dev' into 4875-skip-tests
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 06:13:45 +00:00
Alexandre Riera 45b02c3bc6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 13:45:25 +01:00
Alexandre Riera 98c9e0ac50 refs #4962 autoload added and second header
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 13:42:23 +01:00
Alexandre Riera fb4432b088 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-16 13:06:06 +01:00
Alexandre Riera b72cb64bf8 refs #4928 findById 2022-12-16 12:50:09 +01:00
Alex Moreno 2a8a928ac5 feat: create invoiceIn
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 10:36:18 +01:00
Alexandre Riera 855f00b1c9 Merge branch '4700-split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 09:51:40 +01:00
Alexandre Riera 45317c0850 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 14:26:10 +01:00
Alexandre Riera 522000cd04 refs #4928 fix fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 09:52:34 +01:00
Alexandre Riera 5a975d0b05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 09:22:36 +01:00
Alexandre Riera 33196acac6 refs #4928 fixture notification, fix test supplier
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 08:31:47 +01:00
Joan Sanchez c004a2917d Merge pull request 'refs #4204 Added param URL labelCount and' (!1204) from 4204-collection-label-labelCount into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1204
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:24:34 +00:00
Joan Sanchez 3b9cd5be09 Merge pull request 'fixes #4859 export_db' (!1200) from 4859-export_db into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1200
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-12-15 07:21:01 +00:00
Joan Sanchez e6867f6004 Merge pull request '4898-expedition-pallet-label' (!1203) from 4898-expedition-pallet-label into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1203
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:20:00 +00:00
Vicent Llopis 4e8896202a delete: transacción innecesaria
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 07:17:26 +01:00
Vicent Llopis 6793b8e9a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-12-15 07:13:09 +01:00
Guillermo Bonet 76001ec022 refs #4204 labelCount argument not required
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 16:15:41 +01:00
Alex Moreno 156f2b9129 feat: handle errors and autogenerate user and code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 15:03:55 +01:00
Vicent Llopis e616835600 delete: hasDateRange()
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:40:28 +01:00
Vicent Llopis f7a97a8139 fix: siempre muestra el botón si hay datos
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:31:56 +01:00
Alexandre Riera f80f851e8d refs #4962 model TicketFuture deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:10:33 +01:00
Alexandre Riera 2baa4a1954 refs #4962 ticket tour future refactor 2022-12-14 12:26:18 +01:00
Alex Moreno b378598113 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-12-14 10:15:11 +01:00
Alex Moreno c14059df75 fix(supplier_consumption): fix JOIN
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 10:12:51 +01:00
Guillermo Bonet b7a369a41c refs #4204 Added param URL labelCount and
gitea/salix/pipeline/head There was a failure building this commit Details
changes in the css
2022-12-13 18:05:29 +01:00
Alexandre Riera 050010c09f refs #4700 success translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 14:03:37 +01:00
Alexandre Riera dce48a8a93 refs #4700 corrections
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 14:00:46 +01:00
Alex Moreno 1e0b0028f2 fix: only edit structure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 13:37:25 +01:00
Alexandre Riera 72c27f7176 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 12:37:56 +01:00
Alex Moreno 8900656b14 Merge branch 'dev' into 4859-export_db
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 08:29:32 +00:00
Alexandre Riera 86a58a26ea Merge branch 'dev' into 4893-formato-correo
gitea/salix/pipeline/head This commit looks good Details
2022-12-13 08:07:48 +00:00
Guillermo Bonet d7a6350995 refs #4898 Created report expedition-pallet-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 18:27:45 +01:00
Alex Moreno bb944f9fee feat(newWorker): use worker-welcome
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 15:05:49 +01:00
Alex Moreno 09edb99a1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-12-12 13:48:06 +01:00
Alex Moreno 4cb8d8c763 test: enable one test and skip another
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 13:11:45 +01:00
Vicent Llopis 2e14e04ed0 Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 11:17:15 +00:00
Vicent Llopis 9bcef08397 feat: buscar por responsibleFk sin afectar a la consulta principal
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 12:08:30 +01:00
Alex Moreno b2dcb84a7b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db 2022-12-12 11:57:27 +01:00
Joan Sanchez f93398c783 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 10:27:28 +01:00
Alexandre Riera 704cb71b61 refs #4866 instance log added and e2e done
gitea/salix/pipeline/head Build queued... Details
2022-12-07 13:53:59 +01:00
Alex Moreno 995fb6a5c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db
gitea/salix/pipeline/head This commit is unstable Details
2022-12-02 13:13:53 +01:00
Vicent Llopis 14a3a815da fix(invoiceOut): pdf adjunto correcto. Corregido valor NaN en intrastat. Sólo muestra intrstar en fact CEE
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-02 12:05:25 +01:00
Joan Sanchez 6128414685 m3 decimal
gitea/salix/pipeline/head This commit looks good Details
2022-12-02 11:26:21 +01:00
Joan Sanchez 0c4ab815fd decimal
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-12-02 11:24:08 +01:00
Joan Sanchez 6562b68341 fix(agencyTerm): permitir decimales en m3 minimos
gitea/salix/pipeline/head This commit looks good Details
2022-12-02 11:16:49 +01:00
Alexandre Riera 48a7635449 refs #4893 regex changed
gitea/salix/pipeline/head This commit looks good Details
2022-12-02 09:18:52 +01:00
Pau 691d157da8 Merge branch 'dev' into 4875-skip-tests
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 13:33:52 +00:00
Pau c54844f7ff removed pending from working test
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 14:32:05 +01:00
Joan Sanchez e815292d6b fix(componentUpdate): updated filter where sintax
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 09:24:56 +01:00
Joan Sanchez 6cb0e518d4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-01 07:33:38 +01:00
Vicent Llopis 4c0effc48a refacor: description actualizada
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-01 07:25:18 +01:00
Vicent Llopis 6c59a3098d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel 2022-12-01 07:24:40 +01:00
Vicent Llopis 444d495b7f refactor: codigo reducido
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 07:22:13 +01:00
Vicent Llopis ba8fe7dfa8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 07:11:00 +01:00
Alex Moreno 8df7b91127 fix: entry ref
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 15:24:33 +01:00
Alex Moreno 43bd583d6f Merge branch 'dev' into 4875-skip-tests
gitea/salix/pipeline/head This commit looks good Details
2022-11-30 13:49:59 +00:00
Pau 79f8e30ded add pending to the tests
gitea/salix/pipeline/head This commit looks good Details
2022-11-30 14:49:00 +01:00
Pau 67384b724d refs #4875 skipped failing test
gitea/salix/pipeline/head This commit looks good Details
2022-11-30 14:41:03 +01:00
Alex Moreno b769845a28 hotFix: not transfer all sales if all sales is negatives
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 14:29:44 +01:00
Vicent Llopis c1089c637a fix: backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 13:43:29 +01:00
Vicent Llopis 1588492f9a feat: solo añade los logs de salix con el model 'Sale'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 13:29:39 +01:00
Vicent Llopis 68855add59 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 10:53:54 +01:00
Pau 97baa89a71 Merge branch 'dev' into hotfix(#4914)-Bug-Client-Phone
gitea/salix/pipeline/head This commit looks good Details
2022-11-30 09:52:19 +01:00
Alexandre Riera 492b852be8 delete orderBy
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 09:22:53 +01:00
Pau bef1071316 refs #4914 @1h
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 09:22:03 +01:00
Alexandre Riera 27078595ce fix balances
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 08:39:04 +01:00
Pau 02598ced92 solve merge conficts 2022-11-30 07:12:26 +01:00
Pau 2d7b3cc3a2 Merge branch 'dev' into 4871-socialName-on-client-filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 13:13:57 +00:00
Joan Sanchez 990dd88e2c Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1186
2022-11-29 13:08:38 +00:00
Joan Sanchez 5f3e7c3384 Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 11:49:06 +00:00
Alexandre Riera cd8d5efa88 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 10:29:18 +01:00
Pau ddc543ad63 Merge branch 'dev' into 4557-duplicate-tickets-in-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 08:22:05 +00:00
Alexandre Riera acbd0474a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 08:50:48 +01:00
Vicent Llopis e3e337c02e fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 14:28:47 +01:00
Vicent Llopis 4b54cf954b refactor: envia el email con formato Verdnatura
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 13:56:21 +01:00
Carlos Andrés 2a4e8cdde9 Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 12:19:58 +00:00
Pau 0d6e424a3e allow client search by socialname 2022-11-28 10:21:01 +01:00
Alex Moreno da2d1df522 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio 2022-11-28 10:14:16 +01:00
Alex Moreno 804db15ece Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-28 07:53:51 +01:00
Vicent Llopis 7f3265be55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel 2022-11-25 12:24:00 +01:00
Vicent Llopis d15e2551a2 feat: add frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 12:16:01 +01:00
Vicent Llopis af87fc2d53 fix: modelo incorrecto
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 11:51:07 +01:00
Vicent Llopis bca79e1240 feat: add backTest 2022-11-25 11:50:54 +01:00
Alexandre Riera 8fec0670ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-25 10:25:46 +01:00
Pau 8f98082910 refs #4791 @2h
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:59:02 +01:00
Vicent Llopis e540bf7b31 feat: inserta en la nueva tabla ticketSms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:38:34 +01:00
Carlos Andrés 8d2e532167 #4613 eliminar uso de portfolio
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:32:54 +01:00
Vicent Llopis dbbce77cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 07:41:43 +01:00
Pau 65f82c8fc1 Merge branch 'dev' into 4557-duplicate-tickets-in-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 06:05:05 +00:00
Vicent Llopis 84c6604dd9 feat: enviar sms con cambios en el pedido
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 15:04:15 +01:00
Pau 7c71e40cc5 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 13:15:54 +00:00
Joan Sanchez 0f40aa3e27 Merge pull request 'refs #4844' (!1175) from 4844-traduccion into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1175
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-11-24 12:49:53 +00:00
Pau 001c3ec2ac requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 12:06:13 +01:00
Vicent Llopis 20d0d053ac Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 11:03:23 +00:00
Vicent Llopis 74e8789439 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 10:54:40 +00:00
Pau 37a7a12f87 requested change
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 11:47:32 +01:00
Vicent Llopis b8c6734798 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 09:40:43 +00:00
Pau f74b257d75 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:27:49 +00:00
Pau 6a30074a6a Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:23:00 +00:00
Vicent Llopis 927b5a63ec Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 09:14:01 +00:00
Alexandre Riera 32e4a7273c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:59:59 +01:00
Alexandre Riera 5124b3b681 Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 08:42:09 +00:00
Alexandre Riera 23cf2d9aaf Merge branch 'dev' into 3949-invoiceIn-add-docFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 08:33:39 +00:00
Vicent Llopis 7ccf37c079 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 08:08:56 +00:00
Vicent Llopis 6f2a7a5cef feat: enviar sms con cambios en las líneas
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 15:15:40 +01:00
Alex Moreno f70a9cb785 feat(worker_new): use resetPassword funcionality
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 14:46:25 +01:00
Alex Moreno cbdffc98a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-23 14:16:42 +01:00
Vicent Llopis 14eba75a8e feat: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 14:08:43 +01:00
Vicent Llopis 1c6a5164d4 feat: buscar por itemFk y claimResponsibleFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 14:04:43 +01:00
Alexandre Riera 164b797ab8 front and e2e tests done
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 11:09:32 +01:00
Vicent Llopis 9a47b2fea4 Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 10:00:27 +00:00
Vicent Llopis f313a53cde refactor: cambiadas fixtures, backTest y traducciones
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 10:56:55 +01:00
Vicent Llopis 6a2af344aa feat: antes de bloquear comprobar que no existe un bloqueo previo
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 10:41:32 +01:00
Vicent Llopis 9cfab2b3f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-11-23 10:23:17 +01:00
Vicent Llopis bf782c3782 fix: añadido esquema account
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 10:09:09 +01:00
Vicent Llopis e854fd248e feat: add checkInBox 2022-11-23 10:08:58 +01:00
Pau a8520f851c Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 08:28:07 +00:00
Pau ad38f50ae3 Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 08:55:46 +01:00
Pau ade2e777d6 refs #4457 @30min requested changes 2022-11-23 08:55:44 +01:00
Pau 88db9c0d80 Merge branch '4789-search-ticket-without-invoice' of https://gitea.verdnatura.es/verdnatura/salix into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 08:25:20 +01:00
Pau 4c4e0e109d refactor test to use toBeGreaterThan 2022-11-23 08:25:15 +01:00
Pau b6ff1d99b1 Merge branch '4791-refactor-sendsms' of https://gitea.verdnatura.es/verdnatura/salix into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 08:20:13 +01:00
Pau 0b6d7eaffc refs #4791 @30min fix broken test 2022-11-23 08:20:12 +01:00
Vicent Llopis ccce6af021 fix: add translations
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 07:57:27 +01:00
Pablo Natek 83ed79569a refs #4844
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 20:45:18 +01:00
Pau 51d3091a40 Merge branch 'dev' into 4511-kkear-expedition.itemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 13:45:03 +00:00
Pau bb640da8f0 Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 13:44:23 +00:00
Vicent Llopis df4acb70a3 feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 14:43:21 +01:00
Vicent Llopis e0ba7d523c refacfor: add ctx 2022-11-22 14:43:15 +01:00
Alex Moreno 660648e01f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-22 14:35:25 +01:00
Alexandre Riera 8613b196d8 Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 13:31:04 +00:00
Vicent Llopis 32f28e91b5 feat: sistema de bloque para ficheros mdb
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 14:29:42 +01:00
Alexandre Riera d7843f3298 Merge branch '4547-fix-compensation' of https://gitea.verdnatura.es/verdnatura/salix into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 14:24:55 +01:00
Alexandre Riera 34fb80beec fix translations 2022-11-22 14:24:19 +01:00
Joan Sanchez 7e12938de3 Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 12:53:03 +00:00
Alexandre Riera 5552cd654e Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:48:11 +00:00
Alexandre Riera d5521adb6b working on tests
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 11:44:36 +01:00
Alexandre Riera 6656ea4f54 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:20:42 +01:00
Alexandre Riera 2651081838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:15:31 +01:00
Alexandre Riera c51354b13f refs #3949 textfield, edit and create dialog added
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 09:29:25 +01:00
Vicent Llopis 8876bc2b68 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 08:12:07 +00:00
Pau 3b66da20ca Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 07:01:33 +00:00
Pau 4bd643143b requested changes refs #4791 @1h
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 07:59:18 +01:00
Pau cb6ae41c13 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 13:45:28 +00:00
Pau fc08b27fb6 Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 13:42:53 +00:00
Pau 3003290e61 refs #4551 @20min requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 14:38:51 +01:00
Pau 0099b42fe3 requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 14:06:38 +01:00
Alex Moreno 26be27c2ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 13:13:25 +01:00
Alexandre Riera 6ddd2d95a5 insert acl
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:48:18 +01:00
Alexandre Riera 4c21ffac3b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:44:53 +01:00
Alexandre Riera 463e56b631 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:41:17 +01:00
Alexandre Riera 40ea9805cf fixes #4547 check compensation and tests
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 10:49:19 +01:00
Pau b788415920 Merge branch 'dev' into 4767-route.index-delete-route
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 08:46:32 +00:00
Pau cb0735d136 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 08:34:18 +00:00
Pau 68e4eea2e3 Merge branch 'dev' into 4767-route.index-delete-route
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 08:32:39 +00:00
Pau 153f5f56fa fix test refs #4791 @30min
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 09:11:17 +01:00
Vicent Llopis 3fde11c3ed Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 08:06:39 +00:00
Pau 4e97d931f7 refs #4791 @2h 2022-11-21 08:45:45 +01:00
Vicent Llopis 4c4482c40a Merge branch 'dev' into 4832-refactor_workerTimeControl.sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 06:09:05 +00:00
Pau c320342476 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 06:05:43 +00:00
Joan Sanchez 813cf78128 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-18 14:03:09 +00:00
Pau 0f17c082a3 refs #4557 @1h left join note only delivery
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 12:07:33 +01:00
Alex Moreno ef6af87d89 feat: add supplier.isVies funcionality
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-18 09:21:21 +01:00
Pau 65fd5e2c8f Possible change? 2022-11-18 08:51:17 +01:00
Alex Moreno 8e758f5456 invoiceIn-disable-options
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 06:36:30 +00:00
Joan Sanchez d7729654ee fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-17 16:48:31 +01:00
Joan Sanchez f501707adf fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 16:47:01 +01:00
Joan Sanchez 721f89b76c fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 16:39:12 +01:00
Alexandre Riera 4a063cc310 refs #4780 verification deleted
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 09:25:18 +01:00
Alexandre Riera c4430b4bca fix acl
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 08:56:51 +01:00
Vicent Llopis 161886c936 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4832-refactor_workerTimeControl.sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 07:22:26 +01:00
Pau 9257a02390 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 13:34:49 +00:00
Pau f56c226fba Merge branch 'dev' into 4767-route.index-delete-route
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 13:32:32 +00:00
Pau a733bc8c2f refs #4789 hasInvoice on ticket searchbar @3h30m
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 13:36:26 +01:00
Alexandre Riera 66002968f6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 11:10:21 +01:00
Alexandre Riera 489df60afc suggested filter added
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 11:10:00 +01:00
Alexandre Riera 4feb2bea2c working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 10:57:15 +01:00
Alexandre Riera 294f806bd9 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 09:52:13 +01:00
Alexandre Riera 78dc7db7a7 correcciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 09:46:35 +01:00
Vicent Llopis 9bbaa7c718 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 09:41:43 +01:00
Pau 7779059459 Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 08:05:19 +00:00
Pau 2a4af7ac78 Merge branch 'dev' into 4492-item.create-same-as-item.isLaid
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 07:29:09 +00:00
Pau b21d4b698e Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 07:29:03 +00:00
Vicent Llopis 0089b821cf fix: corregido test intermitente
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 07:26:30 +01:00
Vicent Llopis 46c7aa24b8 fix: corregidas traducciones
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 07:14:45 +01:00
Pau d7dc7c4329 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 06:08:01 +00:00
Alexandre Riera b7c9d6ea50 refs #3963 front and back tests fixed
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:30:00 +01:00
Vicent Llopis c200e1af32 refactor: optimizado select
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:09:41 +01:00
Pau 192d7336a4 change test
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 14:22:09 +01:00
Pau 6e58b1de8b refs #4511 Changed fixtures to fix broken test @30min
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 14:17:24 +01:00
Vicent Llopis dd8117b6a4 feat: añadidas traducciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 14:02:31 +01:00
Pau 56893ea58b Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-15 13:42:06 +01:00
Alex Moreno 8dcd567a68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 13:20:52 +01:00
Alexandre Riera 09d7c450a2 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:08:36 +01:00
Alexandre Riera 97a6aff499 fix workerFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:08:06 +01:00
Alexandre Riera 607f61092a Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:06:10 +01:00
Alexandre Riera 01607c71b6 fix rocket message and order table
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 13:03:55 +01:00
Alex Moreno 7a7da9508f feat: workerWelcomeEmail
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 12:56:30 +01:00
Alex Moreno cba3c38ba6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-15 12:55:07 +01:00
Vicent Llopis fc516d4029 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 12:23:59 +01:00
Vicent Llopis 843e5ae736 feat: traducciones en los modelos
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 11:41:57 +01:00
Pau 90f69da3ca Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 10:30:14 +00:00
Pau 4e2741a9cd Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 11:01:02 +01:00
Pau 31a0aae8e9 Fixed notification not getting inserted 2022-11-15 11:01:00 +01:00
Pau 2b3b2086d9 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:39:03 +00:00
Alex Moreno 53fb575fc0 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:38:52 +00:00
Pau f1b706d178 Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 10:37:13 +01:00
Pau 6339634756 refs #4457 move sql, remove await on front @2h 2022-11-15 10:37:12 +01:00
Alex Moreno 31eb2c86b5 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:20:26 +00:00
Alex Moreno 8f4ac8fcc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-15 10:12:29 +01:00
Joan Sanchez fdb35850ee Merge branch 'dev' into 4811-invoice_storage
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:05:39 +00:00
Joan Sanchez 174dd1fe5c feat(invoice): send invoice from stored PDF - closes #4811
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 10:00:21 +01:00
Vicent Llopis b5f67425ff Merge branch 'dev' into jenkins_backTest_solved
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:54:05 +00:00
Alex Moreno 6fdcb52e2a Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:43:19 +00:00
Vicent Llopis a58379579f Merge branch 'dev' into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 08:38:53 +00:00
Pau 60d12826e4 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 07:59:53 +00:00
Pau 9d0cd36afe Merge branch 'dev' into 4457'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:49:21 +01:00
Pau dc64d619f6 Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 07:34:19 +00:00
Pau 5c249dcbcc refs #4767 @1h30m
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:24:10 +01:00
Alex Moreno bcab493f37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-15 07:33:53 +01:00
Pau 29b299f36a Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 06:10:31 +00:00
Pau e6e70703a6 Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 06:09:40 +00:00
Pau 3610b3bf19 Merge branch 'dev' into 4492-item.create-same-as-item.isLaid
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 06:07:56 +00:00
Alex Moreno db3a6df23d feat(worker): new worker 2022-11-14 15:19:16 +01:00
Vicent Llopis 63142a8861 refactor
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 15:16:21 +01:00
Vicent Llopis 0637050375 fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 15:11:33 +01:00
Vicent Llopis 216108a576 refactor
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 15:01:22 +01:00
Vicent Llopis 386e304958 fix: modelo incorreto para la transacción
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 14:52:08 +01:00
Alexandre Riera 23ed6c6031 refs #3963 test front done
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 14:30:35 +01:00
Alexandre Riera 99aa674995 refs #3963 working on mockup
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 14:29:40 +01:00
Vicent Llopis d6a0580203 feat: traducciones modelo Ticket
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 11:08:23 +01:00
Vicent Llopis 6e94d7f68e fix: nombre variable incorrecto
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 11:00:13 +01:00
Alexandre Riera dc06ba7d89 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:58:18 +01:00
Alexandre Riera 7dd87b1ea8 refs #4700 icons future
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:56:23 +01:00
Alexandre Riera 05f0eba741 Merge branch 'split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:06:51 +01:00
Alexandre Riera c16210dd8a refs #4700 working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 15:58:11 +01:00
Alex Moreno 0f2c0fc490 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-11 12:48:32 +01:00
Vicent Llopis 7e50f23563 refacor code
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 08:55:56 +01:00
Vicent Llopis a5b20bfb03 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing 2022-11-11 08:53:10 +01:00
Vicent Llopis 9d06f5c0f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 07:47:29 +01:00
Alexandre Riera 117e2c03f5 refs #4700 tests back y empezando e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 15:54:00 +01:00
Pau 9004839e00 Merge branch '4484-ticket-withOutNegatives-default-true' of https://gitea.verdnatura.es/verdnatura/salix into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:53:14 +01:00
Pau 01fe8c8997 requested changes 2022-11-10 14:53:08 +01:00
Vicent Llopis 918ea3030d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:41:12 +01:00
Alex Moreno 4c216c4556 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 14:40:55 +01:00
Alex Moreno 37d412bf3b refactor: delete unnecessary test
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 14:38:37 +01:00
Alex Moreno 32701794bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:34:43 +01:00
Alex Moreno 517422be8c refactor: not use axios
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:32:07 +01:00
Pau c15d40b237 Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:45:15 +00:00
Pau 2704017486 check default true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 09:43:19 +01:00
Joan Sanchez 5a56fb4b6a Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1079
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-10 07:50:10 +00:00
Pau c4044ff70d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 07:40:14 +00:00
Pau 8b06243041 Fix link being the whole column
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:36:26 +01:00
Pau 8dd6012b1f Added worker descriptor popover 2022-11-10 08:27:47 +01:00
Pau c53e309071 Fix typo
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:19:54 +01:00
Pau 1327f0ae9d Added requested changes, refs #4507 @1:20h
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:18:05 +01:00
Pau eab9289408 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 06:26:05 +00:00
Pau b1a068ea48 Merge branch '4157-send-sms-to-routes' of https://gitea.verdnatura.es/verdnatura/salix into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 07:23:10 +01:00
Pau 891cd6b474 Added requestes changes refs #4157 2022-11-10 07:23:08 +01:00
Pau 747404521a Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 06:22:24 +00:00
Pau da8ebf1509 Merge branch '4492-item.create-same-as-item.isLaid' of https://gitea.verdnatura.es/verdnatura/salix into 4492-item.create-same-as-item.isLaid
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 07:17:57 +01:00
Pau 638fd62aae added requested changes, refs #4492 @40m 2022-11-10 07:17:54 +01:00
Pau dd10ec3154 Merge branch 'dev' into 4492-item.create-same-as-item.isLaid
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 06:15:00 +00:00
Guillermo Bonet 6804c1a756 Merge branch 'dev' into 4550-printServer
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 16:55:29 +01:00
Alex Moreno 5339bc1143 feat(recoverPassword): use loopback 2022-11-09 14:51:30 +01:00
Alex Moreno cace29f75c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-09 14:20:17 +01:00
Alexandre Riera ff2ee4401e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4547-informe-compensacion
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 13:26:54 +01:00
Vicent Llopis 0bd09ae366 fix: delete unnecessary column
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 12:06:51 +01:00
Vicent Llopis 1ea5ffa6d3 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 12:04:19 +01:00
Vicent Llopis be46f30dd7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 10:32:24 +01:00
Vicent Llopis 574f2757f4 refactor code
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 10:19:27 +01:00
Vicent Llopis 79e9edcee9 delete: old code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-09 09:26:28 +01:00
Vicent Llopis 2ab475791c refactor code
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 09:16:58 +01:00
Vicent Llopis dbd0e77e12 feat: send mail with the invoice pdf
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 09:14:32 +01:00
Vicent Llopis 9bcfebcae6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 07:26:56 +01:00
Alex Moreno 8c137b57f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-09 07:10:35 +01:00
Alexandre Riera ff00066138 refs #4700 tests front y fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 15:56:58 +01:00
Guillermo Bonet 6744b3f797 added collection-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 14:40:38 +01:00
Pau 2fc12dff52 #4457 @1h notifications working, need refactor ACL
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-08 13:59:00 +01:00
Pau e85505ee8e #4457 implement notification system, @1h 30m
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-08 12:26:01 +01:00
Pau f21907855f Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente 2022-11-08 10:04:47 +01:00
Pau f45eaa07f9 refs #4511 fixed test, changed drop to rename @1h
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 09:45:56 +01:00
Pau f1e832ee66 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:06:30 +00:00
Vicent Llopis 9cd57bfde9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:56:56 +01:00
Vicent Llopis 4d81991d86 delete focus test
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:47:08 +01:00
Vicent Llopis 8d7296cc8f feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:46:47 +01:00
Vicent Llopis 11459bbd56 refactor: change column name 2022-11-08 08:46:36 +01:00
Pau 0da6bd44e7 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:06:27 +00:00
Pau 2df195764d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:05:13 +01:00
Pau ab3d0a2549 Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 06:59:45 +00:00
Vicent Llopis 51b047eacc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:40:31 +01:00
Alexandre Riera 896a7eb6f0 refs #4700 arreglar filtro y traducciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 15:55:17 +01:00
Vicent Llopis 7fc18c89df feat: error handlers
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 13:57:54 +01:00
Vicent Llopis ffa0ff650e feat: add time control
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 12:21:14 +01:00
Vicent Llopis b1eb7d469f fix: error duplicated key
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-07 09:51:33 +01:00
Alex Moreno 2165ca0f34 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-07 09:34:24 +01:00
Alex Moreno 03ec8e27e6 feat(ticket_isEditable): use ticketWeekly
gitea/salix/pipeline/head This commit is unstable Details
2022-11-07 09:19:20 +01:00
Alex Moreno 5051f8b590 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-07 07:24:44 +01:00
Vicent Llopis 6858de83a3 feat: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 14:55:47 +01:00
Vicent Llopis 892094f85c feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 13:41:45 +01:00
Vicent Llopis 98cc2b5866 refactor: endpoint 2022-11-04 13:41:38 +01:00
Vicent Llopis 626355d251 fix: sustituido insert por insert ignore
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 12:37:07 +01:00
Vicent Llopis ae513fb2b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 09:12:16 +01:00
Vicent Llopis 158fc56555 Merge branch 'dev' into 3951-invoiceOut.index_downloadPdfs
gitea/salix/pipeline/head This commit is unstable Details
2022-11-04 08:03:55 +00:00
Joan Sanchez f53b74c04c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 09:02:33 +01:00
Joan Sanchez 16554c23a8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 09:02:18 +01:00
Pau 6a5ba6a929 Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 07:36:46 +00:00
Pau 7ff4c4d33c Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 07:35:01 +00:00
Pau a975f37fc3 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 07:27:15 +00:00
Pau ae95b5d3ef Merge branch 'dev' into 4492-item.create-same-as-item.isLaid
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 07:22:37 +00:00
Alexandre Riera 98dd5963bf refs #4547 traduccion añadida
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-04 08:15:12 +01:00
Pau 37292cee89 remove comments
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 08:12:46 +01:00
Alex Moreno 28edb2e53a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-04 08:09:15 +01:00
Vicent Llopis e1d187ef68 Merge branch 'dev' into 3951-invoiceOut.index_downloadPdfs
gitea/salix/pipeline/head This commit is unstable Details
2022-11-04 07:01:45 +00:00
Pau 11cf1ba414 fix back test error
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 07:50:54 +01:00
Pau 42dd56a78c Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 06:46:23 +00:00
Pau 7d7af6eb49 Modified model to allow modifications to isLaid
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 07:42:21 +01:00
Vicent Llopis ab739f412f feat: add test
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 15:00:55 +01:00
Alexandre Riera 8e5f518eb6 refs #4753 texto y fecha sms cambiados
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 14:16:11 +01:00
Vicent Llopis b6d3a08871 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 10:17:46 +01:00
Alex Moreno e6e8f15d64 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:39:10 +00:00
Alex Moreno 36894c31de Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:39:04 +00:00
Alexandre Riera 6663b600a7 Merge branch 'dev' into 4644-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:54:06 +00:00
Alex Moreno e370f20cec Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:49:18 +00:00
Alexandre Riera 3376f301b1 Merge branch 'dev' into 4644-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:49:02 +00:00
Alex Moreno 12df808844 Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:43:14 +00:00
Joan Sanchez 254a56cd78 Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 07:42:41 +00:00
Alex Moreno d100ab4112 Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:39:47 +00:00
Joan Sanchez 009e9e3bb7 Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 07:35:02 +00:00
Alexandre Riera 8304c849e4 Merge branch 'dev' into 2818-sincronizar-usuarios
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:34:49 +00:00
Alexandre Riera 4be3106245 Merge branch 'dev' into 4645-refactor-entry.ref
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:29:49 +00:00
Alexandre Riera 0736fb4818 Merge branch 'dev' into 2818-sincronizar-usuarios
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:28:47 +00:00
Alex Moreno ec9139f985 Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:24:05 +00:00
Alex Moreno 6d85cf7cf5 translations
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:21:03 +01:00
Alex Moreno 67697784cd Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 06:48:38 +00:00
Vicent Llopis 35c50cb314 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs 2022-11-03 07:11:54 +01:00
Juan Ferrer dc2b61a0a4 Merge branch 'dev' into 2818-sincronizar-usuarios
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 15:20:11 +00:00
Alexandre Riera 908908a643 refs #4547 correcciones
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-02 15:54:23 +01:00
Vicent Llopis f96fc0f91e Merge branch 'dev' into 3852-client.search-panel2
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:13:41 +00:00
Alex Moreno 621158badc fix(checkInbox): fix condition
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 15:11:36 +01:00
Vicent Llopis 8c4e70c11d Merge branch 'dev' into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:06:06 +00:00
Vicent Llopis 3cc89c170c Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 13:55:07 +00:00
Vicent Llopis 8a4aa6285b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:49:39 +01:00
Vicent Llopis 7eaafa36a0 Merge branch 'dev' into 4616-ticket.sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 13:42:26 +00:00
Vicent Llopis 6df74facdc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail 2022-11-02 14:23:20 +01:00
Vicent Llopis 57564325e1 feat: añadidas opciones para confirmar o no confirmar el registro de horas
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:22:18 +01:00
Alexandre Riera 8d8d217fe7 refs #4547 formateo arreglado
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-02 13:59:13 +01:00
Alex Moreno 59e66e1f49 typo
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 13:55:06 +01:00
Alex Moreno 2c3b735650 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-11-02 13:49:09 +01:00
Alex Moreno 6a9134d8f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 13:48:36 +01:00
Alex Moreno 9c671ed3a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 13:47:00 +01:00
Alex Moreno acf76aeeef Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 12:25:38 +00:00
Alex Moreno 84a5f3986b feat(worker): createWorker refs #4658
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 13:24:35 +01:00
Alex Moreno 2a8a8ed84a Merge branch 'dev' into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 12:01:11 +00:00
Joan Sanchez 34997b72f5 Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:55:47 +00:00
Alex Moreno 4cded53347 Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 11:23:03 +00:00
Joan Sanchez 2fba17ab15 Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 09:33:27 +00:00
Alexandre Riera dc3ee2c30d refs #2818 sincronización quitada en test
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 10:18:38 +01:00
Alex Moreno 9891f7060d fix(smart-table): monitor only ticketFilter use url and add ?q in routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 09:40:09 +01:00
Joan Sanchez fe3ebe8e0c Merge branch 'dev' into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 06:43:43 +00:00
Joan Sanchez 177b448441 Merge branch 'dev' into 4616-ticket.sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 06:42:35 +00:00
Alex Moreno 755a1667dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 07:35:04 +01:00
Joan Sanchez 33c92a0f24 Merge pull request '4563-Worker-Description-workerDisableExcluded-checkbox' (!1076) from 4563-Worker-Description-workerDisableExcluded-checkbox into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1076
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-02 06:34:49 +00:00
Alex Moreno fc7a39e910 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 07:33:07 +01:00
Alex Moreno e7047e982f fix e2e
gitea/salix/pipeline/head This commit is unstable Details
2022-10-31 15:07:22 +01:00
Vicent Llopis d9107719fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail 2022-10-31 15:04:33 +01:00
Vicent Llopis 3243d35bd7 feat: send email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 14:48:37 +01:00
Pau ff5e601a1e Item islaid and test 2022-10-31 14:43:31 +01:00
Alex Moreno b37c257885 feat(canEdit): use checkAccess
gitea/salix/pipeline/head This commit is unstable Details
2022-10-31 14:13:06 +01:00
Alex Moreno 36c0cc1a38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-31 14:12:40 +01:00
Vicent Llopis 1f2ea2c4d8 fix: incorrect number of params
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 13:30:08 +01:00
Vicent Llopis 273a8cd7c7 refactor code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 13:00:32 +01:00
Joan Sanchez 231575d23e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 12:40:07 +01:00
Joan Sanchez d34936015b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 12:39:54 +01:00
Joan Sanchez 463d3e6e12 Fixes
gitea/salix/pipeline/head This commit looks good Details
2022-10-31 12:39:26 +01:00
Vicent Llopis b17fe0d18c refator code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 09:55:11 +01:00
Pau 0739608de3 Merge branch 'dev' into 4457-hasInvoiceElectronic
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 07:57:50 +01:00
Vicent Llopis 786ba0d614 feat: inserta fichadas de los teletrabajadores
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 07:34:34 +01:00
Alexandre Riera 1246a65f32 refs #4547 informe y email generados
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-28 14:49:22 +02:00
Alex Moreno 445c6f1cc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-28 09:32:08 +02:00
Alex Moreno 9170c22d6f fix send email
gitea/salix/pipeline/head This commit looks good Details
2022-10-28 09:21:28 +02:00
Alex Moreno e9731c4ac0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order 2022-10-28 09:11:40 +02:00
Alex Moreno 9225e8f176 fix tests
gitea/salix/pipeline/head This commit looks good Details
2022-10-27 15:11:57 +02:00
Pau 00061caa65 Merge branch '4490-transfer-tickets-between-clients' of https://gitea.verdnatura.es/verdnatura/salix into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-27 09:05:06 +02:00
Alex Moreno 926ab0e35c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order 2022-10-27 09:05:05 +02:00
Pau c576e503cf fix httpBack.flush error 2022-10-27 09:05:05 +02:00
Alex Moreno 3ffc098b56 feat(privileges): check if user has role from userToUpdate
gitea/salix/pipeline/head This commit looks good Details
2022-10-27 09:01:09 +02:00
Pau d64f0e4b34 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 06:52:08 +00:00
Pau 04514804b7 fix tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 08:51:22 +02:00
Pau bfb9484e02 Merge branch '4490-transfer-tickets-between-clients' of https://gitea.verdnatura.es/verdnatura/salix into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 08:46:24 +02:00
Pau d4a22f7962 Apply requested changes 2022-10-27 08:46:22 +02:00
Alex Moreno 99fca9834f Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 06:10:14 +00:00
Vicent Llopis 1d908002e2 feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 14:25:27 +02:00
Vicent Llopis c0b95564c3 refactor: borrado codigo sql innecesario 2022-10-26 14:25:17 +02:00
Alexandre Riera bc6e639746 refs #4644 cambio en un test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 13:23:54 +02:00
Vicent Llopis b39b28e43d refactor: añadido salto de lineas
gitea/salix/pipeline/head This commit looks good Details
2022-10-26 13:10:17 +02:00
Alexandre Riera 405bc8765a refs #4645 valores ref cambiados
gitea/salix/pipeline/head This commit looks good Details
2022-10-26 12:48:48 +02:00
Vicent Llopis 65e32f5e7f feat: client search panel add find by zone
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 12:40:13 +02:00
Vicent Llopis 350c516bb1 feat: cancelar petición cuando esta calculando el packaging
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 10:36:41 +02:00
Alexandre Riera d243f9a87d refs #4644 checkbox añadido
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 10:03:13 +02:00
Vicent Llopis e0e015c268 fix: backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 09:49:58 +02:00
Vicent Llopis ec81b12239 refactor: el UserError se lanza en back
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 09:33:03 +02:00
Vicent Llopis 21e2945d4f refactor: delete destroyAll
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 09:30:17 +02:00
Vicent Llopis c671540a7f refactor: renombrada variable
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 09:04:53 +02:00
Vicent Llopis d1e2b1f7d5 refactor: tranducciones 2022-10-26 09:02:54 +02:00
Alex Moreno a07a45c1b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-10-26 08:40:49 +02:00
Vicent Llopis 3110172c54 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice 2022-10-26 08:39:58 +02:00
Vicent Llopis d4e2783630 refactor: corregidas traducciones, eliminado destroyAll y añadida transacción
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:39:07 +02:00
Alex Moreno f65d06fc7d fixes #4073
gitea/salix/pipeline/head This commit looks good Details
2022-10-26 08:27:28 +02:00
Vicent Llopis 1e1d4f00f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition 2022-10-26 08:26:23 +02:00
Vicent Llopis 925565d3d2 refator: borrada variable global y añadida Promesa al array
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:23:36 +02:00
Vicent Llopis a8dfc9d06f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:11:15 +02:00
Alex Moreno 342832c475 try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 15:02:22 +02:00
Alex Moreno 607e9010e6 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 12:36:35 +00:00
Joan Sanchez 4334907d91 fix(database): updated sql files
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 14:09:21 +02:00
Pau d83972d3fa Merge branch 'dev' into 4157-send-sms-to-routes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 12:07:32 +00:00
Pau 3cfa56d610 Add deliveryBoss ACL to the front
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 13:15:19 +02:00
Pau e72d57150a Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 10:40:57 +00:00
Alex Moreno ac8c4b8ef0 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 10:39:50 +00:00
Pau 296a743d8a Fix test, remove console log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 12:25:56 +02:00
Pau 7b04464848 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 10:00:13 +00:00
Joan Sanchez 1196125350 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 11:58:47 +02:00
Alex Moreno e1e13468a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 11:58:43 +02:00
Alex Moreno 3fd10dfc64 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:58:17 +00:00
Pau 76d248131c Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:45:25 +00:00
Pau 9089ba7346 requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 10:42:16 +02:00
Pau ddbbfa4360 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 07:46:39 +00:00
Pau d937a1b505 Add acl
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:45:09 +02:00
Joan Sanchez 8f0b566935 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-25 07:25:07 +00:00
Pau a43e642ff7 Add transferclient
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:23:46 +02:00
Alex Moreno e8500f926c feat(invoiceIn): add email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 08:19:56 +02:00
Vicent Llopis 931a891f71 fix: check client.email exists
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 08:09:23 +02:00
Vicent Llopis 8a3573474a refactor: move 'lastEntries' to thrid position in descriptor 2022-10-25 07:40:32 +02:00
Alex Moreno 7cb8175b73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-10-25 07:36:21 +02:00
Vicent Llopis d18b22bb05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 07:05:26 +02:00
Joan Sanchez e80754f280 Added new SQL version
gitea/salix/pipeline/head This commit looks good Details
2022-10-24 18:37:38 +02:00
Alex Moreno 9e0eab5a77 feat(invoiceIn): email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-24 15:15:23 +02:00
Vicent Llopis c77999871e refs #3951
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-24 14:34:17 +02:00
Alex Moreno 6a17a634d4 hotFix(receipt): add receiptPdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-24 09:49:51 +02:00
Pau 30933220ac #4507 greuge.js/json now insert userFk @2h
gitea/salix/pipeline/head This commit looks good Details
2022-10-24 09:37:17 +02:00
Alex Moreno d29d1ff538 Merge branch '4548-invoiceIn-pdf' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-24 08:27:12 +02:00
Pau 5bf425d8e3 Front test and sms require client #4157 @1h30m
gitea/salix/pipeline/head This commit looks good Details
2022-10-24 08:22:04 +02:00
Alex Moreno 6c38835e8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-10-24 08:20:25 +02:00
Alex Moreno bcfbeb7032 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-10-21 12:41:39 +02:00
Joan Sanchez cf0b750304 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 12:35:01 +02:00
Vicent Llopis 888f612dbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 11:41:53 +02:00
Vicent Llopis 0f57a40aac fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 10:50:18 +02:00
Vicent Llopis b06f5b7246 feat: cuando seleccionas 'allClients' no tiene en cuenta el 'clientsRange'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 10:06:34 +02:00
Vicent Llopis f968b19d1e fix: testFront
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 09:08:17 +02:00
Vicent Llopis c33cab7b10 fix: test back
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 09:01:08 +02:00
Vicent Llopis 2d0cb60b50 feat: check if uses mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:55:05 +02:00
Vicent Llopis e7261573d7 delete focus
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:01:22 +02:00
Vicent Llopis 6f31bea21f feat: update testBack
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:00:48 +02:00
Vicent Llopis 5da29fe381 refactor: unify duplicated code 2022-10-21 08:00:24 +02:00
Alex Moreno 066cf6f69b add show dialog
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 15:11:56 +02:00
Vicent Llopis 6891190c72 refactor: create endpoint to unify code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 15:05:46 +02:00
Pau ca53ec7c23 Changed the location of the function 2022-10-20 15:04:59 +02:00
Pau 28bd535e2b Implemented SMS to route clients 2022-10-20 15:04:25 +02:00
Vicent Llopis 29093d7d30 feat: en vez de consultar si el usuario está en la tabla workerMana, consultar es si el usuario está en un departamento que cuelga de ventas
gitea/salix/pipeline/head This commit looks good Details
2022-10-20 14:25:55 +02:00
Vicent Llopis b0471037a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-10-20 08:49:08 +02:00
Vicent Llopis bcc9acac0a fix: tBack
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 08:41:00 +02:00
Vicent Llopis 51cad75298 fix: testFront
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 08:17:15 +02:00
Pau 8cbcb197bb fix downloadPDF wrong method 2022-10-20 08:14:11 +02:00
Vicent Llopis 53112995bc refactor: delete counter
gitea/salix/pipeline/head This commit looks good Details
2022-10-20 07:58:38 +02:00
Pau 2c98563cfa Add buttons to bottom-right 2022-10-20 07:39:33 +02:00
Vicent Llopis 39f4445172 refator: endpoint name
gitea/salix/pipeline/head This commit looks good Details
2022-10-20 07:23:57 +02:00
Vicent Llopis abd2d9a849 fix: e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-19 15:10:43 +02:00
Alex Moreno 9ef835a077 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-10-19 15:10:22 +02:00
Joan Sanchez 7d502c6f57 Merge pull request 'Send delivery note to refund tickets' (!1086) from 3505-closure_refund into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1086
2022-10-19 13:00:18 +00:00
Alex Moreno 192e61a70d hotFix(route_index): fix driverRoutePdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-19 14:54:13 +02:00
Vicent Llopis 390c5790d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing 2022-10-19 14:49:24 +02:00
Vicent Llopis 9d53360d50 feat: replaced await by recursive function
gitea/salix/pipeline/head This commit looks good Details
2022-10-19 13:59:57 +02:00
Alex Moreno ca138cc2be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit looks good Details
2022-10-19 08:23:19 +02:00
Alex Moreno 508decaf0b try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-19 08:22:36 +02:00
Pau dc1b1bc1c3 Merge branch 'dev' into 4563-Worker-Description-workerDisableExcluded-checkbox
gitea/salix/pipeline/head This commit looks good Details
2022-10-19 05:35:06 +00:00
Alex Moreno c9073641aa feat(invoiceInPdf): content
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 14:58:38 +02:00
Vicent Llopis dc62841c3d refator: trying to delete async and await
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 14:46:40 +02:00
Pau 9fa81fe9eb Merge branch '2612-create-supplier' of https://gitea.verdnatura.es/verdnatura/salix into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 14:22:56 +02:00
Pau c2fd1fa44d fixed tests 2022-10-18 14:22:54 +02:00
Pau 73a69051a8 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head Build queued... Details
2022-10-18 12:01:04 +00:00
Pau 8b07180890 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:56:56 +00:00
Pau 579299855f Replaced one freightItemFk to IsBox
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 13:52:42 +02:00
Vicent Llopis 9ea427dbfe refactor: move front to back funcionality
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 13:45:46 +02:00
Pau db12ceb369 removed async from the redirect function
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 13:07:10 +02:00
Pau 470b4485d5 Fixed test and DB structure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 12:58:44 +02:00
Vicent Llopis ae3e3c3c49 fix: id model duplicated
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 12:37:06 +02:00
Pau a204c6e2b0 Fixed the suppliers not appearing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 12:29:04 +02:00
Alex Moreno a5ceee07e9 use loopback
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:50:16 +02:00
Vicent Llopis 5fce93abd5 refactor: change variables name
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:47:37 +02:00
Vicent Llopis 423454d19e feat: add date-picker 2022-10-18 11:47:22 +02:00
Pau f481cc3c97 Capitalizar
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 10:38:40 +02:00
Pau 89bbf35a87 Merge branch 'dev' into 4563-Worker-Description-workerDisableExcluded-checkbox
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 08:30:32 +00:00
Pau 1d8fb25325 Refactored according to the suggested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 10:25:54 +02:00
Vicent Llopis f95f977b69 fix: backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 10:04:53 +02:00
Alex Moreno 8985a678d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-18 09:49:06 +02:00
Vicent Llopis 9f70a1d513 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 08:17:16 +02:00
Pau 047076f189 changed tests
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 07:14:40 +02:00
Alex Moreno eb58839839 feat(invoiceIn): invoiceInPdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 15:13:27 +02:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:06:31 +02:00
Pau 9290cd6fb6 Finished back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:02:18 +02:00
Vicent Llopis f85c2e9700 refactor: delete code repeated
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:01:21 +02:00
Vicent Llopis 8ab6a50c73 try to fix frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 13:02:19 +02:00
Vicent Llopis 86d24ffede refactor code 2022-10-17 13:02:03 +02:00
Pau 70c9c3d788 initial back test created, modified DB statetments
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 12:07:34 +02:00
Vicent Llopis 2d1b48280c fix: backTest 2022-10-17 11:53:29 +02:00
Alex Moreno 57b2ae770d fix(e2e)
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 11:44:29 +02:00
Vicent Llopis dd10b79441 delete: throw error 2022-10-17 11:43:26 +02:00
Vicent Llopis e5fd6adfe5 fix: delete throw error 2022-10-17 11:43:01 +02:00
Vicent Llopis 33092acee7 refactor: delete unnecessary code 2022-10-17 11:42:05 +02:00
Alex Moreno 79b970286c refactor(claim_claimPickupEmail): use text template and external form
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 11:22:27 +02:00
Pau cf50c4690a Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:41:39 +00:00
Vicent Llopis 6924b05c8a feat: add radio button
gitea/salix/pipeline/head Build queued... Details
2022-10-17 10:19:07 +02:00
Pau a4243e14c5 Created Back test for newSupplier 2022-10-17 10:17:56 +02:00
Joan Sanchez cfdcf91be2 Merge branch 'dev' into 3505-closure_refund
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 08:15:16 +00:00
Vicent Llopis 15ba6681af refator: code unified
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 09:49:47 +02:00
Pau dc53aac163 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:32:50 +00:00
Pau f0b1591b14 Remove debugging elements
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 09:22:50 +02:00
Pau 0cdee89ac3 Button removed when user does not have permissions
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 09:20:45 +02:00
Vicent Llopis 787d10aac6 fix: select one result only
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:29:09 +02:00
Vicent Llopis cdce628038 refactor: delete line break
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:11:50 +02:00
Vicent Llopis 06ecceb478 refactor: lines to long
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:02:19 +02:00
Vicent Llopis a11ef73dfb refactor: code repetead 2022-10-17 08:01:55 +02:00
Pau 1603619d81 removed debugging elements
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:38:54 +02:00
Pau 594cee12f3 add checks to the existence of object variables
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:35:02 +02:00
Alex Moreno 2b060a1437 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:32:32 +02:00
Pau dc6c8f924d feat: Create new Supplier
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:25:25 +02:00
Alex Moreno 6bfd54fc71 feat(verify): use user.verify
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:22:22 +02:00
Alex Moreno 3e746ceb7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-10-14 14:47:42 +02:00
Vicent Llopis a036578832 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:43:08 +02:00
Vicent Llopis 40075e7e21 fix: testFront
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:38:47 +02:00
Vicent Llopis 86b7e9cabe fix: only can exists 'mana' or 'manaClaim' discount. Never both
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:30:37 +02:00
Vicent Llopis 2455a11c26 feat: changeMultipleDiscount uses the same popover than changeDiscount 2022-10-14 14:29:21 +02:00
Vicent Llopis 5918b3e0df refactor: juan changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 09:30:09 +02:00
Joan Sanchez 390ee60e59 Get first element in array
gitea/salix/pipeline/head This commit looks good Details
2022-10-14 07:26:34 +02:00
Vicent Llopis 50ec41dece refator: cancel request
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 15:01:15 +02:00
Joan Sanchez 67097970ed Incoterms required param
gitea/salix/pipeline/head This commit looks good Details
2022-10-13 10:44:20 +02:00
Joan Sanchez e81c39d8dc Send delivery note to refund tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 09:30:31 +02:00
Alex Moreno 74383b61e7 hotFix(monitor): use left join in ticketState
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 09:22:53 +02:00
Vicent Llopis 0d785695fe feat: invoicing by (clientFk, addressFk)
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 12:24:06 +02:00
Pau 012cd68c89 Added menu to create a new supplier, not working
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 11:43:01 +02:00
Vicent Llopis 53f78a98d2 feat: update message while globalInvoicing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 10:04:13 +02:00
Vicent Llopis 4f5abb709a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 09:14:14 +02:00
Vicent Llopis bfefec397e feat: add testFront
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 09:13:29 +02:00
Vicent Llopis 1a38fc307f delete: duplicated keybinding
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 08:42:59 +02:00
Vicent Llopis 9c52508a88 feat: add total labels
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 08:40:22 +02:00
Alex Moreno c29b8c99d0 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 05:43:15 +00:00
Alex Moreno e80197bd6f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 07:22:10 +02:00
Vicent Llopis 7b7e01f49e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 07:09:20 +02:00
Vicent Llopis dbfc3d335d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 07:06:45 +02:00
Joan Sanchez e3606c7273 Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 14:46:06 +02:00
Alex Moreno 5c4daee35e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 14:20:22 +02:00
Alex Moreno c7a06baa63 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 11:47:09 +00:00
Vicent Llopis 1f21fdeb65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition 2022-10-10 13:30:27 +02:00
Alex Moreno 99271f275f remove unnecessary isEditable
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 13:26:38 +02:00
Alex Moreno 376d46b67e feat(canEdit): integrate isWeekly and adapt back tests and e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 13:06:49 +02:00
Alex Moreno a6c171d00a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-10 13:05:00 +02:00
Vicent Llopis 843f67919c feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 12:56:03 +02:00
Vicent Llopis 8130cf9e6a feat: separate globalInvoicing in 2 parts
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 12:40:10 +02:00
Joan Sanchez 7f023d7456 Set user default warehouse
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 12:23:40 +02:00
Joan Sanchez 990a1b3c67 250 nodes
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 10:33:08 +02:00
Joan Sanchez 31d1b84bb9 Unfold when there's less than 100 nodes to show
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 10:25:59 +02:00
Alex Moreno 3ac8e1d3bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-10 09:57:21 +02:00
Alex Moreno e497ddd664 fix: add td-editable
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 09:21:14 +02:00
Alex Moreno 18cd34bccb fix(travel_extraCommunity): css
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 08:57:41 +02:00
Joan Sanchez 4ecbb59ac0 Closure hours
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-10 07:49:08 +02:00
Alex Moreno 9befa2531b Merge branch 'hotFix_travel_extraCommunity-css' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travel_extraCommunity-css
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 07:29:26 +02:00
Joan Sanchez 934c0d0169 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2022-10-10 07:28:10 +02:00
Alex Moreno 49e82156cf Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travel_extraCommunity-css 2022-10-10 07:10:25 +02:00
Joan Sanchez 3dee50a796 Updated method accessType
gitea/salix/pipeline/head This commit looks good Details
2022-10-09 20:14:14 +02:00
Alex Moreno 00d5876f88 hotFix(travel_extraCommunity): fix css
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-07 14:35:16 +02:00
Vicent Llopis bb26fa6502 feat: add tFront
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 13:49:42 +02:00
Joan Sanchez 587da840c0 Fix
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 12:16:30 +02:00
Joan Sanchez 6c5acc75eb Consumption fix
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 12:00:06 +02:00
Alex Moreno 94a51db3d5 hotFix(ticket_request): autocomplete buyer
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 10:56:12 +02:00
Vicent Llopis deb8a00dfb feat: add backRoutes
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 10:47:54 +02:00
Vicent Llopis 1894492a2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 09:26:51 +02:00
Vicent Llopis 3da948f3f9 refactor: delete unnecessary lines
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 09:17:14 +02:00
Pau 4f25961988 Created checkbox and logic, package-lock
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 08:33:45 +02:00
Vicent Llopis 2e91698c1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 08:19:08 +02:00
Alex Moreno e7bafb1386 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-07 07:47:46 +02:00
Javi Gallego d5592d6a0f sin toClientId
gitea/salix/pipeline/head This commit looks good Details
2022-10-06 15:19:55 +02:00
Alex Moreno c29625f079 fix: funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
2022-10-06 15:04:27 +02:00
Joan Sanchez 8ccb47d741 Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1073
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-06 11:54:16 +00:00
Joan Sanchez dd9b517883 Merge pull request '4369-ticket.request.create_getItemTypeWorker' (#1061) from 4369-ticket.request.create_getItemTypeWorker into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1061
2022-10-06 11:30:49 +00:00
Javi Gallego d73dab3454 Merge branch 'dev' into 4090-global_invoincing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 13:01:56 +02:00
Pau 3376293d1a Added user icon and fixed icon not updating
gitea/salix/pipeline/head This commit is unstable Details
2022-10-06 11:54:14 +02:00
Vicent Llopis c8d270499b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 11:50:11 +02:00
Vicent Llopis d427c3a6db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 11:48:31 +02:00
Vicent Llopis 37601934f5 feat: first option to delete and update
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 11:40:46 +02:00
Joan Sanchez 8f3e09b88f Merge branch 'dev' into 4033-route
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-06 08:23:19 +00:00
Vicent Llopis a3a432c753 fix: delete one or more expeditions
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-06 10:18:19 +02:00
Pau 1165e050eb feat: workerDisableExcluded update DB field
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-06 10:18:08 +02:00
Vicent Llopis 26d04ce2d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 10:08:29 +02:00
Vicent Llopis ddbe1057ad feat: add new section
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 09:47:53 +02:00
Joan Sanchez f2eaa9d0e5 Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 06:28:00 +00:00
Vicent Llopis 434db10ac9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 07:22:16 +02:00
Joan Sanchez fd219f853f Merge branch 'dev' into 4581-client.web-access
gitea/salix/pipeline/head This commit looks good Details
2022-10-05 14:26:03 +00:00
Joan Sanchez b134aeb0ea Mock report pdf
gitea/salix/pipeline/head This commit looks good Details
2022-10-05 16:19:07 +02:00
Vicent Llopis 2f17257e46 feat: add new sub section itemShelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-05 15:13:48 +02:00
Alex Moreno 9d482f7dfd test(ticket): fix tests and add funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 15:13:36 +02:00
Joan Sanchez 3d36c0339a Merge branch 'dev' into 4592-jenkins_tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-05 12:05:10 +00:00
Pau 940b431059 feat(model) Created the model for packagingMistake
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 14:04:30 +02:00
Alex Moreno 8b636497a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 13:47:25 +02:00
Vicent Llopis 761563edc5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 13:38:17 +02:00
Vicent Llopis 26d655075e fix: bad pull
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 13:28:08 +02:00
Joan Sanchez 726b2d5eb2 Exit on completion
gitea/salix/pipeline/head This commit looks good Details
2022-10-05 13:26:18 +02:00
Vicent Llopis aa51fa1722 feat: check the client to edit is in vn.client and not in account.account
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-05 12:36:36 +02:00
Pau 600dd7a434 Created the model and UI 2022-10-05 11:52:14 +02:00
Vicent Llopis 994cf7ccf0 fix: '==' by '='
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 15:04:27 +02:00
Alex Moreno 5f39249edb fix(ticket): canEdit use aclFunc
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 15:02:00 +02:00
Joan Sanchez 377a0f7228 Attachments refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 13:41:37 +02:00
Alex Moreno fe8ae164eb refactor(ticket): isEditable, canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 13:22:11 +02:00
Joan Sanchez eadff3fff9 Updated back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 09:46:44 +02:00
Joan Sanchez 1598b6c703 Back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 09:39:42 +02:00
Pau 3caf89bddb refactor: Replaced isBox with freightItemFk 2022-10-04 09:27:31 +02:00
Joan Sanchez 3dbd304217 Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 09:21:24 +02:00
Vicent Llopis 68e4f3a8bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 09:10:15 +02:00
Vicent Llopis 6e9909400b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 08:19:38 +02:00
Vicent Llopis 5c76437498 refator: delete unnecessary transaction
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 08:19:09 +02:00
Vicent Llopis f510e26141 refactor: translation
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 07:55:30 +02:00
Vicent Llopis 000655fe1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation
gitea/salix/pipeline/head Build queued... Details
2022-10-04 07:51:24 +02:00
Vicent Llopis 197bbf392b refator: updates translations
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 07:50:37 +02:00
Joan Sanchez c8bad23621 Tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 07:41:40 +02:00
Vicent Llopis 11484edd10 feat: create new ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 15:18:07 +02:00
Alex Moreno cca2878716 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4073-user_privileges
gitea/salix/pipeline/head This commit looks good Details
2022-10-03 15:16:33 +02:00
Alex Moreno 7a690dd880 feat(user): add section privileges and remove changeRole in descriptor
gitea/salix/pipeline/head This commit looks good Details
test(user):back and e2e
2022-10-03 15:11:29 +02:00
Joan Sanchez a065d77929 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 13:37:59 +02:00
Joan Sanchez c177c0366d Item PDF
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 13:35:49 +02:00
Joan Sanchez e4b61f81a9 Merge pull request '#4226-remove-density' (#1066) from #4226-remove-density into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1066
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-03 07:41:58 +00:00
Pau 5ca39c9dd3 Modified TextField to have a insertable option
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 08:48:04 +02:00
Joan Sanchez 21bb95fc88 CSV refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 08:28:47 +02:00
Javi Gallego eb48685484 selectores reparados
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 14:55:31 +02:00
Joan Sanchez 7fd4728c33 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 14:13:16 +02:00
Joan Sanchez 4005d6f82a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-09-30 13:55:53 +02:00
Joan Sanchez 3b0f1efbf4 ACL's
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 13:54:20 +02:00
Alex Moreno eec1d6df4a add translation
gitea/salix/pipeline/head This commit is unstable Details
2022-09-30 09:06:43 +02:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:52:31 +02:00
Joan Sanchez ccec38ef97 Renamed table
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:49:08 +02:00
Joan Sanchez 3601881026 Client consumption queue
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:43:27 +02:00
Joan Sanchez 7a7ad6ac5f InvoiceOut_sendQueued
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 13:09:44 +02:00
Joan Sanchez 4172229051 Closure hotfix
gitea/salix/pipeline/head This commit looks good Details
2022-09-29 09:35:57 +02:00
Joan Sanchez 5aec280adb Closure migration
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 09:07:18 +02:00
Pau 7ac7189a8a added maxlength binding, finished logic on insert
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 08:08:49 +02:00
Joan Sanchez fe5eb3e13d Changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 07:35:20 +02:00
Alex Moreno 203b223cc6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-28 12:24:40 +02:00
Alex Moreno 840140c40f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-28 12:20:35 +02:00
Joan Sanchez ae2bc91cb5 Merge pull request '4505-clonar-foto-weightByPiece' (#1067) from 4505-clonar-foto-weightByPiece into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1067
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-28 06:38:46 +00:00
Joan Sanchez 93f5bf089d Merge pull request '4291-fix(vnInputTime): quit new date(null)' (#1031) from 4291-vnInputTime into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1031
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-28 06:10:55 +00:00
Joan Sanchez d7ab95fcc8 closure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 15:00:12 +02:00
Joan Sanchez 660842ca31 Osticket & waste refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 14:20:57 +02:00
Pau 901007d34b change test case to expect the image to be defined
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 13:58:27 +02:00
Pau 2dd6de1d47 Modified Fixtures, clone.js and the item model
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 13:46:23 +02:00
Pau d30065f90a Add vn-input-account tag and logic
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 12:12:25 +02:00
Javi Gallego a662bb90a2 Merge branch 'dev' into #4226-remove-density
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 09:32:48 +02:00
Joan Sanchez 410e651edd Buyer waste
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 07:24:45 +02:00
Alex Moreno 2c691eb796 feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 14:49:11 +02:00
Joan Sanchez 7f78286d6b Reports refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 13:33:27 +02:00
Alex Moreno f698a22fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 09:25:43 +02:00
Alex Moreno d2cbaa565e add translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:48:46 +02:00
Alex Moreno dc605387ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:23:10 +02:00
Alex Moreno fc5460dc9e feat(account): send verifyEmail when change email and tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:21:58 +02:00
Joan Sanchez 85698410db Templates refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:07:45 +02:00
Pau 26a16bf846 ACL para sector,añadido sector al model-config
gitea/salix/pipeline/head This commit looks good Details
2022-09-23 13:53:33 +02:00
Pau 620162aec7 Añadido el modelo de sector a shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-23 12:24:11 +02:00
Vicent Llopis c4649352a9 feat: add totalChecked
gitea/salix/pipeline/head This commit looks good Details
2022-09-23 08:50:11 +02:00
Joan Sanchez 664fd444cc Sample refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-22 15:44:35 +02:00
Vicent Llopis 2a64fde57c feat: add option "move expedition"
gitea/salix/pipeline/head This commit is unstable Details
2022-09-22 14:58:38 +02:00
Vicent Llopis a486b1593b fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-09-22 13:55:09 +02:00
Vicent Llopis 95e5b1a970 fix: code for search-function 2022-09-22 13:54:58 +02:00
Alex Moreno c79f884526 feat(recover-password): open changePass in front and tests done
gitea/salix/pipeline/head This commit looks good Details
2022-09-22 09:22:24 +02:00
Joan Sanchez 68f3544477 Claim pickup order 2022-09-22 09:17:14 +02:00
Joan Sanchez 8105c12a18 Campaign metrics 2022-09-22 08:48:29 +02:00
Vicent Llopis 0fb7487191 feat: add getItemTypeWorker endpoint
gitea/salix/pipeline/head This commit looks good Details
2022-09-22 08:32:18 +02:00
Vicent Llopis fae1516b33 refactor: correct bleeding
gitea/salix/pipeline/head This commit looks good Details
2022-09-21 14:55:43 +02:00
Vicent Llopis 65e15ada69 refator: delete line break
gitea/salix/pipeline/head This commit looks good Details
2022-09-21 14:53:02 +02:00
Joan Sanchez 5a43bdb6c9 Delivery note 2022-09-21 13:18:32 +02:00
Joan Sanchez 284524e3fa Merge pull request '4358-financialBoss' (#1054) from 4358-financialBoss into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1054
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-21 06:49:44 +00:00
Joan Sanchez fcce73086e Merge pull request '2805-fix(entry_latestBuys): save chekeds when crudModel load more data' (#1045) from 2805-entry_latestBuy_saveChekeds into dev
Reviewed-on: #1045
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-21 06:47:29 +00:00
Joan Sanchez 5d6459d565 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-21 08:37:20 +02:00
Joan Sanchez 09bdee8b34 View & send PDF from loopback endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-19 12:59:32 +02:00
Alex Moreno 55d6dacebb test(ticket_listPackaging):enable back test
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 10:11:44 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 09:45:28 +02:00
Joan Sanchez 18ac0a0b61 Export Email and Report classes
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 23:13:37 +02:00
Joan Sanchez fe71e485aa Merge pull request '4545-route.basic-data_vehicle' (#1055) from 4545-route.basic-data_vehicle into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1055
2022-09-16 07:15:41 +00:00
Joan Sanchez 9f9581c722 Merge pull request '4464-zone.log_excludeEvent' (#1048) from 4464-zone.log_excludeEvent into dev
Reviewed-on: #1048
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-16 07:12:41 +00:00
Joan Sanchez 1b09f3bf7f Merge pull request '4139-refactor(travel_extra-community): use smart-table, fix scroll' (#1052) from 4139-travel_extra-community_refactor into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1052
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-16 07:11:59 +00:00
Joan Sanchez f9f09440ec Merge pull request '4363-refactor(item_waste): refactor table and add totals in table_head' (#1053) from 4363-item_waste_refactor into dev
gitea/salix/pipeline/head This commit is unstable Details
Reviewed-on: #1053
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-16 07:10:48 +00:00
Alex Moreno 54b41faf12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4358-financialBoss
gitea/salix/pipeline/head This commit is unstable Details
2022-09-16 08:55:39 +02:00
Vicent Llopis f5bbe3a9ac fix: scope updated
gitea/salix/pipeline/head This commit is unstable Details
2022-09-15 11:55:07 +02:00
Joan 90229112e9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-15 06:35:03 +00:00
Vicent Llopis eb7bd3dc59 update brach
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 14:03:15 +02:00
Alex Moreno e72c0ae919 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 13:09:00 +02:00
Alex Moreno 06eab58b3d is agency
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 12:45:40 +02:00
Alex Moreno 8c984b5ebe refactor(client): change rol manager to financialBoss
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 12:32:19 +02:00
Alex Moreno 6b252f7e33 refactor(item_waste): refactor table and add totals in table_head
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 10:13:30 +02:00
Alex Moreno 49a7a05310 feat(travel_extra-community): add vn-anchor
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 08:08:07 +02:00
Alex Moreno 2b101cf7c1 refactor(travel_extra-community): use smart-table, fix scroll
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 15:11:14 +02:00
Vicent Llopis a6a5a84add fix: incorrect name of function
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 14:42:15 +02:00
Joan Sanchez 5a46444875 Use POST request method instead of GET
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 13:53:44 +02:00
Vicent Llopis 3bf5f5f86e fix: tfront
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-13 13:47:54 +02:00
Vicent Llopis bddc998b86 feat: allow update route.isOk field
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 13:34:32 +02:00
Joan Sanchez 5cff983d4c Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1040
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-13 10:33:04 +00:00
Vicent Llopis 6e31865add Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4464-zone.log_excludeEvent
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 12:17:30 +02:00
Vicent Llopis cc6ba8712c feat: log when a day is excluded
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 12:15:28 +02:00
Joan Sanchez 1f850d13e9 Merge pull request '4291-delete_it.warehouseFk' (#1035) from 4291-delete_it.warehouseFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1035
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-13 10:00:36 +00:00
Vicent Llopis 1fd97f167c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 11:35:15 +02:00
Vicent Llopis b02aa8466c fix: tfront
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 10:27:17 +02:00
Vicent Llopis 8c6c7345cd fix: change GET by POST, to solve "Request Header Fields Too Large" 2022-09-13 10:27:08 +02:00
Joan Sanchez 3210f91bf7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-12 12:20:49 +02:00
Joan Sanchez de3e14e739 4514 - Write permissions for rrhh
gitea/salix/pipeline/head This commit looks good Details
2022-09-12 10:23:17 +02:00
Joan Sanchez faa3865da1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-09 11:53:57 +02:00
Alex Moreno 8da24a56b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-09-09 07:52:17 +02:00
Alex Moreno c9721f4c7f fix(entry_latestBuys): save chekeds when crudModel load more data
gitea/salix/pipeline/head This commit looks good Details
2022-09-08 14:52:43 +02:00
Alex Moreno a15c051098 fix(monitor_salesFilter): mariadb not optimize query
gitea/salix/pipeline/head This commit looks good Details
2022-09-08 08:07:46 +02:00
Alex Moreno c06d2970ae test(boxing): getVideoList
gitea/salix/pipeline/head This commit looks good Details
2022-09-07 13:58:39 +02:00
Javi Gallego f0a9441e1f Merge branch 'dev' into #4226-remove-density
gitea/salix/pipeline/head This commit is unstable Details
2022-09-07 11:31:47 +02:00
Alex Moreno 886abfd897 fix(monitor): fix left join salesFilter
gitea/salix/pipeline/head This commit looks good Details
2022-09-07 08:49:24 +02:00
Alex Moreno 8dd02ab6ee quit console.logs
gitea/salix/pipeline/head This commit looks good Details
2022-09-06 15:08:28 +02:00
Alex Moreno 6fcb1e54b4 refactor(claim_action): set translations
gitea/salix/pipeline/head This commit looks good Details
2022-09-06 09:35:01 +02:00
Alex Moreno 43df1e7e10 refactor(boxing): refactor getVideo
gitea/salix/pipeline/head This commit looks good Details
2022-09-05 12:06:14 +02:00
Alex Moreno 4a058faaf8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing 2022-09-05 08:12:07 +02:00
Javi Gallego 9fe32788fc regularizado
gitea/salix/pipeline/head This commit looks good Details
2022-08-24 14:38:05 +02:00
Javi Gallego 5cf102c7fd sustituido density por weightByPiece
gitea/salix/pipeline/head This commit is unstable Details
2022-08-24 14:13:26 +02:00
Joan Sanchez cceb456209 Filter by province
gitea/salix/pipeline/head This commit looks good Details
2022-08-12 15:31:59 +02:00
Joan Sanchez d0185017b7 Removed translate from grouping and packing
gitea/salix/pipeline/head This commit looks good Details
2022-08-11 08:29:24 +02:00
Vicent Llopis f3df373f70 delete: unnecessary code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-08-10 13:23:50 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:13:31 +02:00
Vicent Llopis 8f54365350 refator: parametrizardo con ?
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 09:19:23 +02:00
Vicent Llopis 31aafc0719 feat: add inserts in printQueue
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 09:11:38 +02:00
Joan Sanchez d2b901d47f Relative path for master versions
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-08-09 11:49:28 +02:00
Alex Moreno 6054e0bef3 fix(mdb): use relative path
gitea/salix/pipeline/head This commit looks good Details
2022-08-05 13:24:48 +02:00
Alex Moreno 062806b3f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-08-05 13:19:43 +02:00
Joan Sanchez cabc30ef87 Merge pull request '3069-client.shelving' (#1029) from 3069-client.shelving into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1029
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-08-05 09:18:53 +00:00
Joan Sanchez 624428212b Merge pull request '4299-travel.agencyModeFk' (#1026) from 4299-travel.agencyModeFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1026
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-08-04 12:51:41 +00:00
Joan Sanchez 1dda78c438 Merge pull request '3530-Eliminar-el-uso-de-person' (#1036) from 3530-Eliminar-el-uso-de-person into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1036
2022-08-04 12:23:27 +00:00
Vicent Llopis c3d396b042 fix: test e2e
gitea/salix/pipeline/head This commit looks good Details
2022-08-04 13:52:59 +02:00
Vicent Llopis 020990dadc fix: backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-08-04 09:53:22 +02:00
Juan Ferrer 22503375b3 Hotfix: User synchronization
gitea/salix/pipeline/head This commit looks good Details
2022-08-04 08:53:31 +02:00
Alex Moreno b4b6d61460 feat(ticket_boxing): fix getVideo
gitea/salix/pipeline/head This commit is unstable Details
2022-08-03 14:57:39 +02:00
Joan Sanchez eed0ac66c6 Merge pull request '4270-route.create' (#1023) from 4270-route.create into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1023
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-08-03 07:09:08 +00:00
Joan Sanchez 0de2c08739 Merge pull request '4279-worker_phone' (#1034) from 4279-worker_phone into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1034
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-08-03 06:45:58 +00:00
Joan Sanchez 1b9de5cc95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-08-03 08:44:43 +02:00
Joan Sanchez 185ce60bef Merge pull request '1781-zoneHoliday' (#994) from 1781-zoneHoliday into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #994
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-08-03 06:41:22 +00:00
Alex Moreno 8a08b6f399 feat(ticket_boxing): return video stream
gitea/salix/pipeline/head This commit looks good Details
2022-08-02 15:15:05 +02:00
Alex Moreno 7d4dd7bb52 feat(boxing): return stream video
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 15:03:17 +02:00
Alex Moreno d040ecb743 feat(ticket): getVideo from shinobi
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 07:59:04 +02:00
Carlos Andrés 918a09ad5c #3530 Eliminar uso tabla person
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 15:17:00 +02:00
Vicent Llopis 1e521f1a8b feat: delete link
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 14:12:53 +02:00
Vicent Llopis d1e273d1d3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 13:56:01 +02:00
Vicent Llopis 83e5a01649 fix: correct translation
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 13:47:42 +02:00
Vicent Llopis 990fe17f48 fix: correct transalte
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 13:42:59 +02:00
Vicent Llopis 84036d582f fic: delete unnecessary acl 2022-07-29 13:42:52 +02:00
Vicent Llopis 537c383cd2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 13:38:23 +02:00
Vicent Llopis 224ea61a62 fix: delete warehouseFk from itemType model
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 13:07:25 +02:00
Vicent Llopis 840e792d13 fix: backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 12:52:53 +02:00
Vicent Llopis 605da52286 fix: replace it.warehouseFk by userConfig.warehouseFk
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 12:22:03 +02:00
Vicent Llopis 21701601e3 fix: update frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-07-27 13:01:03 +02:00
Vicent Llopis 3bf7efea16 feat: add phone extension and personal phone. Update bussiness phone
gitea/salix/pipeline/head This commit looks good Details
2022-07-27 12:16:41 +02:00
Alex Moreno 4c60303968 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime
gitea/salix/pipeline/head This commit is unstable Details
2022-07-27 11:17:35 +02:00
Joan Sanchez 468da0c5a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-27 08:12:06 +02:00
Joan Sanchez f4825488c6 refactor(Tasks API): ghanged method to GET
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-07-26 11:47:43 +02:00
Alex Moreno d3852bac5d fix(vnInputTime): quit new date(null)
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-07-26 11:45:12 +02:00
Alex Moreno 3fd34e0861 feat(claim_pickup_order): modify email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-25 14:49:39 +02:00
Carlos Jimenez Ruiz f3766edbb7 Merge branch 'dev' into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-22 13:56:19 +00:00
Vicent Llopis 9bd3daf71c feat: add translate 2022-07-22 13:36:44 +02:00
Vicent Llopis 4076f2908e refactor: change type of params in endpoints
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-22 13:35:18 +02:00
Carlos Jimenez Ruiz 7d7365c4f3 Merge branch 'dev' into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-07-22 11:07:08 +00:00
Vicent Llopis 5446c960fb fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-07-21 10:11:31 +02:00
Vicent Llopis 699f19b0d4 refactor: change invoice id by refFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-21 10:05:37 +02:00
Vicent Llopis cb3e488df9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4221-intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 14:12:08 +02:00
Vicent Llopis 26f8996936 refactor: set vn-focus and move sql to new folder
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 14:02:15 +02:00
Vicent Llopis af4e7be229 feat: add frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 13:41:33 +02:00
Vicent Llopis 771c86ba4b fix: shelving log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-20 12:40:30 +02:00
Vicent Llopis b4408dc080 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 14:42:43 +02:00
Vicent Llopis 318b688b67 fix: typo errors
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 14:40:41 +02:00
Vicent Llopis 28deb34047 refactor: update translation 2022-07-19 14:40:23 +02:00
Vicent Llopis 7434532636 feat: add translate
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-19 13:38:06 +02:00
Vicent Llopis c56ac1c192 feat: add log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-19 13:35:17 +02:00
Carlos Jimenez Ruiz 7437da92a5 Merge branch 'dev' into 4294-zone_getEventsFiltered
gitea/salix/pipeline/head This commit looks good Details
2022-07-15 12:43:50 +00:00
Carlos Jimenez Ruiz bbfab8d0bd Merge branch 'dev' into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-07-15 12:22:15 +00:00
Carlos Jimenez Ruiz c883f45653 Merge branch 'dev' into 4221-intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-07-15 12:18:33 +00:00
Carlos Jimenez Ruiz 333828c583 Moved invoiceOut, Ticket and Sales refund loginc to backend + tests
gitea/salix/pipeline/head This commit looks good Details
2022-07-14 13:40:50 +02:00
Vicent Llopis ac344d6edd refactor: add column id PK and updated column code UQ
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-14 09:54:28 +02:00
Vicent Llopis 762ec3045f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3069-client.shelving 2022-07-14 09:11:43 +02:00
Vicent Llopis fdf6e04233 change travel.agencyFk by agencyModeFk 2022-07-13 14:36:03 +02:00
Vicent Llopis dd46a974cc fix: backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-12 11:57:01 +02:00
Vicent Llopis 7bf9a8c100 delete itemType.warehouseFk
gitea/salix/pipeline/head This commit is unstable Details
2022-07-12 11:52:47 +02:00
Vicent Llopis 6f3d4792d5 update backTest
gitea/salix/pipeline/head This commit looks good Details
2022-07-12 10:03:58 +02:00
Vicent Llopis eaa7658b23 delete it.warehouseFk 2022-07-12 10:03:50 +02:00
Vicent Llopis 25dab78ca2 Merge branch 'dev' into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-07-12 06:20:07 +00:00
Alex Moreno 051a849a21 fix(zone): fix getEventsFiltered
gitea/salix/pipeline/head This commit looks good Details
2022-07-12 08:10:29 +02:00
Vicent Llopis 2d57b3bd54 Merge branch 'dev' into 4221-intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-07-12 06:10:20 +00:00
Vicent Llopis 1eb6ee69cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head This commit is unstable Details
2022-07-12 08:09:02 +02:00
Vicent Llopis e4b04fadbc fix: set editMode = 'include' by default
gitea/salix/pipeline/head Build queued... Details
2022-07-12 08:00:17 +02:00
Vicent Llopis 2b5550bc6e feat: add testFront
gitea/salix/pipeline/head This commit looks good Details
2022-07-12 07:57:28 +02:00
Carlos Jimenez Ruiz 136dcee214 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4265-refunds 2022-07-11 16:39:57 +02:00
Carlos Jimenez Ruiz 44c29aa489 updated file as per convention 2022-07-11 11:25:31 +02:00
Alex Moreno b3d001bb9d fix(timeEntry): fix back test
gitea/salix/pipeline/head This commit looks good Details
2022-07-11 08:17:32 +02:00
Vicent Llopis 4b65b531fd feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-08 10:09:03 +02:00
Vicent Llopis eb586643ca refactor: change name of endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-08 09:47:11 +02:00
Vicent Llopis 94872f8493 fix: show geos checked onSearch
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-07 13:37:36 +02:00
Vicent Llopis 6f7a4fc5ff refactor title of test
gitea/salix/pipeline/head This commit is unstable Details
2022-07-05 12:08:16 +02:00
Vicent Llopis 979ee1d956 feat: add backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-07-05 10:19:22 +02:00
Vicent Llopis 51bd18ac37 feat: update commissionWorkCenterFk when create a route 2022-07-05 10:19:06 +02:00
Joan Sanchez fc87039571 Merge pull request '4213-item.summary' (#1011) from 4213-item.summary into dev
gitea/salix/pipeline/head This commit is unstable Details
Reviewed-on: #1011
2022-07-01 09:25:07 +00:00
Carlos Jimenez Ruiz d0e06a46d0 removed deprecated stowaway comp and usages
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-01 09:15:07 +02:00
Joan Sanchez d810b3712b Merge pull request 'added max width to email of 400px + title to overflowing content' (#1017) from 4268-client_list_scroll into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1017
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-06-30 12:22:41 +00:00
Alex Moreno ca767b84f0 fix(entry): change isInventory to isExcludedFromAvailable
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 13:21:07 +02:00
Joan Sanchez ae79163048 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 13:17:04 +02:00
Joan Sanchez 140af7e808 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 13:14:08 +02:00
Joan Sanchez ad021265c7 Deprecated field taxTypeFk
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 11:42:37 +02:00
Carlos Jimenez Ruiz dab8c60f77 Merge branch 'dev' into 4268-client_list_scroll
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 08:13:59 +00:00
Carlos Jimenez Ruiz 14350358d6 added max width to email of 400px + title to overflowing content
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 15:21:30 +02:00
Vicent Llopis 748dc1b37e fix: delete engine memory to pass backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-29 14:36:17 +02:00
Vicent Llopis 24159cd3e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4213-item.summary
gitea/salix/pipeline/head Build queued... Details
2022-06-29 14:28:54 +02:00
Vicent Llopis d49a2666f1 refactor: don´t show 'description' if it is empty
gitea/salix/pipeline/head This commit is unstable Details
2022-06-29 14:28:23 +02:00
Vicent Llopis 459a1fe518 feat: update instrastat.sql
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 14:15:22 +02:00
Carlos Jimenez Ruiz 57a2cd46ce ticket filter pending uses isNotValidated now
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 12:55:11 +02:00
Alex Moreno 22fd0e91b0 title translations, and getWorkedHours test
gitea/salix/pipeline/head This commit looks good Details
2022-06-28 12:10:37 +02:00
Alex Moreno a3f1c36226 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests 2022-06-28 11:12:06 +02:00
Carlos Jimenez Ruiz bdf4ecdf50 Merge branch 'dev' into 4223-claim_observations
gitea/salix/pipeline/head This commit looks good Details
2022-06-28 07:03:44 +00:00
Javi Gallego 4c5c51a319 claim basic-data minor bug
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 18:20:26 +02:00
Alex Moreno 8e2ed4e182 fix(worker_getWorkedHours): fix fixtures and test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-27 15:09:43 +02:00
Alex Moreno 7980a941a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-27 14:03:24 +02:00
Alex Moreno a98a927663 fix back test and e2e that now fail
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 11:17:45 +02:00
Carlos Jimenez Ruiz 6370471bd5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4223-claim_observations
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 11:01:42 +02:00
Vicent Llopis fcf79a507c Merge branch 'dev' into 4213-item.summary
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 05:32:21 +00:00
Alex Moreno 4155b45785 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-27 07:22:43 +02:00
Carlos Jimenez Ruiz d183ccb843 feat(claim.notes): added the observations setction to claim plus refactors
gitea/salix/pipeline/head This commit is unstable Details
2022-06-25 15:22:47 +02:00
Vicent Llopis 3e43bf2024 feat(route.index): can edit fields
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-23 14:14:13 +02:00
Alex Moreno 4d4e09fb9f test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-23 14:07:53 +02:00
Carlos Jimenez Ruiz 3c963b5ab2 refactor(routes json): fixed indentation 2022-06-22 16:42:59 +02:00
Vicent Llopis 2c721867fc feat(item.summary): add description
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-22 14:30:25 +02:00
Joan Sanchez 2381a5d09a Updated e2e tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-22 12:40:11 +02:00
Joan Sanchez 2a758fd12a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization 2022-06-22 11:38:01 +02:00
Joan Sanchez f7d64e89ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-22 08:59:06 +02:00
Joan Sanchez 004f1390fc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-06-22 08:58:51 +02:00
Joan Sanchez e7bf88c703 Fix order
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 14:26:34 +02:00
Alex Moreno 20f886e933 change email and text info in email field
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 13:58:47 +02:00
Alex Moreno 17fd50ee33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4088-client_web-access_email 2022-06-21 13:40:24 +02:00
Joan Sanchez 9751514b10 Merge branch 'dev' into 4138-ticket_create_address_isActive
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 11:15:33 +00:00
Joan Sanchez e5b1bfeec2 Merge branch 'dev' into 4231-worker.calendar_payedHolidays
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 10:59:46 +00:00
Vicent Llopis ec852b898c fix: check if services exists
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 12:44:19 +02:00
Joan Sanchez 16d677528a FIX: Sort by id as last field
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 12:18:33 +02:00
Alex Moreno 8d9d64b49d feat(client_web-access): add email field
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-20 07:31:10 +02:00
Carlos Jimenez Ruiz 7c580da6b8 refactor(ticket.create): display only active addresses
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 16:42:59 +02:00
Carlos Jimenez Ruiz ba0975fe0e Merge branch 'dev' into 4081-ticket.setDeleted
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 10:48:18 +00:00
Carlos Jimenez Ruiz c22e36ff1e Merge branch 'dev' into 4081-ticket.setDeleted
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 10:45:13 +00:00
Vicent Llopis 6611fcb40e fix: show correct payedHolidays
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-17 12:34:33 +02:00
Joan Sanchez 9250cc78ff Merge branch 'dev' into 4197-entry.lastetBuysFilter
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 10:34:00 +00:00
Vicent Llopis 44e95a00c3 refactor: delete duplicated code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-17 08:54:40 +02:00
Vicent Llopis 1bd4b02a62 refactor: code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-17 08:18:23 +02:00
Carlos Jimenez Ruiz 1e504b6b9f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2808-e2e_account_descriptor 2022-06-16 16:46:33 +02:00
Carlos Jimenez Ruiz e151e35f7e replaced isActive by active as per it's model and updated original data in controller
gitea/salix/pipeline/head This commit looks good Details
2022-06-16 16:25:21 +02:00
Carlos Jimenez Ruiz aa6ec3f770 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4185-secure_client_pass_changes 2022-06-16 12:01:05 +02:00
Carlos Jimenez Ruiz 0f44f072ee refactor(client): added updateUser and setPassword methods to client module 2022-06-16 11:32:42 +02:00
Vicent Llopis 00e48f5257 feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-06-16 10:59:31 +02:00
Vicent Llopis 84ffe3f594 feat: delete from ticketCollection and sectorCollection when a ticket is deleted
gitea/salix/pipeline/head This commit looks good Details
2022-06-16 09:58:15 +02:00
Vicent Llopis f41b9b0b57 refator: delete console.log
gitea/salix/pipeline/head This commit looks good Details
2022-06-15 14:25:31 +02:00
Vicent Llopis f3cca1c930 fix: warehouse changed from 'silla' to 'algemesi'
gitea/salix/pipeline/head This commit looks good Details
2022-06-15 14:24:35 +02:00
Vicent Llopis 980ac50ba9 feat: add frontTets
gitea/salix/pipeline/head This commit looks good Details
2022-06-15 14:03:58 +02:00
Vicent Llopis f69fb45b90 feat: it only sets the highest priority, in case that ticket doesn't already have the highest priority.
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-15 12:53:13 +02:00
Vicent Llopis cc23913c9e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route
gitea/salix/pipeline/head This commit looks good Details
2022-06-15 09:40:02 +02:00
Alex Moreno 8474fb5692 Merge branch 'dev' into 3498-staticDate
gitea/salix/pipeline/head This commit looks good Details
2022-06-15 07:15:34 +00:00
Vicent Llopis e61784b6ba refactor: undo chages about drag&drop
gitea/salix/pipeline/head This commit looks good Details
2022-06-14 13:52:32 +02:00
Vicent Llopis 52e78db9ee feat: group by address in buscaman, delete priority by checked, show notes of tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-14 12:36:08 +02:00
Vicent Llopis 189e8dbab3 feat: order by column enabled 2022-06-14 12:34:32 +02:00
Vicent Llopis 931c4fb259 refactor: translate
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-14 08:03:46 +02:00
Vicent Llopis c26b09ead3 refactor: create endpoint
gitea/salix/pipeline/head This commit looks good Details
2022-06-13 14:33:22 +02:00
Vicent Llopis dd65f4a468 refator: rewrite conditionals
gitea/salix/pipeline/head This commit looks good Details
2022-06-13 13:17:56 +02:00
Vicent Llopis 8d4c735744 refactor: delete duplicated code
gitea/salix/pipeline/head This commit looks good Details
2022-06-13 12:26:40 +02:00
Vicent Llopis 363c5f349a fix: solved bug to create temporary table
gitea/salix/pipeline/head This commit looks good Details
2022-06-13 10:04:12 +02:00
Alex Moreno 5e586bf1d0 test(client_defaulter): getBalanceDueTotal tested
gitea/salix/pipeline/head This commit looks good Details
2022-06-13 07:44:21 +02:00
Joan Sanchez 9ab8b84290 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization
gitea/salix/pipeline/head This commit is unstable Details
2022-06-10 13:16:27 +02:00
Carlos Jimenez Ruiz 096f225656 Merge branch 'dev' into 4024-client_defaulter
gitea/salix/pipeline/head This commit looks good Details
2022-06-10 07:21:54 +00:00
Vicent Llopis 06f181e913 feat: add frontTest for calendar
gitea/salix/pipeline/head This commit is unstable Details
2022-06-10 08:29:10 +02:00
Vicent Llopis f6ab9d8a31 feat: updated backTest
gitea/salix/pipeline/head This commit looks good Details
2022-06-10 08:15:54 +02:00
Alex Moreno de0f7c98fa Merge branch 'dev' into 3653-clientInsurance
gitea/salix/pipeline/head This commit looks good Details
2022-06-10 05:32:58 +00:00
Alex Moreno f74c7a6999 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 15:13:04 +02:00
Vicent Llopis a9badfc1ba feat: add backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 14:59:17 +02:00
Alex Moreno f786cdd33d fix pass dates
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 14:39:51 +02:00
Vicent Llopis afd95872c8 feat: drag and drop
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-09 13:48:57 +02:00
Alex Moreno eb9bd66ddb prepare for static dates
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 13:33:01 +02:00
Carlos Jimenez Ruiz 92088c00f7 Merge branch 'dev' into 4163-supplier.account
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 09:04:14 +00:00
Carlos Jimenez Ruiz ad8eace5cb Merge branch 'dev' into 3817-updatePortfolio
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 07:52:52 +00:00
Vicent Llopis fb7f26216c feat: update combo "Banck entity" 2022-06-09 08:43:33 +02:00
Alex Moreno 7eec9de0aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 07:47:03 +02:00
Alex Moreno 61cc3c19f3 refactor(client): creditInsuarnce change creditClassification for creditClassificationFk
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 07:13:54 +02:00
Vicent Llopis 409e935cc7 feat: add fields
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-08 15:17:45 +02:00
Vicent Llopis aa99424476 deleted unnecessary 'await'
gitea/salix/pipeline/head This commit looks good Details
2022-06-08 12:50:32 +02:00
Joan Sanchez c92f444776 Ammends
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 14:59:18 +02:00
Carlos Jimenez Ruiz 27e8c99604 Merge branch 'dev' into 4067-client_detail
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 12:50:37 +00:00
Carlos Jimenez Ruiz 6ebcf4bc02 Merge branch 'dev' into 3817-updatePortfolio
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 12:35:31 +00:00
Joan Sanchez 58a1eea642 Merge branch 'dev' into 4111-claim.summary
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 12:27:12 +00:00
Vicent Llopis eba6c149ba refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-07 13:26:55 +02:00
Joan Sanchez 13e0772f0b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-06-03 14:28:39 +02:00
Alex Moreno 4e3380cf65 hotFix(ticket_expedition): delete e.checked in filter
gitea/salix/pipeline/head This commit looks good Details
2022-06-02 15:28:11 +02:00
Vicent Llopis 5e01ea58e3 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-06-02 13:41:51 +02:00
Vicent Llopis e9c98a98e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head This commit is unstable Details
2022-06-02 13:38:27 +02:00
Vicent Llopis 3da9a775bd feat: add frontTest
gitea/salix/pipeline/head This commit is unstable Details
2022-06-02 13:36:57 +02:00
Vicent Llopis 8dcd430178 fix: events frontTest
gitea/salix/pipeline/head This commit is unstable Details
2022-06-02 13:11:26 +02:00
Vicent Llopis f7be419bbe refator: updated fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-02 11:52:53 +02:00
Vicent Llopis b5fa360960 feat: edit excluded selecetion with specificLocations
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-02 10:40:02 +02:00
Juan Ferrer ea0a43d0fb Merge branch 'dev' into 4108-mdb_backend
gitea/salix/pipeline/head This commit is unstable Details
2022-06-02 06:45:50 +00:00
Joan Sanchez b6d0d9f210 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 14:26:20 +02:00
Joan Sanchez fab4705618 Rollback
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 14:01:19 +02:00
Vicent Llopis 1235affe2d fix: show correct css
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-01 13:47:46 +02:00
Joan Sanchez 4ecffc2448 Merge branch 'dev' into 4067-client_detail
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 11:45:02 +00:00
Joan Sanchez a4a9ea45b7 Removed front unit test
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 13:44:07 +02:00
Joan Sanchez 571e2f03d3 Removed focus
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-01 13:07:47 +02:00
Joan Sanchez 0faabeb145 Added back unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-01 13:07:28 +02:00
Joan Sanchez 0bc48dc27b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 09:39:53 +02:00
Joan Sanchez 4ac26895ba fix(regularizeClaim): refound with negative quantity
gitea/salix/pipeline/head This commit looks good Details
Refs: #4148
2022-06-01 09:36:47 +02:00
Alex Moreno 8340041b33 throw userError and maxFileSize
gitea/salix/pipeline/head This commit is unstable Details
2022-06-01 07:57:32 +02:00
Joan Sanchez c369453bfc Added model fields
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-31 13:36:27 +02:00
Vicent Llopis 0c996f7915 fix: excluded backTest fixed
gitea/salix/pipeline/head This commit looks good Details
2022-05-31 12:23:56 +02:00
Vicent Llopis c7471fdac4 refator: variable names changed
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-31 12:21:04 +02:00
Alex Moreno 7c7c64415d fix(monitor_ticket): add isTooLittle problem
gitea/salix/pipeline/head This commit looks good Details
2022-05-31 12:00:15 +02:00
Alex Moreno cac4e74793 refactor
gitea/salix/pipeline/head This commit is unstable Details
2022-05-31 09:06:15 +02:00
Joan Sanchez a5e833af2c feat(client): detail section with smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-31 07:56:17 +02:00
Vicent Llopis da1e188983 fix: put requests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-27 13:54:35 +02:00
Alex Moreno 1e2f827233 fix
gitea/salix/pipeline/head This commit is unstable Details
2022-05-27 13:39:33 +02:00
Alex Moreno 863977915e fix 2022-05-27 13:27:05 +02:00
Alex Moreno 2b10abbe24 typo
gitea/salix/pipeline/head This commit looks good Details
2022-05-27 10:08:40 +02:00
Alex Moreno ff264ab930 hotFix(client): fiscal-data edit by salesAssistant
gitea/salix/pipeline/head This commit looks good Details
2022-05-27 09:45:08 +02:00
Alex Moreno aa7074f303 test(mdb): back test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-27 08:23:52 +02:00
Joan Sanchez a5f3580b17 derp
gitea/salix/pipeline/head This commit looks good Details
2022-05-26 16:14:10 +02:00
Vicent Llopis 6359c9e5bf feat: add fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 15:08:23 +02:00
Vicent Llopis 456f167513 feat: fix editExclusion mode
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 11:09:03 +02:00
Vicent Llopis bbdaa7de39 feat: add editExclusion mode 2022-05-26 08:33:45 +02:00
Alex Moreno 79c42d04f9 feat(mdb): start section
gitea/salix/pipeline/head This commit is unstable Details
2022-05-25 14:59:28 +02:00
Vicent Llopis a907354cc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-25 09:03:52 +02:00
Vicent Llopis 4baf1afb83 fix: show videos in claim.summary
gitea/salix/pipeline/head This commit looks good Details
2022-05-25 07:51:47 +02:00
Joan Sanchez f9b9dfaf4b 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
2022-05-24 14:54:06 +02:00
Vicent Llopis 5880efe966 refator: commented code deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-24 12:51:00 +02:00
Vicent Llopis f00fb0dc3f feat: add new module shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-24 12:50:22 +02:00
Vicent Llopis 99c7ad1c1b refactor: delete section shelving from client 2022-05-24 12:50:06 +02:00
Joan Sanchez caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 08:45:37 +02:00
Carlos Jimenez Ruiz c721d9ae82 Merge branch 'dev' into 4022-client.balance.create
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:43:00 +00:00
Carlos Jimenez Ruiz a76dd11825 Merge branch 'dev' into 3870-models
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:33:08 +00:00
Vicent Llopis db7638f153 refactor: sectorFk property deleted
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:45:20 +02:00
Vicent Llopis 9bbdeb2840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:41:01 +02:00
Vicent Llopis 1b3f0ee026 refactor: added itemPackingType and temperature relations
gitea/salix/pipeline/head This commit is unstable Details
2022-05-23 12:40:11 +02:00
Vicent Llopis 9736a68dd9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4022-client.balance.create
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:16:58 +02:00
Vicent Llopis 875e9503c3 refactor: request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:16:47 +02:00
Vicent Llopis a043c5d346 refactor: request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:10:48 +02:00
Carlos Jimenez Ruiz d86ac41b70 Merge branch 'dev' into 3905-invoice-out_refund
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 10:54:08 +00:00
Vicent Llopis f4b080243c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:53:23 +02:00
Vicent Llopis fd80fc58fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:33:23 +02:00
Vicent Llopis 3c9800a7a3 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:33:12 +02:00
Joan Sanchez 4d093d37bd Merge branch 'dev' into 3905-invoice-out_refund
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 10:22:48 +00:00
Carlos Jimenez Ruiz b3c0aa7933 Merge branch 'dev' into 4082-zone.basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 10:19:00 +00:00
Vicent Llopis c125fd54eb refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:08:12 +02:00
Vicent Llopis 0425b17b4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund 2022-05-20 11:57:20 +02:00
Vicent Llopis 69e12e0dd8 refactor: 'bonus' can be a negative value
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 09:21:33 +02:00
Vicent Llopis c5683ab880 feat: added itemShelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-20 09:17:18 +02:00
Carlos Jimenez Ruiz ed4718922e prevented logs on non-existent clients 2022-05-17 15:37:52 +02:00
Alex Moreno 4a9c5742c0 fix(entry_latest-buys): fix multi_check
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 13:50:06 +02:00
Vicent Llopis 605ab2ec62 refactor: delete sms.detinationFk
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 12:37:54 +02:00
Vicent Llopis eeede417eb feat: update date depending of accountingType
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 12:24:35 +02:00
Vicent Llopis ebbb0466a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models
gitea/salix/pipeline/head This commit is unstable Details
2022-05-17 10:13:05 +02:00
Vicent Llopis 76515bdd3f add: search-panel
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 09:54:49 +02:00
Vicent Llopis 3335cb8a01 feat(item.itemType): add fields
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 08:32:45 +02:00
Vicent Llopis 7ad56327a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType 2022-05-17 08:21:49 +02:00
Alex Moreno a37be3e5fe refactor(client_defaulter): search in smart-table
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 14:30:48 +02:00
Alex Moreno 8bcdf96aad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter 2022-05-16 14:15:37 +02:00
Carlos Jimenez Ruiz d31f7f1b6b all type Dates replaced to date as per convention
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz b5ccd32800 Merge branch 'dev' into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:23:08 +00:00
Vicent Llopis 10cd9c5b87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3893-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:22:16 +02:00
Vicent Llopis ab13c16948 feat: add dialog
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-16 07:17:29 +02:00
Carlos Jimenez Ruiz 990f7fe4b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation 2022-05-13 18:37:48 +02:00
Joan Sanchez 9cbee7a38a Merge branch 'dev' into 3771-ticket.expedition
gitea/salix/pipeline/head This commit looks good Details
2022-05-13 13:05:08 +00:00
Joan Sanchez 913b76880a Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head This commit looks good Details
2022-05-13 12:59:30 +00:00
Joan Sanchez f8db3c31df Proper test result
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-13 10:02:34 +02:00
Joan Sanchez 6b18432f87 Force test to fail
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-13 09:53:47 +02:00
Vicent Llopis 06e9a22f40 added search
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 15:02:07 +02:00
Alex Moreno ec49dd67be refactor(client_defaulter)
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 14:18:16 +02:00
Vicent Llopis b96d9ea4c2 feat(zone.events): add dialog
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 13:53:13 +02:00
Carlos Jimenez Ruiz cce1d93dde jasmine reporters config for CI
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 11:43:41 +02:00
Javi Gallego 0d63f3c3af Merge branch 'dev' into 3851-dms_delete
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 11:13:34 +02:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 09:47:47 +02:00
Vicent Llopis 6441393249 refactor: pull request changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 08:47:17 +02:00
Vicent Llopis 568579f461 refactor: pull request changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 08:27:04 +02:00
Alex Moreno 7f46d4e50a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 08:06:39 +02:00
Alex Moreno af1fa8051f refactor(clientCredit): refactor test 2022-05-12 08:06:30 +02:00
Vicent Llopis 16fdf982c8 feat(item.itemtype): add frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 07:40:24 +02:00
Carlos Jimenez Ruiz 833addcb75 gulp-jasmine replaced by jasmine
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 19:38:10 +02:00
Vicent Llopis 05b0a5342f feat(zone.events): new dialog when choose 'exclude'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 14:53:52 +02:00
Vicent Llopis 13a6f1f8c1 feat(item): add section itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-11 14:47:54 +02:00
Joan Sanchez d39147689d Merge branch 'dev' into 3771-ticket.expedition
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 12:47:33 +00:00
Joan Sanchez afe4f0ba94 Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 12:46:39 +00:00
Vicent Llopis 734f9cb60d feat(item.itemType): added section itemType
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 07:28:17 +02:00
Carlos Jimenez Ruiz a7b56b3b89 Merge branch 'dev' into 3327-global_invoicing
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 12:19:31 +00:00
Carlos Jimenez Ruiz a47c0dbaea Merge branch 'dev' into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 11:47:14 +00:00
Carlos Jimenez Ruiz 0e65f382f9 Merge branch 'dev' into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 11:36:35 +00:00
Alex Moreno 5919c42df2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check 2022-05-10 11:42:35 +02:00