8566 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	8b7337f9ee	fix: vnlocation	2025-01-14 08:37:10 +01:00
Alex Moreno	0dc0c9efd0	Merge branch 'test' into dev	2025-01-14 08:18:49 +01:00
Alex Moreno	837c389f64	feat(cliamList): add auto-load, in this case they need it	2025-01-14 08:16:44 +01:00
Jose Antonio Tubau	bd9c2ad4dc	refactor: refs #8316 remove unused OrderSearchbar component	2025-01-14 07:57:54 +01:00
Jon Elias	6e5b703018	fix: refs #8247 conflicts	2025-01-14 07:47:33 +01:00
Jon Elias	179571e3e9	Merge branch 'dev' of https: refs #8247//gitea.verdnatura.es/verdnatura/salix-front into 8247-EnableAccount	2025-01-14 07:46:34 +01:00
Alex Moreno	63a6073cce	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-14 07:37:37 +01:00
Jon Elias	3adec919dc	Merge branch '8247-EnableAccount' of https://gitea.verdnatura.es/verdnatura/salix-front into 8247-EnableAccount	2025-01-14 07:37:22 +01:00
Jon Elias	e5d8bfcf3a	refactor: refs #8247 use new acl for sysadmin	2025-01-14 07:37:17 +01:00
Alex Moreno	bce40834a5	Merge pull request '8389-testToMaster' (!1207) from 8389-testToMaster into master ... Reviewed-on: #1207 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-14 06:32:35 +00:00
Alex Moreno	099ea793bd	fix: refs #8389 minor bugs	2025-01-14 07:29:44 +01:00
PAU ROVIRA ROSALENY	b8344f3b22	Merge pull request 'feat: refs #7055 created FilterItemForm test' (!1187) from 7055-testFilterItemForm into dev ... Reviewed-on: #1187 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-14 06:03:50 +00:00
PAU ROVIRA ROSALENY	34442c8577	Merge branch 'dev' into 7055-testFilterItemForm	2025-01-14 05:59:53 +00:00
Jorge Penadés	8d1a095302	Merge branch 'test' into 8197-fix_searchbar_teleport	2025-01-13 15:15:23 +00:00
Alex Moreno	dbafd5d689	build: refs #8389 changelog	2025-01-13 15:24:20 +01:00
Alex Moreno	863d6deb10	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-13 14:49:15 +01:00
Alex Moreno	5a58012f80	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-13 14:49:02 +01:00
Alex Moreno	01a6d714eb	Merge branch 'test' into 8197-fix_searchbar_teleport	2025-01-13 13:36:56 +00:00
Jon Elias	07ecd93fe0	Merge pull request 'Warmfix: Redirect to TicketSales when confirming lines' (!1203) from Warmfix-OrderProblems into test ... Reviewed-on: #1203 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-13 13:33:35 +00:00
Alex Moreno	671f308006	revert: revert header	2025-01-13 13:29:39 +01:00
PAU ROVIRA ROSALENY	a22330b15e	Merge branch 'dev' into 7077-testVnInputTime	2025-01-13 12:20:33 +00:00
PAU ROVIRA ROSALENY	c9c0e87e46	Merge branch 'dev' into 7087-testCardSummary	2025-01-13 11:42:01 +00:00
PAU ROVIRA ROSALENY	50008ce7f1	fix: refs #7055 #7055 #7055 fixed some tests	2025-01-13 12:27:26 +01:00
Jorge Penadés	a32ec49efd	Merge pull request 'fix: refs #8110 prevent form submit' (!1205) from 8110-hotfix-solveConflicts into master ... Reviewed-on: #1205 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-13 11:25:23 +00:00
Jorge Penadés	ac589a8626	fix: refs #8110 prevent form submit	2025-01-13 12:21:33 +01:00
Alex Moreno	dd335ef409	fix: refs #8197 not use yet	2025-01-13 12:18:52 +01:00
Alex Moreno	ed0730df22	feat: refs #8197 useHasContent and use in VnSection and RightMenu	2025-01-13 12:17:55 +01:00
PAU ROVIRA ROSALENY	7a5de9f708	Merge branch 'dev' into 7055-testFilterItemForm	2025-01-13 11:07:04 +00:00
PAU ROVIRA ROSALENY	221df5fa8c	Merge pull request 'fix: added missing translations in InvoiceIn' (!1201) from traduccionesInvoiceIn into dev ... Reviewed-on: #1201 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2025-01-13 11:05:54 +00:00
Jon Elias	a9ac5106cf	Merge branch 'test' into Warmfix-OrderProblems	2025-01-13 10:56:32 +00:00
Jon Elias	5272e5aaae	fix: redirect to sales when confirming lines	2025-01-13 11:53:55 +01:00
PAU ROVIRA ROSALENY	f0fc748c76	fix: changed translations to only use "invoicein"	2025-01-13 11:48:45 +01:00
PAU ROVIRA ROSALENY	f5003687eb	Merge branch 'traduccionesInvoiceIn' of https://gitea.verdnatura.es/verdnatura/salix-front into traduccionesInvoiceIn	2025-01-13 11:06:06 +01:00
PAU ROVIRA ROSALENY	eb92c69475	fix: changed invoiceIn for InvoiceIn	2025-01-13 11:06:01 +01:00
PAU ROVIRA ROSALENY	49f54c6efe	Merge branch 'dev' into traduccionesInvoiceIn	2025-01-13 09:55:20 +00:00
PAU ROVIRA ROSALENY	2a121dbbb3	fix: added missing translations in InvoiceIn	2025-01-13 10:54:28 +01:00
Alex Moreno	ce698522c3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-13 10:23:41 +01:00
Alex Moreno	d761af6537	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-13 10:23:27 +01:00
Jon Elias	330d0dd637	Merge pull request '#8225 use VnMoreOptions' (!1194) from 8225-UseSameMoreOptions into dev ... Reviewed-on: #1194 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-13 09:17:17 +00:00
Alex Moreno	bb8e9c5baa	Merge branch 'dev' into 8225-UseSameMoreOptions	2025-01-13 09:14:24 +00:00
Javi Gallego	7018f09ad1	Merge pull request 'feat: refs #8298 add price optimum input and update translations for bonus and price optimum' (!1185) from 8298-zonePriceOptimum into dev ... Reviewed-on: #1185 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-13 08:41:49 +00:00
Jose Antonio Tubau	1af67db644	refactor: refs #8316 move order localization	2025-01-13 08:37:01 +01:00
Jon Elias	f229ef1cd8	Merge branch 'dev' into 8225-UseSameMoreOptions	2025-01-13 07:35:38 +00:00
Jon Elias	413d567ffb	refactor: refs #8225 requested changes	2025-01-13 08:34:32 +01:00
PAU ROVIRA ROSALENY	6c0181b2e4	Merge branch 'dev' into 7087-testCardSummary	2025-01-13 07:12:13 +00:00
PAU ROVIRA ROSALENY	5bd72c830d	Merge branch '7087-testCardSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 7087-testCardSummary	2025-01-13 08:11:46 +01:00
PAU ROVIRA ROSALENY	1295f394f3	feat: refs #7087 added more test cases	2025-01-13 08:11:41 +01:00
Pablo Natek	8ce4fc38e2	Merge pull request 'feat: add decimal places for longitude and latitude inputs in CustomerAddressEdit' (!1199) from fixDecimalP into master ... Reviewed-on: #1199 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-13 07:03:16 +00:00
Pablo Natek	fb5d76737d	feat: add decimal places for longitude and latitude inputs in CustomerAddressEdit	2025-01-13 08:01:05 +01:00
Jose Antonio Tubau	e65b53fad0	Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1140) from 8316-claimCardWithVnCardBeta into dev ... Reviewed-on: #1140 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-13 06:35:51 +00:00