 Pablo Natek
|
4b7c20075b
|
Merge pull request 'feat: refs #6897 add search method and enhance ACL permissions for Entry model' (!3448) from 6897-addItemSearch into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3448
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-02-13 07:59:58 +00:00 |
 Pako Natek
|
3a1849326b
|
fix(item_getBalance): refs #8408 availabled field prevails over landed
gitea/salix/pipeline/pr-dev This commit looks good
Details
Refs: #8408
|
2025-02-13 08:41:13 +01:00 |
|
Pako Natek
|
317c152c66
|
Merge branch 'dev' into 8575-itemPackingType-Altillo
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-13 06:41:43 +00:00 |
|
Pablo Natek
|
514ddf1045
|
feat: refs #6897 add search method and enhance ACL permissions for Entry model
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-12 19:40:22 +01:00 |
 Ivan Mas
|
5404f895b2
|
refactor: refs #8573 add fk to expedition.hostFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-12 17:08:45 +01:00 |
 Guillermo Bonet
|
8959eb21f6
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-12 14:37:34 +01:00 |
|
Guillermo Bonet
|
5543da2c80
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-12 14:37:10 +01:00 |
|
Guillermo Bonet
|
ba3909a984
|
refactor: refs #6944 Requested changes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-02-12 14:13:39 +01:00 |
|
Pako Natek
|
b95db2eff1
|
feat(productionControl and collection_new): refs #8575 new itempackingtype a
gitea/salix/pipeline/pr-dev This commit looks good
Details
Refs: #8575
|
2025-02-12 13:45:07 +01:00 |
 Alex Moreno
|
5d155ef6bd
|
Merge branch 'test' into hotFix_daily_addressInvoice_2
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2025-02-12 11:17:27 +00:00 |
|
Guillermo Bonet
|
e7c027a8b1
|
refactor: refs #6944 Update ticket_setState to improve state change logic and user tracking
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-02-12 10:06:48 +01:00 |
 Javi Gallego
|
1c8ad94ab8
|
fix: update SQL fixture values and enhance getVideoList method with transaction handling
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-12 09:51:56 +01:00 |
|
Pablo Natek
|
c0b1f3337c
|
Merge branch 'dev' into 6897-refactorEntryBuyList
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-11 15:50:28 +00:00 |
|
Alex Moreno
|
3fbd740a2b
|
fix: address invoice daily
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2025-02-11 14:31:26 +01:00 |
|
Guillermo Bonet
|
f682e3cfe6
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-11 13:26:18 +01:00 |
|
Guillermo Bonet
|
0a33e05bff
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-11 13:26:02 +01:00 |
|
Guillermo Bonet
|
a387e3ae92
|
feat: refs #7162 Add packages and packagesList to ticket_doCmr procedure
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-11 13:25:30 +01:00 |
|
Pablo Natek
|
96248132a1
|
refactor: refs #6897 sql fixture data for improved readability and consistency
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-11 13:02:50 +01:00 |
|
Pablo Natek
|
454fbcb7ce
|
Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-11 12:38:42 +01:00 |
 Javier Segarra
