8662 Commits

All Branches

Search

Author	SHA1	Message	Date
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	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	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
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
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
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	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
Javier Segarra	7b42fac56c	Merge branch 'dev' into warning_defaultValue_firstParam	2025-01-20 07:05:01 +00:00
Jon Elias	3b9ccab48c	fix: redirect to Ticketsale when confirming an order	2025-01-20 08:01:46 +01:00
PAU ROVIRA ROSALENY	c43a8d0a38	Merge pull request 'feat: #8258 added uppercase option to VnInput' (!1184) from 8258-uppercaseInputs into dev ... Reviewed-on: #1184 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-20 06:01:32 +00:00
PAU ROVIRA ROSALENY	c4cf372333	Merge branch 'dev' into 8258-uppercaseInputs	2025-01-17 13:54:22 +00:00
Javier Segarra	238817285d	perf: remove warning default value	2025-01-17 12:35:14 +00:00
Jon Elias	9d35dc08dd	Merge pull request 'Fix: Redirect when confirming lines' (!1236) from Fix-RedirectOrderToTicketSale into dev ... Reviewed-on: #1236 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-17 12:21:32 +00:00
PAU ROVIRA ROSALENY	6d4405c1fe	Merge branch 'dev' into 8258-uppercaseInputs	2025-01-17 12:19:46 +00:00
PAU ROVIRA ROSALENY	32909a96bd	feat: refs #8258 added uppercase validation on supplier create	2025-01-17 13:19:12 +01:00
Jon Elias	63f433a6d3	Merge branch 'dev' into Fix-RedirectOrderToTicketSale	2025-01-17 12:09:37 +00:00
Jon Elias	e1a395b015	refactor: redirect using params	2025-01-17 13:07:30 +01:00
Jose Antonio Tubau	dac99dc132	Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1144) from 8316-entryCardWithVnCardBeta into dev ... Reviewed-on: #1144 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-17 11:49:15 +00:00
Javier Segarra	92311accb0	Merge branch 'master' into hotfix_checbox_css	2025-01-17 12:33:37 +01:00
Javier Segarra	7994f3c791	fix: remove departmentCode	2025-01-17 11:13:37 +00:00
Javier Segarra	04bbf9e9d7	Merge pull request 'HOTFIX: Add acl in description button' (!1231) from hotfix_ticketService_acl into master ... Reviewed-on: #1231 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-17 09:05:46 +00:00
Jose Antonio Tubau	872cf63b5f	Merge branch 'dev' into 8316-entryCardWithVnCardBeta	2025-01-17 08:21:17 +00:00
Jose Antonio Tubau	c2cbcb3309	refactor: refs #8316 add new localization keys and update existing ones for entry components	2025-01-17 08:58:25 +01:00
PAU ROVIRA ROSALENY	11e05433b8	Merge branch 'dev' into 8258-uppercaseInputs	2025-01-17 07:40:49 +00:00
PAU ROVIRA ROSALENY	6b3c510057	Merge pull request 'fix: #8243 fixed SkeletonSummary' (!1230) from 8243-arreglarSkeletonSummary into dev ... Reviewed-on: #1230 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-01-17 07:34:42 +00:00
Jon Elias	972b377e13	fix: redirect when confirming lines	2025-01-17 07:35:23 +01:00
PAU ROVIRA ROSALENY	98cdf00c88	Merge branch 'dev' into 8243-arreglarSkeletonSummary	2025-01-17 06:16:36 +00:00