 Jon Elias
|
1e07a2fc59
|
Merge branch 'dev' into 7884-AddLabelerField
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-24 08:44:36 +00:00 |
 Jorge Penadés
|
78b500e452
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-24 10:15:25 +02:00 |
 Pablo Natek
|
f9b37541eb
|
Merge branch '7404-fixStockBought' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fixStockBought
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-24 08:55:47 +02:00 |
|
Pablo Natek
|
a5f3dbc15a
|
fix: refs #7404 last entries spec
|
2024-09-24 08:55:24 +02:00 |
 Alex Moreno
|
76e545d488
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travelList_daysOnward
gitea/salix/pipeline/pr-master This commit looks good
Details
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2024-09-24 08:35:30 +02:00 |
|
Pablo Natek
|
bfd52b8773
|
Merge branch 'dev' into 7404-fixStockBought
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-24 05:31:34 +00:00 |
|
Pablo Natek
|
166ca42e32
|
Merge branch '7404-fixStockBought' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fixStockBought
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-09-24 07:31:24 +02:00 |
|
Pablo Natek
|
3988eb0d97
|
fix: refs #7404 back and e2e
|
2024-09-24 07:31:22 +02:00 |
 Sergio De la torre
|
ea06afb361
|
Merge pull request 'fix: hotFix backLimit refs #6964' (!3003) from 6964-ListItemNewer into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3003
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-09-24 05:17:02 +00:00 |
|
Alex Moreno
|
882f1eb7c2
|
feat(travelFilter): add daysOnward
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-23 15:30:10 +02:00 |
|
Jorge Penadés
|
6ff76fd74b
|
feat: refs #7207 show queue in worker summary
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-23 14:40:38 +02:00 |
 Robert Ferrús
|
31d5a7a635
|
feat: refs #8000 add column
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-23 11:53:27 +02:00 |
|
Pablo Natek
|
ab89c8f3ba
|
Merge branch 'dev' into 7404-fixStockBought
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-23 08:16:16 +00:00 |
|
Pablo Natek
|
80985fbd56
|
fix: refs #7404 round data and fix specs
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-23 10:14:09 +02:00 |
|
Pablo Natek
|
459f6601b7
|
fix: refs #7404 add transaction on detail calculate
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-23 10:02:01 +02:00 |
|
Jorge Penadés
|
8ff0dc06fe
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-23 09:29:51 +02:00 |
|
Sergio De la torre
|
c6d5e2f292
|
fix: hotFix backLimit refs #6964
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-23 08:09:24 +02:00 |
 Ivan Mas
|
06f8f8e95e
|
refactor: refs #7725 deprecate worker.isF11Allowed
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-22 08:39:19 +02:00 |
|
Pablo Natek
|
fb1e77f9c4
|
fix: refs #7404 fix back data source
|
2024-09-20 11:06:38 +02:00 |
|
Jon Elias
|
2fc07e651f
|
Merge branch 'dev' into 7884-AddLabelerField
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-20 08:24:42 +00:00 |
 Carlos Satorres
|
eb3ea010a1
|
Merge branch 'master' into 6898-fixSupplier2
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-20 07:31:15 +00:00 |
|
Carlos Satorres
|
889b86644b
|
fix: refs #6898 filter fix
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-20 09:14:38 +02:00 |
|
Jon Elias
|
fa4f75fbb9
|
Merge branch '7356-FixTicketWeekly' of https://gitea.verdnatura.es/verdnatura/salix into 7356-FixTicketWeekly
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-19 13:14:24 +02:00 |
|
Jon Elias
|
b642147d82
|
feat: refs #7356 added new filter field
|
2024-09-19 13:14:22 +02:00 |
|
Ivan Mas
|
24b9dfb9a9
|
Merge branch 'dev' into 7343-ModifyDiverRouteEmail
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-19 10:50:44 +00:00 |
|
Ivan Mas
|
c82c9395a4
|
feat: refs #7343 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-19 12:49:45 +02:00 |
|
Alex Moreno
|
ccb60eee87
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-09-19 12:42:12 +02:00 |
|
Ivan Mas
|
c30ecd3760
|
feat: refs #7343 Modify driverRouteEmail.js
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-19 12:26:06 +02:00 |
|
Jorge Penadés
|
22af34c0cb
|
feat: refs #7323 use scopes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-19 09:27:05 +02:00 |
|
Carlos Satorres
|
6b90690924
|
Merge branch 'dev' into 7354_ZoneMigration_End
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-19 06:10:15 +00:00 |
 Javi Gallego
