 Vicent Llopis
|
5248fd7fcf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
|
2023-03-06 10:20:57 +01:00 |
 Alexandre Riera
|
4e800a7a45
|
.
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-06 09:30:14 +01:00 |
|
Alexandre Riera
|
f2bd0253e2
|
refs #5092 added unbilled tickets section
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-06 09:27:53 +01:00 |
 Javi Gallego
|
780572a9f2
|
test fixed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-06 08:14:26 +01:00 |
 Joan Sanchez
|
37043beb68
|
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-03 07:44:31 +01:00 |
|
Joan Sanchez
|
b8881a050c
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-02 07:41:16 +01:00 |
 Carlos Andrés
|
6f5e25493d
|
invoicing test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-03-01 10:36:38 +01:00 |
|
Alexandre Riera
|
2e09845dbd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund
gitea/salix/pipeline/head Build queued...
Details
|
2023-03-01 08:29:58 +01:00 |
 Guillermo Bonet
|
15f2f46e4c
|
refs #4975 Traduction no branch
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-28 14:48:17 +01:00 |
|
Guillermo Bonet
|
656685cd7e
|
refs #4975 Minor changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-28 14:35:34 +01:00 |
|
Alexandre Riera
|
e9dca9211c
|
refs #5149 checked if ticket has refunds, added translations
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-28 13:42:18 +01:00 |
|
Alexandre Riera
|
5d9220c5c0
|
refs #5287 locker added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-27 08:39:46 +01:00 |
|
Alexandre Riera
|
76cd2d160e
|
Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-27 06:05:21 +00:00 |
|
Carlos Andrés
|
4cc6485cbd
|
refs #5000 Invoicing RC
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-23 09:25:23 +01:00 |
|
Carlos Andrés
|
eaa5b4530a
|
getMinClientId
|
2023-02-23 09:22:17 +01:00 |
 Alex Moreno
