 Vicent Llopis
|
d313517e14
|
Merge branch 'dev' into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-29 07:24:28 +00:00 |
 Carlos Satorres
|
1593b4b626
|
Merge branch 'dev' into 5398-Agencys&WarehousesData
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-29 07:09:08 +00:00 |
|
Carlos Satorres
|
95c438b73a
|
refs #5648 move claimSure
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-26 14:52:47 +02:00 |
|
Vicent Llopis
|
3ecfbe2052
|
refs #5252 refactor: creadas varaibles
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-26 12:03:36 +02:00 |
|
Vicent Llopis
|
9e8efff016
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-26 11:55:32 +02:00 |
 Alex Moreno
|
c7b8e57d95
|
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-26 07:41:48 +02:00 |
 Juan Ferrer
|
27d4d10472
|
refs #5667 Expedition translation fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 18:32:03 +02:00 |
|
Juan Ferrer
|
2e0721b101
|
refs #5667 Fixes: Id filter, translations
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 18:22:46 +02:00 |
|
Vicent Llopis
|
71d8a355bd
|
refs #5252 fix: te2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 15:03:22 +02:00 |
|
Vicent Llopis
|
96feb24f12
|
refs #5252 fix: back test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 13:28:44 +02:00 |
 Alexandre Riera
|
a584e1ab5e
|
Merge branch 'dev' into 5634-ticketAdvance-mismoOrigen-multiplesDestinos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 11:22:51 +00:00 |
|
Vicent Llopis
|
ce211b436d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-25 13:00:11 +02:00 |
|
Carlos Satorres
|
fa8fd8d5bc
|
refs #5398 update from oldbranch
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 11:41:14 +02:00 |
|
Alex Moreno
|
dd83b25bb2
|
Merge branch 'master' into hotfix-item_getBalance
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-25 09:37:38 +00:00 |
|
Alexandre Riera
|
dfac44a87b
|
hotfix 3rd parameter to null
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-25 11:35:25 +02:00 |
|
Carlos Satorres
|
d82a7eeeb7
|
Merge branch 'dev' into 5328-abonarTodoTicket
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 08:25:47 +00:00 |
|
Alex Moreno
|
a0da78700b
|
Merge branch 'dev' into 5678-sale-canEdit-notSale
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 07:49:40 +00:00 |
|
Alex Moreno
|
37a3275b27
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 08:56:10 +02:00 |
|
Alex Moreno
|
0e6501f306
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_master
|
2023-05-25 07:42:58 +02:00 |
|
Alex Moreno
|
e19ece6119
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5678-sale-canEdit-notSale
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 07:34:54 +02:00 |
|
Alex Moreno
|
42a39b6778
|
refs #5706 master to test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 07:22:56 +02:00 |
|
Alex Moreno
|
03e2b98485
|
hotFix(closeAll): fix where
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 15:50:59 +02:00 |
|
Alexandre Riera
|
de313b6418
|
refs #3628 Show what's before the inventory
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 13:40:26 +02:00 |
|
Alexandre Riera
|
74ba21b1b7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 13:39:01 +02:00 |
|
Alexandre Riera
|
087fa137fd
|
Merge branch 'dev' into 5677-fallo-saveSign
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 11:14:17 +00:00 |
|
Alex Moreno
|
6b66eb3bb2
|
refs #5679 typo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 12:59:58 +02:00 |
|
Alexandre Riera
|
49bd9c35b4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3628-item-historical-absoluto
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 12:19:45 +02:00 |
|
Alexandre Riera
|
133c5dbca5
|
Merge branch 'dev' into 5677-fallo-saveSign
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 10:18:26 +00:00 |
|
Alexandre Riera
|
05fb0a7203
|
refs #5677 tickets without state fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 12:16:19 +02:00 |
|
Alex Moreno
|
30c896c975
|
refs #5678 feat(sale_canEdit): handle exist sale
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 11:20:07 +02:00 |
|
Carlos Satorres
|
a99b7cd4f1
|
Merge branch 'dev' into 5297-newWorker_iban_not_required
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 08:02:33 +00:00 |
|
Carlos Satorres
|
6294fc0435
|
refs #5297 back&e2e fix changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 10:02:02 +02:00 |
|
Carlos Satorres
|
6cf2c38927
|
Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 06:59:04 +00:00 |
|
Carlos Satorres
|
bb39724718
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required
|
2023-05-24 08:09:44 +02:00 |
|
Carlos Satorres
|
e46caffe96
|
Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 06:05:44 +00:00 |
|
Vicent Llopis
|
3caef0c135
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 07:46:08 +02:00 |
|
Vicent Llopis
|
1ddad7a5ec
|
Merge branch 'dev' into 5609-ticket.index_searchByFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 05:45:04 +00:00 |
|
Alex Moreno
|
6a6d28efa0
|
Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 05:40:11 +00:00 |
|
Alexandre Riera
|
97653d9b8f
|
Merge branch 'dev' into 5581-transferir-lineas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 05:07:33 +00:00 |
|
Vicent Llopis
|
3119ae4471
|
refs #5609 delete: console.log
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 15:12:20 +02:00 |
|
Vicent Llopis
|
2c7473b064
|
refs #5252 feat: permite crear un abono con o sin almacén
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 15:06:38 +02:00 |
|
Carlos Satorres
|
0dda7791f6
|
Merge branch 'dev' into 5639-seccionesFormaPagoYPais(MOROSOS)
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 12:51:10 +00:00 |
|
Carlos Satorres
|
af1f92613f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5297-newWorker_iban_not_required
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 13:57:11 +02:00 |
|
Vicent Llopis
|
0ab411ddc4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5609-ticket.index_searchByFilter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-05-23 13:45:03 +02:00 |
|
Carlos Satorres
|
4f5bd95d21
|
refs #5639 order
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 13:23:46 +02:00 |
|
Carlos Satorres
|
e2bea16e68
|
refs #5639 select country, paymethod
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 12:31:02 +02:00 |
|
Carlos Satorres
|
db7d3b6868
|
refs #5639 payMethodFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 11:32:26 +02:00 |
|
Carlos Satorres
|
7fd2927ec9
|
refs #5639 smart-table country
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 11:26:31 +02:00 |
|
Carlos Satorres
|
84abba5566
|
Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 07:38:01 +00:00 |
|
Alex Moreno
|
9500e99b86
|
Merge branch 'dev' into 5579-fix-order
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 07:17:25 +00:00 |
|
Alex Moreno
|
53e55de605
|
refs #5579 fix(route_index): order
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 09:15:31 +02:00 |
|
Carlos Satorres
|
d7d94796d6
|
Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 07:13:47 +00:00 |
|
Carlos Satorres
|
0c673e43bc
|
refs #5639 smart-tabla defaulter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 09:02:05 +02:00 |
|
Alexandre Riera
|
bf8d82f3c6
|
refs #5581 refresh model
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 08:43:31 +02:00 |
|
Carlos Satorres
|
ee8685329f
|
Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 06:23:19 +00:00 |
|
Alex Moreno
|
6f503e2a81
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
|
2023-05-23 08:23:16 +02:00 |
|
Carlos Satorres
|
8ee581eb67
|
Merge branch 'dev' into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 06:02:17 +00:00 |
|
Alexandre Riera
|
b9f6dc0a39
|
Merge branch 'dev' into 5581-transferir-lineas
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 05:54:12 +00:00 |
|
Alexandre Riera
|
0e11bfab0b
|
refs #5581 ticketId != id
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-23 07:53:25 +02:00 |
|
Juan Ferrer
|
da0aa57539
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-22 19:06:20 +02:00 |
|
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
|
5e651d7b8c
|
Merge branch '5648-sureClaim' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-22 14:30:06 +02:00 |
|
Carlos Satorres
|
6d147e7af7
|
refs #5648 fix spaces
|
2023-05-22 14:30:04 +02:00 |
|
Carlos Satorres
|
6093cb4794
|
Merge branch 'dev' into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-22 10:26:57 +00: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
|
e9222dbcb7
|
Merge branch 'dev' into 5689-fixedPricesSize
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-22 06:31:51 +00: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 |
|
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 |