26285 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Guillermo Bonet	75168eef91	feat: refs #8227 Roadmap changes	2025-01-27 11:04:34 +01: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
Guillermo Bonet	609df98614	feat: refs #8227 Added grants	2025-01-27 09:02:37 +01: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
Robert Ferrús	163302c770	feat: refs #6822 fix test	2025-01-24 13:26:36 +01:00
Robert Ferrús	2ee5ba908a	feat: refs #6822 change request	2025-01-24 13:16:36 +01:00
Guillermo Bonet	e54b148088	Merge pull request 'refactor: refs #8205 Added geoFk Fk' (!3304) from 8205-geoFk into dev ... Reviewed-on: #3304 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2025-01-24 11:42:13 +00:00
Guillermo Bonet	75b0589561	feat: refs #8227 Undo vehicle_checkNumberPlate change and triggers checks	2025-01-24 12:34:08 +01:00
Robert Ferrús	ad05641520	Merge pull request 'feat: refs #8077 sumDefaulter' (!3367) from 8077-sumDefaulterBackFix into dev ... Reviewed-on: #3367 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-24 10:55:32 +00:00
Robert Ferrús	b09e3398ff	Merge branch 'dev' into 8077-sumDefaulterBackFix	2025-01-24 10:46:16 +00:00
Guillermo Bonet	57ed161d27	Merge branch 'dev' into 8205-geoFk	2025-01-24 10:31:02 +00:00
Guillermo Bonet	e9f1e28ac0	feat: refs #8227 Added roadmap_cloneDay	2025-01-24 11:20:16 +01:00
Sergio De la torre	bb35cbece0	Merge pull request '6861-itemShelvingSaleWithUser' (!3381) from 6861-itemShelvingSaleWithUser into master ... Reviewed-on: #3381 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-24 08:23:13 +00:00
Jon Elias	f3cb2bd200	Merge pull request 'Fix[priceDifference]: Fixed shipped field' (!3380) from Fix-priceDifferenceError into dev ... Reviewed-on: #3380 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-24 07:33:30 +00:00
Sergio De la torre	5dd60bd912	fix: refs #6861 refs#6861 showUsername	2025-01-24 08:28:15 +01:00
Sergio De la torre	df97534882	fix: refs #6861 refs#6861 showUsername	2025-01-24 08:25:44 +01:00
Jon Elias	603e3e32c4	fix: shipped field	2025-01-24 07:39:18 +01:00
Guillermo Bonet	306eb6a059	feat: refs #8227 Roadmap fix version	2025-01-24 07:26:25 +01:00
Guillermo Bonet	a6908aa8c0	Merge branch 'dev' into 8227-roadmap	2025-01-24 06:00:37 +00:00
Javi Gallego	e4733b5102	Merge pull request 'hotFix: address isEqualizated can be null for trigger' (!3379) from hotFix_addressIsEqualizated into master ... Reviewed-on: #3379 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-23 14:18:04 +00:00