|
da0e735fb2
|
fix: hotFix limit 5
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-18 23:41:01 +02:00 |
|
Alex Moreno
|
79d79f0c9b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7792-twoFactorFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-18 12:03:52 +02:00 |
|
Jorge Penadés
|
c0c8548216
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-18 09:41:40 +02:00 |
|
Alex Moreno
|
829ecba2ef
|
refactor: refs #7792 revert TwoFactorType
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-18 08:30:05 +02:00 |
|
Jon Elias
|
35358834d9
|
Merge branch 'dev' into 7884-AddLabelerField
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-18 06:23:44 +00:00 |
 Javier Segarra
|
96159224a4
|
Merge branch 'dev' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 16:48:09 +02:00 |
|
Jorge Penadés
|
eb430ea5c4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 15:44:19 +02:00 |
|
Javi Gallego
|
06d06d7b1a
|
Merge pull request '3505-closureTests' (!2970) from 3505-closureTests into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2970
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-09-17 13:09:18 +00:00 |
|
Javier Segarra
|
7f6bd55eaa
|
Merge branch 'dev' into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-17 13:07:25 +00:00 |
|
Jon Elias
|
59c6d316dd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7884-AddLabelerField
|
2024-09-17 14:21:14 +02:00 |
|
Jon Elias
|
71362baa66
|
feat: refs #7884 added filter when daysOnward and daysAgo have value and refactor ifs block
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 12:42:47 +02:00 |
|
Jorge Penadés
|
529be86d84
|
fix: refs #7524 too records error
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-17 11:44:09 +02:00 |
|
Jorge Penadés
|
4332fccfcc
|
chore: refs #7524 rollback
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-09-17 11:43:34 +02:00 |
|
Javier Segarra
|
3e5442c40b
|
Merge branch 'dev' into 7677_vnLocation_perf
|
2024-09-17 11:42:04 +02:00 |
|
Jorge Penadés
|
3f321e8ee8
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-getAmountPaid
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-17 11:40:52 +02:00 |
|
Pablo Natek
|
d308f185bc
|
Merge branch 'dev' into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 08:11:17 +00:00 |
|
Jon Elias
|
1d47690bb4
|
feat: refs #7884 added new filter field
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 08:31:58 +02:00 |
|
Javi Gallego
|
e5e14878b8
|
feat: refs #3505 remove return
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 07:57:00 +02:00 |
|
Javi Gallego
|
06efa8be94
|
Merge branch 'dev' into 3505-closureTests
|
2024-09-17 07:12:01 +02:00 |
|
Jorge Penadés
|
4d0bb81632
|
fix: refs #7323 worker/filter
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 16:33:22 +02:00 |
|
Jorge Penadés
|
8fedfbd090
|
fix: refs #7524 getAmountPaid wip
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-16 13:32:14 +02:00 |
|
Javi Gallego
|
f43fa32d36
|
feat: refs #3505 fdescribe
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-16 13:26:53 +02:00 |
|
Javi Gallego
|
e4a74ba0e9
|
feat: refs #3505 testBack closure
|
2024-09-16 13:24:33 +02:00 |
 Guillermo Bonet
