4020 Commits

Author	SHA1	Message	Date
Jon Elias	37b3affdbf	refactor: revert catalog changes	2024-10-23 13:02:28 +02:00
Jon Elias	1346a2e7fd	fix: tag chips	2024-10-22 12:05:44 +02:00
Jon Elias	5b116a7301	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems	2024-10-22 11:31:45 +02:00
Alex Moreno	36221121f5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-22 07:43:07 +02:00
Alex Moreno	b4d4844100	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-22 07:42:54 +02:00
Jon Elias	cd4b17048c	Merge branch 'dev' into Fix-TicketsModule	2024-10-21 11:40:02 +00:00
Alex Moreno	0afcba0b07	Merge branch 'dev' into 6233-fix_ticketBasicData_zone	2024-10-21 10:49:43 +00:00
Alex Moreno	f2147311d3	fix(TicketBasicData_zone): refs #6233 add acls and fix get zones	2024-10-21 08:41:19 +02:00
Jon Elias	fa0625aa86	Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems	2024-10-18 14:12:25 +02:00
Jon Elias	11bf70d76c	fix: category and tags filters	2024-10-18 14:12:23 +02:00
Jon Elias	11092866b8	fix: merge conflicts	2024-10-18 13:33:28 +02:00
Jon Elias	64c0496f7a	Merge branch 'dev' into Fix-ItemRequest	2024-10-18 11:20:43 +00:00
Jon Elias	7d78ce7781	Merge branch 'dev' into 7010-AddPackingField	2024-10-18 07:29:17 +00:00
Carlos Satorres	8bc06593c5	Merge branch '7986-workerMoto' of https://gitea.verdnatura.es/verdnatura/salix-front into 7986-workerMoto	2024-10-18 08:44:31 +02:00
Carlos Satorres	1f4b681b5b	fix: refs #7986 clean code	2024-10-18 08:44:27 +02:00
Jon Elias	98a380e026	Merge branch 'master' into Fix-InvoiceOutSummary	2024-10-17 08:58:49 +00:00
Carlos Satorres	3cdba5dafa	Merge branch 'dev' into 7986-workerMoto	2024-10-16 12:10:22 +00:00
Carlos Satorres	e06ce4f8a4	fix: refs #7986 clean code	2024-10-15 14:56:32 +02:00
Carlos Satorres	a30915f99e	fix: refs #7986 fix operator, fix crudmodel update	2024-10-15 14:42:26 +02:00
Jon Elias	c4670b57de	Merge branch 'dev' into 7825-FixCreatebankEntity	2024-10-15 11:13:35 +00:00
Jon Elias	15f171da0f	perf: refs #7825 create bank entity	2024-10-15 13:12:37 +02:00
Carlos Satorres	b4245d05fb	fix: refs #7986 crudModel	2024-10-15 13:00:01 +02:00
Carlos Satorres	3badfbcff9	Merge branch 'dev' into 7767-holidayDaysExceeded	2024-10-15 10:54:57 +00:00
Carlos Satorres	af830591b3	fix: refs #7986 front fixed	2024-10-15 09:44:55 +02:00
Jon Elias	d416a34560	refactor: use docuware in ticket descriptor menu	2024-10-15 08:48:30 +02:00
Alex Moreno	d87e8ec4ae	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-15 08:01:22 +02:00
Carlos Satorres	bc581caa4e	fix: refs #7767 console remove	2024-10-15 07:57:19 +02:00
Carlos Satorres	dfceb9403c	fix: refs #7986 fix front	2024-10-15 07:54:52 +02:00
Carlos Satorres	85eed86ba8	Merge branch 'master' into #6898-&-#6899-hotfixFilterList	2024-10-15 05:41:32 +00:00
Jorge Penadés	37dfca3bce	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixScopeDays	2024-10-14 16:03:13 +02:00
Jorge Penadés	19545ca7e6	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixScopeDays	2024-10-14 15:54:08 +02:00
Jorge Penadés	2d34921cf5	fix: refs #7524 paginate	2024-10-14 15:52:12 +02:00
Jorge Penadés	0fb9b22935	chore: refs #7874 refactor code	2024-10-14 14:09:52 +02:00
Carlos Satorres	1a2c5c96fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7986-workerMoto	2024-10-14 13:52:31 +02:00
Carlos Satorres	8258fbb91e	refs #7767 remove onMounted	2024-10-14 13:24:12 +02:00
Jorge Penadés	0f3168456a	chore: refs #7524 sort by firstName	2024-10-14 13:22:59 +02:00
Carlos Satorres	b225f6a4c8	refs #7767 fix contractHolidays	2024-10-14 13:18:34 +02:00
Jon Elias	1183d86867	Merge branch 'master' into Fix-InvoiceOutSummary	2024-10-14 11:10:31 +00:00
Jon Elias	0aab17becc	fix: fixed customer descriptor proxy	2024-10-14 13:08:16 +02:00
Jorge Penadés	4b78c1acd0	fix: refs #7524 dynamic	2024-10-14 12:00:05 +02:00
Jon Elias	720042bed9	feat: added new filter param and refactored link colors	2024-10-14 11:30:31 +02:00
Carlos Satorres	2edeb1043e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7767-holidayDaysExceeded	2024-10-14 10:24:49 +02:00
Carlos Satorres	85b068eddb	refs #6898 #6899 hotfix lists	2024-10-14 10:21:02 +02:00
Carlos Satorres	6a624b12a5	refs: #6898 hotfix accounts	2024-10-14 09:28:51 +02:00
Jorge Penadés	db5449444a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-14 08:37:44 +02:00
Alex Moreno	64c8d264af	warmFix(TravelList): add daysOnward in travelFilter	2024-10-14 07:43:29 +02:00
Jorge Penadés	44c4c378f9	chore: refs #7874 add default ob type	2024-10-10 11:02:03 +02:00
Jon Elias	8b68c0afeb	fix: improve geoFk for ZoneDeliveryPanel	2024-10-10 08:30:56 +00:00
Jorge Penadés	830decb6db	Merge branch 'dev' into 7874-addObservationType	2024-10-10 08:16:36 +00:00
Jon Elias	e58818e891	fix: Use geoFk for ZoneDeliveryPanel	2024-10-10 08:14:24 +00:00