 Alex Moreno
|
a665b6c060
|
refs #5970 fix sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-06 11:51:04 +02:00 |
|
Alex Moreno
|
63a8f40443
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-06 10:42:53 +02:00 |
|
Alex Moreno
|
6530e87508
|
refs #4614 feat(ticket): prevent invoice without weight
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-05 15:20:51 +02:00 |
|
Alex Moreno
|
040e9e4197
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-05 12:50:45 +02:00 |
 Vicent Llopis
|
e58d4e5db3
|
refs #4770 feat: añadida sección 'Troncales'
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-04 14:42:51 +02:00 |
 Pablo Natek
|
2ccf8d5197
|
refs #5347
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-03 14:49:21 +02:00 |
|
Pablo Natek
|
6b557d5d8a
|
refs #5347
|
2023-07-03 14:14:25 +02:00 |
|
Pablo Natek
|
4d0ed75090
|
Merge branch '5347-clientCreateRefactor' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreateRefactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-03 14:08:53 +02:00 |
|
Pablo Natek
|
9fe7024d17
|
refs #5347
|
2023-07-03 14:08:50 +02:00 |
|
Pablo Natek
|
8ef6f0dd17
|
Merge branch 'dev' into 5347-clientCreateRefactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-03 11:35:50 +00:00 |
|
Alex Moreno
|
461e1d4d5d
|
refs #5475 feat: userUses, fix forbiddenError and merge in dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-03 13:33:48 +02:00 |
|
Alex Moreno
|
7fe8698b6f
|
refs #5753 fix ticketToInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-03 10:04:03 +02:00 |
|
Alex Moreno
|
d1fb2859be
|
Merge branch 'dev' into 5753_232401_db_dump
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-03 06:59:42 +00:00 |
|
Alex Moreno
|
f636c3b1ab
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-30 11:57:56 +02:00 |
|
Alex Moreno
|
6fcbf69f60
|
refs #5753 isNotEditableCredit to zeroCreditEditor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-30 08:26:51 +02:00 |
|
Alex Moreno
|
ff320895a2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5753_232401_db_dump
|
2023-06-30 08:23:00 +02:00 |
|
Alex Moreno
|
0441bc29b7
|
refs #5475 correct SQL folder
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-29 15:24:41 +02:00 |
|
Alex Moreno
|
c6bee8f2f9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-29 14:50:06 +02:00 |
|
Alex Moreno
|
273c06a210
|
refs #5833 deploy: test to master 232601
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-29 12:54:56 +02:00 |
|
Vicent Llopis
|
3bd890c343
|
refs #5554 fix: solo llama al back cuando se tiene q renovar
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-29 12:11:16 +02:00 |
|
Pablo Natek
|
be1c145d9a
|
refs #5347
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-29 10:41:41 +02:00 |
 Carlos Andrés
|
1d993c74e5
|
refs #5590 fix total invoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-29 10:39:07 +02:00 |
|
Pablo Natek
|
bbc5ed2683
|
Merge branch 'dev' into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-29 05:22:06 +00:00 |
|
Vicent Llopis
|
e3e0c7e97a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-28 14:31:54 +02:00 |
|
Alex Moreno
|
8723cf2958
|
refs #5753 fix legacy bugs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-28 14:10:21 +02:00 |
|
Pablo Natek
|
54e75dc850
|
Merge branch '5347-clientCreate-→-client_create' of https://gitea.verdnatura.es/verdnatura/salix into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-28 14:07:38 +02:00 |
|
Pablo Natek
|
6e52b3b968
|
refs #5347
|
2023-06-28 14:07:37 +02:00 |
|
Alex Moreno
|
31d637c8a7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-28 07:19:04 +02:00 |
|
Alex Moreno
|
e43e52b561
|
refs #5753 db export and fix fixtures
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-26 15:21:45 +02:00 |
|
Alex Moreno
|
224a44847d
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-26 11:56:07 +02:00 |
|
Alex Moreno
|
ecf742959c
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-26 11:55:28 +02:00 |
|
Alex Moreno
|
ef8e1c4169
|
refs #5531 refs #5753 fix travelConfig sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-26 10:57:12 +02:00 |
|
Alex Moreno
|
798481b24a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
|
2023-06-26 07:53:44 +02:00 |
 Carlos Satorres
