 Carlos Andrés
|
5488a229c1
|
Merge pull request 'fix: priceOptimum error' (!3471) from PriceOptimum-error into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3471
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2025-02-18 08:50:27 +00:00 |
 Juan Ferrer
|
e9244c8538
|
Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-18 08:33:22 +01:00 |
|
Carlos Andrés
|
a73199e70b
|
fix: priceOptimum error
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-02-17 18:52:31 +01:00 |
 Guillermo Bonet
|
1b0da71c9d
|
feat: refs #8244 Floricode api
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-17 15:03:23 +01:00 |
 Javi Gallego
|
a04ddfdee3
|
Merge branch 'dev' into 7937-claimAgile
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-17 14:21:56 +01:00 |
|
Javi Gallego
|
7001076974
|
refactor: refs #7937 remove pickupAgencyFk and related constraints; update claimConfig and tests
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-17 09:05:34 +01:00 |
|
Carlos Andrés
|
a874b96c5e
|
revert a119d9f7fb
gitea/salix/pipeline/head There was a failure building this commit
Details
revert feat: invoiceIn move deductible field from head to lines
|
2025-02-14 11:32:45 +00:00 |
|
Carlos Andrés
|
a119d9f7fb
|
feat: invoiceIn move deductible field from head to lines
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-14 12:29:56 +01:00 |
|
Guillermo Bonet
|
309a287748
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-14 12:08:43 +01:00 |
|
Guillermo Bonet
|
28deadfbad
|
fix: refs #8573 version
gitea/salix/pipeline/head This commit looks good
Details
|
2025-02-14 10:37:08 +01:00 |
|
Juan Ferrer
|
53059f5bb5
|
feat: refs #4409 buyLot and buyLot refresh fixes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-14 10:21:02 +01:00 |
|
Guillermo Bonet
|
d6f08d7e27
|
feat: refs #8227 update roadmap triggers and views, remove obsolete trigger and column
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2025-02-14 10:04:04 +01:00 |
 Ivan Mas
|
13a76e5c70
|
Merge branch 'dev' into 8573-addFkExpeditionHost
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-13 15:43:56 +00:00 |
|
Ivan Mas
|
caa921020d
|
refactor: refs #8573 update before alter table
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-13 16:41:29 +01:00 |
|
Guillermo Bonet
|
4042679c9b
|
feat: refs #8227 Grants
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2025-02-13 14:12:44 +01: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 |
|
Juan Ferrer
|
3adc155b74
|
feat: refs #4409 buyLot and buyLot refresh refactor and fixes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-02-12 07:57:31 +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 |
|
Javi Gallego
|
4f6917ce4c
|
Merge branch 'dev' into 7937-claimAgile
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-02-10 13:17:21 +01:00 |
|
Javi Gallego
|
afef9f4025
|
feat: refs #7937 add initial state 'Recogido' to state table with relevant attributes
|
2025-02-10 13:14:57 +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 |
|
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 |
 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 |
|
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 |
|
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
|
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
|
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
|
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 |
 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 |
|
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 |
|
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
|
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
|
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 |
 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 |
|
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
|
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 |
 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 |
|
Javier Segarra
|
2574e59c71
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-31 01:07:53 +01:00 |
|
Javier Segarra
|
75b4202a7b
|
feat: refs #6321 remove origin
|
2025-01-31 01:04:14 +01:00 |
|
Ivan Mas
|
f68f62543d
|
Merge branch 'dev' into 8477-AddFeeToAWB
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-30 17:00:14 +00:00 |
|
Ivan Mas
|
148072b39d
|
feat: refs #8477 change column name and add comment
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-30 17:58:39 +01:00 |
|
Ivan Mas
|
9e95afa190
|
Merge branch 'dev' into 8312-newPackagingColumn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-30 16:37:52 +00:00 |
|
Ivan Mas
|
e0e72272a7
|
feat: refs #8312 change column name
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-30 17:35:30 +01:00 |
|
Javi Gallego
|
3965441f7f
|
Merge branch 'dev' into 7686-onPrevious
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-30 15:29:45 +01:00 |
|
Ivan Mas
|
85c3dc54fa
|
Merge branch 'dev' into 8487-deprecateAppointmentFromTravel
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-30 13:24:08 +00:00 |
|
Jorge Penadés
|
a0dc8f8104
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-30 10:26:40 +01:00 |
|
Javier Segarra
|
dc6f93c241
|
Merge branch 'dev' into 6321_negative_tickets
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-30 08:54:04 +01:00 |
 Robert Ferrús