|
095e561c82
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-11 08:43:21 +00:00 |
|
Pako Natek
|
fbf56ff0cf
|
fix(available_refresh): refs #8408 more availabled cases
refs#8408
|
2025-02-11 08:46:24 +01:00 |
|
Pablo Natek
|
5ab45831e7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList
|
2025-02-11 08:19:31 +01:00 |
|
Pako Natek
|
5d674139fa
|
Merge branch '8408-Disponible-por-zonas-y-horas' of https://gitea.verdnatura.es/verdnatura/salix into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-10 14:00:36 +01:00 |
|
Pako Natek
|
ec5ef3d7f8
|
fix(item_getStock): refs #8408 field availabled used for itementryin selection
Refs: #8408
|
2025-02-10 14:00:34 +01:00 |
|
Guillermo Bonet
|
75b6867be8
|
feat: refs #8227 Minor change
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2025-02-10 13:06:05 +01:00 |
|
Guillermo Bonet
|
e19e50de14
|
feat: refs #8227 Update roadmap triggers to manage eta adjustments and prevent recursive calls
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2025-02-10 13:04:23 +01:00 |
|
Pako Natek
|
f7f221e2bc
|
Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-10 06:36:15 +00:00 |
|
Pako Natek
|
b60f251c56
|
fix(catalog_calculate): refs #8408 remove comments
resf#8408
|
2025-02-10 07:34:15 +01:00 |
|
Guillermo Bonet
|
0ecf1f281a
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-10 07:27:04 +01:00 |
|
Guillermo Bonet
|
a002168f61
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-10 07:26:53 +01:00 |
|
Guillermo Bonet
|
50a295d495
|
fix: refs #7162 Update JOIN condition for agencyMode in ticket_doCmr
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-10 07:25:39 +01:00 |
|
Pablo Natek
|
2f0cd27ed8
|
Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-09 18:26:52 +01:00 |
|
Pablo Natek
|
6ea4e3096e
|
feat: refs #6897 add maxLockTime parameter to entryConfig insert statement
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-09 18:24:39 +01:00 |
|
Javier Segarra
|
e748c3ea68
|
feat: refs #6321 minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-07 22:40:00 +01:00 |
|
Javier Segarra
|
fce6b13d2d
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-07 16:19:58 +01:00 |
|
Pako Natek
|
e22a21290b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8408-Disponible-por-zonas-y-horas
|
2025-02-07 14:37:20 +01:00 |
|
Pako Natek
|
adf416a086
|
fix: refs #8408 hour time on catalog_calculate
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-07 14:29:50 +01:00 |
|
Guillermo Bonet
|
ec3210a5c0
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-07 14:28:28 +01:00 |
|
Guillermo Bonet
|
b1d2441d2e
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-07 14:27:56 +01:00 |
|
Guillermo Bonet
|
95d2823666
|
fix: refs #7024 Deleted dated check
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-07 14:27:27 +01:00 |
|
Pako Natek
|
ca39edd010
|
fix: refs #8408 test
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-07 14:04:17 +01:00 |
|
Pako Natek
|
466a0a58d9
|
fix(catalog_calculate): refs #8408 delete commented lines
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
refs#8408
|
2025-02-07 12:59:41 +01:00 |
|
Pako Natek
|
74583d899a
|
Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-07 11:53:30 +00:00 |
|
Pako Natek
|
ba323bb7bf
|
fix(fixtures.before): refs #8408 rollback changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
refs#8408
|
2025-02-07 12:53:15 +01:00 |
|
Guillermo Bonet
|
21d9369250
|
fix: refs #8172 Version fix
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-07 11:04:10 +01:00 |
|
Pako Natek
|
a4f3975340
|
feat(catalog_calculate): refs #8408 new concept availabled
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
Refs: #8408
|
2025-02-07 10:40:00 +01:00 |
|
Guillermo Bonet
|
6fd1c35819
|
Merge branch 'dev' into 8172-parkingCoordinates
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-07 10:36:35 +01:00 |
|
Javier Segarra
|
f4dbddbe15
|
fix: refs #6321 dates in fixtures.before
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-07 09:54:55 +01:00 |
|
Javier Segarra
|
9322360979
|
fix: refs #6321 dates in fixtures.before
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-07 08:41:49 +01:00 |
|
Javier Segarra
|
c4e64db9b9
|
Merge branch '6321_negative_tickets' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-06 23:23:00 +01:00 |
|
Javier Segarra
|
ba58746a03
|
fix: refs #6321 test
|
2025-02-06 23:22:58 +01:00 |
|
Javier Segarra
|
35bf9abcf4
|
Merge branch 'dev' into 7601_futureAgency
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-06 16:15:27 +00:00 |
|
Javier Segarra
|
8398a30e4f
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-06 14:58:55 +00:00 |
|
Javier Segarra
|
4e4d6c3b6a
|
fix: refs #6321 fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-06 15:20:44 +01:00 |
|
Javier Segarra
|
8170eafa36
|
feat: refs #6321 remove ticketConfig var
|
2025-02-06 15:19:07 +01:00 |
|
Guillermo Bonet
|
9f302fac24
|
Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2025-02-06 13:47:36 +01:00 |
|
Guillermo Bonet
|
92ca3a2582
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-06 13:47:17 +01:00 |
 Carlos Andrés
|
2e8e2329ec
|
fix: refs #8535 deploy
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-06 13:44:22 +01:00 |
|
Javier Segarra
|
ab0667f85c
|
feat: retrive requested fields
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2025-02-06 12:31:46 +00:00 |
|
Ivan Mas
|
f12a690bef
|
feat: refs #8487 delete appointment from travel view
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2025-02-06 13:28:44 +01:00 |
|
Javier Segarra
|
4c786be3af
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-06 12:34:41 +01:00 |
|
Carlos Andrés
|
fa5888f931
|
Merge branch 'master' of https: refs #8535//gitea.verdnatura.es/verdnatura/salix into 8535-log-mandate
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-02-06 11:53:57 +01:00 |
|
Carlos Andrés
|
9b2c0f1c48
|
feat: refs #8535 log table mandate
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-02-06 11:46:39 +01:00 |
 Jorge Penadés
|
9ba517b648
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-06 10:20:22 +01:00 |
 Juanjo Breso
