2291 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	c217e8a1a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7186-tabIndexVATExpenses	2024-04-09 11:44:11 +02:00
Guillermo Bonet	be9dd8b2b7	Merge pull request 'feat: refs #6636 Added pickup in claim' (!268) from 6636-pickup into dev ... Reviewed-on: #268 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-09 08:04:58 +00:00
Guillermo Bonet	4b9e69625b	Merge branch 'dev' into 6636-pickup	2024-04-09 08:02:30 +00:00
Jon Elias	f1c67a9775	Merge pull request 'refactor: refs #6973 updated label and updated cypress test' (!275) from 6973-UpdateVnLocationLabel into dev ... Reviewed-on: #275 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-09 06:48:49 +00:00
Jon Elias	f988923b4b	Merge branch 'dev' into 6973-UpdateVnLocationLabel	2024-04-09 06:48:06 +00:00
Jon Elias	0e064b3305	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899-endInvoiceOutMigration	2024-04-09 08:45:12 +02:00
Jon Elias	b7788512bc	refactor: refs #6973 fix requested changes	2024-04-09 08:41:44 +02:00
Jon Elias	3bededcd94	refactor: refs #6973 updated label and updated cypress test	2024-04-09 07:47:40 +02: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	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
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
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
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
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
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
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
Pablo Natek	c0ed8da0b7	remove space	2024-04-03 15:02:31 +02: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
William Buezas	3055db8ef8	Delete file	2024-04-02 12:32:15 -03:00
Pablo Natek	f18cefd999	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7128-copyStyles	2024-04-02 14:12:58 +02:00
Pablo Natek	c66be3c2b5	feat #7128 fix styles	2024-04-02 14:04:09 +02:00
Pablo Natek	148224344d	feat(style): refs #7128 add style	2024-04-02 10:46:27 +02:00
William Buezas	239daceca6	Apply changes in Worker PBX	2024-03-28 13:45:35 -03:00
Alex Moreno	bed0b9e8e9	Merge pull request '#6951 warmfix ticketDescriptor' (!263) from 6951-warmfix_ticketDescriptor into test ... Reviewed-on: #263 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 09:09:09 +00:00
Jorge Penadés	7020fab851	fix: refs #6951 drop hook & change selector	2024-03-28 09:46:18 +01:00
Alex Moreno	87825daa8e	refs #7152 deploy: init version 24.16	2024-03-28 09:23:12 +01:00
Alex Moreno	9ed8fa1bcb	Merge pull request '7152-devToTest_2414' (!262) from 7152-devToTest_2414 into test ... Reviewed-on: #262 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-03-28 08:20:23 +00:00
Alex Moreno	2d3ddd886a	Merge pull request 'feat: #6514 create supplierDms lilium' (!258) from 6514-gestDocSupplier into dev ... Reviewed-on: #258 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-28 07:33:19 +00:00
Jon Elias	2b1fe6fd77	Merge branch '6514-gestDocSupplier' of https://gitea.verdnatura.es/verdnatura/salix-front into 6514-gestDocSupplier	2024-03-28 08:31:57 +01:00