 Juan Ferrer
|
26c2ab867d
|
Merge pull request 'master into test' (!1546) from master into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1546
|
2023-05-22 17:04:32 +00:00 |
 Carlos Satorres
|
3994e65040
|
refs #5648 spaces fix2
|
2023-05-22 15:56:14 +02:00 |
|
Carlos Satorres
|
a7c59f51b9
|
Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-22 13:51:35 +00:00 |
|
Carlos Satorres
|
6d147e7af7
|
refs #5648 fix spaces
|
2023-05-22 14:30:04 +02:00 |
|
Carlos Satorres
|
9bc20493fe
|
#refs #5648 e2e fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-22 12:02:07 +02:00 |
|
Carlos Satorres
|
1b19035d8d
|
refs #5648 vn-confirm
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-22 10:41:02 +02:00 |
|
Carlos Satorres
|
23287e5ebf
|
refs #5648 setTimeout
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-22 08:30:23 +02:00 |
|
Carlos Satorres
|
32ce0c1a1a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim
|
2023-05-22 08:13:31 +02:00 |
|
Juan Ferrer
|
69b892f2fd
|
refs #5667 Translations
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-20 16:59:39 +02:00 |
 Vicent Llopis
|
8eedba8a66
|
refs #5609 feat: solo muestra error cuando hay 'from' sin 'to y viceversa
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-19 13:34:07 +02:00 |
|
Juan Ferrer
|
6b0fd99eb8
|
refs #5667 Fixes: Style, translations, fixtures, UI
|
2023-05-19 10:56:15 +02:00 |
|
Vicent Llopis
|
5ec107188c
|
refs #5609 feat: no deja buscar si no tiene un filtro de fecha
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-19 10:30:36 +02:00 |
|
Vicent Llopis
|
8cf988b7d2
|
refs #5638 refactor: code
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-19 08:02:17 +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 |
|
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 |
|
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 |
 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
|
fa40bd9811
|
refs #5667 Style & translation fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-17 10:18:41 +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 |
|
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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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
|
a48e197e46
|
refs #5517 E2E fixes
|
2023-05-05 08:12:38 +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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
Alexandre Riera
|
1219cfcc5c
|
refs #5255 fixed condition
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 12:03:17 +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 |
|
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 |
|
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 |
|
Juan Ferrer
|
081b4af6d6
|
Merge branch 'dev' into 5517-improveLogs+translations
|
2023-04-24 10:44:42 +02: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 |
|
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 |
|
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
|
38e5660e61
|
refs #5542 refactorizado "abono" para que siempre cree un único ticket abono
|
2023-04-21 13:59:28 +02: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 |
|
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 |
|
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
|
6f1744baff
|
Merge branch 'dev' into 5517-improveLogs+translations
|
2023-04-20 16:30:24 +02:00 |
|
Alex Moreno
|
63e0031bc6
|
deploy(231401): test to master
|
2023-04-20 08:24:43 +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
|
a0d8ed1433
|
E2e fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 11:33:36 +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 |
|
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
|
02c573bd23
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
|
2023-04-17 08:57:24 +02:00 |