|
8df36f296a
|
feat: refs #269518 isFragile item and itemType
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-02-06 09:11:48 +01:00 |
|
Javier Segarra
|
b2cbded2dc
|
feat: refs #6321 defaultAlertLevelCode
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-06 01:06:02 +01:00 |
|
Javier Segarra
|
1f6f7b9975
|
feat: refs #6321 updates requested
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-06 00:34:08 +01:00 |
|
Carlos Andrés
|
37b735b988
|
feat: refs #8535 sistema de warnings
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-02-05 17:21:36 +01:00 |
|
Javier Segarra
|
da90d43f7a
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-05 15:36:44 +01:00 |
|
Javier Segarra
|
e02dcf23b7
|
feat: refs #6321 add columns ticketConfigs
|
2025-02-05 15:36:01 +01:00 |
 Jose Antonio Tubau
|
0a25595ed5
|
Merge branch 'dev' into 8304-workerChangesAndFixes
gitea/salix/pipeline/pr-test This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-05 13:00:44 +01:00 |
|
Pablo Natek
|
26faaad5b4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-05 08:03:48 +01:00 |
 Jon Elias
|
502b48718c
|
Merge pull request '#7965 - unifyProblems' (!2990) from 7965-unifyProblems into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2990
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-02-05 06:51:54 +00:00 |
|
Javier Segarra
|
55eb882754
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-04 23:42:47 +01:00 |
|
Javier Segarra
|
272c7c0289
|
perf: refs #6321 minor changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-04 23:42:16 +01:00 |
|
Jon Elias
|
b3aaac2f52
|
Merge branch 'dev' into 7127-ModifyDaysToAddSales
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-04 13:00:07 +00:00 |
|
Javier Segarra
|
0111373471
|
Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-04 14:00:00 +01:00 |
|
Javier Segarra
|
550b0871f0
|
feat: refs #6321 changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-04 13:45:59 +01:00 |
|
Alex Moreno
|
fe7a1c60cc
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2025-02-04 13:03:17 +01:00 |
|
Javier Segarra
|
410f3e73dc
|
Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-04 09:54:41 +01:00 |
|
Guillermo Bonet
|
eb9d3a7b21
|
refactor: refs #8227 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-04 08:27:21 +01:00 |
|
Guillermo Bonet
|
d6bd60f181
|
Merge branch 'dev' into 8227-roadmap
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-04 06:18:34 +00:00 |
|
Guillermo Bonet
|
9cecdab5a8
|
refactor: refs #8227 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-04 07:17:11 +01:00 |
 Sergio De la torre
|
ef5fb111b9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7412_misallocationNotification
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-03 16:13:55 +01:00 |
|
Pablo Natek
|
8f3bf46165
|
Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-03 13:36:20 +01:00 |
|
Guillermo Bonet
|
a408af2467
|
Merge branch 'dev' into 8227-roadmap
|
2025-02-03 13:23:18 +01:00 |
|
Pablo Natek
|
e7dd1f6a58
|
feat: refs #6897 add recalcEntryPrices method and enhance ACL permissions for entry operations
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-03 13:16:48 +01:00 |
|
Sergio De la torre
|
6b9c8300fb
|
feat: refs #7412 notificationMisAllocation
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-03 12:41:56 +01:00 |
|
Javi Gallego
|
55ec4aaba1
|
Merge pull request 'feat: refs #7686 Added new alertLevel ON_PREVIOUS and changes in vn.state.alertLevel' (!2890) from 7686-onPrevious into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #2890
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2025-02-03 08:12:36 +00:00 |
|
Javi Gallego
|
adba4765ed
|
refactor: refs #7686 update alert level conditions to only check for 'FREE'
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-03 09:07:08 +01:00 |
|
Guillermo Bonet
|
12604d0f67
|
Merge branch 'dev' into 8227-roadmap
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-31 14:27:18 +01:00 |
|
Guillermo Bonet
|
8dc803b5df
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-31 14:25:23 +01:00 |
|
Ivan Mas
|
2e4c5fe401
|
feat: refs #8477 add costPerKg to awb view
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-31 12:10:19 +01:00 |
|
Ivan Mas
|
3fa74a18de
|
Merge branch 'dev' into 8477-AddFeeToAWB
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-31 10:39:55 +00:00 |
|
Javier Segarra
|
49c6df42a7
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-31 10:20:42 +00:00 |
|
Ivan Mas
|
fa9b9cc5a3
|
feat: refs #8312 modify fixtures.before
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-31 11:06:24 +01:00 |
|
Guillermo Bonet
|
b40f145613
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-31 10:57:44 +01:00 |
|
Ivan Mas
|
a2258a005a
|
Merge branch 'dev' into 8312-addColumnCubosView
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-31 09:23:32 +00:00 |
|
Ivan Mas
|
da5e395450
|
feat: refs #8312 add flippingCost column to Cubos view
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-31 10:17:01 +01:00 |
 Carlos Satorres
|
e1125dc46d
|
Merge branch 'dev' into 6553-workerBusiness
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-31 09:16:13 +00:00 |