 Javi Gallego
|
be5df940bf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 08:01:20 +01:00 |
|
Javi Gallego
|
58ba1c10d0
|
ci: dev-test
|
2023-12-07 08:01:16 +01:00 |
 Carlos Satorres
|
c75ee22345
|
Merge pull request 'refs #6318 quantity' (!1875) from 6318-negativeQuantity into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1875
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-07 06:59:24 +00:00 |
|
Carlos Satorres
|
acfa0fd857
|
Merge branch 'dev' into 6318-negativeQuantity
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 06:31:21 +00:00 |
|
Javi Gallego
|
7ff8ec93ff
|
Merge pull request 'test' (!1879) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1879
|
2023-12-06 07:54:13 +00:00 |
|
Carlos Satorres
|
af07a531ed
|
refs #6318 quantity
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 08:49:55 +01:00 |
 Jorge Penadés
|
0b1bbbaaa6
|
Merge pull request 'refs #5835 rate added' (!1865) from 5835-summaryRate into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1865
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-12-01 07:22:26 +00:00 |
|
Jorge Penadés
|
611b45bae0
|
Merge branch 'dev' into 5835-summaryRate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 15:16:18 +00:00 |
 Alex Moreno
|
ee7dd66ce9
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:49:42 +01:00 |
|
Jorge Penadés
|
6121eeaa3a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-summaryRate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 09:44:05 +01:00 |
|
Javi Gallego
|
69e555e7b4
|
Merge pull request '5652-fixtures-fix' (!1870) from 5652-fixtures-fix into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1870
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-11-30 08:13:05 +00:00 |
|
Javi Gallego
|
d246b5f9a8
|
Merge branch 'dev' into 5652-fixtures-fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 15:26:51 +01:00 |
 Guillermo Bonet
|
b3cc020ea7
|
Merge pull request 'refs #6023 Fix change rol bug' (!1727) from 6023-changeRol into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1727
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-11-29 11:48:17 +00:00 |
|
Guillermo Bonet
|
5e9a62eac2
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 08:21:23 +00:00 |
|
Alex Moreno
|
2e22984e77
|
refs #6197 fix: add salix role in fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 09:13:54 +01:00 |
|
Jorge Penadés
|
f2673c3818
|
refs #5835 rate added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-28 12:12:42 +01:00 |
|
Guillermo Bonet
|
1a5cc67312
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 12:07:50 +01:00 |
|
Javi Gallego
|
2fa56cce4b
|
fix: refs #5652 arreglo fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 09:22:00 +01:00 |
 Juan Ferrer
|
c7291e3367
|
Merge pull request 'test' (!1863) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1863
|
2023-11-27 12:17:11 +00:00 |
|
Guillermo Bonet
|
8ee8d90eec
|
Merge pull request 'refactor: refs #3222 Expence to expense' (!1860) from 3222-expenceToExpense into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1860
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-11-27 09:56:30 +00:00 |
|
Guillermo Bonet
|
3bdb002034
|
Merge branch 'dev' into 3222-expenceToExpense
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 09:06:17 +00:00 |
|
Guillermo Bonet
|
aefff68c29
|
refactor: refs #3222 Requested changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-27 09:51:56 +01:00 |
|
Jorge Penadés
|
d075cb97ad
|
Merge pull request 'refs #5811 feat: al borrar expedicion borrar de viaexpress' (!1754) from 5811-ticket.expedition_deleteViaexpress into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1754
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-11-27 07:36:28 +00:00 |
|
Guillermo Bonet
|
2be1639e9f
|
refactor: refs #3222 Expence to expense
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 12:42:25 +01:00 |
|
Jorge Penadés
|
53c8e87b5b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 10:57:32 +01:00 |
|
Jorge Penadés
|
74dd64126a
|
Merge pull request '#5835 getTotals fixed' (!1854) from 5835-fixGetTotals into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1854
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-11-24 09:56:21 +00:00 |
|
Jorge Penadés
|
8ac3887d80
|
refs #5811 rename methods
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-24 10:53:38 +01:00 |
|
Jorge Penadés
|
c56588a472
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 10:18:47 +01:00 |
|
Jorge Penadés
|
b3584d9db5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 10:12:45 +01:00 |
|
Javi Gallego
|
4a62588464
|
Merge pull request '6028_route_getRouteByWorker' (!1857) from 6028_route_getRouteByWorker into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1857
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-11-23 14:01:53 +00:00 |
|
Jorge Penadés
|
1f9030c36d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 13:35:46 +01:00 |
|
Jorge Penadés
|
eeef279483
|
refs #5811 replace decription
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 13:34:29 +01:00 |
|
Jorge Penadés
|
5f09907c98
|
Merge branch '5835-fixGetTotals' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 13:21:09 +01:00 |
|
Jorge Penadés
|
025e4f3f87
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
|
2023-11-23 13:21:00 +01:00 |
|
Jorge Penadés
|
f4a1d09ef8
|
Merge branch 'dev' into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 12:04:05 +00:00 |
 Sergio De la torre
