 Carlos Satorres
|
c81ca94d2e
|
refs #6220 add filter address
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-11 14:44:33 +01:00 |
 Javier Segarra
|
f817551a57
|
refs #5666 perf: remove ruleAlias property
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-11 12:59:02 +01:00 |
|
Javier Segarra
|
d1f0557923
|
refs #5666 perf: remove ruleAlias property
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-11 12:40:16 +01:00 |
 Pablo Natek
|
5a99408ba7
|
feat: refs #6548 add buyer department to salesPerson list in client BasicData
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-11 07:31:57 +01:00 |
 Sergio De la torre
|
9937fbed5e
|
REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 11:59:01 +01:00 |
|
Sergio De la torre
|
67994188ee
|
Merge branch 'dev' into 6028_routesByWorkerEmail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 10:42:30 +00:00 |
|
Sergio De la torre
|
fa65cc84a9
|
REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-07 11:39:22 +01:00 |
|
Sergio De la torre
|
0263d880ca
|
refs #6028 add:email in ByWorker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 08:00:17 +01:00 |
|
Carlos Satorres
|
3c9c221220
|
Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-07 06:59:38 +00:00 |
|
Sergio De la torre
|
c9bcd672c9
|
refs #6028 add:email in ByWorker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-07 07:59:21 +01:00 |
|
Carlos Satorres
|
c7d960229d
|
Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-07 06:34:32 +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 |
|
Javier Segarra
|
a7c48b6ddc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 13:02:34 +01:00 |
|
Javier Segarra
|
035b31d878
|
refs #5666 test: fix e2e tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-05 12:00:31 +01:00 |
|
Carlos Satorres
|
f55e85a189
|
refs #6010 remove pending
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 10:35:48 +01:00 |
|
Carlos Satorres
|
af07a531ed
|
refs #6318 quantity
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 08:49:55 +01:00 |
|
Sergio De la torre
|
3692021b12
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 07:26:22 +00:00 |
|
Sergio De la torre
|
318f7e3c0d
|
REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 08:20:55 +01:00 |
|
Javier Segarra
|
1d92bbf4a2
|
refs #5666 feat: replace base value and add mixins
|
2023-12-05 07:48:56 +01:00 |
|
Javier Segarra
|
57add7abf0
|
refs #5666 perf: replace Role by VnRole
|
2023-12-05 07:16:12 +01:00 |
|
Javier Segarra
|
a8b0a7a5b3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-04 14:46:21 +01:00 |
|
Pablo Natek
|
bec1ff71ef
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk
|
2023-12-01 13:43:27 +01: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 |
 David Domenech