|
0d7953a869
|
Merge branch 'dev' into 7912-wasteChanges
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 10:33:23 +00:00 |
|
Guillermo Bonet
|
5c7a537275
|
feat: refs #7912 Added new waste types
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 12:32:52 +02:00 |
|
Jorge Penadés
|
0a0701f7c2
|
Merge branch 'dev' into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 10:24:36 +00:00 |
|
Pablo Natek
|
1f1da689d4
|
fix: refs #7404 remove console log
|
2024-09-16 12:17:51 +02:00 |
|
Pablo Natek
|
138640f991
|
fix: refs #7404 update test to match new fixtures for travel by continent
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 12:05:36 +02:00 |
|
Pablo Natek
|
8f4f2d2d15
|
Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-16 09:06:04 +02:00 |
|
Pablo Natek
|
cc1cd0563f
|
feat: refs #7404 fixtures and translates
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-16 09:00:46 +02:00 |
|
Guillermo Bonet
|
5489a5edbc
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-16 07:16:33 +02:00 |
|
Guillermo Bonet
|
2e34f1bbe6
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-16 07:16:13 +02:00 |
|
Guillermo Bonet
|
635eb405a2
|
fix: refs #7644 Update in print method
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-13 14:53:44 +02:00 |
|
Guillermo Bonet
|
6f1d962db2
|
fix: refs #7644 Update in print method
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-13 14:39:47 +02:00 |
|
Sergio De la torre
|
11193bebe6
|
Merge pull request '6868_createLogin' (!2598) from 6868_createLogin into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2598
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-09-13 09:43:31 +00:00 |
|
Javier Segarra
|
6f18b8a719
|
Merge branch 'dev' into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-13 07:28:45 +00:00 |
|
Jorge Penadés
|
2dc55a706c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-13 09:20:57 +02:00 |
|
Jon Elias
|
99bd20bc05
|
Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-13 06:13:26 +00:00 |
|
Sergio De la torre
|
e80fe1d0dc
|
feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-13 07:10:47 +02:00 |
|
Sergio De la torre
|
2d4e667009
|
feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-13 07:02:30 +02:00 |
|
Sergio De la torre
|
05b6c75a19
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin
|
2024-09-13 07:02:15 +02:00 |
|
Sergio De la torre
|
93e7163858
|
feat: refs #6868 refs# 6868 handleUser
|
2024-09-12 17:09:27 +02:00 |
|
Alex Moreno
|
1abf6a14f9
|
fix: workerDms filter workerFk
|
2024-09-12 13:26:09 +02:00 |
|
Jorge Penadés
|
edccd95fa1
|
fix: refs #7828 rollback
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-12 10:29:03 +02:00 |
|
Jorge Penadés
|
b2bc095caa
|
fix: refs #7828 rollback
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-12 10:28:29 +02:00 |
|
Jorge Penadés
|
74fafdf330
|
fix: refs #7828 filter mail access
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-12 10:27:18 +02:00 |
|
Jorge Penadés
|
6f81ca08db
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-12 09:55:03 +02:00 |
|
Alex Moreno
|
9435ce8c5b
|
Merge pull request '7182-workerDms_optimization' (!2946) from 7182-workerDms_optimization into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2946
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
|
2024-09-12 07:28:07 +00:00 |
|
Jorge Penadés
|
f1f10d1367
|
refactor: refs #7828 wip
|
2024-09-12 09:15:07 +02:00 |
|
Jon Elias
|
d36ce6bf99
|
Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-12 05:43:17 +00:00 |
|
Jon Elias
|
a73bdfe18f
|
Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
|
2024-09-12 07:36:55 +02:00 |
|
Carlos Satorres
|
757cd78cfc
|
fix: refs #7354 fix files
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 14:42:21 +02:00 |
|
Guillermo Bonet
|
728c40916c
|
refactor: refs #7895 workerDocument to workerDms
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 14:38:58 +02:00 |
|
Carlos Satorres
|
f696c4043d
|
Merge branch 'dev' of https: refs #7354//gitea.verdnatura.es/verdnatura/salix into 7354_ZoneMigration_End
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 13:47:30 +02:00 |
|
Jon Elias
|
e5161fe9e2
|
fix: fixed balanceDialog amount field
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-11 13:26:40 +02:00 |
|
Guillermo Bonet
|
6b5f59a09b
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-11 12:54:27 +02:00 |
|
Guillermo Bonet
|
4c6aba96e5
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-11 12:54:16 +02:00 |
|
Alex Moreno
|
17fecf6dcb
|
Merge branch '7182-workerDms_optimization' of https://gitea.verdnatura.es/verdnatura/salix into 7182-workerDms_optimization
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 10:31:44 +02:00 |
|
Alex Moreno
|
c21da8d258
|
fix: refs #7182 function name
|
2024-09-11 10:31:43 +02:00 |
|
Alex Moreno
|
e062088f1e
|
Merge branch 'dev' into 7182-workerDms_optimization
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 08:29:38 +00:00 |
|
Pablo Natek
|
842c98edfc
|
Merge branch 'dev' into 6156-advanceTicketsNewField
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 08:22:24 +00:00 |
|
Jorge Penadés
|
2ee0c93e24
|
chore: refs #7663 fix test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 09:35:26 +02:00 |
|
Jorge Penadés
|
558ab6eba2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
|
2024-09-11 09:30:18 +02:00 |
|
Carlos Satorres
|
838b8f541f
|
fix: setDeleted
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-11 08:45:00 +02:00 |
|
Carlos Satorres
|
ccaf56f842
|
fix: setDeleted
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-11 08:35:19 +02:00 |
|
Alex Moreno
|
fbfbf21e06
|
fix: refs #7182 unnesesary file
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 08:17:18 +02:00 |
|
Alex Moreno
|
8dc83e2444
|
feat: refs #7182 optimize workerDms filter
|
2024-09-11 08:16:21 +02:00 |
|
Alex Moreno
|
e7d3062208
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7182-workerDms_optimization
|
2024-09-11 08:07:29 +02:00 |
|
Sergio De la torre
|
b492a1e6a8
|
feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 08:05:26 +02:00 |
|
Sergio De la torre
|
f7f7df55f5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin
|
2024-09-11 08:00:07 +02:00 |
|
Pablo Natek
|
8607a60ca7
|
feat: refs #7404 format date before select
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-11 07:56:08 +02:00 |
|
Javier Segarra
|
f487aed336
|
Merge branch 'dev' into 5938_fine_ticketAdvance
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-10 14:16:56 +00:00 |
|
Jorge Penadés
|
d98f0a2493
|
chore: refs #7524 rollback
|
2024-09-10 13:15:58 +02:00 |
|
Jorge Penadés
|
b16c2bed2b
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-addNoLimit
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-10 13:09:33 +02:00 |
|
Jorge Penadés
|
91abf2eefe
|
refactor: refs #7663 accurate error
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-10 09:50:02 +02:00 |
|
Jorge Penadés
|
e2ef3472b5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-10 09:41:46 +02:00 |
|
Javi Gallego
|
1c0e148233
|
fix: cau #217599
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-10 09:08:43 +02:00 |
|
Jon Elias
|
9759715609
|
fix: refs #6346 created test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-10 07:52:09 +02:00 |
|
Jon Elias
|
0593ea9a30
|
Merge branch '6346-FixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-10 07:50:42 +02:00 |
|
Jon Elias
|
125c0c9b3b
|
refactor: refs #6346 requested changes
|
2024-09-10 07:50:40 +02:00 |
|
Alex Moreno
|
1aa888b1a3
|
feat(WorkerDms_filter): refs #7182 split code. fix: filter
|
2024-09-09 15:11:09 +02:00 |
|
Guillermo Bonet
|
52f368e4f7
|
fix: refs #7346 Global invoice
|
2024-09-09 14:25:13 +02:00 |
|
Javier Segarra
|
89c2d2705c
|
feat(salix): refs #5938 #5938 change value-field
|
2024-09-09 14:21:59 +02:00 |
|
Javier Segarra
|
f15b33778c
|
feat(salix): refs #5938 #5938 replace variables
|
2024-09-09 14:21:42 +02:00 |
|
Javier Segarra
|
38ee76f7c9
|
Merge branch 'dev' into 6156-advanceTicketsNewField
|
2024-09-09 12:20:02 +00:00 |
|
Javier Segarra
|
03d4427bcd
|
Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 12:16:15 +00:00 |
|
Jon Elias
|
662ede981b
|
Merge branch 'dev' into 7356-FixTicketWeekly
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 11:59:42 +00:00 |
|
Jon Elias
|
97b07ea561
|
fix: refs #7356 ticket weekly filter
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 13:56:30 +02:00 |
|
Javier Segarra
|
2fef104954
|
Merge branch 'dev' into 6156-advanceTicketsNewField
|
2024-09-09 10:48:20 +00:00 |
|
Guillermo Bonet
|
689315bab8
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-09 12:42:21 +02:00 |
|
Guillermo Bonet
|
d9a4b3e6fb
|
fix: refs #7346 Global invoice
|
2024-09-09 12:42:19 +02:00 |
|
Carlos Satorres
|
01690ed081
|
Merge branch 'dev' into 6998-supplierMigration
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 09:39:15 +00:00 |
|
Guillermo Bonet
|
daf3dfd2ee
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-09 11:35:28 +02:00 |
|
Guillermo Bonet
|
3c6b7cd224
|
Merge branch 'master' into test
gitea/salix/pipeline/pr-master This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-09 11:35:08 +02:00 |
|
Guillermo Bonet
|
723ec2b453
|
fix: refs #7844 Filter monitor
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-09 11:34:42 +02:00 |
|
Carlos Satorres
|
44a183785e
|
Merge branch 'dev' into 6998-supplierMigration
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 09:32:43 +00:00 |
|
Alex Moreno
|
ae15d51341
|
Merge branch 'dev' into 7792-twoFactorFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 08:39:36 +00:00 |
|
Javier Segarra
|
378ee1119f
|
Merge branch 'dev' of https: refs #6156//gitea.verdnatura.es/verdnatura/salix into 6156-advanceTicketsNewField
|
2024-09-09 10:18:10 +02:00 |
|
Javier Segarra
|
7710b87f4a
|
test(salix): refs #7671 #7671 improve and revert where changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 10:07:05 +02:00 |
|
Jon Elias
|
c93275b62d
|
Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 08:06:04 +00:00 |
|
Alex Moreno
|
71eb44d083
|
refactor(vnUser): refs #7792 use twoFactorFk and add foreignKey
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-09-09 09:58:20 +02:00 |
|
Javier Segarra
|
57dbdc6f24
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-09 09:58:07 +02:00 |
|
Javier Segarra
|
6012604946
|
perf(salix): refs #7671 #7671 imrpove and revert where changes
|
2024-09-09 09:57:38 +02:00 |
|
Alex Moreno
|
d7613767fb
|
Merge pull request 'feat: refs #7938 remove unnecessary insert in clientLog' (!2934) from 7938-unnecessary_insert_clientLog into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2934
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-09-09 07:46:12 +00:00 |
|
Alex Moreno
|
632d3190b1
|
feat: refs #7938 remove unnecessary insert in clientLog
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 07:49:22 +02:00 |
|
Jon Elias
|
3e9f472447
|
Merge branch 'dev' into 7354_ZoneMigration_End
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 05:33:34 +00:00 |
|
Jon Elias
|
b3aa263cea
|
Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-09 07:32:11 +02:00 |
|
Javier Segarra
|
5c4a30f2f9
|
perf: refs #7671 improve showBadDates
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-08 12:50:32 +02:00 |
|
Javier Segarra
|
dbd8f94555
|
perf: refs #7671 improve showBadDates
|
2024-09-08 12:49:55 +02:00 |
|
Javier Segarra
|
59cce5d349
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices
|
2024-09-08 12:31:39 +02:00 |
|
Jorge Penadés
|
ba2c5cb209
|
chore: refs #7323 filter data
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 17:49:45 +02:00 |
|
Jorge Penadés
|
0a4bd0f2d5
|
chore: refs #7323 fix test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 16:09:29 +02:00 |
|
Jorge Penadés
|
6065c056e2
|
chore: refs #7323 fix test
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-06 16:04:40 +02:00 |
|
Jorge Penadés
|
eb11e18df5
|
fix: refs #7323 fetch from right source
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-06 16:01:26 +02:00 |
|
Jorge Penadés
|
b277ae2d92
|
Merge branch 'dev' into 7323-dynamicRole
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 12:01:18 +00:00 |
|
Javi Gallego
|
3d985d10d3
|
Merge pull request 'feat: refs #7277 test with warehouse' (!2931) from 7277-refunding into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2931
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-09-06 11:52:32 +00:00 |
|
Guillermo Bonet
|
a718b6e81f
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-06 13:52:10 +02:00 |
|
Guillermo Bonet
|
5a82ce4aae
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-06 13:51:13 +02:00 |
|
Guillermo Bonet
|
0ad4d3a959
|
feat: refs #7905 getBuysCsv
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-06 13:50:49 +02:00 |
 Juan Ferrer
