 Javier Segarra
|
1939c65fab
|
refs #6264 test: remove force describe for dms test
|
2023-12-14 12:35:54 +01:00 |
|
Javier Segarra
|
d0af29c0c5
|
refs #6264 test: remove force describe for dms test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 12:28:41 +01:00 |
|
Javier Segarra
|
dddc749744
|
Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-14 11:05:00 +00:00 |
 Alex Moreno
|
e7911738c6
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 08:50:20 +01:00 |
|
Javier Segarra
|
397eb4d32b
|
Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-14 06:22:22 +00:00 |
|
Javier Segarra
|
485968037b
|
Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-14 06:22:17 +00:00 |
 Sergio De la torre
|
af83519ee6
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 15:12:39 +00:00 |
|
Javier Segarra
|
1e89ed6cdc
|
Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 14:39:10 +00:00 |
|
Javier Segarra
|
06bae44824
|
refs #2051 perf: uploadFile after review
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 15:38:46 +01:00 |
 Carlos Satorres
|
9a5536a3a3
|
Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 14:05:51 +00:00 |
|
Carlos Satorres
|
cfa08963fb
|
Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 15:05:43 +01:00 |
|
Carlos Satorres
|
40499e44cf
|
refs #6220 remove concat
|
2023-12-13 15:05:41 +01:00 |
 Robert Ferrús
|
4df2fa8ee4
|
Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 13:30:53 +00:00 |
|
Robert Ferrús
|
b9efbc7d44
|
refs #5854
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 14:30:29 +01:00 |
|
Javier Segarra
|
7b9e3b0985
|
refs #2051 perf: removeFile after review
|
2023-12-13 14:24:05 +01:00 |
|
Javier Segarra
|
7bdb1b2078
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor
|
2023-12-13 13:49:38 +01:00 |
|
Javier Segarra
|
a5ecec9603
|
refs #2051 feat: remove front methods refactor
|
2023-12-13 13:47:30 +01:00 |
 David Domenech
|
9bcd0a3c98
|
Merge branch 'dev' into 6125-roleCreditLimitFix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 11:29:46 +00:00 |
|
David Domenech
|
ee6ad55e66
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 09:43:20 +01:00 |
 Pablo Natek
|
f63b26b71f
|
Merge branch 'dev' into 6125-roleCreditLimitFix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 07:52:36 +00:00 |
|
Carlos Satorres
|
371a202230
|
Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 07:51:23 +00:00 |
|
Pablo Natek
|
69dd34665f
|
refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 08:50:17 +01:00 |
|
Sergio De la torre
|
435819cf3c
|
refs #6275 feat:Silex_to_Salix test getExpeditionSummary
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 07:24:13 +01:00 |
|
Javier Segarra
|
d44cdcbd13
|
Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 06:14:55 +00:00 |
|
Robert Ferrús
|
5f4adab017
|
refs #5854
gitea/salix/pipeline/head Build queued...
Details
|
2023-12-12 18:03:09 +01:00 |
|
Sergio De la torre
|
e22201c840
|
Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-12 14:50:25 +00:00 |
|
Javier Segarra
|
d206c93305
|
refs #2051 feat: getAllowedContentTypes approach
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-12 15:03:00 +01:00 |
|
Javier Segarra
|
6b70f8b3eb
|
refs #2051 feat: uploadFile approach
|
2023-12-12 13:49:14 +01:00 |
|
Carlos Satorres
|
78aa25d74f
|
refs #6220 fix testback
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-12 13:21:08 +01:00 |
|
Carlos Satorres
|
6cefc982e4
|
refs #6220 add filter address
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-12 13:14:41 +01:00 |
|
Javier Segarra
|
ae76776245
|
refs #2051 feat: removeFile approach
|
2023-12-12 12:09:06 +01:00 |
|
Robert Ferrús
|
9894591aa9
|
Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-11 17:56:40 +00:00 |
|
Carlos Satorres
|
7e6f311a43
|
refs #6220 address filter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-11 14:51:11 +01:00 |
|
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 |
 Jorge Penadés
|
84270587cb
|
refs #6274 refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-11 13:42:19 +01:00 |
|
Carlos Satorres
|
2beb1f65f0
|
refs #6085 findOne
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-11 12:45:55 +01:00 |
|
Carlos Satorres
|
53ff8784ff
|
refs #6085 remove myOptions
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-11 10:16:46 +01:00 |
|
Carlos Satorres
|
57ed36cdfc
|
ref #6085 remove console options
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-11 09:43:38 +01:00 |
|
Carlos Satorres
|
584f3264ed
|
refs #6085 refactor sql trad
|
2023-12-11 08:54:58 +01:00 |
|
Carlos Satorres
|
866ad7a9f9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail
|
2023-12-11 08:20:19 +01:00 |
|
Alex Moreno
|
f874faa921
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-11 07:47:55 +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 |
|
Jorge Penadés
|
b88d61e864
|
Merge commit '6fb4e8677' into 6274-loginWorkerTimeControl
|
2023-12-07 14:53:33 +01:00 |
|
Jorge Penadés
|
6fb4e86777
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into HEAD
|
2023-12-07 14:47:31 +01:00 |
|
Jorge Penadés
|
968dc65231
|
refs #6274 tests created
|
2023-12-07 14:47:22 +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 |
|
Jorge Penadés
|
bb186bafe0
|
Merge branch '6264-renewToken' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
|
2023-12-05 14:12:00 +01:00 |
|
Jorge Penadés
|
25006a938b
|
refs #6274 refactor clockIn
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-05 11:53:27 +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 |
|
Jorge Penadés
|
8cb97e2477
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-04 15:09:44 +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 |
|
Carlos Satorres
|
6d486fbec9
|
refs #6085 trad, remove front, back test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-01 13:58:45 +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 |
|
Robert Ferrús
|
2a93dcf5b8
|
Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-01 10:20:08 +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
|
b2e7ea3089
|
refs #5914 feat: make invoice support rectificative
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-30 15:16:41 +01: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 |
|
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 |
|
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 |
|
Jorge Penadés
|
5442e3b4e0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-30 08:44:41 +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 |
|
Carlos Satorres
|
9a3efdd6fe
|
refs #6085 model y back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 13:55:44 +01:00 |
|
Jorge Penadés
|
c609f6f47f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 09:27:50 +01:00 |
|
Carlos Satorres
|
e548ef4dae
|
refs #6085 searchpanel and change path
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-29 07:51:58 +01:00 |
|
Carlos Satorres
|
0186c2c806
|
refs #6085 aclMail back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-29 07:33:49 +01:00 |
|
Jorge Penadés
|
29fb36010c
|
refs #6274 back methods created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 14:48:03 +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 |
|
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 |
|
Robert Ferrús
|
5f26553092
|
Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 11:05:50 +00:00 |
|
Robert Ferrús
|
62fab4e744
|
refs #5854 itemShelving traducciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 11:52:37 +01: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 |