3972 Commits

Author	SHA1	Message	Date
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
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	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
Pablo Natek	1869e3315a	fix: refs #4988 remove id	2024-10-04 13:14:14 +02:00
Pablo Natek	7dc019cfbb	fix: refs #4988 selector on e2e	2024-10-04 13:13:57 +02:00
Jon Elias	195747b5a0	feat: added click and transfer tickets and deleted useless code	2024-10-04 12:34:37 +02:00
Jorge Penadés	67c2e284ba	feat: refs #7702 ask old pass	2024-10-04 11:45:10 +02:00
Jorge Penadés	e43ba9b58a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword	2024-10-04 10:11:38 +02:00
Jon Elias	7874db1647	fix: zone delivery postcodes filter and order catalog type filter	2024-10-04 09:58:23 +02:00
Pablo Natek	4ba52f1a56	Merge branch 'dev' into 7404-addSomeLogisticPreferences	2024-10-04 06:55:41 +00:00
Pablo Natek	4a357c5be6	Merge branch 'dev' into 7404-addSomeLogisticPreferences	2024-10-04 06:53:53 +00:00
Pablo Natek	99ba7a39fa	Merge branch 'dev' into 7129--fixTranslates	2024-10-04 06:53:17 +00:00
Carlos Satorres	530ed4b716	refs #7355 fix searchbar	2024-10-04 08:48:36 +02:00
Jorge Penadés	c64fe8c044	chore: refs #7207 refactor locale	2024-10-03 17:04:56 +02:00
Jorge Penadés	b0ba6a5e0f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-10-03 15:40:05 +02:00
Jorge Penadés	aca10b81af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-03 15:14:28 +02:00
Pablo Natek	c04dad38f1	feat: refs #7404 change travel name and remove buyer filter	2024-10-03 15:02:14 +02:00
Jorge Penadés	e10088ed06	Merge branch 'dev' of https: refs #7702//gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword	2024-10-03 13:49:33 +02:00
Jorge Penadés	ad8b72660f	fix: refs #7353 scopeDays	2024-10-03 13:37:21 +02:00
Jorge Penadés	fadfafbb1d	Merge branch 'dev' into 7524-dynamicFetch	2024-10-03 10:05:22 +00:00
Pablo Natek	05a1d0e8fb	fix: refs #7129 translates from globals to module locals	2024-10-03 10:52:16 +02:00
Jorge Penadés	a8c48789ca	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-03 10:03:49 +02:00
Jorge Penadés	9b8e388525	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-03 09:49:04 +02:00
Pablo Natek	06fa5b13a4	Merge branch 'dev' into 7404-fixStyle	2024-10-03 07:47:52 +00:00
Jorge Penadés	739671a6da	Merge branch 'dev' into 7524-dynamicFetch	2024-10-03 07:25:40 +00:00
Pablo Natek	5e59ecdb43	fix: refs #7404 with on stockBought mobile version	2024-10-02 17:14:51 +02:00
Carlos Satorres	ba3b2198b8	Merge branch 'dev' into warmFix-userListFixRole	2024-10-02 09:31:54 +00:00
Jon Elias	375adfab76	Merge branch 'dev' into 7884-AddLabelerField	2024-10-02 08:46:08 +00:00
Carlos Satorres	49da7168ab	Merge branch 'dev' into 6899-fixInvoiceOutNegative	2024-10-02 08:41:19 +00:00
Jon Elias	12727e93eb	Merge branch 'dev' into 7884-AddLabelerField	2024-10-02 08:36:11 +00:00
Jon Elias	7db166974f	feat: refs #7884 use VnTable prop for chip label filters and modified translations	2024-10-02 10:34:50 +02:00
Carlos Satorres	c2c4acfc30	refs #6899 fix filters, date from to socialName	2024-10-02 09:42:38 +02:00
Jon Elias	03a3d6bd50	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField	2024-10-02 08:47:21 +02:00
Javier Segarra	6b38bdf868	style: improve ZoneLocationTree height	2024-10-01 19:26:03 +00:00
Javi Gallego	36457f704d	Merge branch 'dev' into 6722-showDegrees	2024-10-01 14:04:18 +00:00
Javier Segarra	2ca99a51ae	fix: refs #7356 transfer ticket method	2024-10-01 15:12:22 +02:00
Carlos Satorres	d69336c82a	refs #7366 make travelFilter, travelList	2024-10-01 14:15:18 +02:00
Javi Gallego	589c672ab2	fix: show degrees	2024-10-01 13:28:49 +02:00
Jon Elias	7b63bb38f2	fix: deleted code	2024-10-01 12:34:39 +02:00
Javier Segarra	6e4677848f	Merge branch 'dev' into Fix-TicketSale	2024-10-01 09:53:34 +00:00
Alex Moreno	ddffd5b1c7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-01 11:47:55 +02:00
Alex Moreno	9b90487b6a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-01 11:47:43 +02:00
Alex Moreno	2e9a8d9205	fix(WorkerList): add type email	2024-10-01 11:47:31 +02:00
Javier Segarra	696c9ca9b3	fix: solve conflicts with stockBought	2024-10-01 11:40:29 +02:00
Javier Segarra	27b2d0232c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into fixConflicts_testToDev	2024-10-01 11:35:14 +02:00
Jon Elias	90ce9b2cd3	Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField	2024-10-01 11:32:17 +02:00
Jon Elias	de01dda2ed	refactor: refs #7884 modified icon color	2024-10-01 11:32:15 +02:00
Carlos Satorres	e64e6eefe3	refs #7355 add role	2024-10-01 10:35:31 +02:00
Javier Segarra	778e6299ce	fix: solve conflicts from test to dev	2024-10-01 08:57:04 +02:00
Jon Elias	86ab9f9540	Merge branch 'Fix-TicketSale' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketSale	2024-10-01 06:52:21 +02:00
Jon Elias	10bada7463	fix: deleted useless button	2024-10-01 06:52:19 +02:00
Javier Segarra	e7a2d3aa85	fix: refs #7354 ZonLocation filter	2024-09-30 20:20:51 +02:00
Javier Segarra	03450a86fb	fix: SupplierFiscalData show data printing	2024-09-30 13:13:35 +00:00
Javier Segarra	4d4554a6ca	fix(lilium): #6898 SupplierFiscalData show fields	2024-09-30 15:11:22 +02:00
Alex Moreno	732bb0943c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-09-30 15:03:11 +02:00
Javier Segarra	2302e22f11	fix: solve conflicts from master to test	2024-09-30 15:00:05 +02:00
Jon Elias	3c5a5c3905	Merge branch 'dev' into Fix-TicketSale	2024-09-30 12:36:19 +00:00
Jon Elias	76a77dcee9	fix: duplicate call	2024-09-30 14:35:10 +02:00
Javier Segarra	da78edb6d2	Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues	2024-09-30 13:34:21 +02:00
Javier Segarra	2812e6f456	Merge branch 'master' into fix_8018	2024-09-30 11:13:20 +00:00
Javier Segarra	cf67865b0b	feat: refs #7404 updates	2024-09-30 11:53:54 +02:00
Pablo Natek	c815177be9	fix: refs #7404 translate and width problem	2024-09-30 10:13:39 +02:00
Pablo Natek	868e6a312f	fix: refs #7404 class name	2024-09-30 10:04:00 +02:00
Pablo Natek	cb0d3c5bca	fix: refs #7404 sticky footer and transparent header for vnTable	2024-09-30 09:46:00 +02:00
Pablo Natek	f005674db6	Merge branch 'test' into 7404-remove-from-test	2024-09-30 05:17:08 +00:00
Pablo Natek	336f2ba89e	fix: refs #7404 remove from test	2024-09-27 12:41:00 +02:00
Javier Segarra	2990d32705	fix: grafana url	2024-09-27 07:56:50 +00:00
Jon Elias	2be969339e	Merge branch 'master' into Hotfix-ChangeTicketState	2024-09-27 07:26:16 +00:00
Jon Elias	6b0a0f71ce	fix: fixed change state function	2024-09-27 08:24:58 +02:00
Javi Gallego	a2b7e81982	feat: warehouse	2024-09-26 16:23:18 +02:00
Jorge Penadés	11c135e8c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-09-26 16:01:40 +02:00
Jorge Penadés	ba9f1407ac	Merge branch 'dev' into 7524-dynamicFetch	2024-09-26 13:53:54 +00:00
Jorge Penadés	14b7654db3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-26 15:16:32 +02:00
Jorge Penadés	18ea23adf1	refactor: refs #7323 pr request	2024-09-26 15:03:22 +02:00
Jorge Penadés	01b62adba9	fix: refs #7524 dynamic fetch	2024-09-26 14:30:19 +02:00
Javier Segarra	bbf3b6d4b7	fix: #6943 show nickname salesPerson	2024-09-26 12:29:03 +00:00
Jorge Penadés	c5766aa1b3	chore: refs #7524 remove old filter	2024-09-26 12:38:03 +02:00
Jorge Penadés	c2b52473a1	fix: refs #7323 align tables	2024-09-26 10:04:16 +02:00
Jorge Penadés	e827d3aabf	fix: refs #7323 rollback	2024-09-26 09:47:54 +02:00
Jorge Penadés	478d4695b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-26 09:16:59 +02:00
Jorge Penadés	0cffe0b586	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-09-26 09:08:53 +02:00
Jorge Penadés	709a662ceb	feat: refs #7874 select observation type	2024-09-26 09:08:12 +02:00
Pablo Natek	6e6b65771a	Merge branch 'dev' into 7129-fixMigrationIssues	2024-09-26 06:09:21 +00:00
Pablo Natek	c388d5ab2a	Merge branch 'dev' of https: refs #7129//gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues	2024-09-26 07:57:59 +02:00
Javier Segarra	a8c96278de	Merge branch 'master' into hotfix_itemFixedPrice	2024-09-25 21:04:13 +00:00
Javi Gallego	dcfdabde32	feat: tabulation	2024-09-25 14:17:26 +02:00
Jorge Penadés	68ebda625b	fix: refs #7874 refs #6943 ui	2024-09-25 14:02:11 +02:00
Javi Gallego	eb0e18bf58	Merge branch 'dev' into 6722-thermograph	2024-09-25 13:48:12 +02:00
Javi Gallego	bd2fa37450	feat: maxTemperature and minTemperature	2024-09-25 13:34:43 +02:00
Alex Moreno	8c13ceb3fe	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-25 13:28:13 +02:00
Alex Moreno	bcada72f04	fix: refs #7155 use chip-locale	2024-09-25 13:24:22 +02:00
Alex Moreno	9a11f94922	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward_2	2024-09-25 13:17:34 +02:00
Alex Moreno	8dd2c44832	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-25 12:53:12 +02:00
Alex Moreno	f04beb8f90	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-09-25 12:52:58 +02:00
Jorge Penadés	aab428494e	fix: refs #6898 add role	2024-09-25 12:40:22 +02:00
Pablo Natek	cea5edd506	fix: refs #7129 translate	2024-09-25 12:33:19 +02:00
Pablo Natek	ca568c31ca	fix: refs #7129 clone post	2024-09-25 11:51:51 +02:00