|
f0827c992b
|
feat: add console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-21 14:53:35 +01:00 |
|
Alexandre Riera
|
77066b2005
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
|
2023-02-20 09:20:30 +01:00 |
|
Joan Sanchez
|
acf5981a5f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-16 14:20:05 +01:00 |
|
Alexandre Riera
|
f42fbb80ec
|
refs #5036 changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-16 08:54:45 +01:00 |
|
Alex Moreno
|
a507f7e8fb
|
fix(boot_date): Date.vnUTC return new Date()
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-14 13:17:56 +01:00 |
|
Vicent Llopis
|
222032aae7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
|
2023-02-09 08:38:08 +01:00 |
|
Alex Moreno
|
b209ecb011
|
feat: create post route for debug
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-08 10:56:51 +01:00 |
|
Alexandre Riera
|
0c91f95762
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
|
2023-02-03 12:03:16 +01:00 |
|
Alex Moreno
|
6c772643a8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-02-02 11:55:11 +01:00 |
|
Joan Sanchez
|
eded1ebf20
|
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-02-02 11:42:48 +01:00 |
|
Alexandre Riera
|
780018e4df
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-02 08:40:49 +01:00 |
|
Joan Sanchez
|
7a700de5c2
|
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-02-02 08:23:17 +01:00 |
|
Alexandre Riera
|
62766706b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData
|
2023-02-01 08:52:03 +01:00 |
|
Alexandre Riera
|
7d7e1a74da
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 08:46:28 +01:00 |
|
Alexandre Riera
|
fd440a4db3
|
refs #5129 better translation tracked sales
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-31 15:42:36 +01:00 |
|
Joan Sanchez
|
e34d64361b
|
Account refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-31 14:57:24 +01:00 |
|
Alexandre Riera
|
a358e58171
|
docuware translation
|
2023-01-31 12:12:25 +01:00 |
|
Alexandre Riera
|
7d617c0ac4
|
refs #5129 translations and userErrors added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-31 09:04:45 +01:00 |
|
Alex Moreno
|
a74fb31b5b
|
fix: vn.time
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-30 15:15:27 +01:00 |
|
Vicent Llopis
|
903a42683d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
|
2023-01-30 12:45:17 +01:00 |
|
Alexandre Riera
|
8119b301c5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
|
2023-01-30 12:21:54 +01:00 |
|
Alexandre Riera
|
7e5f50e637
|
refs #5072 email validation added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-30 08:30:39 +01:00 |
|
Alex Moreno
|
4e65e88621
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-30 07:56:12 +01:00 |
|
Joan Sanchez
|
9bf4cd5cff
|
Merge branch 'dev' into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-27 08:20:32 +00:00 |
|
Alexandre Riera
|
355c9d855d
|
Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-27 07:59:49 +00:00 |
|
Alexandre Riera
|
a12f629690
|
refs #5036 corrections
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-27 08:52:33 +01:00 |
|
Alexandre Riera
|
d69b204c4c
|
refs #5036 loggable refactored, tests fixed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-26 15:49:30 +01:00 |
|
Alex Moreno
|
0a096bc96f
|
fix: updateWorkCenter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-25 15:29:01 +01:00 |
|
Joan Sanchez
|
70cc83b8bf
|
Enable vanity user URLs
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-24 11:55:50 +01:00 |
|
Vicent Llopis
|
1154179ddf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-24 08:11:46 +01:00 |
|
Joan Sanchez
|
ee1ce21bb9
|
refactor(account): account model refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-23 15:24:00 +01:00 |
|
Alex Moreno
|
fe656aa125
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-01-23 14:10:20 +01:00 |
|
Alexandre Riera
|
07d3fef8f0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-23 13:44:19 +01:00 |
|
Alexandre Riera
|
635e787cce
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-23 13:26:05 +01:00 |
|
Alexandre Riera
|
96becec9d3
|
refs #4564 mixin vn-report created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-23 10:12:34 +01:00 |
|
Alex Moreno
|
a674169ddb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-20 08:30:30 +01:00 |
|
Alexandre Riera
|
292372395e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
|
2023-01-20 07:15:03 +01:00 |
|
Alex Moreno
|
8d33aa8454
|
fix(fixtures): use static dates
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-17 15:36:39 +01:00 |
|
Vicent Llopis
|
b7004e6a76
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-17 12:50:34 +01:00 |
|
Alexandre Riera
|
2b7383af74
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-17 10:11:19 +01:00 |
|
Alex Moreno
|
6b1a6fe44b
|
feat: mock dates front and back
|
2023-01-16 15:18:00 +01:00 |
|
Guillermo Bonet
|
3d4600d70d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method
|
2023-01-16 12:26:10 +01:00 |
|
Alexandre Riera
|
b3c6443277
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-16 10:33:35 +01:00 |
|
Alex Moreno
|
def41c011c
|
feat(docuware_upload): send to trash last file
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-13 13:33:59 +01:00 |
|
Alexandre Riera
|
41671e8a3a
|
refs #4927 modified hook to check name & country
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-13 08:38:29 +01:00 |
|
Guillermo Bonet
|
868c2aaaef
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-12 15:25:51 +01:00 |
|
Alex Moreno
|
5bb66fec3f
|
test(docuware): back tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-12 15:16:38 +01:00 |
|
Alexandre Riera
|
a0491de9f9
|
refs #5036 refactor transaction and fixing ticket logs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-11 13:24:55 +01:00 |
|
Alexandre Riera
|
bebbe1c846
|
refs #5036 fixed transaction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-10 15:24:22 +01:00 |
|
Guillermo Bonet
|
e0e34595f4
|
refs #4975 Added translations
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-09 18:46:19 +01:00 |
|
Vicent Llopis
|
5a5e4c5afb
|
feat: solo coge los tickets que no esten eliminados
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-09 14:47:52 +01:00 |
|
Alexandre Riera
|
e0fa7609cb
|
refs #5036 transaction added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-09 13:49:35 +01:00 |
|
Vicent Llopis
|
d16235cba9
|
fix: show error when is negative base
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-05 10:55:56 +01:00 |
|
Alex Moreno
|
2c5e42d408
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-28 11:49:16 +01:00 |
|
Vicent Llopis
|
7f80c7ed2c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-22 09:30:35 +01:00 |
|
Vicent Llopis
|
06075aa17b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms
|
2022-12-21 12:15:21 +01:00 |
|
Vicent Llopis
|
1d7145d74b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 08:05:19 +01:00 |
|
Alexandre Riera
|
284f9f418b
|
Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-20 09:54:47 +01:00 |
|
Alexandre Riera
|
6ef282feda
|
refs #4962 updated merge, changed autoload, changed tf->Future
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 09:54:28 +01:00 |
|
Guillermo Bonet
|
dc82e610b7
|
refs #4975 Minor changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 11:24:18 +01:00 |
|
Guillermo Bonet
|
a46c2ced7c
|
refs #4975: Added last mdbVersion/last method
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 07:26:07 +01:00 |
|
Alexandre Riera
|
45b02c3bc6
|
Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 13:45:25 +01:00 |
|
Alexandre Riera
|
900b378c88
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 07:56:38 +01:00 |
|
Carlos Andrés
|
31d7145c51
|
Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-15 13:28:34 +00:00 |
|
Alex Moreno
|
4b16b413dc
|
fixes #4990 acquireTimeout to 60000
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-15 14:09:35 +01:00 |
|
Alex Moreno
|
156f2b9129
|
feat: handle errors and autogenerate user and code
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-14 15:03:55 +01:00 |
|
Carlos Andrés
|
41b7b6ab06
|
Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-12 08:24:11 +00:00 |
|
Vicent Llopis
|
444d495b7f
|
refactor: codigo reducido
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-01 07:22:13 +01:00 |
|
Vicent Llopis
|
ba8fe7dfa8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-01 07:11:00 +01:00 |
|
Vicent Llopis
|
1588492f9a
|
feat: solo añade los logs de salix con el model 'Sale'
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 13:29:39 +01:00 |
|
Alexandre Riera
|
acbd0474a5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-29 08:50:48 +01:00 |
|
Carlos Andrés
|
6b76804913
|
refs #4865 Sintaxis mensajes rocket
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-28 10:52:15 +01:00 |
|
Alex Moreno
|
804db15ece
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-11-28 07:53:51 +01:00 |
|
Alexandre Riera
|
8fec0670ea
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
|
2022-11-25 10:25:46 +01:00 |
|
Vicent Llopis
|
dbbce77cc8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 07:41:43 +01:00 |
|
Vicent Llopis
|
927b5a63ec
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-24 09:14:01 +00:00 |
|
Alexandre Riera
|
32e4a7273c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 09:59:59 +01:00 |
|
Vicent Llopis
|
7ccf37c079
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-24 08:08:56 +00:00 |
|
Vicent Llopis
|
f313a53cde
|
refactor: cambiadas fixtures, backTest y traducciones
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 10:56:55 +01:00 |
|
Alex Moreno
|
314e98b838
|
fix: nested router
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 14:57:52 +01:00 |
|
Alex Moreno
|
660648e01f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-11-22 14:35:25 +01:00 |
|
Vicent Llopis
|
32f28e91b5
|
feat: sistema de bloque para ficheros mdb
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 14:29:42 +01:00 |
|
Alexandre Riera
|
d7843f3298
|
Merge branch '4547-fix-compensation' of https://gitea.verdnatura.es/verdnatura/salix into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 14:24:55 +01:00 |
|
Alexandre Riera
|
34fb80beec
|
fix translations
|
2022-11-22 14:24:19 +01:00 |
|
Alexandre Riera
|
6656ea4f54
|
Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 10:20:42 +01:00 |
|
Alexandre Riera
|
2651081838
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 10:15:31 +01:00 |
|
Alexandre Riera
|
4c21ffac3b
|
Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 11:44:53 +01:00 |
|
Alexandre Riera
|
463e56b631
|
corrections
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 11:41:17 +01:00 |
|
Alexandre Riera
|
4feb2bea2c
|
working on e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-16 10:57:15 +01:00 |
|
Alex Moreno
|
8dcd567a68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 13:20:52 +01:00 |
|
Alexandre Riera
|
607f61092a
|
Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 13:06:10 +01:00 |
|
Alexandre Riera
|
01607c71b6
|
fix rocket message and order table
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 13:03:55 +01:00 |
|
Vicent Llopis
|
284837083c
|
feat: coge el idioma local
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 12:34:18 +01:00 |
|
Vicent Llopis
|
fc516d4029
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 12:23:59 +01:00 |
|
Vicent Llopis
|
843e5ae736
|
feat: traducciones en los modelos
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-15 11:41:57 +01:00 |
|
Alex Moreno
|
bcab493f37
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
|
2022-11-15 07:33:53 +01:00 |
|
Alexandre Riera
|
05f0eba741
|
Merge branch 'split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 09:06:51 +01:00 |
|
Alexandre Riera
|
03ea2b4f11
|
refs #4700 translations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-14 08:55:27 +01:00 |
|
Alexandre Riera
|
c16210dd8a
|
refs #4700 working on e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-11 15:58:11 +01:00 |
|
Vicent Llopis
|
918ea3030d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 14:41:12 +01:00 |
|
Alex Moreno
|
4c216c4556
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-10 14:40:55 +01:00 |
|
Alex Moreno
|
32701794bc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-10 13:34:43 +01:00 |
|
Guillermo Bonet
|
6804c1a756
|
Merge branch 'dev' into 4550-printServer
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 16:55:29 +01:00 |
|
Guillermo Bonet
|
6744b3f797
|
added collection-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 14:40:38 +01:00 |
|
Vicent Llopis
|
1bc8cf52d5
|
add translate
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 08:20:36 +01:00 |
|
Vicent Llopis
|
d34a4ae992
|
add translate
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 08:19:25 +01:00 |
|
Vicent Llopis
|
51b047eacc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-08 07:40:31 +01:00 |
|
Alexandre Riera
|
896a7eb6f0
|
refs #4700 arreglar filtro y traducciones
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-07 15:55:17 +01:00 |
|
Vicent Llopis
|
7fc18c89df
|
feat: error handlers
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-07 13:57:54 +01:00 |
|
Alex Moreno
|
e6e8f15d64
|
Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-03 08:39:10 +00:00 |
|
Alex Moreno
|
36894c31de
|
Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-03 08:39:04 +00:00 |
|
Vicent Llopis
|
8a4aa6285b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 14:49:39 +01:00 |
|
Vicent Llopis
|
6df74facdc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
|
2022-11-02 14:23:20 +01:00 |
|
Alex Moreno
|
6a9134d8f9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-02 13:48:36 +01:00 |
|
Alex Moreno
|
9c671ed3a4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-02 13:47:00 +01:00 |
|
Alex Moreno
|
755a1667dc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-11-02 07:35:04 +01:00 |
|
Alex Moreno
|
fc7a39e910
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-02 07:33:07 +01:00 |
|
Alex Moreno
|
e7047e982f
|
fix e2e
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-10-31 15:07:22 +01:00 |
|
Vicent Llopis
|
d9107719fa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
|
2022-10-31 15:04:33 +01:00 |
|
Vicent Llopis
|
3243d35bd7
|
feat: send email
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 14:48:37 +01:00 |
|
Alex Moreno
|
b37c257885
|
feat(canEdit): use checkAccess
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-10-31 14:13:06 +01:00 |
|
Alex Moreno
|
36c0cc1a38
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
|
2022-10-31 14:12:40 +01:00 |
|
Joan Sanchez
|
d34936015b
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-31 12:39:54 +01:00 |
|
Alex Moreno
|
926ab0e35c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
|
2022-10-27 09:05:05 +02:00 |
|
Alex Moreno
|
cf24301bfe
|
feat(account): email-verify refs #4077
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 13:28:26 +02:00 |
|
Vicent Llopis
|
d4e2783630
|
refactor: corregidas traducciones, eliminado destroyAll y añadida transacción
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-26 08:39:07 +02:00 |
|
Alex Moreno
|
f65d06fc7d
|
fixes #4073
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-26 08:27:28 +02:00 |
|
Alex Moreno
|
bcfbeb7032
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-10-21 12:41:39 +02:00 |
|
Vicent Llopis
|
b0471037a7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-20 08:49:08 +02:00 |
|
Vicent Llopis
|
9ea427dbfe
|
refactor: move front to back funcionality
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-18 13:45:46 +02:00 |
|
Alex Moreno
|
8985a678d5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
|
2022-10-18 09:49:06 +02:00 |
|
Alex Moreno
|
79b970286c
|
refactor(claim_claimPickupEmail): use text template and external form
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 11:22:27 +02:00 |
 Pau
