Guillermo Bonet
|
755312b981
|
refactor: refs #7920 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-13 11:51:23 +01:00 |
Guillermo Bonet
|
9d5ef3eeb0
|
Merge branch 'dev' into 7920-itemShelving
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-13 10:16:57 +00:00 |
Guillermo Bonet
|
b3bf0024e3
|
refactor: refs #7920 Major changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-13 11:15:31 +01:00 |
Jorge Penadés
|
f52041eeff
|
Merge branch 'dev' into 6818-saySimpleIntegration
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-13 08:22:40 +00:00 |
Pablo Natek
|
b025a8b804
|
fix: refs #7404 filter an rounding issues
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-13 09:10:18 +01:00 |
Guillermo Bonet
|
3c8ef7cdba
|
refactor: refs #7950 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 14:54:11 +01:00 |
Guillermo Bonet
|
6427a90c44
|
Merge branch 'dev' into 7950-cmrModelUnify
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 12:25:11 +00:00 |
Sergio De la torre
|
b532691043
|
Merge pull request 'feat: refs #8150 movExpeditions' (!3167) from 8150-moveExpeditionsApp into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3167
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-11-12 11:02:58 +00:00 |
Guillermo Bonet
|
aec4d0b1a4
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-12 11:28:32 +01:00 |
Guillermo Bonet
|
699675b476
|
fix: hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-12 11:27:23 +01:00 |
Javier Segarra
|
96301f8a0b
|
fix: hotfix create order from customer
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-12 10:43:05 +01:00 |
Guillermo Bonet
|
90e7ab1ec1
|
refactor: refs #7950 Created cmr model
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 08:25:23 +01:00 |
Jorge Penadés
|
186312702d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-11 16:41:37 +01:00 |
Jorge Penadés
|
a41fc36f90
|
feat: refs #6869 define model
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-11 13:02:09 +01:00 |
Alex Moreno
|
f7a29cd9c7
|
feat(Supplier): refs #6828 add companySize
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-11 10:32:17 +01:00 |
Jorge Penadés
|
5c054fe0d3
|
feat: refs #6869 add back
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-11 09:09:51 +01:00 |
Pablo Natek
|
50a73c98a2
|
feat: refs #7743 add try catch stmt to the test
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-11-11 08:12:07 +01:00 |
Pablo Natek
|
d6349f113c
|
feat: refs #7743 add simple spec for sendMail
|
2024-11-11 08:06:22 +01:00 |
Pablo Natek
|
0c20aea45f
|
Merge branch 'dev' of https: refs #7457//gitea.verdnatura.es/verdnatura/salix into 7457-orderFilter
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-11 07:34:26 +01:00 |
Pablo Natek
|
39f7391abf
|
Merge branch '7457-orderFilter' of https://gitea.verdnatura.es/verdnatura/salix into 7457-orderFilter
|
2024-11-11 07:27:51 +01:00 |
Pablo Natek
|
fc61f7e4ab
|
fix: refs #7457 remove group by calc time reduce bellow 1s
|
2024-11-11 07:27:50 +01:00 |
Jorge Penadés
|
6927f4b28d
|
feat: refs #6818 saysimple integration
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-08 11:51:00 +01:00 |
Sergio De la torre
|
fd36f7ecc3
|
feat: refs #8150 movExpeditions
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-08 10:44:01 +01:00 |
Sergio De la torre
|
a8cc417fb4
|
Merge branch 'dev' into 7922-scanOrder
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-29 06:32:32 +00:00 |
Guillermo Bonet
|
6afb8fbeb5
|
Merge pull request 'feat: refs #7266 Added details and improvements in item label reports' (!3154) from 7266-itemQrBarcodeLabel into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3154
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-10-29 06:04:15 +00:00 |
Carlos Andrés
|
66a5708efb
|
Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!3147) from 8087-nuevoCampoTravel into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-10-28 14:41:01 +00:00 |
Guillermo Bonet
|
c8662a5051
|
Merge branch '7266-itemQrBarcodeLabel' of https://gitea.verdnatura.es/verdnatura/salix into 7266-itemQrBarcodeLabel
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-28 14:51:21 +01:00 |
Guillermo Bonet
|
a37b7b71a8
|
feat: refs #7266 Requested changes and improvements
|
2024-10-28 14:51:19 +01:00 |
Carlos Satorres
|
385279b39d
|
fix: refs #7283 tback
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-28 13:15:40 +01:00 |
Carlos Satorres
|
0180998683
|
fix: refs #7283 item filters
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-28 13:08:27 +01:00 |
Guillermo Bonet
|
b899a7967f
|
Merge branch 'dev' into 7266-itemQrBarcodeLabel
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-28 10:38:17 +00:00 |
Guillermo Bonet
|
c43bdb5021
|
feat: refs #7266 Added details and improvements in item label reports
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-28 11:29:15 +01:00 |
Jon Elias
|
b27aa1bd94
|
Merge branch 'dev' into 7193-ParkingCreateScope
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-28 09:52:17 +00:00 |
Jon Elias
|
eb5f57285a
|
feat: refs #7193 added scope in parking model
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-28 10:40:43 +01:00 |
Sergio De la torre
|
93feb74949
|
Merge branch 'dev' of https: refs #7921//gitea.verdnatura.es/verdnatura/salix into 7921-sendExpeditionLost
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-28 10:22:23 +01:00 |
Jorge Penadés
|
b20ca1d8d7
|
Merge branch 'dev' into 7524-fixE2e
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-28 08:43:45 +00:00 |
Sergio De la torre
|
6efc2c340c
|
feat: refs #7921 refs#7921 sendLostExpedition
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-28 08:57:22 +01:00 |
Carlos Satorres
|
c8101375a2
|
Merge branch 'dev' into 6644-modEmail
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-28 07:04:17 +00:00 |
Carlos Satorres
|
869c7ab598
|
fix: refs #6644 email and translations
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-28 07:37:42 +01:00 |
Guillermo Bonet
|
8c4d3bac0d
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-28 07:11:38 +01:00 |
Guillermo Bonet
|
765d125219
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-28 07:11:21 +01:00 |
Jorge Penadés
|
d8e241740f
|
feat: refs #7524 restrict fields
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-27 13:47:52 +01:00 |
Guillermo Bonet
|
80764b6495
|
feat: refs #7006 itemTypeLog
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-25 14:17:57 +02:00 |
Sergio De la torre
|
e775e56120
|
feat: refs #7921 refs#7921 sendLostExpedition
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-25 13:48:27 +02:00 |
Guillermo Bonet
|
956e89475e
|
Merge branch 'dev' into 7006-itemTypeLog
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-25 11:06:55 +00:00 |
Jorge Penadés
|
8f10260795
|
feat: refs #7943 return just the required content
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-25 11:37:45 +02:00 |
Guillermo Bonet
|
69e1df2504
|
fix: refs #235425 Requested changes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-25 08:47:43 +02:00 |
Guillermo Bonet
|
111480f7b7
|
fix: refs #235425 Requested changes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-25 07:22:36 +02:00 |
Sergio De la torre
|
11e13fdb20
|
feat: refs #7922 refs #792 scanOrder
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-25 06:40:06 +02:00 |
Carlos Andrés
|
4d3bc2c837
|
feat: refs #8087 Traspasar redadas a travels
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-24 19:32:02 +02:00 |
Carlos Andrés
|
1bf900f81b
|
feat: refs #8087 Traspasar redadas a travels
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-24 12:33:47 +02:00 |
Guillermo Bonet
|
4da11c65bb
|
fix: refs #235425 sale priceFixed update
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-24 12:26:03 +02:00 |
Guillermo Bonet
|
f97f1c2b9a
|
Merge branch 'dev' into 7266-itemLabels
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-24 09:31:14 +00:00 |
Javier Segarra
|
070a5640df
|
fix: recalculatePrice not working with all ids
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-24 08:16:04 +00:00 |
Alex Moreno
|
7ae99fe6a1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-24 07:47:54 +02:00 |
Alex Moreno
|
4660118211
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-10-24 07:47:41 +02:00 |
Guillermo Bonet
|
4c9682e107
|
Merge branch 'dev' into 7266-itemLabels
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-24 05:16:16 +00:00 |
Pablo Natek
|
838dd9e1b4
|
Merge branch 'dev' into 7457-orderFilter
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-24 04:36:11 +00:00 |
Jorge Penadés
|
43f8b22593
|
feat: refs #8083 add field
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-23 16:10:00 +02:00 |
Javi Gallego
|
2f5f4ecc7c
|
Merge pull request 'feat: refs #7943 quitar lectura en metodos comunes' (!3136) from 7943-permisosWorker into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3136
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-10-23 05:53:03 +00:00 |
Carlos Satorres
|
72662b3112
|
Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-23 07:50:40 +02:00 |
Javi Gallego
|
62f9f31279
|
feat: refs #7943 usa back con permisos
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-23 07:44:41 +02:00 |
Alex Moreno
|
f47043cae4
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-22 15:07:24 +02:00 |
Jorge Penadés
|
a543fca01a
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 8083-hotfix-changeState
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-22 14:23:53 +02:00 |
Guillermo Bonet
|
c3f8da52c6
|
feat: refs #7266 Item label barcode
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-22 13:43:54 +02:00 |
Jorge Penadés
|
1c5e4f40ce
|
feat: refs #8083 add prop
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-22 12:39:51 +02:00 |
Jorge Penadés
|
ee0c0996f6
|
feat: refs #7524 add e2e
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-10-22 12:16:26 +02:00 |
Guillermo Bonet
|
0af58b20be
|
feat: refs #7266 Item label QR finished
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-22 12:02:04 +02:00 |
Guillermo Bonet
|
bf2d7541a5
|
feat: refs #7266 Item label QR
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-21 14:57:55 +02:00 |
Jorge Penadés
|
1efe258ea0
|
fix: refs #7524 filter by department
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-10-21 14:30:45 +02:00 |
Carlos Satorres
|
aad616ff83
|
Merge branch 'dev' into 6850-removeChandgeUpdateClaim
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-21 12:26:53 +00:00 |
Carlos Satorres
|
c3ffb31348
|
Merge branch 'dev' into 6831-observationDefaulterEmail
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-21 12:23:39 +00:00 |
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 |
Pablo Natek
|
78ee7e141d
|
fix: refs #7457 remove translate and use param definition for restriction
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-17 08:40:25 +02:00 |
Pablo Natek
|
a35c10adab
|
fix: refs #7457 error on empty from param and add translate
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-17 08:35:24 +02:00 |
Pablo Natek
|
3ce8d21ed3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7457-orderFilter
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-17 08:19:06 +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
|
67714f2dff
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-16 13:59:04 +02: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 |