26263 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	cc727af862	Merge branch 'dev' into 7248-tablesObservation	2025-01-30 07:20:32 +00: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
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
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
Carlos Andrés	ec71cb8df6	Merge pull request 'fix: refs #8492 Sage invoiceInTax Check VAT' (!3390) from 8492-InvoiceInTax-Check-VAT into dev ... Reviewed-on: #3390 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-28 17:58:17 +00:00
Carlos Andrés	801629c8db	fix: refs #8492 Sage invoiceInTax Check VAT	2025-01-28 18:04:02 +01:00
Robert Ferrús	a6a875cb2c	feat: refs #8077 redirection lilium	2025-01-28 13:27:35 +01:00
Carlos Satorres	b383725f9f	fix: refs #7917 fix user tests	2025-01-28 12:56:30 +01:00
Carlos Satorres	bb08ad7d1a	Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-28 12:51:24 +01:00
Carlos Satorres	a01c419b44	fix: refs #7917 fix tback	2025-01-28 12:51:21 +01:00
Carlos Satorres	3c16914135	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-28 11:43:25 +00:00
Javier Segarra	9419eada64	Merge branch 'dev' into 7134-supplierBalance	2025-01-28 08:46:17 +01:00
Alex Moreno	d75d4f82f2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-28 08:16:59 +01:00
Alex Moreno	837719327d	Merge pull request 'build: refs #8452 dump db' (!3386) from 8452-dump into master ... Reviewed-on: #3386 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-01-28 07:16:33 +00:00
Jon Elias	eb29a66a80	Merge pull request 'Fix_TicketSummary[Address]: Added nickname in address relation' (!3383) from Fix-TicketSummaryAddress into dev ... Reviewed-on: #3383 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-28 07:14:07 +00:00
Jon Elias	dac30dcac5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Fix-TicketSummaryAddress	2025-01-28 08:10:25 +01:00
Alex Moreno	f4b7683609	build: refs #8452 dump db	2025-01-28 08:10:23 +01:00
Javi Gallego	c73af0a44b	fix: specify database context in agencyIncoming foreign key deletion SQL	2025-01-28 08:09:18 +01:00
Alex Moreno	7a02af9a3a	Merge pull request '8452-testToMaster' (!3385) from 8452-testToMaster into master ... Reviewed-on: #3385 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-28 06:42:20 +00:00
Alex Moreno	7b8ddef4c2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 8452-testToMaster	2025-01-28 07:36:10 +01:00
Alex Moreno	3bf47af774	Merge pull request 'fix: some params' (!3384) from warmfix_customer_filters into test ... Reviewed-on: #3384 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-28 06:36:00 +00:00
Jon Elias	167368b9ae	Merge branch 'Fix-TicketSummaryAddress' of https://gitea.verdnatura.es/verdnatura/salix into Fix-TicketSummaryAddress	2025-01-28 07:33:09 +01:00
Jon Elias	e85b68650d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Fix-TicketSummaryAddress	2025-01-28 07:33:03 +01:00
Jon Elias	59d3bd9d44	Merge branch 'dev' into Fix-TicketSummaryAddress	2025-01-28 06:28:57 +00:00
Alex Moreno	6e824c1b5e	Merge branch 'test' into warmfix_customer_filters	2025-01-28 06:27:44 +00: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	5f07c159bc	build: refs #8452 add change log	2025-01-27 15:24:26 +01: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
Javier Segarra	b003dff045	fix: new params	2025-01-27 13:30:29 +00:00
Javier Segarra	72a1c2ca57	fix: some params	2025-01-27 12:57:58 +00:00
Robert Ferrús	56982ee1ba	Merge pull request 'feat: refs #8387 crudModel' (!3355) from 8387-itemTagCrudModel into dev ... Reviewed-on: #3355 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-27 11:38:07 +00:00
Carlos Satorres	d9d80a0e43	Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-27 11:46:31 +01:00