1708 Commits

Author	SHA1	Message	Date
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
Ivan Mas	85c3dc54fa	Merge branch 'dev' into 8487-deprecateAppointmentFromTravel	2025-01-30 13:24:08 +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
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
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
Robert Ferrús	8482743baf	feat: refs #6822 ACL	2025-01-28 11:26:48 +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
Javi Gallego	8cbe64eedd	fix: remove orphaned agencyIncoming records with null agencyModeFk	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 ... Reviewed-on: #3369 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-27 15:12:51 +00:00
Alex Moreno	9ba9338f9d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-27 14:39:58 +01:00
Alex Moreno	bbebff7ea9	fix: prevent slow update	2025-01-27 14:37:39 +01:00
Robert Ferrús	5a449c66ce	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-27 10:26:48 +00:00
Guillermo Bonet	a948442e13	Merge branch 'test' into dev	2025-01-27 11:24:05 +01:00
Guillermo Bonet	aecf529976	Merge branch 'master' into test	2025-01-27 11:23:55 +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
Robert Ferrús	b9206c44bb	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-27 06:17:49 +00:00
Guillermo Bonet	57ed161d27	Merge branch 'dev' into 8205-geoFk	2025-01-24 10:31:02 +00:00
Alex Moreno	518a91cff2	fix: address isEqualizated can be null for trigger	2025-01-23 13:56:36 +01:00
Ivan Mas	d98a867e12	Merge branch 'dev' into 8342-deprecateSorterAndSplitLineTables	2025-01-23 11:38:38 +00:00
Carlos Satorres	10a6626a65	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-23 10:26:15 +01:00
Alex Moreno	200a7cf995	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-23 08:33:58 +01:00
Ivan Mas	43528a0a53	feat: refs #8342 deprecate sorter and splitLine tables	2025-01-22 13:04:16 +01:00
Carlos Satorres	99b5433e62	fix: refs #7917 fix acls	2025-01-22 10:02:20 +01:00
Robert Ferrús	2e247c3ea5	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-21 14:14:27 +01:00
Carlos Satorres	d66b8f4963	fix: refs #7917 acls	2025-01-21 13:54:02 +01:00
Robert Ferrús	c727586855	feat: refs #8387 add column validationRegex	2025-01-21 11:25:03 +01:00
Robert Ferrús	785a10a26a	feat: refs #8447 create tables tag	2025-01-21 09:34:56 +01:00
Javi Gallego	8e21ca5293	Merge branch 'dev' into 8381-thermographTravel	2025-01-21 07:53:38 +01:00
Carlos Satorres	a98967bac1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-20 12:38:46 +01:00
Guillermo Bonet	aa62f1d483	Merge branch 'test' into dev	2025-01-20 08:10:38 +01:00
Guillermo Bonet	9584ffcf5b	feat: refs #7531 Added landed index	2025-01-20 08:10:12 +01:00
Javi Gallego	4f68a7d262	feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model	2025-01-17 15:36:11 +01:00
Javi Gallego	d4b7d54052	Merge pull request '8298-zonePriceOptimum' (!3345) from 8298-zonePriceOptimum into dev ... Reviewed-on: #3345 Reviewed-by: Pako Natek <pako@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-17 08:30:44 +00:00
Javi Gallego	125b7730e7	feat: refs #8298 update price calculation logic and add packagesDiscountFactor column to client table	2025-01-16 12:56:04 +01:00
Javi Gallego	b8dbaec46c	Merge pull request 'test: refs #8361 enhance exchangeRateUpdate specs with additional scenarios' (!3340) from 8361-exchangeRateUpdateWithFestiveDays into dev ... Reviewed-on: #3340 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-16 08:10:09 +00:00
Javi Gallego	69f1e76307	Merge pull request 'feat: refs #8381 add initial and final temperature fields to entry model and queries' (!3354) from 8381-entryTemperature into dev ... Reviewed-on: #3354 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-16 06:56:42 +00:00