 Jorge Penadés
|
2f77359892
|
Merge branch 'dev' into 7919-deleteTicketRefund
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-21 11:00:31 +00:00 |
 Jon Elias
|
158f701f1e
|
Merge branch 'dev' into Fix-ItemRequest
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-21 09:31:29 +00:00 |
|
Jorge Penadés
|
cb4e8355ba
|
feat: refs #7524 myteam filter
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-21 10:58:36 +02:00 |
|
Jorge Penadés
|
288dc1c598
|
feat: refs #7524 myteam filter wip
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-21 10:05:58 +02:00 |
 Carlos Satorres
|
bf0cc687e1
|
Merge branch 'dev' into 6850-removeChandgeUpdateClaim
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-21 07:27:46 +00:00 |
|
Carlos Satorres
|
eea09a9d4a
|
fix: refs #6850 add code
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-10-21 09:24:53 +02:00 |
 Javi Gallego
|
be9f711cc1
|
Merge pull request 'feat: refs #7348 hasDailyInvoice from client' (!3110) from 7348-autonomyDailyInvoice into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3110
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-10-21 06:31:17 +00:00 |
|
Carlos Satorres
|
19fbb836a6
|
fix: refs #6850 fix model
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-21 08:30:39 +02:00 |
|
Javi Gallego
|
da772cf504
|
Merge pull request '7744-closeAllTest' (!3114) from 7744-closeAllTest into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #3114
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-10-21 06:29:17 +00:00 |
|
Carlos Satorres
|
b88dc1c70f
|
fix: refs #6850 remove notifyPickUp
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-20 16:23:24 +02:00 |
|
Carlos Satorres
|
b8e782d3a5
|
fix: refs #6831 filter observation
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-20 15:59:24 +02:00 |
|
Jon Elias
|
9e9773578a
|
Merge branch 'dev' into Fix-ItemRequest
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-18 11:22:35 +00:00 |
|
Carlos Satorres
|
ed69604767
|
Merge branch 'dev' into 7906-notDeleteZone
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-18 08:31:38 +00:00 |
 Guillermo Bonet
|
939f083671
|
Merge pull request 'refactor: refs #8106 Optimized ticket_getTax' (!3122) from 8106-negativeBasesOptimize into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3122
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-10-18 08:27:08 +00:00 |
|
Carlos Satorres
|
5a14aed73a
|
Merge branch 'dev' into 7906-notDeleteZone
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-18 07:40:04 +00:00 |
|
Jon Elias
|
3139d99130
|
Merge branch 'dev' into 7010-AddPackingField
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-18 07:30:43 +00:00 |
|
Jon Elias
|
46993ad103
|
refactor: refs #7010 deleted distinct
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-18 09:29:01 +02:00 |
|
Carlos Satorres
|
1273e895af
|
fix: refs #7906 fix test back
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-18 09:27:43 +02:00 |
|
Jon Elias
|
f68584b3fa
|
Merge branch 'dev' into Fix-ItemRequest
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-18 06:53:38 +00:00 |
|
Carlos Satorres
|
02dc952024
|
fix: refs #7906 add test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-18 08:28:08 +02:00 |
|
Guillermo Bonet
|
28e957fecd
|
refactor: refs #8106 refs #1406 Optimized ticket_getTax
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-17 14:46:19 +02:00 |
|
Javi Gallego
|
681f82a3ae
|
feat: refs #7744 test back ok
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-16 16:09:53 +02:00 |
|
Carlos Satorres
|
37d3ef5f16
|
Merge branch 'dev' into 7986-workerMoto
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-16 12:10:13 +00:00 |
|
Carlos Satorres
|
3f3b936255
|
fix: refs #7906 remove code
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-16 13:56:42 +02:00 |
|
Carlos Satorres
|
a282170016
|
fix: refs #7906 fix method
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-16 11:36:48 +02:00 |
|
Jorge Penadés
|
8f01e4d110
|
fix: refs #7353 redirect to lilium
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-16 09:32:15 +02:00 |
|
Carlos Satorres
|
c5aa7dc44e
|
fix: refs #7906 edit test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-16 09:30:37 +02:00 |
|
Jorge Penadés
|
8ca097d4a9
|
chore: refs #7919 change var name
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-16 09:23:39 +02:00 |
|
Javi Gallego
|
aac4dd0a6d
|
feat: refs #7348 minor bug
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-16 08:52:27 +02:00 |
|
Javi Gallego
|
c6e764b478
|
feat: refs #7348 hasDailyInvoice from client
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-16 08:32:10 +02:00 |
|
Carlos Satorres
|
46e657675b
|
fix: refs #7906 remake method
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-16 08:26:39 +02:00 |
|
Jorge Penadés
|
d57f4fc44a
|
chore: refs #7919 refactor, drop relation on back
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-15 17:24:14 +02:00 |
|
Jorge Penadés
|
6f8a005726
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7919-deleteTicketRefund
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-15 17:01:29 +02:00 |
|
Javi Gallego
|
4a88ba5078
|
feat: refs #7744 closeAll Test
|
2024-10-15 15:43:12 +02:00 |
|
Carlos Satorres
|
099fe8f950
|
fix: refs #7986 fix model
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-15 14:42:35 +02:00 |
|
Jon Elias
|
e334152acc
|
refactor: deleted comment
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-15 09:03:15 +02:00 |
|
Javi Gallego
|
976e50b566
|
feat: refs #8098 identation
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-15 08:25:53 +02:00 |
|
Javi Gallego
|
4526873bbe
|
feat: refs #8098 without Date
|
2024-10-15 08:24:13 +02:00 |
|
Javi Gallego
|
5e2edad6de
|
Merge branch 'dev' into 8098-closureTransation
|
2024-10-15 08:21:40 +02:00 |
|
Javi Gallego
|
f2d1aa5f16
|
feat: refs #8098 closureDaysAgo
|
2024-10-15 08:17:03 +02:00 |
 Alex Moreno
