 Carlos Satorres
|
6416891918
|
refs #6291 tinIsValid worker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-12-13 13:55:31 +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 |
|
Javier Segarra
|
074bb2b980
|
Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-13 06:30:14 +00: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 |
|
Javier Segarra
|
8bd9becb74
|
refs #2687 feat: remove procedure argument
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-12 07:34:20 +01:00 |
|
Javier Segarra
|
30dbc8a587
|
refs #2687 feat: fix test suite
|
2023-12-12 07:33:08 +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 |
|
Javier Segarra
|
c0d2e0511d
|
refs #2687 feat: modify back method
|
2023-12-11 14:54:12 +01: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 |
|
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 |
|
Carlos Satorres
|
2beb1f65f0
|
refs #6085 findOne
gitea/salix/pipeline/head This commit looks good
Details
|
2023-12-11 12:45:55 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Carlos Satorres
|
f9d5cad412
|
refs #6506 contract
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-27 07:57:18 +01:00 |
|
Alex Moreno
|
824ca1d70a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-27 07:42:50 +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
|
e314a67fe7
|
refs #6274 time control methods migrated
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 13:25:31 +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 |
|
Carlos Satorres
|
7c6798c564
|
refs #6291 dni vn-user
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-21 16:25:48 +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 |
|
Alex Moreno
|
0ddfb28327
|
refs #5914 fix: transferInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-20 07:56:15 +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 |
|
Guillermo Bonet
|
2f611391b9
|
Revert "refactor: refs #4502 Deleted zoneEstimatedDelivery"
gitea/salix/pipeline/head This commit looks good
Details
This reverts commit bfd6e1f398.
|
2023-11-17 07:17:29 +01:00 |
|
Juan Ferrer
|
c2e295f777
|
fix: refs #6432 account sync fixes
|
2023-11-17 00:08:29 +01:00 |
|
Juan Ferrer
|
ea5a881d1f
|
fix: refs #6432 account sync fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-16 23:10:30 +01:00 |
|
Juan Ferrer
|
1937560118
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-16 23:07:30 +01:00 |
|
Juan Ferrer
|
4f5242e3ae
|
fix: refs #6432 account sync fixes
|
2023-11-16 23:07:26 +01:00 |
|
Javier Segarra
|
9e64939810
|
refs #6434 feat: add Id property in model
|
2023-11-16 11:56:48 +01:00 |
|
Alex Moreno
|
b8d256e4e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 09:58:51 +01:00 |
|
Alex Moreno
|
f677382f96
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 09:29:53 +01:00 |
|
Javier Segarra
|
e4f7790843
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-16 09:15:01 +01:00 |
|
Javier Segarra
|
c6b5d7f5a4
|
refs #6434 feat: rename id key by token
|
2023-11-16 08:30:01 +01:00 |
|
Guillermo Bonet
|
bfd6e1f398
|
refactor: refs #4502 Deleted zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 08:29:00 +01:00 |
|
Alex Moreno
|
5bdf6a7338
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-16 07:56:23 +01:00 |
|
Javier Segarra
|
13720291b2
|
refs #6434 perf: remove unique in token column
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-15 15:18:02 +01:00 |
|
Alex Moreno
|
ac3d23579a
|
Merge branch 'master' into 6434-signInLog_issue_MASTER
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 13:50:21 +00:00 |
|
Carlos Satorres
|
5b587b3449
|
Merge branch 'master' into hotfix-ticketAddresFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 12:56:45 +00:00 |
|
Javier Segarra
|
e0f6d08a1e
|
refs #6434 feat: create signInLog table
|
2023-11-15 13:49:41 +01:00 |
|
Sergio De la torre
|
a5d94b3a26
|
Merge branch 'test' into 5652_warmFix_setVisibleDiscard
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 12:43:58 +00:00 |
|
Alex Moreno
|
89967b8538
|
fix(workerDescriptor): show account button
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-15 13:16:31 +01:00 |
|
Sergio De la torre
|
692c5eb164
|
refs #5652 fix: setVisibleDiscard add parameter null
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-15 12:38:08 +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 |
|
Javier Segarra
|
f7b0882978
|
refs #6434 feat: remove forceId property
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 11:50:56 +01:00 |
|
Javi Gallego
|
a4328e607e
|
Merge branch 'dev' into 6207-incoterm-solo-en-serie-world
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 10:11:05 +01:00 |
|
Javi Gallego
|
3f7663da97
|
feat: refs #6275 crea back etExpeditionSummary
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-15 10:09:04 +01:00 |
|
Javier Segarra
|
4061241650
|
refs #6434 feat: create signInLog table
|
2023-11-15 09:37:03 +01:00 |
|
Alex Moreno
|
2a67048594
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 15:54:47 +01:00 |
|
Alex Moreno
|
88ec0f24c3
|
ref #5914 rename table
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 15:45:52 +01:00 |
|
Pablo Natek
|
2a57f7e98a
|
Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 14:02:27 +00:00 |
|
Pablo Natek
|
0a5e8e1902
|
refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-14 14:49:54 +01:00 |
|
Carlos Satorres
|
f3faf37e1a
|
hotfix addressFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 12:34:00 +01:00 |
|
Carlos Satorres
|
b57106af48
|
refs #6291 validateTin
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-14 11:13:33 +01:00 |
|
Alex Moreno
|
2cd9c9c688
|
Merge branch 'dev' into 5914-warmfix-renameTable
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 09:36:47 +00:00 |
|
Alex Moreno
|
bc6389fd66
|
Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-14 09:00:12 +00:00 |
|
Alex Moreno
|
aec1c9d447
|
fix: correct align
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-14 09:54:07 +01:00 |
|
Guillermo Bonet
|
4003e161ce
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-13 09:44:06 +00:00 |
|
Guillermo Bonet
|
64ca72b1f4
|
refactor refs #6184 Changed downloadCmrsZip
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-13 09:57:25 +01:00 |
|
Javier Segarra
|
384b5eb7c7
|
refs #5666 remove old file
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-13 09:56:16 +01:00 |
|
Javier Segarra
|
aab88dc7de
|
refs #5666 perf: use use loggable as mixin
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-13 09:54:12 +01:00 |
|
Guillermo Bonet
|
2792efa9cd
|
perf: refs #6184 Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-13 08:36:05 +01:00 |
|
Javier Segarra
|
3c5af184bb
|
refs #5666 feat: use mixin for this models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 15:12:49 +01: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 |
|
Carlos Satorres
|
a1c8bba4a5
|
hotfix addressId
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 11:29:18 +01:00 |
|
Alex Moreno
|
0fed5c1ab4
|
Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 09:59:24 +00:00 |
|
Alex Moreno
|
2eacf7391e
|
refs #6335 fix(db_ticket_canAdvance): not use unnecessary ifnulls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-10 08:46:49 +01:00 |
|
Alex Moreno
|
e9666a5930
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
|
2023-11-10 08:11:52 +01:00 |
|
Jorge Penadés
|
40b9a83606
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 15:59:12 +01:00 |
|
Jorge Penadés
|
8d94a94e14
|
ref #5914 fix test back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 15:56:50 +01:00 |
|
Jorge Penadés
|
513562955b
|
ref #5835 test back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 15:53:41 +01:00 |
|
Jorge Penadés
|
52f1843580
|
ref #5835 due day new and fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 15:00:49 +01:00 |
|
Jorge Penadés
|
0baa9c5a98
|
ref #5914 fix summary
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-09 14:34:53 +01:00 |
|
Jorge Penadés
|
b07858fddb
|
ref #5914 replace name
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-09 14:33:46 +01:00 |
|
Guillermo Bonet
|
05a7498219
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 13:14:21 +00:00 |
|
Guillermo Bonet
|
0771548ef1
|
refs #6184 Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 14:14:09 +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 |
|
Jorge Penadés
|
01d3c23cf0
|
ref #5914 renameTable
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-09 11:57:52 +01:00 |
|
Alex Moreno
|
52f419d4cf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
|
2023-11-09 09:33:22 +01:00 |
|
Sergio De la torre
|
4258015c07
|
refs #5870 feat:fixModel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-09 08:04:38 +01:00 |
|
Javi Gallego
|
9d54618620
|
fix: refs: #6207 impide facturar si no tienes incoterm
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-08 10:01:02 +01:00 |
|
Sergio De la torre
|
d30c4e4463
|
refs #5652 feat:addressShortage
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-07 16:13:21 +01:00 |
|
Pablo Natek
|
1c6618d494
|
fix(new): refs #6150 revert chabges in worker new method
gitea/salix/pipeline/head Build queued...
Details
|
2023-11-06 14:56:48 +01:00 |
|
Pablo Natek
|
aa800b1fd3
|
Merge branch '6150-clientCredit-update-Fix' of https://gitea.verdnatura.es/verdnatura/salix into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-06 14:23:38 +01:00 |
|
Pablo Natek
|
a75565f2ce
|
feat(client.create): refs #6150 clientCredit update fix
|
2023-11-06 14:23:36 +01:00 |
|
Juan Ferrer
|
99c88e6f5d
|
fix: refs #6390 Loggable set as base for ItemShelving
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-05 09:33:18 +01:00 |
|
Alex Moreno
|
d06810b1b9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-03 14:58:55 +01:00 |
|
Alex Moreno
|
a523e32373
|
refs #6335 style(ticketAdvance): fix with split-progress
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-03 07:57:53 +01:00 |
|
Sergio De la torre
|
728838334c
|
hotFix_6312 fix originalQuantity
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-02 14:42:22 +01:00 |
|
Pablo Natek
|
2d3ee4a16e
|
Merge branch 'dev' into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-02 13:05:31 +00:00 |
|
Pablo Natek
|
175e73e565
|
fix(clientCredit): refs #6150 se arreglan los inserts en clientCredit
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-02 14:05:14 +01:00 |
|
Alex Moreno
|
740d2fb976
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
|
2023-11-02 08:48:03 +01:00 |
|
Alex Moreno
|
83b9ef72fc
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-02 08:47:44 +01:00 |
|
Alex Moreno
|
742d6de986
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-02 07:28:41 +01:00 |
 Carlos Andrés
