6897 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	09d40b844c	Merge pull request 'fix: Use geoFk for ZoneDeliveryPanel' (!819) from hotfix_zoneDeliveryPanel into master ... Reviewed-on: #819 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-10 08:33:58 +00: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
Jorge Penadés	9c6b4f28d7	Merge pull request '#7524 use dynamic load' (!818) from 7524-hotfix-dynamicFetch into master ... Reviewed-on: #818 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-10 08:00:56 +00:00
Jorge Penadés	cfe95df9e8	fix: refs #7524 use dynamic load	2024-10-10 09:46:07 +02:00
Javier Segarra	3d5d267345	revert: commit	2024-10-10 09:29:12 +02:00
Javier Segarra	f16707756e	fix: change type vnput	2024-10-10 09:29:04 +02:00
Jorge Penadés	480f243205	Merge pull request 'feat: refs #7207 show queue' (!748) from 7207-showPbx into dev ... Reviewed-on: #748 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-10 07:20:25 +00:00
Jorge Penadés	00dc2c6edc	Merge branch 'dev' into 7207-showPbx	2024-10-10 07:18:00 +00:00
Jon Elias	d721083795	fix: filter panel	2024-10-10 08:43:33 +02:00
Jon Elias	2dd3e09928	refactor: requested changes	2024-10-10 08:26:16 +02:00
Jon Elias	419d3d2d45	fix: refs #6896 fixed module problems	2024-10-10 07:20:33 +02:00
Javier Segarra	801b6585e8	perf: refs #7679 change limit value	2024-10-09 00:44:54 +02:00
Javier Segarra	9edf35fba2	Merge branch 'dev' into 7679_improve_newPostcode_form	2024-10-08 20:27:04 +00:00
Carlos Satorres	855032e4a6	refs #7986 fix front	2024-10-08 15:36:57 +02:00
Javier Segarra	6a79746080	test: fix TicketDescriptor	2024-10-08 13:18:51 +02:00
Javier Segarra	e0f60ed118	test: fix VnLocation	2024-10-08 11:07:05 +00:00
Alex Moreno	b6778aaf17	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-08 12:24:39 +02:00
Alex Moreno	3dad27e463	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-08 12:21:57 +02:00
Alex Moreno	6108a26e93	Merge pull request 'fix(VnPaginate): use default value' (!805) from hotFix_VnPaginate_offset into master ... Reviewed-on: #805 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-10-08 10:19:32 +00:00
Alex Moreno	d8a2cdc11c	Merge branch 'master' into hotFix_VnPaginate_offset	2024-10-08 10:16:14 +00:00
Carlos Satorres	68a54ebe22	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-08 09:26:35 +02:00
Carlos Satorres	0517b39c60	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front	2024-10-08 09:26:07 +02:00
Carlos Satorres	56fff55f71	fix: unnecessary property	2024-10-08 09:26:00 +02:00
Alex Moreno	bde739e7ef	Merge branch 'master' into hotFix_VnPaginate_offset	2024-10-08 06:50:16 +00:00
Carlos Satorres	73e5039ec3	refs #7986 create front	2024-10-08 08:35:24 +02:00
Jorge Penadés	1723331615	Merge branch 'dev' of https: refs #7207//gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-10-07 16:35:00 +02:00
Jorge Penadés	e6535a5dd8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8019-makeResponsiveInputs	2024-10-07 16:10:59 +02:00
Jorge Penadés	4344458bb0	feat: refs #8019 fine-tunning vnTime	2024-10-07 16:02:29 +02:00
Jorge Penadés	c815066953	feat: refs #8019 fine-tunning vnDate	2024-10-07 15:55:18 +02:00
Guillermo Bonet	26b4110d22	Merge pull request 'feat: refs #7893 Added waste recalc section' (!809) from 7893-wasteRecalc into dev ... Reviewed-on: #809 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-07 12:59:28 +00:00
Javier Segarra	a0da1b3f46	Merge pull request 'HOTFIX: VnImg zoom resolution missing property' (!811) from hotfix_vnImg_zoom_resolution into master ... Reviewed-on: #811 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-07 12:00:55 +00:00
Javier Segarra	43da6ea1b8	Merge branch 'master' into hotfix_vnImg_zoom_resolution	2024-10-07 12:00:12 +00:00
Guillermo Bonet	50eed83d05	feat: refs #7893 Requested changes	2024-10-07 13:50:19 +02:00
Jorge Penadés	d1b3e01d87	chore: refs #8019 refactor css scoped	2024-10-07 13:36:27 +02:00
Jon Elias	27dca7c35f	Merge branch 'Fix-TicketsModule' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketsModule	2024-10-07 13:29:46 +02:00
Jon Elias	afc52f6cea	fix: changes in sale and summary	2024-10-07 13:29:43 +02:00
Javier Segarra	0ed9fdd55d	fix: refs VnImg zoom resolution missing property	2024-10-07 13:02:40 +02:00
Carlos Satorres	51e8d37e4b	Merge pull request 'hotfix: routePrice null' (!810) from hotfix-routePrice into master ... Reviewed-on: #810 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-07 10:37:11 +00:00
Carlos Satorres	e396cd0cac	hotfix: routePrice null	2024-10-07 12:16:32 +02:00
Jorge Penadés	d88fadca55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8019-makeResponsiveInputs	2024-10-07 11:47:39 +02:00
Guillermo Bonet	a6944561de	Merge branch 'dev' into 7893-wasteRecalc	2024-10-07 11:32:03 +02:00
Guillermo Bonet	c3eaab44ed	Merge branch '7893-wasteRecalc' of https://gitea.verdnatura.es/verdnatura/salix-front into 7893-wasteRecalc	2024-10-07 11:31:18 +02:00
Guillermo Bonet	178fa8cd21	feat: refs #7893 Requested changes	2024-10-07 11:31:16 +02:00
Alex Moreno	b1385cf08a	Merge pull request 'refactor(ticketNotes): translations' (!807) from fix_ticketNotes_translations into dev ... Reviewed-on: #807 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-10-07 08:09:12 +00:00
Guillermo Bonet	f98739f0ed	Merge branch 'dev' into 7893-wasteRecalc	2024-10-07 08:03:26 +00:00
Guillermo Bonet	4f3e7e2630	feat: refs #7893 Added waste recalc section	2024-10-07 10:03:05 +02:00
Carlos Satorres	f22809d609	Merge pull request 'refs #6898 hotfix agency' (!808) from 6898-hotfixSupplierAgency into master ... Reviewed-on: #808 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-07 07:54:07 +00:00
Carlos Satorres	27e6dd5bf1	Merge branch 'master' into 6898-hotfixSupplierAgency	2024-10-07 07:51:02 +00:00