6600 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	9386d648d0	Merge branch '7010-AddPackingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField	2024-09-26 14:13:00 +02:00
Jon Elias	1c99c01d1d	refactor: refs #7010 modified front	2024-09-26 14:12:59 +02:00
Jorge Penadés	2057189b8e	Merge pull request '#7524 remove old filter' (!764) from 7524-hotfix-removeOldFilter into master ... Reviewed-on: #764 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-09-26 11:03:36 +00:00
Jorge Penadés	c5766aa1b3	chore: refs #7524 remove old filter	2024-09-26 12:38:03 +02:00
Jon Elias	51aae0f726	Merge branch 'dev' into 7010-AddPackingField	2024-09-26 08:22:02 +00:00
Jon Elias	6d5a8cba6f	refactor: refs #7010 modified customer summary table	2024-09-26 10:20:50 +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
Javi Gallego	9095c579db	Merge pull request '6722-thermograph' (!761) from 6722-thermograph into dev ... Reviewed-on: #761 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-26 06:07:26 +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	0b47623011	Merge pull request 'HOTFIX: itemFixedPrice' (!755) from hotfix_itemFixedPrice into master ... Reviewed-on: #755 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-25 21:15:35 +00:00
Javier Segarra	a8c96278de	Merge branch 'master' into hotfix_itemFixedPrice	2024-09-25 21:04:13 +00:00
Jon Elias	56af4d3736	feat: refs #7010 added packing type field in customer summary and ticket list	2024-09-25 14:18:34 +02:00
Javi Gallego	dcfdabde32	feat: tabulation	2024-09-25 14:17:26 +02:00
Javier Segarra	73c45b8c4a	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-25 12:08:40 +00: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	5f4df6eb96	Merge pull request '7155-travel_daysOnward_2' (!759) from 7155-travel_daysOnward_2 into test ... Reviewed-on: #759 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-09-25 11:27:25 +00:00
Alex Moreno	bcada72f04	fix: refs #7155 use chip-locale	2024-09-25 13:24:22 +02:00
Alex Moreno	6bd2835c59	chore: refs #7155 typo	2024-09-25 13:18:26 +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	0dec6edc68	Merge pull request 'fix: refs #6898 add role' (!757) from 6898-hotfix-addRole into master ... Reviewed-on: #757 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-25 10:48:16 +00: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
Javier Segarra	357f3ba308	Merge pull request 'fix: refs #6943 prevent null' (!756) from 6943-warmfix-preventNull into test ... Reviewed-on: #756 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-25 10:26:14 +00:00
Jorge Penadés	d2996f0838	fix: refs #6943 prevent null	2024-09-25 12:23:41 +02:00
Pablo Natek	ca568c31ca	fix: refs #7129 clone post	2024-09-25 11:51:51 +02:00
Javier Segarra	53d5d123c2	feat: i18n	2024-09-25 11:36:44 +02:00
Javier Segarra	fb180f0198	fix: apply order	2024-09-25 11:31:05 +02:00
Javier Segarra	77ad96a58b	fix: itemfixedPrice inputs	2024-09-25 11:30:18 +02:00
Pablo Natek	27b699ebf4	fix: refs #7129 some component styles	2024-09-25 11:16:27 +02:00
Javier Segarra	a0c324c339	Merge branch '8031_notify_dataSaved' of https://gitea.verdnatura.es/verdnatura/salix-front into 8031_notify_dataSaved	2024-09-25 10:54:13 +02:00
Javier Segarra	72ddeaa90a	test: refs #8031 e2e	2024-09-25 10:53:38 +02:00
Jorge Penadés	45b3ed6e17	fix: refs #7207 te2e	2024-09-25 09:53:06 +02:00
Jorge Penadés	b54d358617	fix: refs #7207 use right locale	2024-09-25 09:14:35 +02:00
Javier Segarra	8c7ee3024f	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-25 09:12:17 +02:00
Jorge Penadés	dc6acfadb7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-09-25 08:51:21 +02:00
Pablo Natek	1ee3691cc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues	2024-09-25 08:26:27 +02:00
Jon Elias	a14eb53f14	Merge branch 'dev' into 7884-AddLabelerField	2024-09-25 06:02:51 +00:00
Jon Elias	4ff068aa8a	Merge pull request '#7553 modified TicketExpedition & changes in ticket section' (!571) from 7553_FixTicketExpedition into dev ... Reviewed-on: #571 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-25 05:51:15 +00:00
Javier Segarra	c1087614c6	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-25 05:50:22 +00:00
Javier Segarra	e8a0d44292	Merge pull request 'feat: autofocus after clear' (!747) from vnInput_autoFocus into dev ... Reviewed-on: #747 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-25 05:50:04 +00:00