3245 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	4efe09722f	refs #6336 feat(claim): improvements	2024-04-15 08:40:15 +02:00
William Buezas	9c7c98d64d	Merge with dev	2024-04-12 16:55:51 -03:00
William Buezas	2699040f0e	Item request view	2024-04-12 16:50:41 -03:00
William Buezas	5f46ad225e	Fix genus and specie value	2024-04-12 10:44:56 -03:00
William Buezas	92429295cd	more translations	2024-04-12 10:44:25 -03:00
William Buezas	4d418c9cb7	Pull new traduction yml files and add translations	2024-04-12 10:32:19 -03:00
William Buezas	beaffbf685	delete old i18n files and adapt branch to the new ones	2024-04-12 10:20:05 -03:00
William Buezas	d38c85a0ef	resolve conflicts	2024-04-12 09:39:34 -03:00
William Buezas	b4d92d4f97	Fix Options item labels	2024-04-12 09:35:57 -03:00
Carlos Satorres	ee80b1d617	refs #6976 changes table	2024-04-12 14:34:11 +02:00
Jon Elias	32382622e4	Merge pull request 'refactor: refs #6425 new translation proposal' (!250) from 6425-translationProposal into dev ... Reviewed-on: #250 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-12 12:22:23 +00:00
Jon Elias	5cd32ec2fe	Merge branch 'dev' into 6425-translationProposal	2024-04-12 12:21:41 +00:00
Javier Casado	372863e693	Merge pull request '#6946 add table and floating button' (!248) from 6946-refactorEntryNotes into dev ... Reviewed-on: #248 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-04-12 11:48:36 +00:00
William Buezas	6019c7f7b2	Add remove chip button only if is manual	2024-04-12 08:41:45 -03:00
William Buezas	9283b190b0	Differentiate manual chips	2024-04-12 08:35:39 -03:00
Jorge Penadés	a27bdc37d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6946-refactorEntryNotes	2024-04-12 13:27:14 +02:00
William Buezas	c4a8127a5b	Add toggle right drawer button	2024-04-12 08:24:56 -03:00
William Buezas	0006761201	Use black background on WorkerDateLabel	2024-04-12 08:22:17 -03:00
William Buezas	f2dc50d229	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into WorkerCalendar	2024-04-12 08:13:58 -03:00
William Buezas	3d9d444bb4	remove filter field	2024-04-12 08:11:58 -03:00
William Buezas	c12fd77218	Remove businessFk from FetchData	2024-04-12 08:10:14 -03:00
William Buezas	f72ea07b09	WIP	2024-04-12 08:07:33 -03:00
Jon Elias	f83de74f01	refs #6425 fix conflicts	2024-04-12 11:44:56 +02:00
Carlos Satorres	b5aae63e15	refs #6976 supplier onUnmounted	2024-04-12 08:47:25 +02:00
Pablo Natek	af9fd6ed73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-12 07:52:37 +02:00
William Buezas	73703dc778	Add translations	2024-04-11 18:07:02 -03:00
William Buezas	98f273cb93	WIP	2024-04-11 18:04:11 -03:00
jcasado	ad8007fe6b	refs #6641 add checkbox	2024-04-11 13:42:37 +02:00
William Buezas	c032c83e7f	Item create view	2024-04-11 08:40:41 -03:00
Javier Casado	a66ece1683	Merge pull request 'refs #7179 changes customer proxy and client Id' (!279) from 7179-changesClaimSummary into dev ... Reviewed-on: #279 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-04-11 11:38:59 +00:00
Javier Casado	6002800000	Merge branch 'dev' into 7179-changesClaimSummary	2024-04-11 11:37:11 +00:00
Alex Moreno	cc633acfd9	deploy: refs #7199 init version 2418	2024-04-11 12:34:23 +02:00
Alex Moreno	3f8d97e2a3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-11 12:32:51 +02:00
Alex Moreno	da8ed5d6b3	Merge pull request '7199-devToTest_2316' (!282) from 7199-devToTest_2316 into test ... Reviewed-on: #282 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-04-11 10:31:49 +00:00
Alex Moreno	d99d934dab	fix: refs #7199 e2e	2024-04-11 12:29:30 +02:00
Jorge Penadés	170747371a	fix: refs #6480 css	2024-04-11 12:27:58 +02:00
Jorge Penadés	bfa9dc9634	feat: refs #6480 include drawer	2024-04-11 12:23:00 +02:00
Jorge Penadés	edf75c8cdd	feat: refs #6480 check if hasContent or slots	2024-04-11 09:22:15 +02:00
Jon Elias	675b764c82	refactor: fixed invoiceInVat tests	2024-04-11 09:05:02 +02:00
Jorge Penadés	96d3073f67	Revert "Merge branch '6480-improveCard' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard" ... This reverts commit 984539b70f, reversing changes made to d7ab6e8a02.	2024-04-11 09:01:44 +02:00
Jorge Penadés	984539b70f	Merge branch '6480-improveCard' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-11 08:42:17 +02:00
Jorge Penadés	d7ab6e8a02	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-11 08:41:52 +02:00
Alex Moreno	9be132b8a0	Merge pull request 'feature/ItemsList' (!280) from hyervoni/salix-front-mindshore:feature/ItemsList into dev ... Reviewed-on: #280 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-11 05:56:27 +00:00
William Buezas	4a0ae8aa45	Item summary	2024-04-10 17:18:57 -03:00
Javier Segarra	5f502c2aad	#6480: POC Claims	2024-04-10 20:52:45 +02:00
Robert Ferrús	de18b56cb2	feat: refs #6679 add icon	2024-04-10 14:47:20 +02:00
Robert Ferrús	f59ecbf94e	Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon	2024-04-10 14:42:48 +02:00
Robert Ferrús	7f2d8ee1e5	feat: refs #6679 add icon	2024-04-10 14:42:43 +02:00
William Buezas	9dfe5f5e68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList	2024-04-10 09:34:51 -03:00
William Buezas	99c576b16e	Add actions again	2024-04-10 09:32:15 -03:00