|
5b938a6f78
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-10-15 08:00:39 +02:00 |
 Sergio De la torre
|
f27566ac0f
|
Merge pull request 'master' (!3098) from master into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
Reviewed-on: #3098
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
|
2024-10-15 05:18:30 +00:00 |
|
Jorge Penadés
|
6d4c71d465
|
feat: refs #7919 test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-14 17:14:40 +02:00 |
|
Jorge Penadés
|
a35208d903
|
feat: refs #7919 test
|
2024-10-14 17:14:01 +02:00 |
|
Jorge Penadés
|
ccf9dbde8e
|
feat: refs #7919 test
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-14 17:11:12 +02:00 |
|
Sergio De la torre
|
13c7b34c98
|
Merge branch 'master' into 6861-ItemShelvingSaleReserve
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-14 14:15:51 +00:00 |
|
Jorge Penadés
|
0549e22720
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-14 15:38:30 +02:00 |
|
Jorge Penadés
|
f3b5a70b67
|
feat: refs #7323 show right error
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-14 14:41:25 +02:00 |
|
Carlos Satorres
|
68469e2ba8
|
Merge branch 'dev' of https: refs #7986//gitea.verdnatura.es/verdnatura/salix into 7986-workerMoto
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-14 13:52:08 +02:00 |
|
Jon Elias
|
07849ebeb8
|
fix: myTeam param
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-14 13:25:09 +02:00 |
|
Sergio De la torre
|
06b7d56837
|
fix: refs #6861 assignCollection&isOnReservationMode
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-14 13:01:30 +02:00 |
|
Jon Elias
|
4ee6a46bd5
|
feat: added new filter param
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-14 11:29:49 +02:00 |
|
Guillermo Bonet
|
6c62172633
|
feat: refs #7006 itemTypeLog created
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-14 09:31:35 +02:00 |
|
Guillermo Bonet
|
78a9b788bf
|
feat: refs #7006 itemTypeLog created
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-14 08:42:54 +02:00 |
|
Jorge Penadés
|
b39a749bee
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-14 08:37:58 +02:00 |
|
Alex Moreno
|
d8e0c1debe
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-14 07:27:19 +02:00 |
|
Jorge Penadés
|
2b17e6da4c
|
Merge branch 'dev' into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-10 08:16:29 +00:00 |
|
Jorge Penadés
|
f5a43962fd
|
Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-10 07:18:06 +00:00 |
|
Alex Moreno
|
040304d04f
|
fix: merge
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-08 17:10:19 +02:00 |
|
Alex Moreno
|
0c6541372e
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2024-10-08 17:09:26 +02:00 |
|
Alex Moreno
|
3cf7591206
|
fix(closeAll): not use transaction
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-08 17:03:27 +02:00 |
|
Carlos Satorres
|
39e808bca7
|
fix: refs #7986 fix model
|
2024-10-08 16:06:38 +02:00 |
 Carlos Andrés