|
8c1ff26de7
|
Merge branch 'dev' into 5637-saleGroupLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-31 11:12:40 +00:00 |
|
Robert Ferrús
|
6112c7ba5f
|
refs #5637 saleGroup traducciones
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-31 09:59:34 +01:00 |
|
Pablo Natek
|
a47d31cec9
|
Merge branch 'dev' into 4131-unifyTicketStatusChanges
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-31 06:48:53 +00:00 |
|
Alex Moreno
|
37dce99447
|
refs #6335 test(ticketAdvance): add test to keep price
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-30 15:00:05 +01:00 |
|
Pablo Natek
|
e504ad313c
|
remove(console.log): refs #4131 quitar console log
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-30 14:56:33 +01:00 |
|
Alex Moreno
|
a80715583c
|
refs #6335 feat(ticketAdvance): change the date if you can
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-30 14:16:25 +01:00 |
|
Jorge Penadés
|
ab0640291b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-addExpeditionState
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-30 08:25:41 +01:00 |
|
Alex Moreno
|
bd8cc897c6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
|
2023-10-30 07:21:31 +01:00 |
|
Pablo Natek
|
14753212bb
|
fix(saveSign): refs #4131 remove call state on saveSign
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-27 18:07:17 +02:00 |
|
Pablo Natek
|
65a1d052dc
|
feat(ticket.state): refs #4131 to state
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-27 18:03:40 +02:00 |
|
Sergio De la torre
|
7ae12327f5
|
refs #5134 fix: model ExpeditionScan
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-27 16:16:22 +02:00 |
|
Alex Moreno
|
ae160890a8
|
refs #6335 feat(ticketAdvance): use componentUpdate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-27 15:06:20 +02:00 |
|
Pablo Natek
|
42bbdf9814
|
feat(ticket.state): refs #4131 convert changeState to State
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-27 13:41:32 +02:00 |
|
Pablo Natek
|
524ac4d99d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4131-unifyTicketStatusChanges
|
2023-10-26 22:16:06 +02:00 |
|
Pablo Natek
|
3584b15c19
|
Merge branch 'dev' into 4131-unifyTicketStatusChanges
|
2023-10-26 22:10:35 +02:00 |
|
Alex Moreno
|
55d80458cc
|
refs #6065 warmFix(workerTimeControl): set date
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-26 14:37:42 +02: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
|
6b94ea7d11
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
|
2023-10-26 09:48:35 +02:00 |
|
Jorge Penadés
|
3a1227bdc2
|
ref #5914 fix ticketrefund
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-26 09:20:25 +02:00 |
|
Jorge Penadés
|
da2bc416f5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-26 08:26:35 +02:00 |
|
Alex Moreno
|
013b010c22
|
refs #6278 test(itemRequest): fix e2e, correct selector
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-26 07:56:57 +02:00 |
|
Alex Moreno
|
26bdbabff5
|
refs #6335 feat(ticketAdvanced): show all tickets
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-25 15:48:19 +02:00 |
|
Alex Moreno
|
a501d577f8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-25 09:23:00 +02:00 |
|
Alex Moreno
|
efa9f16452
|
fix: remove unnecessary UserError
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-25 09:22:44 +02:00 |
|
Carlos Andrés
|
001d7cd574
|
Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 15:03:38 +00:00 |
|
Jorge Penadés
|
9f141238bc
|
ref #5216 add userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 11:47:54 +02:00 |
|
Alex Moreno
|
5442476f05
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
|
2023-10-24 10:35:11 +02:00 |
|
Jorge Penadés
|
35bb949fcb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 10:13:38 +02:00 |
|
Jorge Penadés
|
f1deeb69ca
|
ref #5914 add ticketrefund and fix text
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 09:34:04 +02:00 |
|
Alex Moreno
|
22b7c59812
|
refs #6335 feat(ticketAdvance): add zone field
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-24 09:23:03 +02:00 |
|
Jorge Penadés
|
1231d6dd1d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-24 08:34:42 +02:00 |
|
Carlos Andrés
|
08431e94c6
|
Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-23 13:52:52 +00:00 |
|
Carlos Andrés
|
6e3517b40f
|
refs #4707 fix: problemas fichadas y test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-23 14:51:09 +02:00 |
|
Alex Moreno
|
247aa5af2a
|
refs #6199 fix(sale_quantity): add isReduction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-23 09:52:06 +02:00 |
|
Alex Moreno
|
cf856a585b
|
refs #6199 fix(sale_quantity): add isReduction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-23 09:50:00 +02:00 |
|
Jorge Penadés
|
1f0a57d320
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-23 09:03:15 +02:00 |
|
Alex Moreno
|
dc00b85bec
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-23 08:31:37 +02:00 |
|
Jorge Penadés
|
33656e9d9a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-23 08:21:32 +02:00 |
|
Pablo Natek
|
0237517f0c
|
Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 10:55:30 +00:00 |
|
Pablo Natek
|
8597c23fb3
|
Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 12:53:57 +02:00 |
|
Pablo Natek
|
5c69d9c7f0
|
fix: add await in async functions refs #5979
|
2023-10-20 12:53:54 +02:00 |
|
Alex Moreno
|
1eabad7f4b
|
refs #6257 fix(saleQuantity): add isInPreparing restriction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 12:37:44 +02:00 |
|
Pablo Natek
|
75cfea4a2e
|
Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 10:18:43 +00:00 |
|
Pablo Natek
|
25c13e42ab
|
Merge branch '6278-ticketRequestFixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 11:36:24 +02:00 |
|
Pablo Natek
|
243a32dff5
|
remove(expand): quito expand de la columna requester refs #6278
|
2023-10-20 11:36:11 +02:00 |
|
Alex Moreno
|
ef1ddfd484
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 09:28:37 +02:00 |
|
Alex Moreno
|
84aed7ca21
|
refs #6257 fix(saleQuantity): newPrice correct restricction
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 09:26:56 +02:00 |
|
Alex Moreno
|
d5f98700e7
|
refs #6287 fix: ticket new correct return type
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 08:32:35 +02:00 |
|
Pablo Natek
|
9cb4e57951
|
Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-20 05:31:12 +00:00 |
|
Pablo Natek
|
dc93328bcf
|
Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 18:24:04 +02:00 |
|
Pablo Natek
|
07fa011035
|
fix(updateClaim): el spec daba error refs #5979
|
2023-10-19 18:24:03 +02:00 |
|
Pablo Natek
|
dad67539c5
|
Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 16:23:34 +00:00 |
|
Carlos Andrés
|
16f20cea70
|
refs #6199 fix(sale): get minim price without grouping
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 15:12:06 +02:00 |
|
Pablo Natek
|
f26595bb62
|
Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 12:15:43 +00:00 |
|
Alex Moreno
|
a0e32cf455
|
Merge branch 'test' into 6199-saleUploadQuantity
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 12:05:25 +00:00 |
|
Alex Moreno
|
cadec7d01f
|
Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 11:36:14 +00:00 |
|
Guillermo Bonet
|
5c51d7fb04
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 13:22:33 +02:00 |
|
Alex Moreno
|
d9ab607126
|
refs #6199 feat(sale): increase quantity if newPrice is higher
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 13:03:11 +02:00 |
|
Pablo Natek
|
71182d8630
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 10:49:31 +00:00 |
|
Alex Moreno
|
1ea6b87266
|
Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 10:48:51 +00:00 |
|
Juan Ferrer
|
39a0f13500
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 10:14:29 +00:00 |
|
Guillermo Bonet
|
1b8f227c47
|
ticket #125321 filter advance tickets fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 11:58:15 +02:00 |
|
Pablo Natek
|
e2f7ce8b35
|
Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 08:58:50 +00:00 |
|
Alex Moreno
|
3294937b54
|
Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 08:50:29 +00:00 |
|
Jorge Penadés
|
e680a6a080
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 10:00:43 +02:00 |
|
Jorge Penadés
|
15890e80d8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 09:59:19 +02:00 |
|
Jorge Penadés
|
52b14cf8b4
|
ref #6138 fix emailVerified
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 09:51:10 +02:00 |
|
Jorge Penadés
|
5b1e5743b5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 09:35:37 +02:00 |
|
Pablo Natek
|
f1b11fdca2
|
Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 06:51:50 +00:00 |
|
Javi Gallego
|
84fc0de4ea
|
Merge pull request 'refs #6312 no inserta el originalquantity' (!1803) from 6312 into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1803
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-10-19 06:41:43 +00:00 |
|
Pablo Natek
|
d3a7b4ecb9
|
remove: console.log from updateClaim refs #5979
|
2023-10-19 08:41:26 +02:00 |
|
Pablo Natek
|
f8889df903
|
remove(console.log): se quitan console.log que se utilizaron para dbuggear refs #5979
gitea/salix/pipeline/head Build queued...
Details
|
2023-10-19 08:40:25 +02:00 |
|
Pablo Natek
|
488181e1b6
|
feat(getUrl): se añade el metodo getUrl refs #5979
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 08:37:28 +02:00 |
|
Jorge Penadés
|
770aa60b69
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 08:26:22 +02:00 |
|
Jorge Penadés
|
7e25fac3e9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 08:25:00 +02:00 |
|
Jorge Penadés
|
8917821ec0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-19 08:23:44 +02:00 |
|
Alex Moreno
|
daaf076133
|
Merge branch 'dev' into 6312
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-19 05:29:43 +00:00 |
|
Alex Moreno
|
da20697052
|
refs #6199 feat(sale_updateQuantity): can upload
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 15:19:26 +02:00 |
|
Javi Gallego
|
44ce0a8730
|
refs #6312 no inserta el originalquantity
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 13:46:41 +02:00 |
|
Jorge Penadés
|
8fe911ee0b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 13:43:22 +02:00 |
|
Jorge Penadés
|
62d2c7e701
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 13:42:15 +02:00 |
|
Jorge Penadés
|
ea5597d3f3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 13:40:02 +02:00 |
|
Jorge Penadés
|
af0d5072ff
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 13:37:14 +02:00 |
|
Pablo Natek
|
3e96b3d0d2
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 11:24:03 +00:00 |
|
Jorge Penadés
|
330fb08aac
|
ref #5417 fix back test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 13:23:00 +02:00 |
|
Pablo Natek
|
bf09f13aa2
|
Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 11:07:24 +00:00 |
|
Pablo Natek
|
44bc30adf7
|
Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 10:35:53 +00:00 |
|
Pablo Natek
|
2bb4300e1b
|
remove: se quita el console log refs #6278
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:35:45 +02:00 |
|
Pablo Natek
|
34c9d030e9
|
Merge branch 'dev' into 6266-minimumImprtSmsFix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 10:31:12 +00:00 |
|
Pablo Natek
|
5f49a4fe1d
|
fix: created -> shipped refs #6266
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:25:47 +02:00 |
|
Pablo Natek
|
1920a1b893
|
merge(dev): branch 'dev' into 6266-minimumImprtSmsFix refs #6266
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:23:23 +02:00 |
|
Jorge Penadés
|
251d71a437
|
ref #5417 refactor transactions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-18 12:05:33 +02:00 |
|
Alex Moreno
|
a84f6fe1da
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:05:04 +02:00 |
|
Jorge Penadés
|
700caac641
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 12:03:07 +02:00 |
|
Alex Moreno
|
4300b24c14
|
refs #5918 refactor(worker_timeControl): simplify ng-show
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 10:45:15 +02:00 |
|
Alex Moreno
|
d1cb2a1d9a
|
refs #5918 test: add updateWorkerTimeControlMail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-18 10:30:36 +02:00 |
|
Alex Moreno
|
a7b0ef1e4c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
|
2023-10-18 09:23:55 +02:00 |
|
Alex Moreno
|
b3c7511e59
|
refs #6067 feat(url): getByUser
|
2023-10-18 08:52:06 +02:00 |
|
Alex Moreno
|
a916007314
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail
|
2023-10-18 07:20:34 +02:00 |
|
Pablo Natek
|
8d44bb8867
|
refactor(toggleIsIcluded): actualizo la versión y modifico el proc refs #5749
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 15:05:48 +02:00 |
|
Jorge Penadés
|
69a54be1a9
|
ref #5947 refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 14:02:08 +02:00 |
|
Pablo Natek
|
541926d3f7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5749-autoincrement-zoneIncluded
|
2023-10-17 13:57:32 +02:00 |
|
Pablo Natek
|
9870a0e60a
|
feat(origin): create method url_/geturl redf #5979
|
2023-10-17 13:56:49 +02:00 |
|
Alex Moreno
|
d4770c525e
|
refs #6199 test(sale): fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 11:00:41 +02:00 |
|
Jorge Penadés
|
48003b5d03
|
ref #6138
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-17 08:28:15 +02:00 |
|
Pablo Natek
|
4f911e644c
|
fix: remove console.log refs #5979
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 18:43:03 +02:00 |
|
Pablo Natek
|
afe4c676fc
|
fix(url): la ulr termina con / no es necesario añadir el texto
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 18:38:33 +02:00 |
|
Pablo Natek
|
033c02750b
|
refactor(origin): .origin por getUrl()
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 18:24:58 +02:00 |
|
Jorge Penadés
|
bd535374d8
|
ref #6138 setPasword created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-16 15:58:25 +02:00 |
|
Alex Moreno
|
093431ecdf
|
refs #6119 fix(sale_hook): fix quantity case
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 15:27:10 +02:00 |
|
Alex Moreno
|
9e39e96cf4
|
hotFix: workerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-16 15:22:33 +02:00 |
|
Alex Moreno
|
f79e711617
|
refs #6199 test: updateQuantity refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-16 10:19:33 +02:00 |
|
Alex Moreno
|
b769fa9bcf
|
refs #6199
gitea/salix/pipeline/head This commit looks good
Details
fix(sale_updateQuantity): if clientType is loses skip
test: fix updateQuantity activeCtx and add test for minQuantity
|
2023-10-16 10:10:57 +02:00 |
|
Jorge Penadés
|
3af72e1439
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
|
2023-10-16 08:20:20 +02:00 |
|
Jorge Penadés
|
ab6c58cd12
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-16 08:18:00 +02:00 |
|
Pablo Natek
|
f832c1d9ec
|
refs #5979 getUrl
|
2023-10-15 11:08:33 +02:00 |
|
Sergio De la torre
|
f6bf36d46a
|
Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-13 14:02:25 +00:00 |
|
Alex Moreno
|
ab1cc34015
|
refs #6199 feat(sale): best quantity restriction
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 15:14:48 +02:00 |
|
Alex Moreno
|
03687cb482
|
hotFix: delete getCurrentWorkerMana
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-13 14:56:56 +02:00 |
|
Jorge Penadés
|
9ba3c9c8bc
|
Merge branch 'dev' into 5914-transferInvoiceOut
|
2023-10-13 11:17:12 +00:00 |
|
Jorge Penadés
|
6b8a6c7a69
|
Merge branch 'dev' into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 11:15:04 +00:00 |
|
Alex Moreno
|
f00a4e63a6
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6199---Cantidad-mínima-back
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 13:08:54 +02:00 |
|
Javi Gallego
|
0081c55b9e
|
Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-13 10:56:33 +00:00 |
|
Carlos Andrés
|
9c0334619d
|
refs #6199
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 11:56:50 +02:00 |
|
Alex Moreno
|
fa90132934
|
refs #6199 fix(orderCatalogView): html and css
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 10:23:48 +02:00 |
|
Guillermo Bonet
|
7367656a35
|
refs #6199 Requested changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-13 09:02:40 +02:00 |
|
Sergio De la torre
|
35c0ec0d04
|
Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 15:14:13 +00:00 |
|
Guillermo Bonet
|
c79f706cdc
|
Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 12:23:39 +00:00 |
|
Guillermo Bonet
|
3e70cb07e0
|
refs #6184 Changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 14:20:35 +02:00 |
|
Javi Gallego
|
393d1889f7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 14:06:32 +02:00 |
|
Javi Gallego
|
df9d6fd6f8
|
efectue con acento
|
2023-10-11 14:06:28 +02:00 |
|
Guillermo Bonet
|
c0089b1fa0
|
refs #6184 Added cmrFk in ticket model
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 12:20:30 +02:00 |
|
Carlos Satorres
|
cba8a48d18
|
Merge branch 'dev' into 5768-incoterms
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 10:05:45 +00:00 |
|
Carlos Satorres
|
0023561acb
|
refs #6293 traducción
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 12:04:12 +02:00 |
|
Guillermo Bonet
|
d9339af87e
|
refs #6184 Insert in ticketCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 11:46:56 +02:00 |
|
Guillermo Bonet
|
3e522b08b6
|
refs #6184 Added saveCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-11 11:43:21 +02:00 |
|
Guillermo Bonet
|
6b1dded222
|
refs #6199 Requested change, position of input
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-11 08:28:52 +02:00 |
|
Guillermo Bonet
|
d41233efaf
|
refs #6199 Requested change, name of color
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-11 07:59:05 +02:00 |
|
Guillermo Bonet
|
2b41bf7eb1
|
refs #6199 Requested changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-11 07:39:41 +02:00 |
|
Guillermo Bonet
|
d2ce920f13
|
refs #6199 Added minQuantity in catalog and more
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-10 13:49:11 +02:00 |
|
Carlos Satorres
|
4adee11c63
|
refs #5768 remove comment
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-10 12:35:34 +02:00 |
|
Jorge Penadés
|
179d8ab87d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-10 11:30:53 +02:00 |
|
Guillermo Bonet
|
03afea3b8e
|
refs #6199 Added minQuantity in item
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-10 10:51:02 +02:00 |
|
Carlos Satorres
|
1adfa33a9a
|
hotfix length sales
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-06 14:52:30 +02:00 |
|
Pablo Natek
|
c4e3fdf510
|
Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-06 06:03:03 +00:00 |
|
Carlos Satorres
|
05812c3f35
|
refs #6282 left join
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-06 07:14:30 +02:00 |
|
Carlos Satorres
|
62c7dc9db5
|
hotfix-change minus
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-06 06:16:42 +02:00 |
|
Pablo Natek
|
f40185c2d4
|
refs #4764 hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 14:24:52 +02:00 |
|
Carlos Satorres
|
3fbdae15b2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms
|
2023-10-05 14:04:42 +02:00 |
|
Carlos Satorres
|
3b81b511c2
|
remove consolelog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 14:01:53 +02:00 |
|
Carlos Satorres
|
5b6eb0a2a6
|
refs #5768 add address, nickname, pdf, email
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 14:01:07 +02:00 |
|
Pablo Natek
|
020de5d754
|
Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-05 07:57:46 +00:00 |
|
Alex Moreno
|
8d7eda5af3
|
refs #5673 fix: add development translation
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 09:12:54 +02:00 |
|
Alex Moreno
|
7a6022efd4
|
Merge branch 'dev' into 6216-saleLog_open_ticketLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 06:31:54 +00:00 |
|
Jorge Penadés
|
0d39471970
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
|
2023-10-05 08:20:47 +02:00 |
|
Alex Moreno
|
9538841a30
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 07:28:02 +02:00 |
|
Alex Moreno
|
ca86b3cc2f
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 07:27:35 +02:00 |
|
Alex Moreno
|
7cd2e290ce
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-05 07:22:41 +02:00 |
|
Carlos Satorres
|
f2adbc1716
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms
|
2023-10-04 13:54:18 +02:00 |
|
Alex Moreno
|
f8a510b330
|
refs #5918 fix(workerTimeControl): update(workerTimeControl
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-04 12:31:46 +02:00 |
|
Alex Moreno
|
df6d10e514
|
refs #5918 fix(workerTimeControl): resend mail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-04 12:17:24 +02:00 |
|
Jorge Penadés
|
c35899542d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-04 08:40:44 +02:00 |
|
Alex Moreno
|
45e41de9a9
|
refs #5918 fix(worker_time-control): isMailSended
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-03 14:03:52 +02:00 |
|
Alex Moreno
|
21ddcb7e8e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-03 11:39:44 +02:00 |
|
Carlos Satorres
|
bd46a77cb7
|
refs #5768 incoterms addressFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-03 10:15:16 +02:00 |
|
Pablo Natek
|
96769d9ff9
|
refs #6213 fixIntermitentError
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-03 08:57:59 +02:00 |
|
Alex Moreno
|
9baa450298
|
Merge branch 'dev' into 6216-saleLog_open_ticketLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-03 05:25:55 +00:00 |
|
Pablo Natek
|
7fd2d143c3
|
refs #6213 devMerge
|
2023-10-03 07:08:29 +02:00 |
|
Alex Moreno
|
4545a63214
|
refs #6067 feat(vnUser): verifyEmail redirect to lilium
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-10-02 14:51:19 +02:00 |
|
Pablo Natek
|
99d65804e8
|
refs #6278 fixFilter
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 13:29:39 +02:00 |
|
Jorge Penadés
|
918cff55d9
|
Merge branch '5417-fixCustomerPayments' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 10:06:08 +02:00 |
|
Jorge Penadés
|
c59b119a4a
|
ref #5417 fix transactions
|
2023-10-02 10:06:04 +02:00 |
|
Jorge Penadés
|
a00cf557b7
|
Merge branch 'dev' into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 07:57:25 +00:00 |
|
Jorge Penadés
|
2eb9a97ece
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
|
2023-10-02 09:28:41 +02:00 |
|
Sergio De la torre
|
3ba349b74a
|
refs #5890 feat: itemShelvingSaleAsignado more calls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 09:14:30 +02:00 |
|
Jorge Penadés
|
a7128b8187
|
ref #5417 fix transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 09:04:43 +02:00 |
|
Jorge Penadés
|
cb2ac21349
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
|
2023-10-02 08:49:27 +02:00 |
|
Jorge Penadés
|
5f93df26a5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl
|
2023-10-02 08:21:09 +02:00 |
|
Alex Moreno
|
d3706733e4
|
Merge branch 'master' into 5929-hotFix_canEdit_weekly
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 05:06:55 +00:00 |
|
Alex Moreno
|
7b8518ff5a
|
Merge branch 'dev' into 6033-vnLog_userDescriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-10-02 05:04:26 +00:00 |
|
Jorge Penadés
|
6f4a12e50f
|
ref #5417 date filters added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 14:42:47 +02:00 |
|
Jorge Penadés
|
3e9d01815a
|
Merge branch 'dev' into 6065-fixWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-29 10:30:44 +00:00 |
|
Alex Moreno
|
a0d705683b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail
|
2023-09-29 12:22:42 +02:00 |
|
Alex Moreno
|
53ab694ad4
|
Merge branch 'dev' into 5890--itemShelvingAsignado
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 10:18:34 +00:00 |
|
Alex Moreno
|
b33700abc9
|
refs #6216 feat(ticket_sale): open filtered ticketLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 11:57:25 +02:00 |
|
Jorge Penadés
|
9536fdba58
|
ref #6119 refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 10:10:58 +02:00 |
|
Alex Moreno
|
a0a59b672f
|
refs #6271 hotFix(email): clientCreditEmail → creditRequestEmail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 10:04:57 +02:00 |
|
Pablo Natek
|
0fa56149d7
|
refs #6266 smsfix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 09:47:22 +02:00 |
|
Alex Moreno
|
542119983b
|
refs #5929 test: fix test after fix ticket_isEditable
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 09:28:23 +02:00 |
|
Jorge Penadés
|
f1dc809147
|
Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-29 06:22:51 +00:00 |
|
Jorge Penadés
|
4d226d9a58
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl
|
2023-09-29 08:20:16 +02:00 |
|
Jorge Penadés
|
d4e78ea889
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
|
2023-09-29 08:16:12 +02:00 |
|
Alex Moreno
|
f3c55cdee9
|
refs #5929 fix(isEditable): can edit if is weekly
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 16:00:09 +02:00 |
|
Carlos Andrés
|
52cba80dc8
|
Merge branch 'dev' into 5890--itemShelvingAsignado
|
2023-09-28 15:13:37 +02:00 |
|
Alex Moreno
|
1d4001f520
|
Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 12:04:11 +00:00 |
|
Alex Moreno
|
28dfb895ca
|
refs #6224 deploy: correct sql folder and fix sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 13:49:58 +02:00 |
|
Jorge Penadés
|
4b213c1c9d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 13:31:45 +02:00 |
|
Alex Moreno
|
e51df063d3
|
refs #5890 feat: add userId in rawSql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 13:26:05 +02:00 |
|
Alex Moreno
|
75e54bd82f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado
|
2023-09-28 13:21:12 +02:00 |
|
Jorge Penadés
|
e209ab28f4
|
ref #6065 first time hours load fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 11:53:09 +02:00 |
|
Jorge Penadés
|
869bdab7ce
|
ref #6065 fetchHours relocated
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 11:36:03 +02:00 |
|
Sergio De la torre
|
22f71e6147
|
Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 08:18:15 +02:00 |
|
Sergio De la torre
|
4048627c76
|
refs #5890 fix: format
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 08:08:40 +02:00 |
|
Sergio De la torre
|
18de92f9e7
|
refs #5134 fix: format
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-28 07:51:54 +02:00 |
|
Sergio De la torre
|
a86469ccd2
|
refs #5134 fix: format
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-28 07:42:44 +02:00 |
|
Sergio De la torre
|
ac3e9c811d
|
refs #5890 feat: itemShelvingSaleAsignado
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-27 14:01:17 +02:00 |
|
Jorge Penadés
|
a7c0949f0e
|
ref #6065 replace then by async/await
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-27 08:57:31 +02:00 |
|
Alex Moreno
|
d313f6ea5c
|
Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-26 12:59:32 +00:00 |
|
Sergio De la torre
|
2ea2943eca
|
refs #5134 feat: models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-26 13:12:18 +02:00 |
|
Jorge Penadés
|
e1e225a1ef
|
Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-26 12:42:47 +02:00 |
|
Jorge Penadés
|
50543963c1
|
ref #5914 refactor createTicketRefund
|
2023-09-26 12:42:45 +02:00 |
|
Jorge Penadés
|
45fbe6f174
|
Merge branch 'dev' into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-26 06:36:44 +00:00 |
|
Alex Moreno
|
e36f98195c
|
refs #6033 feat: create user-photo component for worker and user descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-26 08:15:19 +02:00 |
|
Jorge Penadés
|
db8dc8487b
|
ref #6246 replace name
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 15:28:08 +02:00 |
|
Jorge Penadés
|
474399b383
|
ref #5914 refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 15:23:51 +02:00 |
|
Alex Moreno
|
7a3d3d5e2a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-25 14:14:23 +02:00 |
|
Jorge Penadés
|
64eb216367
|
ref #5914 fixed back test
|
2023-09-25 14:01:40 +02:00 |
|
Jorge Penadés
|
f4ce5db93b
|
Merge branch 'dev' into 6246-checkTicketSales
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 11:49:18 +00:00 |
|
Alex Moreno
|
eb0e6dd985
|
refs #6033 feat(VnLog): can use accountDescriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 13:06:28 +02:00 |
|
Jorge Penadés
|
98ee9bbaf3
|
ref #5914 back test added
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-25 12:54:31 +02:00 |
|
Alex Moreno
|
d05106cc83
|
Merge branch 'dev' into 5673-claim-development
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 10:10:21 +00:00 |
|
Jorge Penadés
|
c8c06f498c
|
ref #5914 fixed tests e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 10:49:47 +02:00 |
|
Alex Moreno
|
6cf1095b10
|
refs #6067 feat: vnUser use verify() and more security when update user and mailForward
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-25 08:33:16 +02:00 |
|
Pablo Natek
|
af8773612c
|
refs #6213 remove f
gitea/salix/pipeline/head Build queued...
Details
|
2023-09-25 08:23:59 +02:00 |
|
Pablo Natek
|
fc4019ad69
|
Merge branch '6213-supplierFixCreateErrors' of https://gitea.verdnatura.es/verdnatura/salix into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-25 08:23:25 +02:00 |
|
Pablo Natek
|
9b10a2904c
|
refs #6213 unifyTest
|
2023-09-25 08:23:23 +02:00 |
|
Jorge Penadés
|
731bad5981
|
ref #5914 create ticket with new and refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-22 14:52:56 +02:00 |