|
756e55f5c2
|
Merge pull request 'refs #5890 fix: getTickets' (!1852) from 5890_collection_getTickets into dev
gitea/salix/pipeline/head Build queued...
Details
Reviewed-on: #1852
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-11-23 11:23:15 +00:00 |
|
Alex Moreno
|
4735307f5d
|
refs #5890: fix(Collection/getTickets): accepts iss.quantity nulls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:49:00 +01:00 |
|
Jorge Penadés
|
6b2c1e09de
|
refs #5835 refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:31:00 +01:00 |
|
Javi Gallego
|
5b145a57e6
|
error: refs 6028 test front quitado
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:29:53 +01:00 |
|
Jorge Penadés
|
048e3089cd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:26:41 +01:00 |
|
Jorge Penadés
|
db15285858
|
refs #5811 test updated
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:21:56 +01:00 |
|
Jorge Penadés
|
2e67ef4f5d
|
refs #5811 refactor deleteExpeditions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 10:32:07 +01:00 |
|
Jorge Penadés
|
900dffbbba
|
refs #5811 delete viaexpress expeditions included
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 10:26:28 +01:00 |
|
Javi Gallego
|
f44424dbcf
|
test: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 09:44:47 +01:00 |
|
Javi Gallego
|
5b289ec083
|
Merge branch 'dev' into 6028_route_getRouteByWorker
|
2023-11-23 09:21:44 +01:00 |
|
Alex Moreno
|
1277bec801
|
Merge branch 'dev' into 5890_collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 07:56:02 +00:00 |
|
Jorge Penadés
|
6580896dcd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 08:46:11 +01:00 |
|
Alex Moreno
|
217aa1ac77
|
refs #6491 deploy(2350) init version
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 08:35:08 +01:00 |
|
Jorge Penadés
|
da7b670d74
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 08:28:56 +01:00 |
 Carlos Andrés
|
800d12e0f2
|
Merge branch 'dev' into 5890_collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-22 18:00:34 +00:00 |
|
Javi Gallego
|
e856de0cfd
|
feat: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-22 15:54:38 +01:00 |
|
Jorge Penadés
|
26a8cc6a2c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-22 15:41:24 +01:00 |
|
Javi Gallego
|
e146c0ea46
|
Merge branch 'dev' into 6028_route_getRouteByWorker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-22 12:42:20 +01:00 |
|
Jorge Penadés
|
a27bb53089
|
refs #5835 getTotals fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-22 08:57:45 +01:00 |
|
Sergio De la torre
|
707173d618
|
refs #5890 fix: getTickets
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-22 07:04:33 +01:00 |
|
Jorge Penadés
|
3f8d1ff617
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 10:17:31 +01:00 |
|
Guillermo Bonet
|
2847b993d3
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 11:30:23 +00:00 |
|
Guillermo Bonet
|
a4cbc33ee1
|
Merge branch '6023-changeRol' of https://gitea.verdnatura.es/verdnatura/salix into 6023-changeRol
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-10 11:55:38 +01:00 |
|
Guillermo Bonet
|
b7da144967
|
feat: refs #6023 Added SELECT FOR UPDATE
|
2023-11-10 11:55:37 +01:00 |
|
Guillermo Bonet
|
eb98de71b1
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 10:49:38 +00:00 |
|
Guillermo Bonet
|
9f92bc4b4c
|
fix: refs #6023 Rollback privileges.js
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 11:43:42 +01:00 |
|
Guillermo Bonet
|
9668468f94
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 13:06:55 +00:00 |
|
Alex Moreno
|
30895f444f
|
Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-26 12:14:31 +00:00 |
|
Alex Moreno
|
2dbd711104
|
Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-19 05:24:05 +00:00 |
|
Guillermo Bonet
|
f6d46396b5
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-18 08:15:43 +00:00 |
|
Guillermo Bonet
|
cab3548c9b
|
Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-01 06:11:08 +00:00 |
|
Guillermo Bonet
|
0dbb77fc64
|
refs #6023 Transactioned sync
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-31 09:20:33 +02:00 |
|
Guillermo Bonet
|
9f6d034f9c
|
refs #6023 Minor changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-29 13:45:20 +02:00 |
|
Guillermo Bonet
|
d1df8009a6
|
refs #6023 Fix change rol bug
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-29 10:52:05 +02:00 |
 Vicent Llopis
|
f3e43686a3
|
refs #5811 feat: al borrar expedicion borrar tmb de viaexpress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 14:59:28 +02:00 |
|
Sergio De la torre
|
639d5963a3
|
refs #6028 get_routes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-17 13:50:07 +02:00 |