|
d497ffc781
|
Actualizar modules/ticket/back/methods/ticket/closure.js
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-08 13:32:57 +00:00 |
|
Alex Moreno
|
5cdb0b7eb6
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2024-10-08 12:19:10 +02:00 |
|
Jorge Penadés
|
3755c5a15b
|
Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-07 14:27:09 +00:00 |
|
Jorge Penadés
|
4fb0936399
|
Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-07 06:39:11 +00:00 |
|
Jorge Penadés
|
53f590af61
|
Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-07 06:31:14 +00:00 |
|
Sergio De la torre
|
e90d48c777
|
fix: refs #7524 backSuppliersPackaging
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-07 08:00:34 +02:00 |
|
Guillermo Bonet
|
1ae60f51dd
|
Merge branch '6824-itemShelvingSaleNoDelete' of https://gitea.verdnatura.es/verdnatura/salix into 6824-itemShelvingSaleNoDelete
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-06 10:54:53 +02:00 |
|
Guillermo Bonet
|
7fc2e34af9
|
refactor: refs #6824 Fix tests
|
2024-10-06 10:54:51 +02:00 |
|
Jorge Penadés
|
6fcd883f4b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 16:37:01 +02:00 |
|
Jorge Penadés
|
475d0bde38
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-04 16:12:44 +02:00 |
|
Jorge Penadés
|
4411f0cfb3
|
Merge branch 'dev' into 7353-takeoutMonitor
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 13:56:49 +00:00 |
|
Jorge Penadés
|
3d831e290b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 13:46:41 +02:00 |
|
Sergio De la torre
|
52e8bac168
|
fix: refs #7524 backSuppliersPackaging
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-04 13:34:04 +02:00 |
|
Jorge Penadés
|
c4faac7446
|
Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 07:47:38 +00:00 |
|
Jorge Penadés
|
70a2189e30
|
Merge branch 'dev' into 7207-showPbx
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 07:46:18 +00:00 |
|
Guillermo Bonet
|
0b1756ff3a
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-04 09:13:53 +02:00 |
|
Carlos Satorres
|
3385f4136d
|
Merge branch 'dev' into 6896-ordersMigration
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-04 06:31:13 +00:00 |
 Pablo Natek
|
229d5369a1
|
fix: refs #7404 spec for new entry fixture
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-04 07:20:10 +02:00 |
|
Carlos Satorres
|
db6cea6cbb
|
Merge branch 'dev' into 6896-ordersMigration
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-04 05:19:20 +00:00 |
 Ivan Mas
|
0374cbd4c9
|
fix: hotfix email rutas
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-03 18:20:21 +02:00 |
|
Jorge Penadés
|
23d2d2b1ea
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 15:39:37 +02:00 |
|
Jorge Penadés
|
5416d38255
|
feat: refs #7874 redirect to lilium
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 15:25:56 +02:00 |
 Javier Segarra
|
0a188e03fe
|
Merge branch 'master' into fix_isWorker_defaulter
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-03 12:19:27 +00:00 |
|
Javier Segarra
|
76308f7e37
|
fix(salix): filter isWorker in DefaulterView
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-03 12:13:38 +02:00 |
|
Pablo Natek
|
3f325d865f
|
fix: refs #7404 test for lasEntriesFilter
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-03 12:08:23 +02:00 |
|
Jon Elias
|
975e77c2f9
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into Hotfix-RecoveryDescriptor
|
2024-10-03 10:26:08 +02:00 |
|
Jon Elias
|
120aa3e169
|
fix: recover entry descriptor and deleted code
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-03 10:23:32 +02:00 |
|
Pablo Natek
|
616c328681
|
Merge branch 'dev' into 7404-roundDetailVolume
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 07:55:51 +00:00 |
|
Jorge Penadés
|
546bb85484
|
Merge branch 'dev' of https: refs #7874//gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 09:27:51 +02:00 |
|
Jorge Penadés
|
0311069f00
|
Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-03 07:16:55 +00:00 |
|
Jon Elias
|
cbc8cc6210
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7010-AddPackingField
|
2024-10-03 09:14:16 +02:00 |
|
Javi Gallego
|
91d9a6e417
|
Merge pull request '#7346 - manualInvoice' (!3060) from 7346-manualInvoice into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3060
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-10-03 05:45:09 +00:00 |
|
Javi Gallego
|
5f695f63b3
|
Merge pull request 'refactor: refs #7817 itemShelving_addList change' (!2882) from 7817-isChecked into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2882
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-10-03 05:34:44 +00:00 |
|
Javi Gallego
|
ee52c8b45f
|
fix: refs #7346 findByid con fields
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-02 15:34:53 +02:00 |
|
Javi Gallego
|
43df98598c
|
feat: refs #7346 manual invoice with address
|
2024-10-02 15:27:09 +02:00 |
|
Carlos Satorres
|
c8abf153e5
|
Merge branch 'dev' of https: refs #7366//gitea.verdnatura.es/verdnatura/salix into 7366-travelMigration
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-02 10:38:21 +02:00 |
|
Jon Elias
|
2267b2c6b1
|
Merge branch 'dev' into 7884-AddLabelerField
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-02 04:55:56 +00:00 |
|
Javi Gallego
|
1cf14035d5
|
feat: existingRefund without ticketRefund
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-01 15:51:30 +02:00 |