Pablo Natek
|
33d9ba9b44
|
fix: refs #7404 negative quantity
gitea/salix/pipeline/pr-master Build queued...
Details
|
2024-11-19 06:21:00 +01:00 |
Pablo Natek
|
056b5adddc
|
Merge branch 'dev' into 7457-orderFilter
|
2024-11-19 05:12:18 +00:00 |
Carlos Satorres
|
6619ec451c
|
fix: getSales
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-18 13:46:56 +01:00 |
Javi Gallego
|
72415a4348
|
Merge branch 'dev' into 7821-entryIsBooked
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-18 12:49:59 +01:00 |
Javier Segarra
|
4b64b27ca7
|
Merge branch 'dev' into 7289_sales_already_moved
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-18 10:39:17 +00:00 |
Carlos Satorres
|
0c4985604b
|
fix: refs #7917 test back
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-18 10:53:52 +01:00 |
Jorge Penadés
|
dd637b9333
|
fix: refs #6869 use id as primaryKey
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-18 10:34:23 +01:00 |
Javier Segarra
|
9558d030ff
|
feat: refs #7289 #7289 remove bad translation
|
2024-11-18 10:10:30 +01:00 |
Guillermo Bonet
|
2b97c18412
|
Merge branch 'dev' into 6869-createGetDetails
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-18 08:34:11 +00:00 |
Carlos Satorres
|
bbe62ece6e
|
fix: refs #7917 model
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-18 08:46:48 +01:00 |
Carlos Satorres
|
5e7dea94b1
|
fix: refs #7917 tests
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-18 08:32:44 +01:00 |
Carlos Satorres
|
57a77628dc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-18 08:29:25 +01:00 |
Javier Segarra
|
6c00efae89
|
feat: refs #7289 #7289 apply option 1
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-17 17:57:54 +01:00 |
Ivan Mas
|
2a1c0ef2af
|
Merge branch 'dev' into 7690-renameConfigTables
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-15 13:35:14 +00:00 |
Ivan Mas
|
6a11416838
|
refactor: refs #7690 copy acls and remove worker-time-control-params.json
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-15 14:30:32 +01:00 |
Jon Elias
|
7d7c66de89
|
Merge branch 'Hotfix-DescriptorRedirectToLilium' of https://gitea.verdnatura.es/verdnatura/salix into Hotfix-DescriptorRedirectToLilium
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-15 14:22:21 +01:00 |
Jon Elias
|
4783cc23ac
|
refactor: deleted negative bases route due to not being used
|
2024-11-15 14:22:19 +01:00 |
Jon Elias
|
af781d4c1a
|
Merge branch 'master' into Hotfix-DescriptorRedirectToLilium
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-15 12:15:21 +00:00 |
Jon Elias
|
6ed521ae5e
|
fix: redirect to invoice-out summary from salix' descriptor
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-11-15 13:10:19 +01:00 |
Pablo Natek
|
60f989b566
|
Merge branch 'dev' into 7457-orderFilter
|
2024-11-15 11:56:54 +00:00 |
Carlos Satorres
|
91c5da9022
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-15 12:41:18 +01:00 |
Pablo Natek
|
86e4e3e981
|
Merge branch 'dev' into 7743-simpleTestForSendMail
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-15 09:26:42 +00:00 |
Guillermo Bonet
|
48ffb80094
|
Merge branch 'dev' into 7920-itemShelving
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-15 06:40:41 +00:00 |
Pablo Natek
|
d8e728e823
|
Merge branch 'dev' into 7457-orderFilter
|
2024-11-15 06:17:04 +00:00 |
Guillermo Bonet
|
d1c528c8fd
|
Merge branch 'dev' into 7950-cmrModelUnify
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-15 06:03:36 +00:00 |
Guillermo Bonet
|
3b48cf3d5d
|
Merge pull request 'feat: refs #8151 moveExpeditions' (!3200) from 8151-moveExpeditions into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3200
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-11-15 05:59:19 +00:00 |
Jorge Penadés
|
4766d25dda
|
feat: refs #7874 use name
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 15:54:53 +01:00 |
Pablo Natek
|
9ac54f463a
|
fix: refs #7457 add with on select to reduce
|
2024-11-14 15:48:11 +01:00 |
Alex Moreno
|
a8cb0b9eb8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-11-14 12:21:13 +01:00 |
Ivan Mas
|
96a13af02c
|
Merge branch 'dev' into 8143-deprecateColumnsFromUser
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 10:11:37 +00:00 |
Guillermo Bonet
|
54da1a713a
|
Merge branch '8151-moveExpeditions' of https://gitea.verdnatura.es/verdnatura/salix into 8151-moveExpeditions
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 10:53:15 +01:00 |
Guillermo Bonet
|
b3dcaf4cf5
|
feat: refs #8151 Requested changes
|
2024-11-14 10:53:13 +01:00 |
Guillermo Bonet
|
b7cb420c72
|
Merge branch 'dev' into 8151-moveExpeditions
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-14 09:46:00 +00:00 |
Guillermo Bonet
|
534b50f51a
|
feat: refs #8151 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-14 10:45:28 +01:00 |
Carlos Satorres
|
155616e622
|
Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3
|
2024-11-14 09:26:13 +01:00 |
Jon Elias
|
66149a69a7
|
Merge branch 'dev' into 6924-NotifyOnlyToBoss
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 07:37:42 +00:00 |
Jon Elias
|
7be1bc385f
|
perf: refs #6924 deleted useless relation
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 08:35:28 +01:00 |
Guillermo Bonet
|
97e53b2ef8
|
Merge branch 'dev' into 7950-cmrModelUnify
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-14 06:57:26 +00:00 |
Guillermo Bonet
|
9c0af7f7c6
|
refactor: refs #7950 Requested changes
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-11-14 07:57:13 +01:00 |
Ivan Mas
|
e1b0fc298c
|
feat: refs #8143 deprecate recoverPass and sync from account.user
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-13 20:26:54 +01:00 |
Guillermo Bonet
|
d4a60f63c9
|
feat: refs #8151 Added test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-13 14:05:03 +01:00 |
Guillermo Bonet
|
018393fa93
|
feat: refs #8151 Added test
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-13 14:04:02 +01:00 |
Guillermo Bonet
|
344427da45
|
feat: refs #8151 moveExpeditions
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-13 13:46:40 +01:00 |
Pablo Natek
|
5f3b1ff601
|
Merge pull request 'fix: refs #7404 filter an rounding issues' (!3196) from 7404-fix-stockBoughtDetailFilter into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3196
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-13 11:24:18 +00:00 |
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 |
Jon Elias
|
dcae6dfbb4
|
Merge branch '6924-NotifyOnlyToBoss' of https://gitea.verdnatura.es/verdnatura/salix into 6924-NotifyOnlyToBoss
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-13 08:45:45 +01:00 |
Jon Elias
|
ea4adbea85
|
refactor: refs #6924 deleted department check
|
2024-11-13 08:45:44 +01:00 |
Jon Elias
|
0f913d8975
|
Merge branch 'dev' into 6924-NotifyOnlyToBoss
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-13 06:51:32 +00:00 |
Ivan Mas
|
870882cdc1
|
Merge branch 'dev' into 7690-renameConfigTables
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 16:27:19 +00:00 |
Ivan Mas
|
20bd426704
|
refactor: refs #7690 unify workerTimeControlParams with workerTimeControlConfig
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 17:25:05 +01:00 |
Carlos Andrés
|
358ed2513d
|
feat: refs#8087 Redadas en travel
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-11-12 16:26:30 +01:00 |
Carlos Andrés
|
69d6e4a104
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8087-nuevosCamposTravel
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-12 16:24:05 +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 |
Javi Gallego
|
ea45d1da0a
|
Merge branch 'dev' into 7821-entryIsBooked
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-12 09:30:40 +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 |
Carlos Andrés
|
cf102699d5
|
feat: refs#8087 Redadas en travel
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-11 14:19:11 +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 |
Jon Elias
|
25891e0bad
|
feat: refs #6924 notify absences only to department boss
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-11-11 10:42:06 +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 |
Carlos Satorres
|
e0e487859f
|
fix: refs #7529 fix models
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-29 13:59:47 +01:00 |
Carlos Satorres
|
ca6d8a67cb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT
|
2024-10-29 08:32:44 +01:00 |
Carlos Satorres
|
6b10f60933
|
fix: refs #7529 mod model
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-10-29 08:03:18 +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 Satorres
|
55a409c680
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT
|
2024-10-29 06:13:12 +01: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 |
Javi Gallego
|
a432133c18
|
Merge branch 'dev' into 7821-entryIsBooked
|
2024-10-28 14:46:31 +01:00 |
Carlos Satorres
|
248ae64872
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-10-28 13:31:37 +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 |