|
9c467e67e0
|
Merge branch 'dev' into 6822-entryTransferFix
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-30 06:07:59 +00:00 |
|
Ivan Mas
|
2a7795d432
|
feat: refs #8477 add fee column to awb table
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 19:24:49 +01:00 |
|
Ivan Mas
|
70d286df80
|
feat: refs #8487 deprecate travel.appointment
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 14:59:19 +01:00 |
|
Jorge Penadés
|
a463a8f4d8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-29 14:49:07 +01:00 |
|
Guillermo Bonet
|
a14d6227a1
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-29 14:15:22 +01:00 |
|
Robert Ferrús
|
35e72c90d3
|
Merge branch 'dev' into 6822-entryTransferFix
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 11:46:23 +00:00 |
|
Robert Ferrús
|
d536690197
|
feat: refs #6822 changes request
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 12:43:46 +01:00 |
 Pako Natek
|
af5b4981df
|
Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 11:16:41 +00:00 |
|
Pako Natek
|
597615facb
|
fix(agencyIncomingForeign): refs #8408 version changes rolled back
gitea/salix/pipeline/pr-dev This commit looks good
Details
Refs: #8408
|
2025-01-29 12:15:04 +01:00 |
|
Pako Natek
|
0de9c3c172
|
feat(available): refs #8408 available refreshing now includes time
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
Refs: #8408
|
2025-01-29 12:03:55 +01:00 |
|
Jorge Penadés
|
2b443266b2
|
Merge branch 'dev' of https: refs #7119//gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-29 11:51:21 +01:00 |
|
Guillermo Bonet
|
56b0baebaa
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 07:53:41 +01:00 |
|
Ivan Mas
|
821e2cbe4d
|
feat: refs #8312 new column packaging.rejectCost
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-28 19:11:56 +01:00 |
|
Carlos Satorres
|
3c16914135
|
Merge branch 'dev' into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-28 11:43:25 +00:00 |
|
Carlos Satorres
|
b14beb83f4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-28 11:55:27 +01:00 |
|
Jorge Penadés
|
2eabfaaa8f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-28 11:44:59 +01:00 |
|
Robert Ferrús
|
8482743baf
|
feat: refs #6822 ACL
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-28 11:26:48 +01:00 |
|
Javier Segarra
|
10eef6d1b6
|
feat: refs #6321 updates
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-28 08:45:00 +01:00 |
|
Javi Gallego
|
0def25ad15
|
Merge branch 'dev' into 7686-onPrevious
|
2025-01-28 08:28:16 +01:00 |
|
Javi Gallego
|
c73af0a44b
|
fix: specify database context in agencyIncoming foreign key deletion SQL
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-28 08:09:18 +01:00 |
|
Javi Gallego
|
b8f9dc7ad7
|
fix: correct SQL syntax for deleting orphaned agencyIncoming records
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-27 16:37:17 +01:00 |
|
Javi Gallego
|
8cbe64eedd
|
fix: remove orphaned agencyIncoming records with null agencyModeFk
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2025-01-27 16:34:28 +01:00 |
|
Javi Gallego
|
1261722943
|
Merge pull request 'feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model' (!3369) from 8381-thermographTravel into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3369
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-01-27 15:12:51 +00:00 |
|
Javi Gallego
|
857874c4c6
|
refactor: refs #7686 remove obsolete alert level updates and adjust state alert level logic
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-27 15:43:26 +01:00 |
 Alex Moreno
|
9ba9338f9d
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-27 14:39:58 +01:00 |
|
Alex Moreno
|
bbebff7ea9
|
fix: prevent slow update
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-27 14:37:39 +01:00 |
|
Robert Ferrús
|
5a449c66ce
|
Merge branch 'dev' into 8387-itemTagCrudModel
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-27 10:26:48 +00:00 |
|
Guillermo Bonet
|
a948442e13
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-27 11:24:05 +01:00 |
|
Guillermo Bonet
|
aecf529976
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-27 11:23:55 +01:00 |
|
Guillermo Bonet
|
75168eef91
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-27 11:04:34 +01:00 |
|
Carlos Satorres
|
62f26ec8c8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2
|
2025-01-27 09:24:38 +01:00 |
|
Guillermo Bonet
|
609df98614
|
feat: refs #8227 Added grants
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-27 09:02:37 +01:00 |
|
Pablo Natek
|
ef5c2ab3a2
|
feat: refs #6897 add cloneEntry and deleteEntry methods with corresponding ACL permissions
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-27 08:11:41 +01:00 |