|
eb0766bafd
|
Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 14:08:47 +00:00 |
|
Pablo Natek
|
72283005b8
|
remove(console.log): refs #3271 remove console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 14:43:14 +01:00 |
|
David Domenech
|
8ab981907d
|
refactor(ticketTracking.userFk): refs #6398 workerFk to userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 14:25:00 +01:00 |
|
Pablo Natek
|
c457b5c4d2
|
Merge branch 'test' into 3271-zoneGetFilterdFix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:39:26 +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 |
|
Alex Moreno
|
35e74a7635
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:48:27 +01:00 |
|
Alex Moreno
|
016e4ae37c
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
|
2023-11-30 12:20:50 +01:00 |
|
Javier Segarra
|
01e7135224
|
refs #5666 feat: replace Role by VnRole in front
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 12:20:05 +01:00 |
|
Pablo Natek
|
3f22f48df7
|
fix(getFiltered): refs #3271 fix to event filter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 12:13:12 +01:00 |
|
Javier Segarra
|
2a2998a8bc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
|
2023-11-30 12:01:44 +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 |
|
Carlos Satorres
|
9cdb7c3cca
|
refs #6065 remove workcenter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 09:18:00 +01:00 |
|
Javier Segarra
|
97d7f8356f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
|
2023-11-30 07:08:23 +01:00 |
|
Javier Segarra
|
1576ab992d
|
refs #6434 perf: new field in SignInLog table
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 19:36:30 +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 |
|
Javier Segarra
|
63533459b0
|
refs #6434 feat: improve signIn method
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 13:22:17 +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 |
|
Javier Segarra
|
bb9723b65d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 08:18:11 +01:00 |
|
Javier Segarra
|
f5f2896cbf
|
refs 5666 feat: replace Role model by VnRole model
|
2023-11-28 08:12:16 +01:00 |
|
Alex Moreno
|
37555cbb63
|
refs #6335 warmFix(ticketAdvance): correct properties
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 15:10: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 |
|
Juan Ferrer
|
74772472d5
|
Merge pull request 'master' (!1820) from master into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1820
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-11-27 12:16:42 +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 |
|
Javier Segarra
|
901a44cc62
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-27 09:48:31 +01:00 |
|
Javier Segarra
|
72a0932e35
|
refs #6264 other: rename camel-case variable
|
2023-11-27 09:46:27 +01:00 |
|
Alex Moreno
|
3fb1ed9dfe
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6506-hotfixContract
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 08:38:17 +01:00 |
|
Carlos Satorres
|
f9d5cad412
|
refs #6506 contract
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 07:57:18 +01: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
|
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 |
|
Carlos Satorres
|
5d18c211a0
|
refs #6507 state
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 08:40:06 +01:00 |
|
Javi Gallego
|
4071c06b5f
|
feat: refs #6275 getTickets con los campos de silex
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 08:15:39 +01:00 |
|
Carlos Satorres
|
8a568f180a
|
refs #6506 fix e2e, refactor business
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 07:47:57 +01:00 |
|
Carlos Satorres
|
ebe467f721
|
refs #6506 hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 07:04:55 +01:00 |
|
Javi Gallego
|
aa0794e136
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 06:31:25 +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 |
|
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 |
|
Alex Moreno
|
f4fabb9fff
|
refs #6491 refactor(order_filter): optimized
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 08:26:14 +01:00 |
|
Carlos Satorres
|
2b455488a3
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-22 18:35:16 +01:00 |
|
Carlos Satorres
|
6b07ee4eb1
|
hotfix workerhours
|
2023-11-22 18:35:14 +01: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 |
|
Javi Gallego
|
a0a9e299d9
|
feat: refs #6275 getTickets with phone
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-22 12:39:21 +01:00 |
|
Guillermo Bonet
|
d52c82fb19
|
Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-22 11:36:07 +00: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 |
|
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
|
b3d1c72adc
|
Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 09:13:41 +00:00 |
|
Alex Moreno
|
e909c2bc26
|
Merge branch 'dev' into 6454-dbDump
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 09:13:17 +00:00 |
|
Alex Moreno
|
02e8b90926
|
refs #6454 test: fix e2e by dump
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 10:12:07 +01:00 |
|
Juan Ferrer
|
bf7c67dbde
|
fix: refs #6197 add definer to events
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 09:26:02 +01:00 |
|
Jorge Penadés
|
dd11cf5327
|
ref #5835 fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 09:03:25 +01:00 |
|
Jorge Penadés
|
34e5409533
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 08:19:11 +01:00 |
|
Juan Ferrer
|
0a2fd9cf5d
|
fix: refs #6432, #5848 account sync fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-20 18:39:37 +01:00 |
|
Alex Moreno
|
ee1a0c15ee
|
refs #6454 feat: dump db
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-20 15:09:55 +01:00 |
|
Guillermo Bonet
|
5fdf18825c
|
Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-20 13:14:51 +00:00 |
|
Alex Moreno
|
e25ca914a0
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-20 10:13:02 +01:00 |
|
Guillermo Bonet
|
badb4d69a2
|
Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-20 06:15:40 +00:00 |
|
Pablo Natek
|
e2a2454d4e
|
Merge branch 'dev' into 6461-fixFilterNegativeBases
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-17 10:31:35 +00:00 |
|
Pablo Natek
|
dc100f7959
|
fix(filter): refs #6461 now is mockDate in local
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-17 11:29:57 +01:00 |
|
Juan Ferrer
|
bb6f3b4cfd
|
fix: refs #6432 account sync fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-17 08:56:25 +01:00 |
|
Guillermo Bonet
|
500eb22dc6
|
Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-17 06:43:58 +00:00 |
|
Guillermo Bonet
|
8da36569f7
|
refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head Build queued...
Details
|
2023-11-17 07:44:43 +01:00 |
|
Guillermo Bonet
|
3d1c69be56
|
refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-17 07:43:32 +01:00 |