 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
|
66b932d1ae
|
Merge pull request 'fixes #4700 Ticket.split tour a futuro' (!1136) from 4700-split-tour into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1136
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-11-22 10:36:34 +00:00 |
 Joan Sanchez
|
738fc7d348
|
Merge pull request 'refs #4550 HOTFIX added jsbarcode module in print' (!1165) from 4550-HOTFIX-jsbarcode-module into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1165
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-11-22 10:30:00 +00:00 |
 Vicent Llopis
|
e148284332
|
jenkins test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 11:02:19 +01:00 |
 Guillermo Bonet
|
6247ebc65c
|
refs #4550 HOTFIX added jsbarcode module in print
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 10:42:39 +01:00 |
|
Vicent Llopis
|
89141419c1
|
fix: merge filter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 10:36:40 +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
|
37b312564e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4682-searchbar_filter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 09:23:32 +01:00 |
|
Vicent Llopis
|
cac8879ec7
|
fix: solo vuelve a buscar el mismo filtro en caso de que se encuentre en un index
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-22 09:22:06 +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 |
|
Alexandre Riera
|
9236e3e3e8
|
Merge pull request 'fixes #3557 back sale/missingTrash' (!1143) from 3557-back-missingTrash into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1143
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2022-11-22 07:09:28 +00:00 |
|
Alexandre Riera
|
8e1505d5ee
|
Merge branch 'dev' into 3557-back-missingTrash
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 07:02:56 +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 |
 Alex Moreno
|
5e831581a0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-11-22 07:26:29 +01:00 |
|
Alex Moreno
|
7c75eaadce
|
feat: worker-welcome
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 15:15:25 +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
|
40398da48d
|
refs #4789 @30m tested the requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 14:21:23 +01:00 |
|
Pau
|
0099b42fe3
|
requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 14:06:38 +01:00 |
|
Pau
|
6711593a87
|
Merge pull request 'Closes #4767 - route.index delete route' (!1154) from 4767-route.index-delete-route into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1154
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-11-21 12:56:35 +00:00 |
|
Pau
|
52630f0a25
|
add collections with sectorFk
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 13:38:53 +01:00 |
|
Pau
|
b1e12d7128
|
Merge branch '4732-new-label' into 4732-previa-label
|
2022-11-21 13:33:52 +01:00 |
|
Pau
|
2567a1fab3
|
refs #4732 @4h30m
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 13:31:55 +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
|
4302f0be02
|
Merge pull request '#4507 greuge.js/json now insert userFk @2h' (!1101) from 4507-greuge-add-userFk into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1101
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-11-21 08:44:45 +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
|
7475aa8389
|
Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 08:33:51 +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 |
|
Pau
|
4e97d931f7
|
refs #4791 @2h
|
2022-11-21 08:45:45 +01:00 |
|
Alex Moreno
|
7e98a255b8
|
refs #4849 SQL
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 08:11:01 +01:00 |
|
Joan Sanchez
|
1f857d5b10
|
4859 - Export production database
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 08:01:21 +01:00 |
|
Vicent Llopis
|
83aec89adb
|
Merge pull request 'fixed 4832-refactor_workerTimeControl.sendMail' (!1147) from 4832-refactor_workerTimeControl.sendMail into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1147
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-11-21 06:41:52 +00:00 |
|
Vicent Llopis
|
4c4482c40a
|
Merge branch 'dev' into 4832-refactor_workerTimeControl.sendMail
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-21 06:09:05 +00:00 |
|
Pau
|
c320342476
|
Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 06:05:43 +00:00 |
|
Joan Sanchez
|
813cf78128
|
Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-18 14:03:09 +00:00 |
|
Pau
|
0f17c082a3
|
refs #4557 @1h left join note only delivery
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-18 12:07:33 +01:00 |
|
Pau
|
d41269bbbe
|
Change fixtures so the provider is present in the label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-18 11:58:46 +01:00 |
|
Pau
|
99eea1df1d
|
refs #4732 @1h
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-18 11:46:49 +01:00 |