8692 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	b1d18de23e	Merge branch 'dev' into 6822-createEntryTransferOption	2025-01-21 08:48:40 +00:00
Jon Elias	d178a77bc6	Merge pull request 'Fix: Move dialog to descriptorMenu' (!1246) from Fix-InvoiceInDescriptorDialog into dev ... Reviewed-on: #1246 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-01-21 07:52:42 +00:00
Jon Elias	7c91869c8b	Merge branch 'dev' into Fix-InvoiceInDescriptorDialog	2025-01-21 07:51:35 +00:00
Alex Moreno	e6c16356be	Merge pull request 'Fix(TicketService): Sort by name in description' (!1253) from Fix-TicketServicesSortByName into dev ... Reviewed-on: #1253 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-21 06:50:57 +00:00
Alex Moreno	bee5a1e82d	Merge branch 'dev' into Fix-TicketServicesSortByName	2025-01-21 06:49:28 +00:00
Javi Gallego	590b4d9ca6	Merge pull request 'feat: refs #8381 add initial and final temperature fields to entry forms and summaries' (!1202) from 8381-entryTemperature into dev ... Reviewed-on: #1202 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-21 06:48:30 +00:00
Javi Gallego	545cb19dce	feat: refs #8381 add initial and final temperature labels in English and Spanish locales	2025-01-21 07:46:14 +01:00
Javi Gallego	d21e11cc3d	Merge branch 'dev' into 8381-entryTemperature	2025-01-21 07:45:44 +01:00
Javi Gallego	45c4e08191	Merge branch 'dev' into 8381-entryTemperature	2025-01-21 07:45:20 +01:00
Alex Moreno	3cb21d7117	fix: use entryFilter	2025-01-21 07:34:48 +01:00
Alex Moreno	824b60df57	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-21 07:33:09 +01:00
Alex Moreno	7357559c48	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-21 07:32:21 +01:00
Alex Moreno	44d3fa7634	Merge pull request 'fix: remove departmentCode' (!1240) from fix_customerList_departmentCode into dev ... Reviewed-on: #1240 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-21 06:31:42 +00:00
Javier Segarra	c86dbcb456	Merge branch 'dev' into fix_customerList_departmentCode	2025-01-20 22:13:30 +00:00
Javier Segarra	0b52be2568	Merge branch 'dev' into Fix-TicketServicesSortByName	2025-01-20 21:33:13 +00:00
Javier Segarra	0f8edae458	Merge pull request 'perf: remove warning default value' (!1241) from warning_defaultValue_firstParam into dev ... Reviewed-on: #1241 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-20 17:30:10 +00:00
Javier Segarra	c0144e78c4	Merge branch 'dev' into warning_defaultValue_firstParam	2025-01-20 17:29:21 +00:00
Jorge Penadés	f8bcc74133	Merge branch 'Fix-InvoiceInDescriptorDialog' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-InvoiceInDescriptorDialog	2025-01-20 18:09:31 +01:00
Jorge Penadés	e1b329db34	Merge pull request '#7936 update select model-value' (!1247) from 7936-hotfix-autoComplete into master ... Reviewed-on: #1247 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-20 14:42:57 +00:00
Jorge Penadés	0a97d0504b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-autoComplete	2025-01-20 15:41:55 +01:00
Jon Elias	84dd46b22c	Merge branch 'dev' into Fix-TicketServicesSortByName	2025-01-20 13:45:43 +00:00
Jon Elias	5a5adbd165	fix: sort by name in description	2025-01-20 14:42:51 +01:00
Jon Elias	7eadb62af7	Merge branch 'Fix-InvoiceInDescriptorDialog' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-InvoiceInDescriptorDialog	2025-01-20 14:39:33 +01:00
Jon Elias	f1fb2f9904	fix: fixed rectificative class	2025-01-20 14:39:32 +01:00
Jorge Penadés	819a5e2d6e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-InvoiceInDescriptorDialog	2025-01-20 14:18:33 +01:00
Jorge Penadés	91f10bba79	Merge pull request 'feat: skip tests' (!1235) from skipTests into dev ... Reviewed-on: #1235 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-20 13:16:57 +00:00
Jon Elias	f7a3bdf997	Merge branch 'dev' into Fix-InvoiceInDescriptorDialog	2025-01-20 12:54:22 +00:00
Carlos Satorres	a3fe097970	Merge pull request 'fix: refs #6898 hotfix filter' (!1252) from 6898-hotfixFiscalData into master ... Reviewed-on: #1252 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-20 12:52:41 +00:00
Jon Elias	5ed5554495	refactor: move remaining data to descriptorMenu	2025-01-20 13:52:38 +01:00
Carlos Satorres	77857e9d31	Merge branch 'master' into 6898-hotfixFiscalData	2025-01-20 12:47:27 +00:00
Carlos Satorres	c7b24adc5a	fix: refs #6898 hotfix filter	2025-01-20 13:39:56 +01:00
Javier Segarra	1f2746ac18	Merge pull request 'Remove space checkbox when is not hover' (!1002) from hotfix_checbox_css into master ... Reviewed-on: #1002 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-20 12:28:13 +00:00
Jorge Penadés	7d57b1ebe7	test: skip	2025-01-20 13:13:09 +01:00
Jorge Penadés	bdae839e50	fix: refs #7936 toggle option	2025-01-20 12:56:40 +01:00
Javier Segarra	c3203b18e7	Merge branch 'master' into hotfix_checbox_css	2025-01-20 11:17:58 +00:00
Carlos Satorres	c333428389	Merge pull request 'fix: fix ticketSale quantity' (!1251) from hotfix-7356ticketSale into master ... Reviewed-on: #1251 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-20 11:11:48 +00:00
Carlos Satorres	a3cdb18535	fix: fix use-like	2025-01-20 12:04:59 +01:00
Jorge Penadés	ae68f25c3c	fix: refs #7936 rollback	2025-01-20 11:55:49 +01:00
Jorge Penadés	ff95882e42	fix: refs #7936 rollback	2025-01-20 11:51:53 +01:00
Jorge Penadés	1d3feef1e7	chore: add task comment	2025-01-20 11:39:59 +01:00
Jorge Penadés	18d4661bc3	chore: add task comment	2025-01-20 11:37:28 +01:00
Carlos Satorres	a1254b25b4	fix: fix ticketSale quantity	2025-01-20 11:26:57 +01:00
Jorge Penadés	3abd06db02	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into skipTests	2025-01-20 11:00:55 +01:00
Jorge Penadés	2f40b77f0b	Merge pull request '#8198 keep section filter' (!1210) from 8198-keepSectionFilter into dev ... Reviewed-on: #1210 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-20 09:42:31 +00:00
Jorge Penadés	7795fd1524	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8198-keepSectionFilter	2025-01-20 10:30:33 +01:00
Jorge Penadés	e636a37c33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into skipTests	2025-01-20 10:18:05 +01:00
Jorge Penadés	8843318b66	fix: refs #7936 update select model-value WIP	2025-01-20 10:10:45 +01:00
Jon Elias	ad2e502010	fix: move dialog to descriptorMenu	2025-01-20 08:44:48 +01:00
Jon Elias	b447df7217	Merge pull request 'Hotfix: Redirect to Ticketsale when confirming an order' (!1245) from Hotfix-RedirectOrderToTicketSale into master ... Reviewed-on: #1245 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-20 07:07:30 +00:00
Jon Elias	ed0e4fadf8	Merge branch 'master' into Hotfix-RedirectOrderToTicketSale	2025-01-20 07:06:14 +00:00