8507 Commits

All Branches

Search

Author	SHA1	Message	Date
PAU ROVIRA ROSALENY	5ce78ba473	Merge branch 'dev' into 8258-uppercaseInputs	2025-01-14 12:45:18 +00:00
Jon Elias	372a43b17e	Merge pull request 'Fix: Fixed CustomerDescriptor' (!1212) from Fix-CustomerIcons into dev ... Reviewed-on: #1212 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-14 11:03:39 +00:00
Javier Segarra	4c4d5649ba	Merge branch 'dev' into Fix-CustomerIcons	2025-01-14 11:01:43 +00:00
Jose Antonio Tubau	a36c2ec32a	Merge pull request 'test: refs #7076 added new test for VnInputDate' (!1188) from 7076-createTestVnInputDate into dev ... Reviewed-on: #1188 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-14 09:10:40 +00:00
Jose Antonio Tubau	ec44bfbc11	Merge branch 'dev' into 7076-createTestVnInputDate	2025-01-14 08:43:15 +00:00
Jon Elias	8dc2955109	Merge branch 'dev' into Fix-CustomerIcons	2025-01-14 08:18:24 +00:00
Jon Elias	25dd028487	fix: modified setData in customerDescriptor to show the icons	2025-01-14 09:15:53 +01:00
Alex Moreno	e61ce651ca	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-14 09:10:35 +01:00
Alex Moreno	30e501610d	fix: parallelism	2025-01-14 09:09:26 +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
Alex Moreno	63a6073cce	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-14 07:37:37 +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
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
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	2a8c2a1079	Merge branch 'dev' into 8258-uppercaseInputs	2025-01-13 11:54:12 +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
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
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
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
Jose Antonio Tubau	a8706b3daa	Merge branch 'dev' into 8316-claimCardWithVnCardBeta	2025-01-13 06:34:35 +00:00
PAU ROVIRA ROSALENY	6a01c9b746	Merge branch 'dev' into 7055-testFilterItemForm	2025-01-10 13:54:08 +00:00
Alex Moreno	6b8f6c464c	Merge pull request 'feat: refs #8372 workerPBX' (!1192) from 8372-workerPBX into dev ... Reviewed-on: #1192 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-10 12:39:00 +00:00
Alex Moreno	a28d9280a4	Merge branch 'dev' into 8372-workerPBX	2025-01-10 12:38:01 +00:00
PAU ROVIRA ROSALENY	47168cdeb8	Merge branch 'dev' into 8258-uppercaseInputs	2025-01-10 10:53:10 +00:00
Jon Elias	57c538c9c9	fix: refs #8225 invoice in translations	2025-01-10 10:49:07 +01:00