6665 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Carlos Satorres	5d65d3e20c	refs #6898 hotfix agency	2024-10-07 09:48:57 +02:00
Jorge Penadés	5c5a359986	refactor: refs #8019 create VnTime	2024-10-07 09:38:39 +02:00
Jorge Penadés	947f913679	refactor: refs #8019 create VnDate	2024-10-07 09:25:06 +02:00
Alex Moreno	5af6c89c1a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into hotFix_VnPaginate_offset	2024-10-07 09:17:19 +02:00
Alex Moreno	ef5ae0f723	refactor(ticketNotes): translations	2024-10-07 09:16:07 +02:00
Jon Elias	33d6d529c5	Merge branch 'dev' into Fix-TicketsModule	2024-10-07 07:11:52 +00:00
Jon Elias	bd3de77cbd	fix: changes in list and filter to fix section	2024-10-07 09:10:20 +02:00
Alex Moreno	b8407140f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-07 09:02:01 +02:00
Alex Moreno	426b7254d6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-07 09:01:57 +02:00
Jorge Penadés	120f96fedc	Merge pull request '#7323 workerList' (!719) from 7323-fineTunningWorker into dev ... Reviewed-on: #719 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-07 06:41:35 +00:00
Jorge Penadés	355c84ad06	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-07 06:39:07 +00:00
Alex Moreno	9df5857b21	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-07 08:35:13 +02:00
Alex Moreno	34a40dd87c	fix(VnPaginate): use default value	2024-10-07 08:24:53 +02:00
Javier Segarra	c9467b5286	Merge pull request 'Hotfix: zones and order filters, ticket transfer' (!799) from Hotfix-ZoneOrderFilters into master ... Reviewed-on: #799 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-05 09:02:46 +00:00
Javier Segarra	04b2a4d9ce	perf: clean warnings	2024-10-05 00:31:41 +02:00
Javier Segarra	c3c2528342	feat: #7356 improve NotesSummary	2024-10-05 00:31:32 +02:00
Javier Segarra	a69a4577a3	Merge pull request 'Fix:: order module' (!802) from Fix-OrderCatalog into dev ... Reviewed-on: #802 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-04 17:48:47 +00:00
Pako Natek	355b1357b7	Merge branch 'dev' into Fix-OrderCatalog	2024-10-04 16:08:12 +00:00
Jorge Penadés	9383a71adb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-10-04 16:38:27 +02:00
Jorge Penadés	055b1b0a88	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-04 16:12:31 +02:00
Jon Elias	aee23c75e8	fix: order module	2024-10-04 14:31:39 +02:00
Jon Elias	e4e60abe0e	Merge branch 'master' into Hotfix-ZoneOrderFilters	2024-10-04 12:25:49 +00:00
Jon Elias	3a21f6aadb	fix: order catalog	2024-10-04 14:22:00 +02:00
Pablo Natek	d325459beb	Merge pull request '4988-fixE2e' (!801) from 4988-fixE2e into dev ... Reviewed-on: #801 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-04 12:18:52 +00:00
Jorge Penadés	9c5ce6dbfd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-04 13:50:31 +02:00
Jorge Penadés	905841e0d6	Merge branch 'dev' into 7207-showPbx	2024-10-04 11:45:28 +00:00
Jorge Penadés	9fe3de22ac	Merge branch '7323-fineTunningWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-10-04 13:37:57 +02:00
Jorge Penadés	b735ccb3a0	Merge branch 'dev' of https: refs #7323//gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-10-04 13:37:55 +02:00
Pablo Natek	efe5208d30	Merge branch 'dev' into 4988-fixE2e	2024-10-04 11:32:40 +00:00