2494 Commits

All Branches

Search

Author	SHA1	Message	Date
William Buezas	f12ec3c0c9	Add redirection to summary and open summary action	2024-04-08 08:47:29 -03:00
Javier Segarra	1a9e9d35ca	Merge pull request 'fix_merge_worker_submoduls' (!272) from fix_merge_worker_submoduls into dev ... Reviewed-on: #272 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-08 07:04:29 +00:00
Javier Segarra	f2d513766e	fix_merge_worker_submoduls	2024-04-08 07:03:42 +00:00
Javier Segarra	dafc9f83b9	Merge pull request 'Desarrollo de los submodulos basic data, notes y pbx' (!245) from hyervoni/salix-front-mindshore:features/ms_submodulos_worker into dev ... Reviewed-on: #245 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-08 06:19:28 +00:00
Guillermo Bonet	b2ef381f1d	Merge branch 'dev' into 6636-pickup	2024-04-08 05:18:34 +00:00
William Buezas	4b6038d1d2	Last changes	2024-04-06 14:10:08 -03:00
William Buezas	4701714aa9	merge with dev	2024-04-05 08:42:13 -03:00
William Buezas	970d1a48e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into features/ms_submodulos_worker	2024-04-05 08:25:28 -03:00
William Buezas	03be831ee5	remove package-lock.json	2024-04-05 08:24:55 -03:00
William Buezas	dae08c322d	visual adjustments	2024-04-05 08:04:34 -03:00
Guillermo Bonet	1a15ccec2c	fix: refs #6636 Call getEnumValues method	2024-04-05 11:01:48 +02:00
Javier Casado	d72c151d82	Merge pull request 'refs #6816 remove microsip tag' (!267) from 6816-removeMicroSip into dev ... Reviewed-on: #267 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-05 08:01:10 +00:00
Javier Casado	5d7fed3b32	Merge branch 'dev' into 6816-removeMicroSip	2024-04-05 07:57:21 +00:00
Alex Moreno	e14993c114	minor changes	2024-04-05 09:12:49 +02:00
Guillermo Bonet	9310d863aa	fix: refs #6636 Icon save and reset	2024-04-05 07:39:05 +02:00
Guillermo Bonet	58b9eb1c78	feat: refs #6636 Requested changes	2024-04-05 07:29:25 +02:00
Guillermo Bonet	8d7670cc85	Merge branch 'dev' into 6636-pickup	2024-04-05 05:24:31 +00:00
William Buezas	cb55115cd2	Remove unused component	2024-04-04 12:02:43 -03:00
William Buezas	78dc3c1c9a	Move data fetching to main component	2024-04-04 11:20:30 -03:00
Jon Elias	b5f721316b	Merge pull request 'refactor: refs #6894 changed filter fields and checked functionality' (!269) from 6894-invoiceInChangeFilters into dev ... Reviewed-on: #269 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-04 12:33:34 +00:00
Jon Elias	59a631b19e	Merge branch 'dev' into 6894-invoiceInChangeFilters	2024-04-04 12:32:40 +00:00
William Buezas	fd5ea8f6f5	WIP	2024-04-04 09:27:17 -03:00
Jon Elias	97b7c2469a	refactor: refs #6894 changed filter fields and checked functionality	2024-04-04 14:13:34 +02:00
Guillermo Bonet	b09ecefad4	feat: refs #6636 Added pickup in claim	2024-04-04 14:12:16 +02:00
William Buezas	503efb79c9	WIP	2024-04-04 08:39:52 -03:00
Javier Segarra	0ad722381e	#6425 fix quotes in yml file	2024-04-04 13:38:25 +02:00
Guillermo Bonet	b21c54f20d	Merge branch 'test' into dev	2024-04-04 11:31:20 +02:00
Guillermo Bonet	d98e5d78ff	hotfix: refs #6930 Rollback tokenMultimedia	2024-04-04 10:17:13 +02:00
jcasado	d00ec3c41c	refs #6816 remove microsip tag	2024-04-04 09:38:47 +02:00
Alex Moreno	06af04a043	Merge pull request '7167-testToMaster_2414' (!266) from 7167-testToMaster_2414 into master ... Reviewed-on: #266 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-04 05:35:07 +00:00
William Buezas	0f6c6cde91	Improve visually WorkerDateLabel	2024-04-03 17:32:22 -03:00
Pablo Natek	ef489b74df	Merge pull request '7128-copyStyles' (!265) from 7128-copyStyles into dev ... Reviewed-on: #265 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-03 19:12:23 +00:00
Pablo Natek	be42593368	Merge branch 'dev' into 7128-copyStyles	2024-04-03 19:10:38 +00:00
William Buezas	60b146196f	add calendar short-weekday-label	2024-04-03 13:48:41 -03:00
Alex Moreno	7ed505bde8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-03 16:30:10 +02:00
Alex Moreno	dec71dbf62	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-04-03 16:29:40 +02:00
William Buezas	4ee8c45fdc	resolve conflicts	2024-04-03 11:22:52 -03:00
Pablo Natek	c0ed8da0b7	remove space	2024-04-03 15:02:31 +02:00
Jon Elias	94b177c9a2	fix: refs #6425 fix yml format	2024-04-03 14:33:47 +02:00
William Buezas	64b1083619	Add today date	2024-04-03 09:28:38 -03:00
Jon Elias	3e423867e3	fix: refs #6425 fix yml format	2024-04-03 13:12:00 +02:00
William Buezas	bfee37b631	WIP	2024-04-03 08:08:54 -03:00
Jon Elias	9a160d9248	refactor: refs #6425 merged changes	2024-04-03 12:57:23 +02:00
Jon Elias	cb31c2baa2	refs: #6425 merge conflicts	2024-04-03 12:56:56 +02:00
Jon Elias	fb795f65ee	refactor: refs #6425 test changes	2024-04-03 09:49:15 +02:00
William Buezas	fc87bb8293	Add page title name	2024-04-02 13:04:28 -03:00
William Buezas	507c979cc2	Remove unused reactive import	2024-04-02 12:48:14 -03:00
William Buezas	3569afdb85	Update fetch-data name	2024-04-02 12:46:50 -03:00
William Buezas	71b2f7c8dc	Remove col divs	2024-04-02 12:43:32 -03:00
William Buezas	addbe9345b	Resolve conflicts	2024-04-02 12:40:26 -03:00