26330 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
Carlos Satorres	d659e05ce8	fix: refs #7917 remove update	2025-01-27 11:46:29 +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
Carlos Satorres	06cd177d31	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-27 10:23:57 +00:00
Guillermo Bonet	aecf529976	Merge branch 'master' into test	2025-01-27 11:23:55 +01:00
Guillermo Bonet	cd8e04d648	refactor: refs #7568 ticket_doCmr ignore alertLevel	2025-01-27 11:22:21 +01:00
Robert Ferrús	edb26a3750	Merge pull request '6822-entryTransfer' (!3376) from 6822-entryTransfer into dev ... Reviewed-on: #3376 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-27 10:08:23 +00:00
Carlos Satorres	c4a7fbf6e8	fix: refs #7917 fix tests	2025-01-27 10:57:54 +01:00
Carlos Satorres	14c087e17f	Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-27 10:00:34 +01:00
Robert Ferrús	6f8cbc1017	Merge branch 'dev' into 6822-entryTransfer	2025-01-27 08:51:03 +00: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	d10670cb37	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-27 08:05:26 +00:00
Robert Ferrús	1f6779d86b	feat: refs #8387 change request	2025-01-27 08:59:33 +01:00
Jose Antonio Tubau	be3bcefa46	Merge pull request '7322-addSelectAddressOnTicketTransfer' (!3363) from 7322-addSelectAddressOnTicketTransfer into dev ... Reviewed-on: #3363 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-27 07:31:51 +00:00
Jose Antonio Tubau	29af7cfcbc	test: refs #7322 added test error for case when expected error is not thrown	2025-01-27 08:23:30 +01:00
Robert Ferrús	46a22733e2	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-27 07:10:54 +00:00
Jose Antonio Tubau	4fd58e24c5	Merge branch 'dev' into 7322-addSelectAddressOnTicketTransfer	2025-01-27 07:07:28 +00:00
Robert Ferrús	705dec2dbc	Merge pull request 'feat: refs #6629 refs # 6629 updateAddress' (!3255) from 6629-addressObservationBack2 into dev ... Reviewed-on: #3255 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-27 07:02:05 +00:00
Robert Ferrús	ad87631092	Merge branch 'dev' into 6629-addressObservationBack2	2025-01-27 06:33:42 +00:00
Robert Ferrús	b9206c44bb	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-27 06:17:49 +00:00
Jon Elias	034df6e8ea	feat: added nickname in address	2025-01-24 13:48:35 +01:00