 Alex Moreno
|
995fb6a5c3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db
gitea/salix/pipeline/head This commit is unstable
Details
|
2022-12-02 13:13:53 +01:00 |
 Vicent Llopis
|
14a3a815da
|
fix(invoiceOut): pdf adjunto correcto. Corregido valor NaN en intrastat. Sólo muestra intrstar en fact CEE
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-02 12:05:25 +01:00 |
 Joan Sanchez
|
6128414685
|
m3 decimal
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-02 11:26:21 +01:00 |
|
Joan Sanchez
|
0c4ab815fd
|
decimal
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2022-12-02 11:24:08 +01:00 |
|
Joan Sanchez
|
6562b68341
|
fix(agencyTerm): permitir decimales en m3 minimos
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-02 11:16:49 +01:00 |
 Alexandre Riera
|
48a7635449
|
refs #4893 regex changed
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-02 09:18:52 +01:00 |
 Pau
|
691d157da8
|
Merge branch 'dev' into 4875-skip-tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-01 13:33:52 +00:00 |
|
Pau
|
c54844f7ff
|
removed pending from working test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-01 14:32:05 +01:00 |
|
Joan Sanchez
|
e815292d6b
|
fix(componentUpdate): updated filter where sintax
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-01 09:24:56 +01:00 |
|
Joan Sanchez
|
6cb0e518d4
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-01 07:33:38 +01:00 |
|
Alex Moreno
|
8df7b91127
|
fix: entry ref
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 15:24:33 +01:00 |
|
Alex Moreno
|
43bd583d6f
|
Merge branch 'dev' into 4875-skip-tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-30 13:49:59 +00:00 |
|
Pau
|
79f8e30ded
|
add pending to the tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-30 14:49:00 +01:00 |
|
Pau
|
67384b724d
|
refs #4875 skipped failing test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-30 14:41:03 +01:00 |
|
Alex Moreno
|
b769845a28
|
hotFix: not transfer all sales if all sales is negatives
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 14:29:44 +01:00 |
|
Vicent Llopis
|
c1089c637a
|
fix: backTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 13:43:29 +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 |
|
Pau
|
97baa89a71
|
Merge branch 'dev' into hotfix(#4914)-Bug-Client-Phone
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-30 09:52:19 +01:00 |
|
Alexandre Riera
|
492b852be8
|
delete orderBy
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 09:22:53 +01:00 |
|
Pau
|
bef1071316
|
refs #4914 @1h
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 09:22:03 +01:00 |
|
Alexandre Riera
|
27078595ce
|
fix balances
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 08:39:04 +01:00 |
|
Pau
|
02598ced92
|
solve merge conficts
|
2022-11-30 07:12:26 +01:00 |
|
Pau
|
2d7b3cc3a2
|
Merge branch 'dev' into 4871-socialName-on-client-filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 13:13:57 +00:00 |
|
Joan Sanchez
|
990dd88e2c
|
Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1186
|
2022-11-29 13:08:38 +00:00 |
|
Joan Sanchez
|
5f3e7c3384
|
Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 11:49:06 +00:00 |
|
Alexandre Riera
|
cd8d5efa88
|
corrections
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 10:29:18 +01:00 |
|
Pau
|
ddc543ad63
|
Merge branch 'dev' into 4557-duplicate-tickets-in-routes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 08:22:05 +00: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 |
|
Vicent Llopis
|
e3e337c02e
|
fix: backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-28 14:28:47 +01:00 |
|
Vicent Llopis
|
4b54cf954b
|
refactor: envia el email con formato Verdnatura
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-28 13:56:21 +01:00 |
 Carlos Andrés
|
2a4e8cdde9
|
Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-28 12:19:58 +00:00 |
|
Pau
|
0d6e424a3e
|
allow client search by socialname
|
2022-11-28 10:21:01 +01:00 |
|
Alex Moreno
|
da2d1df522
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio
|
2022-11-28 10:14:16 +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 |
|
Vicent Llopis
|
d15e2551a2
|
feat: add frontTest
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 12:16:01 +01:00 |
|
Vicent Llopis
|
af87fc2d53
|
fix: modelo incorrecto
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 11:51:07 +01:00 |
|
Vicent Llopis
|
bca79e1240
|
feat: add backTest
|
2022-11-25 11:50:54 +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 |
|
Pau
|
8f98082910
|
refs #4791 @2h
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 09:59:02 +01:00 |
|
Vicent Llopis
|
e540bf7b31
|
feat: inserta en la nueva tabla ticketSms
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 09:38:34 +01:00 |
|
Carlos Andrés
|
8d2e532167
|
#4613 eliminar uso de portfolio
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-25 09:32:54 +01:00 |
|
Pau
|
65f82c8fc1
|
Merge branch 'dev' into 4557-duplicate-tickets-in-routes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-25 06:05:05 +00:00 |
|
Vicent Llopis
|
84c6604dd9
|
feat: enviar sms con cambios en el pedido
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-24 15:04:15 +01:00 |
|
Pau
|
7c71e40cc5
|
Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-24 13:15:54 +00:00 |
|
Joan Sanchez
|
0f40aa3e27
|
Merge pull request 'refs #4844' (!1175) from 4844-traduccion into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1175
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2022-11-24 12:49:53 +00:00 |
|
Pau
|
001c3ec2ac
|
requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 12:06:13 +01:00 |
|
Vicent Llopis
|
20d0d053ac
|
Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 11:03:23 +00:00 |
|
Vicent Llopis
|
74e8789439
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 10:54:40 +00:00 |
|
Pau
|
37a7a12f87
|
requested change
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 11:47:32 +01:00 |
|
Vicent Llopis
|
b8c6734798
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-24 09:40:43 +00:00 |
|
Pau
|
f74b257d75
|
Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 09:27:49 +00:00 |
|
Pau
|
6a30074a6a
|
Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 09:23:00 +00: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 |
|
Alexandre Riera
|
5124b3b681
|
Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 08:42:09 +00:00 |
|
Alexandre Riera
|
23cf2d9aaf
|
Merge branch 'dev' into 3949-invoiceIn-add-docFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-24 08:33:39 +00: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
|
6f2a7a5cef
|
feat: enviar sms con cambios en las líneas
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 15:15:40 +01:00 |
|
Alexandre Riera
|
164b797ab8
|
front and e2e tests done
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-23 11:09:32 +01:00 |
|
Vicent Llopis
|
9a47b2fea4
|
Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-23 10:00:27 +00:00 |
|
Vicent Llopis
|
bf782c3782
|
fix: añadido esquema account
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-23 10:09:09 +01:00 |
|
Vicent Llopis
|
e854fd248e
|
feat: add checkInBox
|
2022-11-23 10:08:58 +01:00 |
|
Pau
|
a8520f851c
|
Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 08:28:07 +00:00 |
|
Pau
|
ad38f50ae3
|
Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-23 08:55:46 +01:00 |
|
Pau
|
ade2e777d6
|
refs #4457 @30min requested changes
|
2022-11-23 08:55:44 +01:00 |
|
Pau
|
88db9c0d80
|
Merge branch '4789-search-ticket-without-invoice' of https://gitea.verdnatura.es/verdnatura/salix into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-23 08:25:20 +01:00 |
|
Pau
|
4c4e0e109d
|
refactor test to use toBeGreaterThan
|
2022-11-23 08:25:15 +01:00 |
|
Pau
|
b6ff1d99b1
|
Merge branch '4791-refactor-sendsms' of https://gitea.verdnatura.es/verdnatura/salix into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 08:20:13 +01:00 |
|
Pau
|
0b6d7eaffc
|
refs #4791 @30min fix broken test
|
2022-11-23 08:20:12 +01:00 |
|
Vicent Llopis
|
ccce6af021
|
fix: add translations
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 07:57:27 +01:00 |
 Pablo Natek
|
83ed79569a
|
refs #4844
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 20:45:18 +01:00 |
|
Pau
|
51d3091a40
|
Merge branch 'dev' into 4511-kkear-expedition.itemFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 13:45:03 +00:00 |
|
Pau
|
bb640da8f0
|
Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 13:44:23 +00: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 |
|
Alexandre Riera
|
8613b196d8
|
Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 13:31:04 +00: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 |
|
Joan Sanchez
|
7e12938de3
|
Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 12:53:03 +00:00 |
|
Alexandre Riera
|
5552cd654e
|
Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 10:48:11 +00:00 |
|
Alexandre Riera
|
d5521adb6b
|
working on tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 11:44:36 +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
|
c51354b13f
|
refs #3949 textfield, edit and create dialog added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 09:29:25 +01:00 |
|
Vicent Llopis
|
8876bc2b68
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 08:12:07 +00:00 |
|
Pau
|
3b66da20ca
|
Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 07:01:33 +00:00 |
|
Pau
|
4bd643143b
|
requested changes refs #4791 @1h
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 07:59:18 +01:00 |
|
Pau
|
cb6ae41c13
|
Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 13:45:28 +00:00 |
|
Pau
|
fc08b27fb6
|
Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 13:42:53 +00:00 |
|
Pau
|
3003290e61
|
refs #4551 @20min requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 14:38:51 +01:00 |
|
Pau
|
0099b42fe3
|
requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 14:06:38 +01:00 |
|
Alex Moreno
|
26be27c2ee
|
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-21 13:13:25 +01:00 |
|
Alexandre Riera
|
6ddd2d95a5
|
insert acl
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 11:48:18 +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
|
40ea9805cf
|
fixes #4547 check compensation and tests
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 10:49:19 +01:00 |
|
Pau
|
b788415920
|
Merge branch 'dev' into 4767-route.index-delete-route
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 08:46:32 +00:00 |
|
Pau
|
cb0735d136
|
Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 08:34:18 +00:00 |
|
Pau
|
68e4eea2e3
|
Merge branch 'dev' into 4767-route.index-delete-route
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 08:32:39 +00:00 |
|
Pau
|
153f5f56fa
|
fix test refs #4791 @30min
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 09:11:17 +01:00 |
|
Vicent Llopis
|
3fde11c3ed
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 08:06:39 +00:00 |