Commit Graph

7150 Commits

Author SHA1 Message Date
Alexandre Riera d70a31bfbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes 2023-05-18 14:49:27 +02:00
Alex Moreno f54d9180b1 fix front test
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 14:44:05 +02:00
Alexandre Riera e8376c00a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 14:43:20 +02:00
Alex Moreno 15a1965a53 refs #5094 add scopes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 14:12:46 +02:00
Vicent Llopis ec02972efb refs #5609 mostrar filtro por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 14:11:29 +02:00
Carlos Satorres 814568f2a9 refs #5297 errors solve, trad
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 13:11:17 +02:00
Alexandre Riera 2591d2d115 refs #3628 added check & date-picker
gitea/salix/pipeline/head Build queued... Details
2023-05-18 11:42:22 +02:00
Alexandre Riera 4bcb461d36 refs #3628 added check & date-picker
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 11:41:46 +02:00
Vicent Llopis d33a84c39f refs #5638 feat: updated backTest
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 09:30:21 +02:00
Vicent Llopis 463d209d77 refs #5638 refactor: eliminado if innecesario
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 09:21:30 +02:00
Vicent Llopis 9263684ec5 refs #5638 fix: contempla que se le pase un filtro del 'nombre'
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 08:58:13 +02:00
Vicent Llopis b66362d313 refs #5638 fix: cambiado nombre de variable
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 08:33:17 +02:00
Alex Moreno 2ef922e80c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 08:10:10 +02:00
Vicent Llopis a9f71ccbc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5638-ticket.summary_states
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 07:33:08 +02:00
Alex Moreno ba763abc26 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 07:17:31 +02:00
Juan Ferrer 48da4b13ff refs #5667 Ticket translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 17:08:20 +02:00
Alex Moreno 02451818ef typo
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 14:31:19 +02:00
Carlos Satorres 69a25d8d03 refs #5696 horas a 00
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 14:04:13 +02:00
Alex Moreno 6ddbd8b8ea Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 11:43:25 +00:00
Carlos Satorres c31eee4906 refs #5696 landed
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 13:35:55 +02:00
Carlos Satorres 60bfb1b079 refs #5689 fix pixels
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 12:53:18 +02:00
Juan Ferrer 0d51987d47 refs #5667 Client sample translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 12:41:25 +02:00
Alexandre Riera 0d980334b8 refs #5634 conditional merge
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 12:41:00 +02:00
Juan Ferrer f9fdf80350 refs #5667 Item translations added
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 12:06:31 +02:00
Juan Ferrer f55e5f9f74 refs #5667 Business translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 11:52:13 +02:00
Juan Ferrer fa40bd9811 refs #5667 Style & translation fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 10:18:41 +02:00
Carlos Satorres adafd7444b refs #5334 worker-department
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-17 10:04:44 +02:00
Vicent Llopis eaaa860e97 Merge branch 'dev' into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 07:27:46 +00:00
Carlos Satorres f63dd0f9a3 refs #5334 datos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-17 09:05:28 +02:00
Juan Ferrer d8eeacb371 refs #5667 Translation improved
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 20:24:04 +02:00
Juan Ferrer 30d6f56c39 refs #5667 Style fixes, model translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 20:06:14 +02:00
Carlos Satorres 5c9ee21cfc refs #5334 department.card
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 14:00:05 +02:00
Carlos Satorres 9f9963af56 refs #5334 descriptor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 13:10:26 +02:00
Carlos Satorres d09889b08a refs #5334 fix summary route
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 12:12:25 +02:00
Carlos Satorres 3dcdbe0223 refs #5334 summary basic data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 11:41:42 +02:00
Carlos Satorres 612d0a2dfb refs #5334 fix index
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 09:52:48 +02:00
Carlos Satorres fd4d04756a refs #5334 routes index fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 08:54:54 +02:00
Alex Moreno 08fcbebbaf refs #5488 polish specifics acls
gitea/salix/pipeline/head This commit looks good Details
2023-05-15 14:14:08 +02:00
Carlos Satorres 443821b5c2 refs #5334 ?q
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 13:59:54 +02:00
Carlos Satorres 071849065a refs #5334 fix main
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 13:55:35 +02:00
Carlos Satorres 598067f757 refs #5334 routes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 13:15:33 +02:00
Vicent Llopis d5f5115980 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice 2023-05-15 11:50:09 +02:00
Carlos Satorres 87e1caa4eb refs #5334 department seccion
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 10:43:06 +02:00
Alex Moreno 0aa12a5efb hotFix(worker_new): use postcode not postalCode
gitea/salix/pipeline/head This commit looks good Details
2023-05-15 09:54:40 +02:00
Pablo Natek 8419c76b12 refs #5153 worker sin tr
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 12:51:07 +02:00
Carlos Satorres ece2875b38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 12:30:34 +02:00
Carlos Satorres 9cbf3006a0 refs #5599 futureState
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 11:17:51 +02:00
Vicent Llopis 3f26072787 refs #5468 eliminados getters a VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 09:02:55 +02:00
Alexandre Riera 9760e50212 refs #5513 minor fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 08:46:12 +02:00
Pablo Natek 65082be077 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 08:28:19 +02:00
Carlos Satorres 0dea1dfd9e Merge branch 'dev'
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 15:52:35 +02:00
Vicent Llopis b10f90fbe1 refs #5468 a la seccion privileges se le pasa el parametro user
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-11 15:25:37 +02:00
Vicent Llopis 2ed99426ef eliminado focus
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 10:18:02 +02:00
Vicent Llopis 90b844062d refs #5327 add frontTest
gitea/salix/pipeline/head Build queued... Details
2023-05-11 10:17:41 +02:00
Vicent Llopis 59f4b63db7 borrado espacio
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 10:04:59 +02:00
Vicent Llopis a7fcd8a1bf changes 2023-05-11 10:04:15 +02:00
Vicent Llopis f00643505d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head Build queued... Details
2023-05-11 10:03:07 +02:00
Vicent Llopis 8ed17d99c3 refs #5327 permite filtrar por columnas (desde el front)
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-11 10:02:45 +02:00
Alex Moreno 7704256079 master to test
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 08:00:49 +02:00
Carlos Satorres 43a91194fd refs #5599 remove e2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-10 15:59:29 +02:00
Carlos Satorres 2111ca0993 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5599-ticketColors 2023-05-10 14:49:37 +02:00
Carlos Satorres e258e779b3 refs #5599 ticketFuture
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 14:49:19 +02:00
Carlos Satorres 9a813c075c refs #5599 procedure y colorClass
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 14:43:08 +02:00
Carlos Satorres c59915f951 refs #5599 procedure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 13:55:36 +02:00
Vicent Llopis 74ea0ce9fd refs #5468 actualizados acls
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 13:44:51 +02:00
Alex Moreno 29e0562c8b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-10 13:33:52 +02:00
Alexandre Riera 3166a9e420 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora 2023-05-10 13:23:10 +02:00
Alexandre Riera ded8e0e141 refs #5137 added trigger, template and test
gitea/salix/pipeline/head This commit looks good Details
2023-05-10 13:22:53 +02:00
Vicent Llopis 62dd64eb89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 11:56:50 +02:00
Carlos Satorres f4be69c85c refs #5599 select state.classColor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 11:55:56 +02:00
Carlos Satorres 61d6f47162 refs #5599 remove returns
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 11:31:58 +02:00
Alex Moreno 8c0deb6cfa test(e2e_order): fiter optimized
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 09:16:19 +02:00
Vicent Llopis 461966d73e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-09 11:33:28 +02:00
Alex Moreno 8ae67799a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-05-09 07:11:09 +02:00
Juan Ferrer 2aaded4ed4 refs #5517 Fix: Show spinner when loading
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-05-08 16:30:21 +02:00
Carlos Satorres 0b2c91466e refs #5648 create vn-confirm
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-08 13:25:42 +02:00
Alex Moreno ebbc860ba3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-08 12:03:53 +02:00
Juan Ferrer 68b1b6c5bd refs #5517 E2E fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 12:03:27 +02:00
Alex Moreno 7273dd4f1e Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 08:56:06 +00:00
Alex Moreno 73fb940c63 refs #5472 try change-password
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-08 10:55:16 +02:00
Carlos Satorres 2c6f71b4c4 Merge branch 'dev' 2023-05-08 10:16:57 +02:00
Alexandre Riera a2055d35fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 09:48:09 +02:00
Alexandre Riera 372b9a2ce2 refs #5513 test getItemsPackaging
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 09:46:56 +02:00
Alexandre Riera d21b949ffb refs #5513 fix getItemsPackaging
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 09:18:53 +02:00
Alex Moreno 456e1d5912 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-05 14:11:47 +02:00
Alex Moreno 97da5e6e24 refs #5488 feat(isRoleAdvanced): use Acl instead of method
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 13:58:11 +02:00
Juan Ferrer ea5b032b40 refs #5517 Travel create E2E fixes 2023-05-05 13:00:45 +02:00
Juan Ferrer 805e678ca7 Merge branch 'dev' into 5517-e2eFix
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 08:14:13 +02:00
Juan Ferrer a48e197e46 refs #5517 E2E fixes 2023-05-05 08:12:38 +02:00
Alex Moreno 2da4289695 refs #5472 feat(vn-user): override change-password & set-password
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-04 15:01:29 +02:00
Vicent Llopis 404acdab6f refs #5638 fix: solucionado problema con el limit
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 14:51:47 +02:00
Alexandre Riera 5cdec35ed4 refs #5513 addFromPackaging.spec.js
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 14:30:10 +02:00
Alexandre Riera 8ae5a0de0f refs #5513 adding backs and models
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 12:03:47 +02:00
Juan Ferrer 677764f302 refs #5517 Fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 10:00:21 +02:00
Alexandre Riera 54eb0fc7a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 09:59:05 +02:00
Alex Moreno 1fa5926c17 Merge branch 'dev' into client_use_account_setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 07:06:44 +00:00
Alex Moreno b2027fddf3 fix(client): use account setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 14:56:14 +02:00
Alexandre Riera ad3c6dcee2 wip #5595
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 14:34:36 +02:00
Carlos Satorres dbd0e5138b refs #5328 fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 14:12:26 +02:00
Carlos Satorres 3ac1ce403c refs #5328 myOptions
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 14:06:57 +02:00
Carlos Satorres 566f03c497 refs #5328 commit prueba
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 13:03:14 +02:00
Carlos Satorres 3b2e1ca8d5 ref #5328 refundTicket.id
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 12:36:30 +02:00
Carlos Satorres eaf425fb51 refs #5328 mod funcion createTicketRefund
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-03 12:30:33 +02:00
Alex Moreno a1521f5220 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 09:39:39 +00:00
Carlos Satorres 17425a627c Merge branch 'dev' into 5316-kkeoEntryNotes
gitea/salix/pipeline/head Build queued... Details
2023-05-02 11:25:17 +00:00
Alex Moreno 306d73eb69 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 09:42:56 +00:00
Alex Moreno 4a7902ae4d Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 08:41:18 +00:00
Carlos Satorres 5436eec63e Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 10:00:50 +02:00
Carlos Satorres 8156c17c7d refs #5540 del jasmine 2023-05-02 10:00:47 +02:00
Javi Gallego ed6b2cf25b refs #5615
gitea/salix/pipeline/head This commit looks good Details
2023-05-01 14:57:50 +02:00
Carlos Satorres 06c01f3e94 Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 13:02:10 +00:00
Carlos Satorres fb59371d54 refs #5540 quit logs 2023-04-28 14:38:49 +02:00
Carlos Satorres 0e0db960af refs #5540 supplier 2023-04-28 14:23:44 +02:00
Alex Moreno ac55dc4cc7 refs #5297 feat(worker_new): add payMethod
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 14:17:19 +02:00
Carlos Satorres c0deb745d6 refs #5540 arreglo en supplier 2023-04-28 14:03:21 +02:00
Carlos Satorres 38142c121d refs #5540 mods client 2023-04-28 12:12:26 +02:00
Alex Moreno e00edf0266 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required 2023-04-28 12:06:45 +02:00
Pablo Natek 8651898a1f Merge branch 'dev' into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good Details
2023-04-28 08:36:47 +00:00
Carlos Satorres cdbbec9d36 refs #5540 validate
gitea/salix/pipeline/head Build queued... Details
2023-04-28 10:21:54 +02:00
Alex Moreno 42e3c8f29d refs #5488 fix(): use hasWriteRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 09:35:15 +02:00
Carlos Satorres b8f7f7bd69 refs #5540 create validateIban
gitea/salix/pipeline/head This commit looks good Details
2023-04-28 09:07:06 +02:00
Juan Ferrer 2cfd2d9dda Merge branch 'dev' into 5517-improveLogs+translations
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-27 18:13:24 +02:00
Vicent Llopis 87ffd2668e refs #5468 scope para VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-27 15:06:05 +02:00
Vicent Llopis 1597f7ab69 refs #5468 permitir acceso al módulo 'Usuarios' 2023-04-27 15:05:41 +02:00
Carlos Satorres 66986d3c21 Merge branch 'dev' into 5316-kkeoEntryNotes
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 12:08:28 +00:00
Pablo Natek 51624882e8 Merge branch 'dev' into 4795-client_getDebt
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 12:05:12 +00:00
Carlos Satorres 08c173acf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies 2023-04-27 12:49:01 +02:00
Carlos Satorres d15a671359 refs #5540 traduccion 2023-04-27 11:40:42 +02:00
Carlos Satorres 07148f6c29 refs #5540 mon message
gitea/salix/pipeline/head Build queued... Details
2023-04-27 11:31:26 +02:00
Alexandre Riera 3bd5582794 Merge branch 'dev' into 5255-revisar-ticketBoxing
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 08:42:21 +00:00
Carlos Satorres f8f4e14351 Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies
gitea/salix/pipeline/head This commit is unstable Details
2023-04-27 10:40:01 +02:00
Carlos Satorres dd4d0bca84 refs #5540 delete tinIsValid, solve test back, e2e 2023-04-27 10:39:58 +02:00
Alex Moreno 9b13e3fd2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 07:23:25 +02:00
Pablo Natek 990bfc63a8 Merge branch 'dev' into 4795-client_getDebt
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 16:10:39 +00:00
Vicent Llopis 2d181139b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 14:58:34 +02:00
Vicent Llopis 22b223038a delete focus 2023-04-26 14:56:07 +02:00
Vicent Llopis 8bb8b8cfba refs #5594 fix backTest
gitea/salix/pipeline/head Build queued... Details
2023-04-26 14:55:37 +02:00
Vicent Llopis 09dbd29086 refs #5594 cuando se factura se envía automáticamente un mail y quitados logs duplicados
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-26 14:46:16 +02:00
Alex Moreno c1ea1acc8c refs #4614 fear(ticket): add 'set weight' funcionality
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 13:49:08 +02:00
Vicent Llopis c69e038a56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:45:54 +02:00
Alex Moreno c62f8e1c14 refs #5297 feat(worker): iban and bankEntity not required
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:13:14 +02:00
Vicent Llopis c580be2790 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-26 12:07:34 +02:00
Alexandre Riera 1219cfcc5c refs #5255 fixed condition
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 12:03:17 +02:00
Carlos Satorres a524d7837d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 11:45:20 +02:00
Vicent Llopis 2e5a43af68 refs #5468 restringido permisos 'WRITE' para sysadmin en VnUser
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 11:40:21 +02:00
Carlos Satorres b25071f52b refs #5316 solve e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-26 11:40:18 +02:00
Carlos Satorres af875dd67e Merge
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 10:26:54 +02:00
Carlos Satorres 899ef23541 refs #084200 test back solve
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 10:03:01 +02:00
Vicent Llopis d6ff61b768 refs #5468 corregidas condiciones de autorización
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 09:48:02 +02:00
Alex Moreno 73153071d6 Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 05:56:46 +00:00
Alex Moreno af0523a155 refs #5468 descriptor account solo lo puede ejecutar sysadmin y mail-forwarding solo el mismo o un superior
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 15:17:45 +02:00
Pablo Natek e8ce8e42fd refs #5153
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:25:22 +02:00
Alex Moreno 28ead70615 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:17:46 +02:00
Alex Moreno 0c668c6ade refs #5488 feat(): replace all hasRole to checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:17:36 +02:00
Alexandre Riera 83319894b2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 11:25:29 +02:00
Alex Moreno 11d1900859 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 09:40:36 +02:00
Alex Moreno 4cb231759f feat(State/Supplier): replace hasRole to acls
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 09:15:05 +02:00
Alexandre Riera edb1e2197c Merge branch 'master' into hotfix-negativeBases
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 06:23:08 +00:00
Juan Ferrer 49368a837b refs #5517 Filter improved
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 19:10:04 +02:00
Pablo Natek 3e15728db4 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 15:33:28 +00:00
Carlos Satorres 40da3dfe52 Merge branch 'dev' into 5575-tercerDecimalLatest
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 12:53:28 +00:00
Carlos Satorres 08e890d6d9 Merge branch 'dev' into 5436-mensajeClienteSinCorreo
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 12:40:57 +00:00
Juan Ferrer a053764122 refs #5517 E2E fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 12:59:56 +02:00
Alex Moreno 8502b74dee feat(): replace hasRole to checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 11:07:04 +02:00
Juan Ferrer 081b4af6d6 Merge branch 'dev' into 5517-improveLogs+translations 2023-04-24 10:44:42 +02:00
Carlos Satorres 4473cc11c7 Merge branch 'dev' into 5439-inheritRole
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 08:43:19 +00:00
Carlos Satorres 210bd949d2 Merge branch 'dev' into 5436-mensajeClienteSinCorreo
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 08:38:06 +00:00
Carlos Satorres 1717f03ccc Merge branch 'dev' into 5575-tercerDecimalLatest
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 07:38:06 +00:00
Vicent Llopis 4983aa1632 refs #5542 fix backTest
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 09:11:09 +02:00
Vicent Llopis 9b432bac85 refs #5542 fix: test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 08:57:10 +02:00
Carlos Satorres 67db2f0476 Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 06:51:41 +00:00
Carlos Satorres cd4f66e292 refs #5540 arreglar e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 08:48:35 +02:00
Vicent Llopis bf558761a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 08:45:56 +02:00
Alexandre Riera 0a1583aa54 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 08:42:32 +02:00
Alex Moreno ef12fdf889 Merge branch 'dev' into 5575-tercerDecimalLatest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 06:02:34 +00:00
Alex Moreno 5e33395534 Merge branch 'dev' into 5436-mensajeClienteSinCorreo
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-24 06:02:00 +00:00
Vicent Llopis 5b7ca82509 Merge branch 'dev' into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 04:58:30 +00:00
Alexandre Riera 6609f96f92 Merge branch 'master' into hotfix-negativeBases
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 12:56:15 +00:00
Alexandre Riera bbf1c40987 Merge branch 'master' into hotfix-dms-hasFile
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 12:48:06 +00:00
Alexandre Riera 2975e7fae3 hotfix savesign
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 14:46:46 +02:00
Vicent Llopis e24366707b refactor: añadido focus a la seccion usuarios
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 14:26:12 +02:00
Vicent Llopis 2b74ab43ae refactor front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 14:12:53 +02:00
Vicent Llopis 9f04581862 refs #5542 "importar reclamacion" crea un registro en ticketRefund
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 14:00:28 +02:00
Vicent Llopis 38e5660e61 refs #5542 refactorizado "abono" para que siempre cree un único ticket abono 2023-04-21 13:59:28 +02:00
Alex Moreno faee5ccd7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-04-21 13:53:07 +02:00
Vicent Llopis ea1035311e Merge branch 'dev' into 5128-client.credit-management
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 11:30:58 +00:00
Alex Moreno 294bf2b8a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-04-21 13:30:34 +02:00
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Carlos Satorres 397d8f658e refs #5540 error trad
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 10:41:50 +02:00
Vicent Llopis 83f71cdd36 refactor: mostrar en columnas visibles 'Frágil'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 10:31:23 +02:00
Vicent Llopis 5af961ac69 fix: maneja si se elimina la sale
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 09:53:21 +02:00
Alexandre Riera af1ad7e08c fixed e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 09:47:34 +02:00
Carlos Satorres d8b5659a5d refs #5540 client vies 2023-04-21 09:14:30 +02:00
Alexandre Riera b3a10698af hotfix negativeBases
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 08:20:38 +02:00
Pablo Natek de3b4f37c2 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 05:54:00 +00:00
Juan Ferrer 9694a35343 refs #5517 Added: Tests, filter panel, model and props titles
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 19:46:57 +02:00
Juan Ferrer 6f1744baff Merge branch 'dev' into 5517-improveLogs+translations 2023-04-20 16:30:24 +02:00
Carlos Satorres 33c296c34d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-inheritRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 14:31:46 +02:00
Vicent Llopis ec9a5722c2 refs #5128 añadido icono de grafana
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 13:58:49 +02:00
Carlos Satorres d6e6dab03b Merge branch 'dev'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 11:55:52 +02:00
Carlos Satorres b4183c2698 refs #5436 mod de error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 11:33:28 +02:00
Carlos Satorres c103eeab7f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5436-mensajeClienteSinCorreo 2023-04-20 10:40:22 +02:00
Alex Moreno 63e0031bc6 deploy(231401): test to master 2023-04-20 08:24:43 +02:00
Alexandre Riera aecde484f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 07:52:05 +02:00
Alexandre Riera 84c2512847 refs #5293 open lilium in the same page
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 07:51:25 +02:00
Alex Moreno 39333a9119 refs #5488 replace hasRole for checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 15:23:32 +02:00
Vicent Llopis f6bf92b74b refs #5128 intentando poner icono grafana
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 15:21:59 +02:00
Vicent Llopis 6fbb734a34 quitado salto de linea
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 14:43:23 +02:00
Vicent Llopis 187ba032d2 refs #5128 rol por ACL 2023-04-19 14:43:15 +02:00
Alex Moreno c1d4281b1b refs #5488 replace hasWriteRole, hasReadRole
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 13:59:26 +02:00
Vicent Llopis 34b360040b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 12:18:45 +02:00
Vicent Llopis 5ace66ebca refs #5318 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 09:54:54 +02:00
Vicent Llopis be8a11cafc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 09:52:28 +02:00
Carlos Satorres a559c1f648 refs #5575 mod3Decimal
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 09:02:04 +02:00
Alex Moreno bde81e685f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 07:55:46 +02:00
Alex Moreno db19f153fb refs #5488 removes 'role =='
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 15:03:23 +02:00
Joan Sanchez 6f2aa0f618 Worker note ACL
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 14:51:48 +02:00
Joan Sanchez c3443ecc7c Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 14:37:20 +02:00
Joan Sanchez 32c9e22d96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 11:41:55 +02:00
Joan Sanchez a0d8ed1433 E2e fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 11:33:36 +02:00
Alexandre Riera 2df362327f Merge branch 'dev' into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 08:33:15 +00:00
Joan Sanchez a5f6991511 continue
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 10:18:44 +02:00
Joan Sanchez aabc4ec58d fix(consumption): continue queue if client mailing fails
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 10:08:04 +02:00
Alexandre Riera 28a7722bb6 Merge branch 'dev' into 5518-log-user-role
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 08:01:42 +00:00
Joan Sanchez fded7d062b section fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:49:23 +02:00
Vicent Llopis b3e7cedd1e refs #5128 borrada línea por error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:49:12 +02:00
Vicent Llopis c5225cb632 refs #5128 borrado código innecesario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:23:19 +02:00
Vicent Llopis 48cd23750e refs #5128 add testBack
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 09:09:09 +02:00
Vicent Llopis c9dffe9175 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:39:43 +02:00
Joan Sanchez 6fd5c8ae2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-18 08:34:20 +02:00
Joan Sanchez 6d593a0937 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5213-minorBugs2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:32:22 +02:00
Pablo Natek 3636543f73 refs #5075
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 08:19:23 +02:00
Alex Moreno 560b5b374f Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 05:37:12 +00:00
Vicent Llopis d99815356a refs #5144 manejado que el usuario sea NULL
gitea/salix/pipeline/head This commit looks good Details
2023-04-18 07:26:35 +02:00
Alex Moreno 0c475be10b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 14:23:02 +02:00
Alexandre Riera 7d8a0597c1 Merge branch 'dev' into 5518-log-user-role
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 09:53:36 +00:00
Alexandre Riera 2675c02d13 refs #5518 moved models to account
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 11:52:52 +02:00
Alexandre Riera 2bc190b01e Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:49:41 +00:00
Alexandre Riera 0dcbc9fc8b refs #5293 redirected claim.photos to lilium
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 10:46:26 +02:00
Carlos Satorres d399cda050 refs #5316 quitar comment
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 10:34:08 +02:00
Joan Sanchez 3ee29553b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 09:00:52 +02:00
Joan Sanchez 610f51aaf8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 08:59:49 +02:00
Joan Sanchez f53ebb7641 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:59:34 +02:00
Joan Sanchez 02c573bd23 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser 2023-04-17 08:57:24 +02:00
Carlos Satorres 60d3729b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes 2023-04-17 08:55:22 +02:00
Alex Moreno 0bfdbcb750 refs #4617 use temporary instead of vn
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:44:24 +02:00
Joan Sanchez 51e42e485b Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1372
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-17 06:44:17 +00:00
Carlos Satorres af8603185c refs #5439 inheritedRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 08:35:44 +02:00
Juan Ferrer c5dcfd3cab refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing
gitea/salix/pipeline/head This commit looks good Details
2023-04-15 14:24:50 +02:00
Juan Ferrer 2af48b3049 refs #4480 Fix: VnUser before save hook removed -> setting password attribute 2023-04-15 01:51:38 +02:00
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Alexandre Riera ad3836552e refs #5518 sections added
gitea/salix/pipeline/head This commit looks good Details
2023-04-14 14:16:29 +02:00
Vicent Llopis 4c18efa589 refs #5128 creado método setRating
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-14 13:05:57 +02:00
Joan Sanchez 35f94c58b7 reafactor(image): upload image using gm library
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-14 13:04:40 +02:00
Vicent Llopis 83dd386eed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management 2023-04-14 10:39:16 +02:00
Alexandre Riera b9b52c6b1d Merge branch 'dev' into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-14 07:08:02 +00:00
Juan Ferrer b4ef49cf24 Merge branch 'dev' into 5546-codigo-registro
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 16:48:11 +00:00
Alexandre Riera 8ade602563 hotfix one sign for every ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 14:18:01 +02:00
Carlos Satorres a2ddbd8a66 refs #5284 test update
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 14:04:10 +02:00
Joan Sanchez 6d5167ab7f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 13:47:18 +02:00
Alexandre Riera ac4772e44e refs #5418 mistake doing git pull origin dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 13:46:29 +02:00
Carlos Satorres 90268a79b0 refs #5284 test createClaim
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 13:41:10 +02:00
Vicent Llopis 2ada64e1bf refs #5517 eliminadas traducciones duplicadas
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 08:49:50 +02:00
Alexandre Riera 71e202d586 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5546-codigo-registro
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 08:45:05 +02:00
Carlos Satorres 44eab101cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo 2023-04-13 08:44:56 +02:00
Vicent Llopis 3790e3457f refs #5517 añadidas más traducciones
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 08:43:42 +02:00
Carlos Satorres ad267c933c refs #5540 country.code
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-13 08:30:33 +02:00
Pablo Natek 9594bd68b5 refs #4795
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 21:10:50 +02:00
Juan Ferrer 7e1d6f4339 Merge branch 'dev' into 5522-loggable-deadlock
gitea/salix/pipeline/head This commit looks good Details
2023-04-12 15:33:23 +00:00
Vicent Llopis 2a2d03e05a refs #5517 añadidas traducciones de algunos modelos
gitea/salix/pipeline/head This commit looks good Details
2023-04-12 15:02:21 +02:00
Carlos Satorres 60103fa80a refs #5540 validacion nif
gitea/salix/pipeline/head This commit looks good Details
2023-04-12 14:39:40 +02:00
Carlos Satorres ef6e85532e refs #5213 cambios e2e, descriptor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 14:20:05 +02:00
Alexandre Riera 0666163ca0 refs #5546 deleted log property, fixed back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 12:33:14 +02:00
Carlos Satorres 117849f093 refs #5540 supplier js
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 12:03:55 +02:00
Vicent Llopis 58750aa065 refs #5318 eliminido triggers y añadido loggable en salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-12 10:02:06 +02:00
Pablo Natek 1456da58f5 refs #5075
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 15:41:45 +02:00
Pablo Natek c928274e24 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 13:19:54 +00:00
Carlos Satorres 1ce2705869 refs #5316 last kkentry
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 15:04:49 +02:00
Vicent Llopis d03ca01b73 refs #5128 añadida subseccion "Gestión de crédito"
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 14:57:56 +02:00
Pablo Natek ccf26c5413 Merge branch 'dev' into 5211-cleanItemShelvings
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 11:56:33 +00:00
Pablo Natek 1770b8c038 refs #5075
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 13:42:28 +02:00
Carlos Satorres d21ab7a5a7 refs #5316 primer kkeo
gitea/salix/pipeline/head This commit is unstable Details
2023-04-11 10:32:21 +02:00
Vicent Llopis ec03c6edfa fix intermittent backTest
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 10:23:33 +02:00
Alexandre Riera 161fc25c5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 10:01:21 +02:00
Alexandre Riera 53bd6cd729 Merge branch 'dev' into 5522-loggable-deadlock
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 07:52:16 +00:00
Alexandre Riera ce28339973 refs #5522 deleted trigger afterInsert, added hook beforeInsert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 09:48:31 +02:00
Joan Sanchez 5732f9a33b Merge pull request 'refs #5250 campo de notes' (!1407) from 5250-observacionesWorker into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1407
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-11 07:07:55 +00:00
Joan Sanchez fe0d861dc0 Merge pull request '4856-worker.time-control_2' (!1418) from 4856-worker.time-control_2 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1418
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-11 07:06:04 +00:00
Vicent Llopis cd6a6f65b3 Merge branch '5327-ticket.sale_ordenarPorColumnas' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 07:45:20 +02:00
Vicent Llopis cc9ce65678 test 2023-04-11 07:44:25 +02:00
Vicent Llopis ba31613ac9 Merge branch 'dev' into 5275-item.fixed-price_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-04-06 09:58:07 +00:00
Carlos Satorres b3f946e15f Merge branch 'dev' into 5250-observacionesWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:32:05 +00:00
Vicent Llopis d9ae24c927 Merge branch 'dev' into 4856-worker.time-control_2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:08:10 +00:00
Vicent Llopis 8a297469d6 refs #4856 añadido myOptions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 10:06:29 +02:00
Vicent Llopis faab024e24 test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 09:59:45 +02:00
Carlos Satorres 68a24b7335 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker 2023-04-06 09:33:50 +02:00
Alexandre Riera 5cbc826281 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk
gitea/salix/pipeline/head This commit looks good Details
2023-04-06 07:16:00 +00:00
Joan Sanchez b71ad207ff Merge pull request 'fixes #5437 Desactivar correos "Cliente con email/teléfono/móvil duplicados"' (!1420) from 5437-deactivate-mail-duplicated-client into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1420
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-06 07:07:35 +00:00
Joan Sanchez a8af280de5 Merge pull request '5439-newFilterEnPeticionesDeCompra' (!1406) from 5439-newFilterEnPeticionesDeCompra into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1406
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-06 07:05:18 +00:00
Vicent Llopis 041590e541 refs #4856 maneja errores y notifica a los jefes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:54:12 +02:00
Vicent Llopis 6fc2867551 permite decimales
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:05:37 +02:00
Alexandre Riera c823a0d6f1 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 05:44:33 +00:00
Vicent Llopis a44a640d15 refs #4856 manejo errores
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 15:14:42 +02:00
Vicent Llopis 6a0bca1a94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 14:06:33 +02:00
David Domenech 44d4df9c21 Merge branch 'dev' into 5211-cleanItemShelvings
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 11:00:08 +00:00
Carlos Satorres 8741a9f913 Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra
gitea/salix/pipeline/head This commit looks good Details
2023-04-05 06:51:21 +00:00
Carlos Satorres 7d3c6a98f3 refs #5439 search panel solve
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 08:48:15 +02:00
Vicent Llopis fb5969a120 refs #5275 add test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 08:43:47 +02:00
Joan Sanchez ca30aaa18a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-04-05 08:39:43 +02:00
Carlos Satorres 77b91b77b2 refs #5439 requesterFk solve
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 08:19:50 +02:00
Vicent Llopis e97b5a9f80 refs #5275 fix backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 07:54:56 +02:00
Vicent Llopis 28a12d0706 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5275-item.fixed-price_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 07:36:53 +02:00
Carlos Andrés e342852ed8 Merge branch 'master' into 5529-invoicingFixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-04-04 13:05:49 +00:00
Carlos Andrés 0372d44415 fixes #5529 Fixes: missing awaits, buffer-to-file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 15:00:28 +02:00
Alexandre Riera eed1ecc208 refs #4954 trigger modified
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 14:47:13 +02:00
Vicent Llopis 35d19e586a add translatiojn
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 14:27:16 +02:00
Vicent Llopis 7a274e2721 Merge branch 'dev' into 5410-client.defaulter_getChecked
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 12:12:20 +00:00
Vicent Llopis 3630c7d398 refs #5410 creada ruta de back para enviar emails
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 14:09:55 +02:00
Joan Sanchez c126c6044a Updated format
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 13:55:44 +02:00
Vicent Llopis c89f95a33e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 13:40:12 +02:00
Alexandre Riera 9380b88460 refs #5437 back and test deprecated
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 12:40:03 +02:00
Vicent Llopis 0bfa4c54aa fix: inserta en workerTimeControlMail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 09:52:46 +02:00
Alexandre Riera 1a14c793cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 09:47:31 +02:00
Vicent Llopis 0db3bc5e26 refs #4856 fix test
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 09:29:51 +02:00
Vicent Llopis 21b7050cfd refs #4856 otros usuarios pueden actualizar el estado 2023-04-04 09:29:40 +02:00
Alexandre Riera 24f576a4b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 08:40:03 +02:00
Vicent Llopis d1100384bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2 2023-04-04 08:27:27 +02:00
Vicent Llopis 862101c4b0 refs #4856 feat: si se modifica una fichada actualiza el estado a 'SENDED' y notifica al trabajador
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-03 21:29:02 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:57:00 +02:00
Vicent Llopis 67689695e4 refs #5275 filtra por defecto por el this.vnConfig.warehouseFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:29:19 +02:00
Vicent Llopis e1bfdc3f3c eliminada variable que no se usa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 11:13:40 +02:00
Carlos Satorres 60383eda0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker
gitea/salix/pipeline/head This commit looks good Details
2023-03-30 08:26:45 +02:00
Carlos Satorres 4edb2463b8 refs #5250 eliminacion isEnabled 2023-03-30 08:23:53 +02:00
Vicent Llopis 5a67f47305 refs #4856 fix: actualizar estado a 'SENDED' movido al back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 08:14:17 +02:00
Joan Sanchez 6aca23e466 Merge pull request 'fixes #5056 Nuevo sistema de sacado de pedidos: Gestión de vagones' (!1386) from 5056-gestion-vagones into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1386
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-30 05:23:29 +00:00
Joan Sanchez cafb21d90b Merge pull request 'fixes #5206 travel buscador en el lateral' (!1384) from 5206-travel-buscadorLateral into dev
Reviewed-on: #1384
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-30 05:21:24 +00:00
Joan Sanchez 26bddef5e5 Merge pull request 'refs #5425 modificacion de los campos' (!1394) from 5425-modCamposBasicos(pesoycaja) into dev
Reviewed-on: #1394
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-30 05:19:50 +00:00
Joan Sanchez ea60e31361 Merge pull request '5432-propiedadesBotonMas' (!1396) from 5432-propiedadesBotonMas into dev
Reviewed-on: #1396
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-30 05:19:28 +00:00
Joan Sanchez 30a4356139 Merge pull request 'fixes #5184 InvoiceIn crear seccion invoiceIn serial' (!1414) from 5184-invoiceIn-serial into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1414
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-30 05:18:44 +00:00
Joan Sanchez 6366af9a15 Merge pull request 'refs #5490 traducción corregida' (!1415) from 5490-arregloExpedition into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1415
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-30 05:18:21 +00:00
Vicent Llopis d066c4ea0b refs #4856 feat: se envia el registro a todos los teletrabajadores. Tmb se pone estado 'SENDED' cuando se da a 'Reenviar'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 11:27:48 +02:00
Vicent Llopis b8da868095 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro
gitea/salix/pipeline/head This commit looks good Details
2023-03-29 09:22:23 +02:00
Vicent Llopis 3b615d9879 refs #5275 fix: actualiza correctamete los elementos del checkedDummy
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 09:11:40 +02:00
Alexandre Riera 9a713d2753 refs #5184 stmts removed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 08:48:54 +02:00
Alexandre Riera 3ad85c0de3 refs #5184 subselect deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-29 08:44:35 +02:00
Vicent Llopis c53c54b6cd refs #5275 feat: modificar masivamente
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 14:59:08 +02:00
Carlos Satorres bf5f1011e8 refs #5490 traducción corregida
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 14:56:20 +02:00
Vicent Llopis b4e04fcdad refs #5275 feat: colorear fechas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 14:40:14 +02:00
Alexandre Riera 69be91b964 refs #5184 fix back test, added e2e
gitea/salix/pipeline/head This commit looks good Details
2023-03-28 13:45:26 +02:00
Pablo Natek 2c01ebf681 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 13:26:17 +02:00
Alexandre Riera 695444f6ae refs #5184 back and front tests added
gitea/salix/pipeline/head This commit looks good Details
2023-03-28 11:34:14 +02:00
Vicent Llopis fb1b39da17 refs #5275 fix: al añadir artículo desde cero se muestra el nombre y se establecen las fechas por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 10:30:02 +02:00
Carlos Satorres 809c24f6cf Merge branch '5250-observacionesWorker' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker
gitea/salix/pipeline/head This commit looks good Details
2023-03-28 10:07:18 +02:00
Carlos Satorres 564165dc0f refs #5250 Self.validatesPresenceOf 2023-03-28 10:07:14 +02:00
Vicent Llopis 06ac8f9910 refs #5275 fix: si tenia valor el minPrice el checkbox siempre se marcaba. El checkbox no funcionaba cuando le pulsabas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 09:41:39 +02:00
Alexandre Riera 05caf0c6d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 08:26:11 +02:00
Alexandre Riera 87d0dc3cec refs #5092 changed name to negative bases
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 08:25:41 +02:00
Alexandre Riera 6f2de903bc refs #5184 working on search panel
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 14:29:22 +02:00
Alexandre Riera 188e592d28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-27 11:20:05 +02:00
Carlos Satorres 1302665d98 refs #5436 showSucces
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 10:00:00 +02:00
Alexandre Riera 0c8fe855ac refs #5418 lateral search panel added, missing e2e
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 09:11:29 +02:00
Alexandre Riera 8b4121e021 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-27 08:38:35 +02:00
Alexandre Riera 39af68c3dc Merge branch 'dev' into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 05:39:22 +00:00
Carlos Satorres b199ca4a6e Merge branch 'dev' into 5250-observacionesWorker
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 11:48:31 +00:00
Carlos Satorres c68c78cc5b refs #5250 solucion error WorkerObserv
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 12:11:42 +01:00
Vicent Llopis a32dea0acd Merge branch 'dev' into 5395-travel.extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 11:00:22 +00:00
Vicent Llopis f689d35100 refs #5410 fix test
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 10:05:17 +01:00
Joan Sanchez 00a0f88dc4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 10:03:23 +01:00
Joan Sanchez e67a40714c Claim log hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 09:59:55 +01:00
Vicent Llopis 6c75853ce6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 09:43:13 +01:00
Carlos Satorres fa78649607 refs #5439 url filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 08:54:03 +01:00
Vicent Llopis 5784f05fd4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 08:34:04 +01:00
Alexandre Riera 0baccc4745 refs #5206 fix tests front
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 08:25:37 +01:00
Alexandre Riera 8f2398bc8c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 08:12:50 +01:00
Vicent Llopis 92aed3eac1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 08:11:35 +01:00
Vicent Llopis a45308c6a5 refs #5342 fix: testFront
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 07:58:27 +01:00
Vicent Llopis 0f6092483c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 07:51:31 +01:00
Alexandre Riera 24d032910a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 14:58:31 +01:00
Vicent Llopis afdfe5e3f3 refs #5331 al filtrar por 'Pendiente' no muestra los estados 'Previa x'
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 14:55:19 +01:00
Vicent Llopis 2513377add Merge branch 'dev' into 5342-monitor.tickets_isFragile
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 13:38:08 +00:00
Joan Sanchez ea50da8a19 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 14:33:10 +01:00
Carlos Satorres 36af9d45e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-newFilterEnPeticionesDeCompra
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 11:56:40 +01:00
Vicent Llopis 805df64bb2 fallo cantidad reclamados
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 10:54:04 +01:00
Alexandre Riera c6fc2dee24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 10:53:11 +01:00
Alexandre Riera 4e5364dc0b refs #5036 fix tests logs
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 10:05:02 +01:00
Vicent Llopis 46e61543a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 09:29:03 +01:00
Vicent Llopis 34126119e2 fix errors
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 09:02:22 +01:00
Carlos Satorres 79c42384ee refs #5439 role actualizado
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 08:26:06 +01:00
Joan Sanchez 7b5e0bae8e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 08:20:33 +01:00
Carlos Satorres 3fd1e7a086 refs #5439 se elimina el filtro de fecha añadido
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 15:41:36 +01:00
Vicent Llopis 0579c563b9 refs #5327 ordernar por columnas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 15:03:12 +01:00
Joan Sanchez fcd422eb49 added relation
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 14:55:54 +01:00
Carlos Satorres 1ab8570ed3 Merge branch 'dev' into 5425-modCamposBasicos(pesoycaja)
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 13:28:07 +00:00
Carlos Satorres b2cc79a98e Merge branch 'dev' into 5432-propiedadesBotonMas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 13:24:32 +00:00
Vicent Llopis 27bb50ad12 refs #5342 esta tabla ya se borra en el proc
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 12:17:48 +01:00
Alexandre Riera 60eabbf7a0 Merge branch 'test' into hotfix-added-grabUser-logs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 10:37:57 +00:00
Alexandre Riera 81472a5e50 removed duplicated log
gitea/salix/pipeline/head Build queued... Details
2023-03-22 11:36:28 +01:00
Alexandre Riera 59c3ef23de grabUser added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 11:03:13 +01:00
Vicent Llopis d276c7b611 refs #5342 unificados proc x_getWarnings
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 10:57:18 +01:00
Vicent Llopis 2559be8230 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile 2023-03-22 10:29:21 +01:00
Carlos Satorres fde854f5c2 refs #5250 campo de notes
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:21:15 +01:00
Vicent Llopis 18afcbabc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community 2023-03-22 10:20:55 +01:00
Vicent Llopis 1b1bca28bd refs #5410 add frontTest
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:13:59 +01:00
Vicent Llopis bf38098e5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked 2023-03-22 09:31:08 +01:00
Alexandre Riera 700151b500 refs #5092 amount <> 0
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 08:18:56 +01:00
Alexandre Riera ce67132d7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 07:21:20 +01:00
Vicent Llopis 41c79263c4 refs #5410 feat: envia email cuando se añade una nota
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 14:53:36 +01:00
Joan Sanchez d209b35071 Merge pull request 'refs #5423 añadido 3r decimal' (!1392) from #5423-tercerDecimalCoste into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1392
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-21 10:22:37 +00:00
Alexandre Riera 1198ad3b01 refs #5056 wagonType backs and test
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 10:44:00 +01:00
Joan Sanchez 3a922b453f Merge branch 'dev' into 5241-virtual_pos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 09:10:34 +00:00
Joan Sanchez 12a9ff599b Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 10:05:27 +01:00
Joan Sanchez 3881e435f4 Renamed method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 09:55:45 +01:00
Vicent Llopis 46a6a5fc63 refs #5203 refactor: se le pasan los argumentos directamente y se corrige la transaccion
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 08:51:30 +01:00
Carlos Satorres 1bc3103d9f refs #5439 filtro comercial
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 08:44:28 +01:00
Joan Sanchez 634db7c7fc refactor(getTransactions): lilium customer transactions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-20 23:09:17 +01:00
Carlos Satorres da05140635 Merge branch '#5423-tercerDecimalCoste' of https://gitea.verdnatura.es/verdnatura/salix into #5423-tercerDecimalCoste
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 15:14:11 +01:00
Carlos Satorres 306573b1bf refs #5439 campos fecha y salesperson
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 15:11:55 +01:00
Carlos Satorres f0f2a8c731 refs #5432 quitar comentario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-20 13:41:32 +01:00
Carlos Satorres a670795f9d refs #5432 mod ng-show, add tooltip and disabled 2023-03-20 13:22:21 +01:00
Carlos Satorres 78d8bbd82a refs #5423 tercer decimal en entrada 2023-03-20 10:44:44 +01:00
Alexandre Riera 61a0d8bcb2 refs #5092 showing clients with multiple negative bases
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 10:15:18 +01:00
Alexandre Riera a94e47e622 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 09:54:02 +01:00
Carlos Satorres 9e42ab52ce refs #5425 modificación usuario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-17 09:32:20 +01:00
Robert Ferrús 1d697e1ac5 refs #4357 add operator model
gitea/salix/pipeline/head This commit looks good Details
2023-03-17 08:46:01 +01:00
Carlos Satorres 9565bb33f2 refs #5425 modificacion de los campos
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 14:12:54 +01:00
Vicent Llopis 6d04933fe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 14:01:19 +01:00
Vicent Llopis 5794ae5130 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked 2023-03-16 13:55:54 +01:00
Vicent Llopis bc47fc35d6 refs #5410 feat: añadido filtro a las columnas created y defaulterSinced
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 13:55:21 +01:00
Alexandre Riera a8f92b151d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 10:38:04 +01:00
Vicent Llopis 2f2d65bfd6 refs #5342 feat: añadido icono en los tickets que tengan sales fragiles
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 10:33:24 +01:00
Alexandre Riera 668fa73386 refs #4632 deleted return in definition
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 10:32:00 +01:00
Alexandre Riera 60162fe71f refs #4632 removed return
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 10:30:53 +01:00
Carlos Satorres aadb796adf Merge branch 'dev' into #5423-tercerDecimalCoste
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:12:56 +00:00
Alexandre Riera 3f356335db refs #5092 added popovers
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:47:58 +01:00
Alexandre Riera c46e15c8e4 refs #5092 changed section name
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:35:00 +01:00
Alexandre Riera 0b4a6874d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 09:16:50 +01:00
Alexandre Riera c0094d8047 Merge branch '4632-guardarFirmas-salix' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 09:07:21 +01:00
Alexandre Riera a0be5c50fc refs #4632 changed packed from boxed 2023-03-16 09:07:19 +01:00
Alexandre Riera f037575428 Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head Build queued... Details
2023-03-16 08:06:17 +00:00
Alexandre Riera 6e2269b428 refs #4632 removed alert level id from code
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:04:57 +01:00
Carlos Satorres 70beaf9b6c refs #5423 añadido 3r decimal
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:03:16 +01:00
Alexandre Riera a99bd2577a refs #4632 changed route from TicketDms to Ticket
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 08:24:34 +01:00
Alexandre Riera 387576d63a Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 06:42:39 +00:00
Joan Sanchez 8fda595c2e Merge pull request '4856-worker.time-control' (!1375) from 4856-worker.time-control into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1375
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:39:00 +00:00
Joan Sanchez d373d80b12 Merge pull request '5120-reports_loopback' (!1389) from 5120-reports_loopback into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1389
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:34:02 +00:00
Vicent Llopis a87e0c52d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control 2023-03-16 07:32:04 +01:00
Joan Sanchez a8049c5b2c Merge pull request '5380-m3/itemMaxSize' (!1377) from 5380-m3/itemMaxSize into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1377
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-16 06:28:03 +00:00
Joan Sanchez e911f7a127 Merge pull request '4980-travel.extra-community_filterToReport' (!1391) from 4980-travel.extra-community_filterToReport into dev
Reviewed-on: #1391
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:27:33 +00:00
Joan Sanchez d9296c139d Merge pull request 'fix: autocompletar el switf/bic' (!1388) from 5352-worker.create_swift/bic into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1388
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:25:18 +00:00
Joan Sanchez 1f52326091 Merge pull request 'feat(print): added reusable pdf print functions' (!1390) from 5182-print_publish into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1390
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-03-16 06:22:45 +00:00