26439 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	49c6df42a7	Merge branch 'dev' into 6321_negative_tickets	2025-01-31 10:20:42 +00:00
Ivan Mas	45ccf8da28	Merge pull request 'feat: refs #8312 add flippingCost column to Cubos view' (!3407) from 8312-addColumnCubosView into dev ... Reviewed-on: #3407 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2025-01-31 10:10:12 +00:00
Ivan Mas	fa9b9cc5a3	feat: refs #8312 modify fixtures.before	2025-01-31 11:06:24 +01:00
Ivan Mas	66a08f7641	Merge branch 'dev' into 8312-addColumnCubosView	2025-01-31 09:51:33 +00:00
Jon Elias	923fef444c	Merge pull request 'Fix[CustomerList]: fixed country field' (!3406) from CustomerListCountryField into dev ... Reviewed-on: #3406 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-31 09:33:17 +00:00
Ivan Mas	a2258a005a	Merge branch 'dev' into 8312-addColumnCubosView	2025-01-31 09:23:32 +00:00
Carlos Satorres	3fede6d586	Merge pull request 'refs #6553 changes models' (!2522) from 6553-workerBusiness into dev ... Reviewed-on: #2522 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-31 09:19:14 +00:00
Ivan Mas	da5e395450	feat: refs #8312 add flippingCost column to Cubos view	2025-01-31 10:17:01 +01:00
Carlos Satorres	e1125dc46d	Merge branch 'dev' into 6553-workerBusiness	2025-01-31 09:16:13 +00:00
Jon Elias	53ee0c1617	fix: fixed country field	2025-01-31 09:17:15 +01:00
Javier Segarra	767c891317	perf: refs #6321 remove comments	2025-01-31 01:17:23 +01:00
Javier Segarra	2574e59c71	Merge branch 'dev' into 6321_negative_tickets	2025-01-31 01:07:53 +01:00
Javier Segarra	cd7add3497	feat: refs #6321 debug	2025-01-31 01:07:39 +01:00
Javier Segarra	7fdd3d1eb8	feat: refs #6321 fix methods	2025-01-31 01:07:28 +01:00
Javier Segarra	9791f3b935	fix: refs #6321 fixtures	2025-01-31 01:06:57 +01:00
Javier Segarra	b8894ca67d	feat: refs #6321 i18n replaceItem	2025-01-31 01:04:34 +01:00
Javier Segarra	75b4202a7b	feat: refs #6321 remove origin	2025-01-31 01:04:14 +01:00
Ivan Mas	4d210b34c7	Merge pull request 'feat: refs #8312 new column packaging.rejectCost' (!3391) from 8312-newPackagingColumn into dev ... Reviewed-on: #3391 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-30 17:03:58 +00: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	ecc92792da	Merge pull request 'feat: refs #8487 deprecate travel.appointment' (!3399) from 8487-deprecateAppointmentFromTravel into dev ... Reviewed-on: #3399 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-30 13:40:37 +00:00
Ivan Mas	85c3dc54fa	Merge branch 'dev' into 8487-deprecateAppointmentFromTravel	2025-01-30 13:24:08 +00:00
Jon Elias	ef8e206520	Merge pull request '#7488: Deleted nif validation' (!3402) from 7488-DeleteNifValidation into dev ... Reviewed-on: #3402 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-30 12:52:50 +00:00
Jon Elias	0a89a6a6fd	fix: refs #7488 deleted nif validation	2025-01-30 12:40:48 +01:00
Javier Segarra	dc6f93c241	Merge branch 'dev' into 6321_negative_tickets	2025-01-30 08:54:04 +01:00
Robert Ferrús	7654a2e693	Merge pull request 'feat: refs #6822 ACL' (!3388) from 6822-entryTransferFix into dev ... Reviewed-on: #3388 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-01-30 07:26:33 +00:00
Robert Ferrús	9c467e67e0	Merge branch 'dev' into 6822-entryTransferFix	2025-01-30 06:07:59 +00:00
Javier Segarra	811feb9fee	feat: refs #6321 tour	2025-01-29 23:46:19 +01:00
Javier Segarra	1a8e962382	Merge pull request '#7134 SupplierBalance' (!3173) from 7134-supplierBalance into dev ... Reviewed-on: #3173 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-29 15:15:58 +00:00
Javier Segarra	efe0aa708f	Merge branch 'dev' into 7134-supplierBalance	2025-01-29 15:13:49 +00:00
Ivan Mas	70d286df80	feat: refs #8487 deprecate travel.appointment	2025-01-29 14:59:19 +01:00
Pako Natek	e87803874c	Merge pull request 'feat(available): refs #8408 available refreshing now includes time' (!3395) from 8408-Disponible-por-zonas-y-horas into dev ... Reviewed-on: #3395 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-29 12:57:13 +00:00
Pako Natek	73d1266bfc	Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas	2025-01-29 12:54:07 +00:00
Robert Ferrús	dd77326424	Merge pull request 'feat: refs #8077 redirection lilium' (!3389) from 8077-sumDefaulterRedirectionLilium into dev ... Reviewed-on: #3389 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-01-29 12:48:35 +00:00
Robert Ferrús	f87fa37a79	Merge branch 'dev' into 8077-sumDefaulterRedirectionLilium	2025-01-29 12:44:42 +00: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
Javier Segarra	ac053814e6	test: refs #6321 fixing test	2025-01-29 12:26:42 +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	4e2a6d275a	fix(travel): refs #8408 trigger restriction for wrong availabled value ... Refs: #8408	2025-01-29 12:12:23 +01:00
Pako Natek	0de9c3c172	feat(available): refs #8408 available refreshing now includes time ... Refs: #8408	2025-01-29 12:03:55 +01:00
Jon Elias	17b4089b51	Merge pull request 'Fix[WorkerFilter]: Fixed filter' (!3394) from Fix-WorkerFilterLimit into dev ... Reviewed-on: #3394 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-01-29 11:03:14 +00:00
Jon Elias	1d53f2c490	fix: worker filter limit	2025-01-29 11:43:15 +01:00
Carlos Satorres	78842cd69c	Merge pull request 'fix: refs #7917 fix route filter freeLancer' (!3327) from 7917-freelancerRoute2 into dev ... Reviewed-on: #3327 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-29 10:37:04 +00:00
Carlos Satorres	17a27060c3	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-29 10:11:50 +00:00
Javier Segarra	295c8493a8	Merge branch '7134-supplierBalance' of https://gitea.verdnatura.es/verdnatura/salix into 7134-supplierBalance	2025-01-29 09:54:17 +01:00
Javier Segarra	f2be71be6c	fix: refs #7134 replace value by util.VN_CURDATE()	2025-01-29 09:54:05 +01:00
Javier Segarra	b32c7f734f	Merge branch 'dev' into 7134-supplierBalance	2025-01-28 22:43:12 +00:00
Javier Segarra	a63ca1b3c5	Merge branch 'dev' into 7134-supplierBalance	2025-01-28 23:39:03 +01:00