 Javi Gallego
|
92789ba3de
|
refs #6173 fixed backTest
|
2023-08-31 10:04:28 +02:00 |
|
Javi Gallego
|
e498bba37b
|
initial dump
|
2023-08-31 08:41:19 +02:00 |
 Carlos Satorres
|
0b9199688e
|
refs #5843 userFk remove and vchange
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-30 12:48:57 +02:00 |
|
Carlos Satorres
|
91c6ab9e44
|
refs #5843 edit structure
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-22 12:50:27 +02:00 |
 Jorge Penadés
|
040f5be85c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-18 12:18:30 +02:00 |
 Juan Ferrer
|
5924303ae2
|
refs #5483 Dumped fixtures for vn.time removed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-14 09:53:53 +02:00 |
 Alex Moreno
|
9ef4ba9bef
|
refs #5134 feat: add saleMistake model
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-11 12:32:49 +02:00 |
|
Carlos Satorres
|
8807b9f87f
|
fix upper
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-10 09:58:48 +02:00 |
|
Carlos Satorres
|
aff6668dc9
|
remove names upper
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-09 13:33:06 +02:00 |
|
Carlos Satorres
|
5653a39e3b
|
fix fixtures names, socialnames streets
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-09 13:10:05 +02:00 |
|
Jorge Penadés
|
7ca6c6b96d
|
refs #5914 fix merge
|
2023-08-08 15:10:15 +02:00 |
|
Carlos Satorres
|
183fdacefc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-03 10:01:11 +02:00 |
|
Jorge Penadés
|
7513323156
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
|
2023-07-31 07:53:36 +02:00 |
|
Jorge Penadés
|
50155cea8d
|
refs #5914 WIP transfer invoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-28 15:21:43 +02:00 |
 Vicent Llopis
|
fbc1e28031
|
Merge branch 'dev' into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-28 07:54:26 +00:00 |
|
Carlos Satorres
|
0546ae99eb
|
refs #5660 add fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-27 17:27:06 +02:00 |
|
Carlos Satorres
|
af60412232
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant
|
2023-07-27 17:24:50 +02:00 |
 Sergio De la torre
|
85c017431c
|
refs #5983 fix(itemShelving): fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-19 07:01:43 +02:00 |
|
Alex Moreno
|
2f6c988005
|
Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-18 13:53:17 +00:00 |
|
Sergio De la torre
|
9076553070
|
refs #5983 test(itemShelving): add getInventory
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-18 14:11:50 +02:00 |
|
Vicent Llopis
|
09b00401ec
|
Merge branch 'dev' into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-18 05:56:35 +00:00 |
 Guillermo Bonet
|
3c013110d3
|
refs #5819 Changed structure sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-18 07:32:45 +02:00 |
|
Carlos Satorres
|
6f3cdd3508
|
refs #5640 fix e2e back
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-17 12:30:48 +02:00 |
|
Carlos Satorres
|
b113052b5c
|
refs #5640 fixtures and test fix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-14 13:48:36 +02:00 |
|
Vicent Llopis
|
01dc26f64e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-13 09:42:53 +02:00 |
|
Vicent Llopis
|
17b2b02246
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-13 09:16:32 +02:00 |
|
Alex Moreno
|
219a4fbca9
|
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-07-12 13:09:58 +02:00 |
|
Vicent Llopis
|
a831a1534b
|
Merge branch 'dev' into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-11 11:50:15 +00:00 |
|
Alex Moreno
|
8922d27f20
|
refs #4614 fix e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-07 12:25:02 +02:00 |
|
Vicent Llopis
|
6fa6c21cb1
|
remove fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-07 09:31:26 +02:00 |
|
Alex Moreno
|
be0120728d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight
|
2023-07-06 15:15:36 +02:00 |
|
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
|
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 |
|
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
|
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
|
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 |
 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 |
|
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 |
|
Carlos Satorres
|
3bea23c52a
|
refs #5660 delivery acls
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-28 11:30:45 +02:00 |
|
Carlos Satorres
|
a930963ef9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant
|
2023-06-27 12:34:37 +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
|
798481b24a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
|
2023-06-26 07:53:44 +02: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 |
|
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 |
|
Carlos Satorres
|
9870cc7b14
|
refs #5660 change assist
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-21 13:34:27 +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 |
|
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 |
|
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 |
|
Vicent Llopis
|
425118d333
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-16 13:09:38 +02:00 |
|
Carlos Satorres
|
0eca606de0
|
Merge branch 'dev' into 5660-changeRolDeliveryAssistant
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-16 07:29:30 +00: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 |
|
Vicent Llopis
|
0cc5781f3f
|
refs #4734 feat: añadido método putExpedicionInternacional de viaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-13 15:05:37 +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 |
|
Carlos Satorres
|
908799adee
|
refs #5660 deliveryAssit
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-12 14:58:28 +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
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
Alex Moreno
|
91b0e3013a
|
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-05 08:11:47 +02:00 |
|
Alex Moreno
|
bca7224f74
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-05 08:09:16 +02:00 |
|
Alex Moreno
|
9462ca90a7
|
refs #5472 refactor setPassword & changePassword, fix sync
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-01 15:29:46 +02:00 |
|
Alex Moreno
|
0263d76021
|
refs #5701 update to mariadb 10.7.7
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-31 14:58:16 +02:00 |
|
Vicent Llopis
|
46b6625527
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 12:06:31 +02:00 |
|
Alexandre Riera
|
30816f7947
|
Merge branch 'dev' into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-30 09:51:42 +00:00 |
|
Alexandre Riera
|
1bb5033729
|
Merge branch 'dev' into 5137-aviso-impresora
gitea/salix/pipeline/head Build queued...
Details
|
2023-05-29 10:56:21 +00: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 |
|
Alex Moreno
|
375fdf2a21
|
fix item_getBalance
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 14:31:28 +02:00 |
|
Vicent Llopis
|
886c4a15b5
|
refs #5554 fix: manejado si la tabla accessTokenConfig esta vacía
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-25 10:19:00 +02:00 |
|
Vicent Llopis
|
eab329b230
|
refs #554 feat: actualizar el token automáticamente
gitea/salix/pipeline/head This commit looks good
Details
|
2023-05-24 15:01:59 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
Juan Ferrer
|
6b0fd99eb8
|
refs #5667 Fixes: Style, translations, fixtures, UI
|
2023-05-19 10:56:15 +02:00 |