3882 Commits

All Branches

Search

Author	SHA1	Message	Date
William Buezas	a1fde3f645	WIP	2024-05-24 15:25:00 -03:00
William Buezas	68bb4251a4	WIP	2024-05-24 14:12:17 -03:00
Javier Segarra	cedc3e5c83	Merge pull request '#6957 - Change color FetechedTags' (!407) from 6957_changeColorFetechedTags into dev ... Reviewed-on: #407 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-24 16:10:46 +00:00
William Buezas	b4331ab2d2	remove import	2024-05-24 13:02:28 -03:00
William Buezas	66955dbc90	mini fix	2024-05-24 12:33:29 -03:00
William Buezas	9e264e6f1f	Improvement	2024-05-24 12:27:15 -03:00
Javier Segarra	5c711c1bcb	perf: 6957 add color as new shared variable	2024-05-24 14:34:57 +02:00
Javier Segarra	f25385961b	perf: 6957 change fetchedTags color	2024-05-24 14:34:44 +02:00
Carlos Satorres	c7d7ae5373	Merge pull request 'refs #7396 fix summary' (!406) from fix-basicDataWorker into dev ... Reviewed-on: #406 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-24 12:02:11 +00:00
Carlos Satorres	ba5407310f	refs #7396 fix summary	2024-05-24 13:40:00 +02:00
William Buezas	9b3135fd97	WIP	2024-05-24 08:18:38 -03:00
Jorge Penadés	933e0be028	fix: refs #6942 e2e tests	2024-05-24 12:10:27 +02:00
Jorge Penadés	d460b198a4	fix: refs #6942 skip e2e tests	2024-05-24 11:43:54 +02:00
Carlos Satorres	f1c688af89	refs #7391 fix textarea	2024-05-24 10:08:10 +02:00
Jorge Penadés	1c76d86710	fix: refs #6942 e2e tests	2024-05-24 09:56:16 +02:00
Jorge Penadés	12016f8653	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-05-24 09:02:24 +02:00
Alex Moreno	b531370e2c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-24 08:33:27 +02:00
Carlos Satorres	70e5b207e5	Merge pull request 'fix: refs #6095 add reFfk null on search' (!383) from 6095-add-refFk-null-on-search into dev ... Reviewed-on: #383 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-24 06:29:58 +00:00
Carlos Satorres	4bacc8d836	Merge branch 'dev' into 6095-add-refFk-null-on-search	2024-05-24 06:28:34 +00:00
Javier Segarra	515561b75d	Merge pull request '#6957: FetchedTags refactor template' (!382) from 6957_refactorFetechedTags into dev ... Reviewed-on: #382 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-05-24 06:18:24 +00:00
Javier Segarra	d015a2e217	Merge branch 'dev' into 6957_refactorFetechedTags	2024-05-24 08:15:11 +02:00
Javier Segarra	4b9e9a84c5	Merge pull request 'Zone Upcoming deliveries' (!381) from hyervoni/salix-front-mindshore:feature/UpcomingDeliveries into dev ... Reviewed-on: #381 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-24 06:14:43 +00:00
Javier Segarra	cabee09052	Merge branch 'feature/UpcomingDeliveries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/UpcomingDeliveries	2024-05-24 08:13:40 +02:00
Javier Segarra	286fe0d20c	Merge branch 'dev' into feature/UpcomingDeliveries	2024-05-24 08:13:37 +02:00
Alex Moreno	f12c9d5a9e	refactor: add flat	2024-05-24 07:55:54 +02:00
Jorge Penadés	75c2800e55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-05-23 16:49:18 +02:00
Jorge Penadés	b6638e3545	refactor: refs #6942 use router hook	2024-05-23 16:48:50 +02:00
Carlos Satorres	a603f37144	refs #7391 fix textarea	2024-05-23 15:54:57 +02:00
Carlos Satorres	4bf4d754a2	Merge pull request 'refs #6111 fix qtable, actions, scroll' (!264) from 6111-modsRouteList into dev ... Reviewed-on: #264 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-23 12:48:28 +00:00
Carlos Satorres	6388f08ffb	Merge branch 'dev' into 6111-modsRouteList	2024-05-23 12:47:38 +00:00
Pablo Natek	92c7109290	Merge pull request 'fix: refs #7187 fix responsive' (!393) from 7187-fix-workerPda into test ... Reviewed-on: #393 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-23 12:43:34 +00:00
Pablo Natek	0896ae24d2	Merge branch 'test' into 7187-fix-workerPda	2024-05-23 12:42:54 +00:00
Carlos Satorres	0dfd00dbfc	Merge pull request '#6332 - calendarMods' (!391) from 6332-calendarMods into dev ... Reviewed-on: #391 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-23 12:39:51 +00:00
Carlos Satorres	bfdd319366	Merge branch 'dev' into 6332-calendarMods	2024-05-23 12:36:36 +00:00
Pablo Natek	410012df55	fix: refs #7187 fix div	2024-05-23 14:24:58 +02:00
Jorge Penadés	d153cc9c24	fix: refs #6942 unit tests	2024-05-23 14:19:39 +02:00
Jorge Penadés	4a6d09ae2c	feat: refs #6942 use correct currency in InvoiceIn components	2024-05-23 14:04:35 +02:00
Javier Segarra	889263bfb8	feat: roleCreate as dialog	2024-05-23 13:47:14 +02:00
Carlos Satorres	8b8033cb3d	refs #6095 remove limit	2024-05-23 13:21:54 +02:00
Jon Elias	68213721a7	feat: refs #7003 new data order in section	2024-05-23 13:09:11 +02:00
Jorge Penadés	e8fed46dd1	fix: refs #6942 cardDescriptor use store if its popup or different source data	2024-05-23 12:33:13 +02:00
Carlos Satorres	74f25f54ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6095-add-refFk-null-on-search	2024-05-23 11:55:49 +02:00
Jorge Penadés	af32c4b79c	fix: refs #6942 drop console	2024-05-23 11:24:29 +02:00
Carlos Satorres	2432a37211	refs #6111 fix sticky	2024-05-23 10:26:54 +02:00
Javier Casado	103e3fe08a	Merge branch 'dev' into 6911-saveOnEnter	2024-05-23 07:31:08 +00:00
Jorge Penadés	c6477af493	fix: refs #6942 formModel watch changes & invoiceInCreate	2024-05-23 09:29:50 +02:00
Carlos Satorres	6ea942bf31	refs #6111 fix merge, fix column	2024-05-23 09:24:50 +02:00
Carlos Satorres	66c841114b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6111-modsRouteList	2024-05-23 09:23:11 +02:00
Jorge Penadés	c73599692b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-05-23 09:00:45 +02:00
Javier Segarra	433564507e	Merge branch 'dev' into 7311_boilerplate_users	2024-05-23 08:53:10 +02:00