1775 Commits

Author	SHA1	Message	Date
Robert Ferrús	a248c9b7f2	Merge branch 'dev' into 7248-tablesObservation	2025-02-06 13:05:58 +00:00
Guillermo Bonet	9f302fac24	Merge branch 'test' into dev	2025-02-06 13:47:36 +01:00
Guillermo Bonet	92ca3a2582	Merge branch 'master' into test	2025-02-06 13:47:17 +01:00
Carlos Andrés	2e8e2329ec	fix: refs #8535 deploy	2025-02-06 13:44:22 +01:00
Jorge Penadés	9ba517b648	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-02-06 10:20:22 +01:00
Carlos Andrés	37b735b988	feat: refs #8535 sistema de warnings	2025-02-05 17:21:36 +01:00
Robert Ferrús	9a80f50fed	Merge branch 'dev' into 7248-tablesObservation	2025-02-05 12:35:05 +00:00
Robert Ferrús	eaea108e62	feat: refs #7248 modify column workerFk to userFK	2025-02-05 13:30:40 +01:00
Jose Antonio Tubau	0a25595ed5	Merge branch 'dev' into 8304-workerChangesAndFixes	2025-02-05 13:00:44 +01:00
Jon Elias	502b48718c	Merge pull request '#7965 - unifyProblems' (!2990) from 7965-unifyProblems into dev ... 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
Jon Elias	b3aaac2f52	Merge branch 'dev' into 7127-ModifyDaysToAddSales	2025-02-04 13:00:07 +00:00
Guillermo Bonet	d6bd60f181	Merge branch 'dev' into 8227-roadmap	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	2025-02-03 16:13:55 +01:00
Guillermo Bonet	a408af2467	Merge branch 'dev' into 8227-roadmap	2025-02-03 13:23:18 +01:00
Sergio De la torre	6b9c8300fb	feat: refs #7412 notificationMisAllocation	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 ... 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	2025-01-31 14:27:18 +01:00
Guillermo Bonet	8dc803b5df	feat: refs #8227 Roadmap changes	2025-01-31 14:25:23 +01:00
Ivan Mas	3fa74a18de	Merge branch 'dev' into 8477-AddFeeToAWB	2025-01-31 10:39:55 +00:00
Carlos Satorres	e1125dc46d	Merge branch 'dev' into 6553-workerBusiness	2025-01-31 09:16:13 +00:00
Ivan Mas	f68f62543d	Merge branch 'dev' into 8477-AddFeeToAWB	2025-01-30 17:00:14 +00:00
Ivan Mas	148072b39d	feat: refs #8477 change column name and add comment	2025-01-30 17:58:39 +01:00
Ivan Mas	9e95afa190	Merge branch 'dev' into 8312-newPackagingColumn	2025-01-30 16:37:52 +00:00
Ivan Mas	e0e72272a7	feat: refs #8312 change column name	2025-01-30 17:35:30 +01:00
Javi Gallego	3965441f7f	Merge branch 'dev' into 7686-onPrevious	2025-01-30 15:29:45 +01:00
Ivan Mas	85c3dc54fa	Merge branch 'dev' into 8487-deprecateAppointmentFromTravel	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	2025-01-30 10:26:40 +01:00
Robert Ferrús	4bd92f2cb2	Merge branch '7248-tablesObservation' of https://gitea.verdnatura.es/verdnatura/salix into 7248-tablesObservation	2025-01-30 09:16:10 +01:00
Robert Ferrús	bc00c28abc	feat: refs #7248 create trigger	2025-01-30 09:16:06 +01:00
Robert Ferrús	cc727af862	Merge branch 'dev' into 7248-tablesObservation	2025-01-30 07:20:32 +00:00
Robert Ferrús	9c467e67e0	Merge branch 'dev' into 6822-entryTransferFix	2025-01-30 06:07:59 +00:00
Ivan Mas	2a7795d432	feat: refs #8477 add fee column to awb table	2025-01-29 19:24:49 +01:00
Ivan Mas	70d286df80	feat: refs #8487 deprecate travel.appointment	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	2025-01-29 14:49:07 +01:00
Guillermo Bonet	a14d6227a1	feat: refs #8227 Roadmap changes	2025-01-29 14:15:22 +01:00
Robert Ferrús	35e72c90d3	Merge branch 'dev' into 6822-entryTransferFix	2025-01-29 11:46:23 +00:00
Robert Ferrús	d536690197	feat: refs #6822 changes request	2025-01-29 12:43:46 +01:00
Pako Natek	af5b4981df	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-01-29 11:16:41 +00:00
Pako Natek	597615facb	fix(agencyIncomingForeign): refs #8408 version changes rolled back ... Refs: #8408	2025-01-29 12:15:04 +01:00
Pako Natek	0de9c3c172	feat(available): refs #8408 available refreshing now includes time ... 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	2025-01-29 11:51:21 +01:00
Guillermo Bonet	56b0baebaa	feat: refs #8227 Roadmap changes	2025-01-29 07:53:41 +01:00
Ivan Mas	821e2cbe4d	feat: refs #8312 new column packaging.rejectCost	2025-01-28 19:11:56 +01:00
Carlos Satorres	3c16914135	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-28 11:43:25 +00:00
Carlos Satorres	b14beb83f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	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	2025-01-28 11:44:59 +01:00
Robert Ferrús	8482743baf	feat: refs #6822 ACL	2025-01-28 11:26:48 +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	2025-01-28 08:09:18 +01:00
Javi Gallego	b8f9dc7ad7	fix: correct SQL syntax for deleting orphaned agencyIncoming records	2025-01-27 16:37:17 +01:00