6439 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	cf509d608a	Merge branch 'dev' into 8018_location_label	2024-09-30 10:53:33 +00:00
Javier Segarra	b3c36e555f	style: refs #7404 compress spaces	2024-09-30 12:50:23 +02:00
Javier Segarra	b41026806f	style: refs #7404 compress spaces	2024-09-30 12:48:05 +02:00
Javier Segarra	cf67865b0b	feat: refs #7404 updates	2024-09-30 11:53:54 +02:00
Pablo Natek	90762f1d1c	Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues	2024-09-30 10:47:03 +02:00
Pablo Natek	7fa0a5b28c	fix: refs #7404 path name	2024-09-30 10:47:02 +02:00
Javier Segarra	63d2b06b70	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-30 08:23:12 +00:00
Pablo Natek	37d32a7934	Merge branch 'dev' into 7404-fixSomeStyleIssues	2024-09-30 08:14:44 +00: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
Javier Segarra	fd202f30d2	Merge branch '8018_location_label' of https://gitea.verdnatura.es/verdnatura/salix-front into 8018_location_label	2024-09-30 09:43:09 +02:00
Javier Segarra	9d7db2020b	Merge pull request '#7679 Filter data from others filters' (!769) from 7679_improve_filters into dev ... Reviewed-on: #769 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-30 07:19:30 +00:00
Javier Segarra	36838f930c	Merge pull request 'fix: onDataSaved VnTable' (!772) from fix_vnTable_onDataSaved into master ... Reviewed-on: #772 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-30 05:20:22 +00:00
Pablo Natek	e5eb1d7663	Merge pull request 'fix: refs #7404 revert commit prevent production access' (!771) from 7404-remove-from-test into test ... Reviewed-on: #771 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-30 05:18:36 +00:00
Pablo Natek	f005674db6	Merge branch 'test' into 7404-remove-from-test	2024-09-30 05:17:08 +00:00
Javier Segarra	8356be1ec0	fix: onDataSaved VnTable ... Habia un problema al usar this en entorno no local	2024-09-27 18:10:43 +00:00
Javier Segarra	12a452d774	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-27 18:02:24 +00:00
Javier Segarra	cffd97a521	Merge branch 'dev' into 8018_location_label	2024-09-27 18:01:17 +00:00
Javier Segarra	bec50d6eed	perf: refs #7679 #7679 comments	2024-09-27 19:54:01 +02:00
Javier Segarra	5097cc8b81	Merge pull request 'fix: #6943 show nickname salesPerson' (!766) from warmfix_customerModule into test ... Reviewed-on: #766 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-27 11:37:03 +00:00
Javier Segarra	157370ec26	Merge branch 'dev' into 8018_location_label	2024-09-27 13:18:06 +02:00
Pablo Natek	336f2ba89e	fix: refs #7404 remove from test	2024-09-27 12:41:00 +02:00
Pablo Natek	193670fdcf	fix: refs #7404 revert commit prevent production access	2024-09-27 12:39:30 +02:00
Javier Segarra	e06d567e3c	test: refs #7679 #7679 remove comment	2024-09-27 10:35:39 +02:00
Jon Elias	45c0d0ae3f	Merge pull request 'Hotfix: fixed ticket state function' (!770) from Hotfix-ChangeTicketState into master ... Reviewed-on: #770 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-27 08:08:45 +00:00
Jorge Penadés	b541ce4e56	fix: split params	2024-09-27 09:59:18 +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
Javier Segarra	6b2e0df9c2	test: refs #7679 #7679 improve test	2024-09-26 23:39:14 +02:00
Javier Segarra	d2067c633d	feat: refs #7679 #7679 use country or province to retrieve cities	2024-09-26 23:38:22 +02:00
Javier Segarra	807827c97c	Merge branch 'test' into warmfix_customerModule	2024-09-26 16:25:27 +00:00
Javier Segarra	d5253149ed	Merge pull request 'fix: split params' (!768) from warmfix-addSearchUrl into test ... Reviewed-on: #768 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-26 16:21:48 +00:00
Javier Segarra	3caeb9e738	Merge branch 'dev' into 7323-fineTunningWorker	2024-09-26 16:21:22 +00:00
Javi Gallego	a2b7e81982	feat: warehouse	2024-09-26 16:23:18 +02:00
Jorge Penadés	ba9f1407ac	Merge branch 'dev' into 7524-dynamicFetch	2024-09-26 13:53:54 +00:00
Jorge Penadés	353116a7a0	fix: split params	2024-09-26 15:49:12 +02:00
Jorge Penadés	7eb951ef13	fix: refs #7323 use right locale	2024-09-26 15:28:00 +02: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
Pablo Natek	6e6b88d340	Merge pull request '7129-fixMigrationIssues' (!754) from 7129-fixMigrationIssues into dev ... Reviewed-on: #754 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-26 12:53:44 +00:00
Javier Segarra	428c6966f2	Merge branch 'dev' into 8018_location_label	2024-09-26 14:48:47 +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
Javier Segarra	a0b3e933a8	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-26 12:17:40 +00:00
Alex Moreno	f00db79d47	fix(VnTable): header background-color	2024-09-26 14:14:27 +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
Jorge Penadés	c2b52473a1	fix: refs #7323 align tables	2024-09-26 10:04:16 +02:00