|
e2c6a45756
|
fix: refs #7931 Available back test fix
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-09-06 12:57:57 +02:00 |
|
Jorge Penadés
|
99ce158632
|
chore: refs #7663 return correct type
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 11:33:15 +02:00 |
|
Juan Ferrer
|
382e54b572
|
fix: refs #7931 Back test fix
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2024-09-06 11:30:43 +02:00 |
|
Jorge Penadés
|
26d47b3f38
|
Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 11:29:53 +02:00 |
|
Juan Ferrer
|
d44dec3703
|
fix: refs #7931 Back test fix
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2024-09-06 11:25:49 +02:00 |
|
Jorge Penadés
|
18d93d93a6
|
chore: refs #7323 worker changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 10:40:16 +02:00 |
|
Guillermo Bonet
|
b0abe829b1
|
fix: refs ##7905 Handle error
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-06 10:10:41 +02:00 |
|
Javi Gallego
|
46a4b577ce
|
feat: refs #7277 test with warehouse
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-06 10:07:46 +02:00 |
|
Juan Ferrer
|
a06e9a98ca
|
Merge branch '7931-availableFix' of https://gitea.verdnatura.es/verdnatura/salix into 7931-availableFix
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2024-09-06 09:16:23 +02:00 |
|
Juan Ferrer
|
48f94140e2
|
fix: refs #7931 Back test fix
|
2024-09-06 09:16:22 +02:00 |
|
Jorge Penadés
|
c1e086072b
|
fix: refs #7524 load after get client
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-05 14:50:36 +02:00 |
|
Guillermo Bonet
|
620ce5d45e
|
Merge pull request 'feat: refs #7905 getBuysCsv' (!2900) from 7905-getBuysCsv into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2900
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-09-05 09:44:38 +00:00 |
|
Javi Gallego
|
40a1b24403
|
Merge pull request '#7277 - RefundInvoices' (!2904) from 7277-RefundInvoices into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #2904
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-09-05 09:07:24 +00:00 |
|
Jon Elias
|
dc236dbf82
|
Merge pull request 'Redirect invoice out to Lilium' (!2807) from InvoiceOut_Migration into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #2807
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-09-05 08:32:56 +00:00 |
|
Guillermo Bonet
|
d0eab064b7
|
Merge branch 'dev' into 7905-getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-05 07:26:27 +00:00 |
|
Guillermo Bonet
|
6df817ea5d
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-05 09:25:00 +02:00 |
|
Guillermo Bonet
|
95d4c706d4
|
fix: refs #7346 multiple to quick in closure.js
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-05 09:23:58 +02:00 |
|
Guillermo Bonet
|
f6e585433a
|
Merge branch '7905-getBuysCsv' of https://gitea.verdnatura.es/verdnatura/salix into 7905-getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-05 09:21:02 +02:00 |
|
Guillermo Bonet
|
2aeff19578
|
fix: refs #7905 added comments to flatten.js
|
2024-09-05 09:21:00 +02:00 |
|
Guillermo Bonet
|
2b465d0d23
|
Merge branch 'dev' into 7905-getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-05 07:18:37 +00:00 |
|
Jorge Penadés
|
998d3865a3
|
chore: refs #7663 fix test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-05 08:56:15 +02:00 |
|
Robert Ferrús
|
4c96d57491
|
Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-05 06:06:22 +00:00 |
|
Jorge Penadés
|
7e2150e434
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-addNoLimit
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-04 16:04:27 +02:00 |
|
Jorge Penadés
|
ac5ff9e807
|
Merge branch 'master' into 6900-hotfix-fineTunning
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-04 13:55:24 +00:00 |
|
Carlos Satorres
|
b66386fdb1
|
Merge pull request 'refs #7407 create models' (!2603) from 7407-workerMedical into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2603
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-09-04 13:07:50 +00:00 |
|
Jorge Penadés
|
d82f9b2cd6
|
chore: refs #7524 fix test
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-04 14:55:59 +02:00 |
|
Jorge Penadés
|
842f88b8c3
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-addNoLimit
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-09-04 14:53:38 +02:00 |
|
Jorge Penadés
|
e3015a6559
|
feat: refs #7524 no apply limit
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-09-04 14:52:53 +02:00 |
|
Guillermo Bonet
|
2bb73af47d
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-04 14:12:50 +02:00 |
|
Guillermo Bonet
|
80839100c7
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/pr-test This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-04 14:10:33 +02:00 |
|
Guillermo Bonet
|
212e8d1a03
|
fix: refs #7346 invoiceSerial
|
2024-09-04 14:09:31 +02:00 |
|
Jorge Penadés
|
8311795fd8
|
refactor: refs #7524 dynamic fetch
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-04 12:16:42 +02:00 |
|
Jorge Penadés
|
df5961a2a2
|
feat: refs #7663 wip test
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-04 11:41:47 +02:00 |
|
Jorge Penadés
|
544ddb0f15
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-04 10:39:46 +02:00 |
|
Javi Gallego
|
c1e76e4c43
|
Merge branch '7277-RefundInvoices' of https://gitea.verdnatura.es/verdnatura/salix into 7277-RefundInvoices
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-04 10:24:56 +02:00 |
|
Jorge Penadés
|
ec63bf35c2
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6900-hotfix-fineTunning
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-04 09:15:15 +02:00 |
|
Javi Gallego
|
99243fa248
|
feat: refs #7277 traducciones
|
2024-09-04 08:30:01 +02:00 |
|
Guillermo Bonet
|
c5521ea021
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-04 07:06:22 +02:00 |
|
Jorge Penadés
|
9797d5e219
|
feat: refs #7663 return created invoice ids
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-03 17:33:44 +02:00 |
|
Sergio De la torre
|
36cf6b1aee
|
feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-03 16:50:55 +02:00 |
|
Javier Segarra
|
d54361a0bc
|
Merge branch 'dev' into 7277-RefundInvoices
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-03 13:38:03 +00:00 |
|
Javi Gallego
|
a1bc881385
|
Merge branch '7277-RefundInvoices' of https: refs #7277//gitea.verdnatura.es/verdnatura/salix into 7277-RefundInvoices
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-03 15:15:20 +02:00 |
|
Javi Gallego
|
652395bee1
|
feat: refs #7277 transfer addressFk
|
2024-09-03 15:14:33 +02:00 |
|
Guillermo Bonet
|
3cc19549e4
|
fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems
gitea/salix/pipeline/pr-test This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-03 15:03:09 +02:00 |
|
Jon Elias
|
26876fd0a6
|
Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-03 14:35:59 +02:00 |
|
Jon Elias
|
29b0851741
|
refactor: refs #6346 hook added in wagon-type-tray model
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-03 14:35:05 +02:00 |
|
Guillermo Bonet
|
790a44c62a
|
fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems
|
2024-09-03 13:29:01 +02:00 |
|
Jorge Penadés
|
623794c3dd
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6900-hotfix-fineTunning
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-03 12:52:13 +02:00 |
|
Guillermo Bonet
|
0c3349dc03
|
fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-09-03 12:06:31 +02:00 |
|
Guillermo Bonet
|
6f97d1b83a
|
fix: refs #7844 salesFilter and isTooLittle condition
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-09-03 09:57:18 +02:00 |
|
Jorge Penadés
|
30c7475fcb
|
Merge branch 'dev' into 7353-takeoutMonitor
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-03 07:11:05 +00:00 |