|
abfe012a78
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted
|
2023-06-26 06:12:22 +02:00 |
 Juan Ferrer
|
2fec5bf2aa
|
Merge pull request 'refs #5772 test into dev' (!1633) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1633
|
2023-06-23 09:51:44 +00:00 |
|
Juan Ferrer
|
47a4a9950f
|
refs #5772 Parallelism added to PDF generation
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-23 11:42:30 +02:00 |
|
Pablo Natek
|
16af0c5d6c
|
Merge branch 'dev' into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-22 16:02:30 +00:00 |
|
Pablo Natek
|
203e80afa8
|
refs #5347
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-22 17:56:45 +02:00 |
|
Pablo Natek
|
f0fec2cdd6
|
refs #5347
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-22 17:46:21 +02:00 |
|
Pablo Natek
|
f6cc59eafb
|
refs #5347
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-22 16:23:36 +02:00 |
|
Pablo Natek
|
27946c0062
|
Refs #5347
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-22 15:00:15 +02:00 |
|
Alex Moreno
|
344ba298f8
|
refs #5832 232801 init
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-22 14:27:33 +02:00 |
|
Alex Moreno
|
6ab431f8ef
|
refs #5475 tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-21 14:17:25 +02:00 |
|
Vicent Llopis
|
d9afdccd9c
|
fix: acl renewToken
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-21 14:12:42 +02:00 |
|
Alex Moreno
|
d6c504d3bb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-21 07:53:40 +02:00 |
|
Pablo Natek
|
e741904250
|
refs #5347
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-20 17:01:06 +02:00 |
|
Vicent Llopis
|
f37974c835
|
Merge branch 'dev' into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-20 12:39:27 +00:00 |
|
Vicent Llopis
|
556bdb52ce
|
Merge branch 'dev' into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-20 12:18:46 +00:00 |
|
Vicent Llopis
|
f6cb1cb130
|
Merge branch 'dev' into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-20 12:07:52 +00:00 |
|
Carlos Satorres
|
fa10070675
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-20 14:04:38 +02:00 |
 Robert Ferrús
|
503054fe05
|
refs #5112 modificaciones entry_updateComission
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-20 08:58:22 +02:00 |
|
Alex Moreno
|
dd157d59d9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-16 13:42:13 +02:00 |
 Alexandre Riera
|
73133778fc
|
Merge branch 'dev' into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-16 05:07:16 +00:00 |
|
Alex Moreno
|
5163b7b253
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-06-15 15:14:41 +02:00 |
|
Alex Moreno
|
99ad9d3afa
|
refs #5753 fix(change-password)
|
2023-06-15 11:49:39 +02:00 |
 Sergio De la torre