|
d91814473e
|
Merge branch 'dev' into 4124-webp-images
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-17 06:45:49 +00:00 |
|
Alex Moreno
|
6bfd54fc71
|
feat(verify): use user.verify
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-17 07:22:22 +02:00 |
|
Alex Moreno
|
acc88c8239
|
use ejs template
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-11 14:56:33 +02:00 |
|
Alex Moreno
|
ce2ad32ac9
|
add email template
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-10 15:16:56 +02:00 |
|
Alex Moreno
|
5c4daee35e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-10 14:20:22 +02:00 |
|
Alex Moreno
|
376d46b67e
|
feat(canEdit): integrate isWeekly and adapt back tests and e2e
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-10 13:06:49 +02:00 |
|
Pau
|
452745b04a
|
Added webp to the list of allowed images
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-10 09:01:52 +02:00 |
|
Vicent Llopis
|
c8d270499b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 11:50:11 +02:00 |
|
Joan Sanchez
|
f2eaa9d0e5
|
Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-06 06:28:00 +00:00 |
|
Vicent Llopis
|
aa51fa1722
|
feat: check the client to edit is in vn.client and not in account.account
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-05 12:36:36 +02:00 |
|
Vicent Llopis
|
197bbf392b
|
refator: updates translations
gitea/salix/pipeline/head This commit looks good
Details
|
2022-10-04 07:50:37 +02:00 |
|
Joan Sanchez
|
21bb95fc88
|
CSV refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-03 08:28:47 +02:00 |
|
Joan Sanchez
|
1ac35c0b68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-29 14:52:31 +02:00 |
|
Joan Sanchez
|
fe5eb3e13d
|
Changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-29 07:35:20 +02:00 |
|
Alex Moreno
|
81752e7f30
|
quit userError
|
2022-09-28 12:20:29 +02:00 |
|
Joan Sanchez
|
660842ca31
|
Osticket & waste refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-27 14:20:57 +02:00 |
|
Alex Moreno
|
d2cbaa565e
|
add translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-26 08:48:46 +02:00 |
|
Alex Moreno
|
dc605387ba
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-26 08:23:10 +02:00 |
|
Alex Moreno
|
fc5460dc9e
|
feat(account): send verifyEmail when change email and tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-26 08:21:58 +02:00 |
|
Alex Moreno
|
c79f884526
|
feat(recover-password): open changePass in front and tests done
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-22 09:22:24 +02:00 |
|
Joan Sanchez
|
8105c12a18
|
Campaign metrics
|
2022-09-22 08:48:29 +02:00 |
|
Joan Sanchez
|
284524e3fa
|
Merge pull request '4358-financialBoss' (#1054) from 4358-financialBoss into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1054
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-09-21 06:49:44 +00:00 |
|
Alex Moreno
|
918863ee8e
|
feat(account): recover-password
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-20 15:21:01 +02:00 |
|
Joan Sanchez
|
09bdee8b34
|
View & send PDF from loopback endpoint
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-19 12:59:32 +02:00 |
|
Alex Moreno
|
b3aaa493d5
|
fix(): fix fixtures and all code needed for change the structure
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-19 09:45:28 +02:00 |
|
Joan Sanchez
|
18ac0a0b61
|
Export Email and Report classes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-16 23:13:37 +02:00 |
|
Alex Moreno
|
4f7218ab76
|
translation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-09-14 13:01:40 +02:00 |
|
Joan Sanchez
|
768e4d5e77
|
Resolved conflicts
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-10 12:13:31 +02:00 |
|
Vicent Llopis
|
c3d396b042
|
fix: test e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-04 13:52:59 +02:00 |
 Carlos Jimenez Ruiz
|
27e8c99604
|
Merge branch 'dev' into 4067-client_detail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-06-07 12:50:37 +00:00 |
|
Alex Moreno
|
8340041b33
|
throw userError and maxFileSize
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-06-01 07:57:32 +02:00 |
|
Joan Sanchez
|
c369453bfc
|
Added model fields
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-31 13:36:27 +02:00 |
|
Alex Moreno
|
cac4e74793
|
refactor
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-05-31 09:06:15 +02:00 |
|
Alex Moreno
|
aa7074f303
|
test(mdb): back test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-05-27 08:23:52 +02:00 |
|
Alex Moreno
|
79c42d04f9
|
feat(mdb): start section
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-05-25 14:59:28 +02:00 |
|
Alex Moreno
|
5021315ed4
|
refactor(clientCredit): test and types
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-12 09:47:47 +02:00 |
|
Alex Moreno
|
5bad0592a5
|
change errors
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-10 08:48:51 +02:00 |
|
Vicent Llopis
|
579ff3aa4a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-21 07:13:34 +02:00 |
|
Vicent Llopis
|
5db20ee3e2
|
refactor: deleteOldFiles in claim
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-20 14:46:37 +02:00 |
|
Vicent Llopis
|
013390fae9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-12 12:49:34 +02:00 |
|
Joan Sanchez
|
47a2f76aa4
|
3837 - Import data from external service
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-04-11 11:58:40 +02:00 |
|
Vicent Llopis
|
5567e07773
|
feat(claim_photo): can upload videos
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-08 09:34:46 +02:00 |
|
Vicent Llopis
|
1915850a09
|
feat(claim_photo): added videos
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-07 14:12:56 +02:00 |
|
Vicent Llopis
|
5f2424dc44
|
feat(ticket): add option 'refund all' in descriptor menu
gitea/salix/pipeline/head This commit looks good
Details
|
2022-04-04 13:26:53 +02:00 |
|
Vicent Llopis
|
e29f820e60
|
feat(ticket_line): new table ticketRefund and update proc ticket_doRefund
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-30 08:56:35 +02:00 |
|
Carlos Jimenez Ruiz
|
39694b31b8
|
Merge branch 'dev' into 3607-supplier_agencyTerm
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-28 08:40:32 +00:00 |
|
Vicent Llopis
|
fd7afc962f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-23 12:53:33 +01:00 |
|
Vicent Llopis
|
1056060957
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-23 12:37:34 +01:00 |
|
Joan Sanchez
|
52b61d16ac
|
Merge pull request '3638-export_database' (#899) from 3638-export_database into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #899
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-03-23 10:43:14 +00:00 |
|
Vicent Llopis
|
29036cc39d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-21 13:17:52 +01:00 |
|
Vicent Llopis
|
fae267f539
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data
|
2022-03-21 13:15:46 +01:00 |
|
Carlos Jimenez Ruiz
|
728a5de311
|
Merge branch 'dev' into 3625-ticket_log_routeFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-21 11:56:44 +00:00 |
|
Vicent Llopis
|
e4eed95724
|
notify rocket when claimState change to canceled
gitea/salix/pipeline/head This commit looks good
Details
|
2022-03-21 10:02:56 +01:00 |