|
1f454e6219
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-15 07:22:10 +02:00 |
|
Alex Moreno
|
3a5e591cf0
|
refs #5475 feat(signin): use twoFactor and passExpired
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-14 15:15:00 +02:00 |
|
Sergio De la torre
|
927c0fddc6
|
refs #5651
|
2023-06-14 13:15:37 +02:00 |
|
Sergio De la torre
|
c62e6fa0eb
|
refs #5651 packingSiteAdvanced
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-14 10:51:22 +02:00 |
|
Alex Moreno
|
aeb04efe82
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-13 11:49:42 +02:00 |
|
Vicent Llopis
|
61f99744c9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-13 07:43:23 +02:00 |
|
Vicent Llopis
|
0aae1732bf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-13 07:35:29 +02:00 |
|
Alex Moreno
|
d8b041c734
|
refs #5472 correcto version folder
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 22:04:02 +02:00 |
|
Alex Moreno
|
f113bfbc95
|
Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 12:32:29 +00:00 |
|
Alex Moreno
|
22e69e6e91
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
|
2023-06-12 11:06:27 +02:00 |
|
Alexandre Riera
|
703c224e91
|
refs #5513 modified-entry email
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 10:26:50 +02:00 |
|
Alex Moreno
|
051269d646
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 09:11:17 +02:00 |
|
Alex Moreno
|
33f2d556fd
|
refs #5701 fix(db/dockerFile): fix docker-temp-stop
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 07:33:45 +02:00 |
|
Alex Moreno
|
a8215e38f0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5701-update_to_mariadb10.7.7
|
2023-06-12 07:31:25 +02:00 |
|
Alex Moreno
|
d735f142a1
|
Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 05:04:28 +00:00 |
|
Alex Moreno
|
fdb9d2ed7f
|
refs #5701 fix dockerFile and sh's
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-09 14:38:44 +02:00 |
|
Alex Moreno
|
50ced36338
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5701-update_to_mariadb10.7.7
|
2023-06-09 08:43:39 +02:00 |
|
Carlos Satorres
|
c66feb53f0
|
refs #5760 fix fixtures
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-09 08:29:18 +02:00 |
|
Carlos Satorres
|
ec9dfa90fd
|
refs #5760 fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-09 08:06:45 +02:00 |
|
Alex Moreno
|
96d88cdf4b
|
refs #5366 refactor(invoiceIn_toBook): use invoiceIn_booking
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 14:42:07 +02:00 |
|
Vicent Llopis
|
dfdf948c42
|
move sql changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-08 13:15:00 +02:00 |
|
Vicent Llopis
|
929b29e7e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token
|
2023-06-08 13:14:33 +02:00 |
|
Vicent Llopis
|
0ab23477d1
|
refs #5468 move sql changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-08 13:13:55 +02:00 |
|
Vicent Llopis
|
653c37f048
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
|
2023-06-08 13:12:59 +02:00 |
|
Alex Moreno
|
3e39564695
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 12:39:36 +02:00 |
|
Alex Moreno
|
dd72ac9107
|
refs #5809 version 232601 init
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 10:48:35 +02:00 |
|
Alex Moreno
|
5ba8a15316
|
refs #5809 deploy 232401 dev in test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 10:25:25 +02:00 |
|
Vicent Llopis
|
cf559b2ba5
|
refs #5774 feat: solo se pueden añadir cantidades negativas si es un ticket de abono
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 09:19:57 +02:00 |
|
Vicent Llopis
|
a88166cdb5
|
Merge branch 'dev' into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-08 05:15:24 +00:00 |
|
Juan Ferrer
|
980ea67c24
|
Merge pull request 'test' (!1596) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1596
|
2023-06-07 21:02:22 +00:00 |
|
Vicent Llopis
|
e2c7a38e82
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 14:18:36 +02:00 |
|
Vicent Llopis
|
bd4eee6606
|
refs #5252 eliminado warehouseFk = 1 por defecto #5252
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 14:17:46 +02:00 |
|
Alex Moreno
|
1240a6b71a
|
Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 11:44:47 +00:00 |
|
Alex Moreno
|
edc601fd5d
|
refs #5489 fix(account/sync), fix(order) catalog-search-panel popover
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 13:34:13 +02:00 |
|
Vicent Llopis
|
7cf85eeef8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 09:03:33 +02:00 |
|
Alexandre Riera
|
bfd421c188
|
Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-07 06:30:43 +00:00 |
|
Carlos Satorres
|
738b04af4c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted
|
2023-06-07 08:15:50 +02:00 |
|
Alex Moreno
|
ac0e7ae32b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-07 07:08:02 +02:00 |
|
Alex Moreno
|
cb50c617ee
|
refs #5489 deprecate account.user.password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-06 15:09:01 +02:00 |
|
Vicent Llopis
|
b144948dcf
|
conflictos resueltos
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-06 12:31:44 +02:00 |
|
Vicent Llopis
|
98af8ee10f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token
|
2023-06-06 12:31:20 +02:00 |
|
Vicent Llopis
|
024cb1e3f4
|
refs #5561 feat: permite modificar registros
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-06 11:56:14 +02:00 |
|
Carlos Satorres
|
6f3704c365
|
hotfix colors ticket advance ticket future
|
2023-06-06 11:42:35 +02:00 |
|
Alex Moreno
|
5d6eaca6b8
|
refs #5472 test(changePassword): e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-05 15:20:07 +02:00 |
|
Alexandre Riera
|
9c9a2d4fe2
|
Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-05 12:25:50 +00:00 |