767 Commits

Author	SHA1	Message	Date
William Buezas	91df35fcae	Ticket volume	2024-06-24 11:12:49 -03:00
William Buezas	17e9d95702	Ticket notes	2024-06-24 09:02:29 -03:00
Javier Segarra	0d718448e2	perf: approach	2024-06-21 13:09:34 +02:00
Jorge Penadés	891c0d2347	feat: refs 6238 show notes & create vnPopup	2024-06-21 13:05:28 +02:00
Carlos Satorres	f88fffa89c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration	2024-06-21 10:32:44 +02:00
Carlos Satorres	87a9ee5ccb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance	2024-06-21 09:50:38 +02:00
Carlos Satorres	fdedf7bf57	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-21 08:42:57 +02:00
Jorge Penadés	9e078bc074	fix: refs #7197 vat, intrastat, filter and list sections	2024-06-20 16:15:10 +02:00
Alex Moreno	28b241bb77	Merge branch 'dev' into 6825-vnTable	2024-06-20 10:26:05 +00:00
William Buezas	0afd7f4ae1	Ticket tracking	2024-06-19 10:22:20 -03:00
William Buezas	b3a4dd3f79	Ticket purchase request	2024-06-19 08:16:20 -03:00
Carlos Satorres	789dffe2e2	refs #6898 vntable, traductions	2024-06-19 12:05:21 +02:00
Pablo Natek	825762d70e	Merge branch 'dev' into 7129-finishRouteMigration	2024-06-19 08:20:14 +00:00
Jon Elias	42c58296ac	refafctor: changed titles errors	2024-06-19 08:44:40 +02:00
William Buezas	bb208040bb	Last changes	2024-06-18 11:47:35 -03:00
Jon Elias	a33ce5699e	feat: refs #7030 translation proposal	2024-06-18 15:26:48 +02:00
Alex Moreno	8085e1e518	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-18 13:25:44 +02:00
Carlos Satorres	84378187be	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance	2024-06-18 08:56:23 +02:00
Carlos Satorres	0940872625	Merge branch '6897-EntryMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-18 07:18:47 +02:00
Carlos Satorres	bc30531d42	refs #6897 fix trad	2024-06-18 07:18:44 +02:00
William Buezas	06e8e819f4	WIP	2024-06-17 12:11:23 -03:00
Carlos Satorres	0ccfd9ae75	refs #7409 columns trad	2024-06-17 15:50:33 +02:00
William Buezas	c807b5feb2	Weekly tickets	2024-06-17 08:21:43 -03:00
Alex Moreno	e8054467a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-17 13:00:30 +02:00
Javier Segarra	6ef53e790a	feat: itemProposal and LackDetail	2024-06-17 12:19:57 +02:00
Pablo Natek	20e0c84035	fix: refs #7129 fix module routes	2024-06-14 13:10:47 +02:00
Pablo Natek	d6f085dc3d	Merge branch 'dev' into 7129-finishRouteMigration	2024-06-13 13:48:44 +02:00
Pablo Natek	f2dddb5e30	Merge branch 'dev' into 7129-finishRouteMigration	2024-06-13 10:45:37 +02:00
Javier Segarra	bb58f72e3f	updates	2024-06-13 09:37:39 +02:00
Pablo Natek	e10755d8fe	Merge branch 'dev' into 7499-refactorEntrys	2024-06-13 05:39:13 +00:00
Javier Segarra	1641ad396c	Merge branch 'dev' into 6321_negative_tickets	2024-06-12 23:07:14 +02:00
Guillermo Bonet	9388cb3599	Merge branch 'test' into dev	2024-06-12 12:02:12 +02:00
Guillermo Bonet	135e05b139	hotfix: refs #6636 EN i18n	2024-06-12 12:00:43 +02:00
Pablo Natek	b7a097fd13	Merge branch 'dev' into 7499-refactorEntrys	2024-06-12 06:16:48 +00:00
Alex Moreno	c3409a9d5c	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-12 07:50:41 +02:00
Alex Moreno	048685277f	Merge branch 'dev' into 6825-vnTable	2024-06-12 05:31:31 +00:00
Pablo Natek	a65f5dfe44	fix: refs #7499 use current colors	2024-06-11 16:38:12 +02:00
Alex Moreno	3dfe3226ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-11 15:00:52 +02:00
Jon Elias	4045a3a631	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 12:56:52 +00:00
Javi Gallego	cb0559fee8	Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev ... Reviewed-on: #432 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 12:53:42 +00:00
Jon Elias	2d0b33c626	Merge branch '7154-ItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7154-ItemDescriptor	2024-06-11 14:29:44 +02:00
Jon Elias	de18b670ea	feat: refs #7154 changed label	2024-06-11 14:29:42 +02:00
Pablo Natek	be919f97b1	Merge branch '7499-refactorEntrys' of https://gitea.verdnatura.es/verdnatura/salix-front into 7499-refactorEntrys	2024-06-11 14:28:20 +02:00
Pablo Natek	80adeede81	fix: refs #7499 fix item reference	2024-06-11 14:28:19 +02:00
Javier Segarra	8d9bfd8f1d	Merge branch 'dev' into 6321_negative_tickets	2024-06-11 13:52:48 +02:00
Jon Elias	989ea3d82c	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 11:49:25 +00:00
Jon Elias	e5a590a9f9	feat: refs #7154 new item descriptor field	2024-06-11 13:48:15 +02:00
Alex Moreno	59e72dcd50	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-06-11 12:53:50 +02:00
Alex Moreno	f753eddc43	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-11 11:40:58 +02:00
Javi Gallego	0e0e351805	Merge branch 'dev' into 7548-ticketSummaryCollection	2024-06-10 10:53:33 +02:00
Jorge Penadés	d35f9c9468	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection	2024-06-07 12:03:52 +02:00
Javi Gallego	9ceac32d89	feat: refs #7548 grafana	2024-06-07 11:59:26 +02:00
Javier Segarra	0ea44eb8db	Merge branch 'dev' into feature/AccountAcls	2024-06-07 10:07:15 +02:00
Pablo Natek	68e49e2ffa	fix: refs #7129 fix some issues on load and tools	2024-06-07 07:52:50 +02:00
Alex Moreno	395eb6bed7	Merge branch 'dev' into feature/AccountRoles	2024-06-06 07:32:15 +00:00
William Buezas	3efca6242d	Account ACLs	2024-06-04 08:41:41 -03:00
Javier Segarra	5b1819f7da	Merge branch 'dev' into 6321_negative_tickets	2024-06-04 09:27:46 +02:00
Jorge Penadés	1bc99cbd22	feat: refs #6243 show all cmrs & filter by warehouse	2024-06-03 16:30:59 +02:00
Jorge Penadés	f58b072964	feat: refs #6600 Add option to add comment for photo motivation	2024-06-03 09:30:37 +02:00
Javier Segarra	28173ddee2	Merge branch 'dev' into feature/AccountRoles	2024-05-31 10:24:37 +02:00
William Buezas	4bd78922af	remove unnecesary files	2024-05-30 15:43:26 -03:00
William Buezas	05b7df9168	Role submodules	2024-05-30 15:34:37 -03:00
William Buezas	5c25c77f19	Mail aliases	2024-05-30 13:09:11 -03:00
William Buezas	0cf4f41d19	Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases	2024-05-30 08:38:23 -03:00
Alex Moreno	2b6612317c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-05-29 14:05:42 +02:00
Alex Moreno	5965e70740	Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation	2024-05-29 07:50:15 +02:00
William Buezas	0659eac652	Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountRoles	2024-05-28 18:38:13 -03:00
Javier Segarra	577c21e601	Merge branch 'dev' into 6321_negative_tickets	2024-05-28 12:48:00 +02:00
Alex Moreno	0f1c91d36c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-05-28 07:42:15 +02:00
Carlos Satorres	d8512e2033	refs #7406 fix trad	2024-05-27 18:23:33 +02:00
Carlos Satorres	ef52c9b0c0	refs #7406 routes trad	2024-05-27 10:42:47 +02:00
Jorge Penadés	3b799efa22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn	2024-05-27 08:57:34 +02:00
Carlos Satorres	ba5407310f	refs #7396 fix summary	2024-05-24 13:40:00 +02:00
Javier Segarra	ceae5eaa9e	Merge branch 'dev' into 6321_negative_tickets	2024-05-24 11:21:06 +02:00
Javier Segarra	433564507e	Merge branch 'dev' into 7311_boilerplate_users	2024-05-23 08:53:10 +02:00
Javier Segarra	06664cc2d0	feat: newRole	2024-05-23 08:52:57 +02:00
Alex Moreno	bcb800269e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-05-22 14:32:00 +02:00
Jorge Penadés	5bddc6e04d	fix: refs #6942 wip: formModel	2024-05-22 11:22:46 +02:00
Javier Segarra	a2316fb222	feat: change skeleteon different components	2024-05-18 10:35:08 +02:00
Javier Segarra	aa007117a7	Merge branch 'dev' into 7311_boilerplate_users	2024-05-18 10:16:28 +02:00
Carlos Satorres	cd21d7817d	refs #7396 fix summary basicData	2024-05-17 14:16:06 +02:00
Alex Moreno	d00801b066	feat: refs #6825 VnComponent mix component and attrs Form to create new row	2024-05-17 13:00:57 +02:00
Javier Segarra	372e797059	feat: recover split	2024-05-15 16:25:25 +02:00
Jorge Penadés	31573c0f0b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7274-fixCustomer	2024-05-15 11:22:23 +02:00
Javier Segarra	58597bdddf	Merge branch 'dev' into 6321_negative_tickets	2024-05-15 08:55:47 +02:00
Javier Segarra	1ca7420207	feat: replace item	2024-05-15 08:54:22 +02:00
Jorge Penadés	a6c761c031	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1	2024-05-14 13:42:38 +02:00
Javier Segarra	fc6bd82ea0	Merge branch 'dev' into feature/ZoneCreate	2024-05-14 11:52:29 +02:00
Javier Segarra	32e715ce6b	Merge branch 'dev' into feature/Monitors	2024-05-13 17:59:39 +02:00
William Buezas	8e7b043a46	Resolve conflicts	2024-05-13 10:28:21 -03:00
Jorge Penadés	99ea8e843c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets	2024-05-13 13:22:39 +02:00
Jorge Penadés	0b83d3663f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-13 13:20:15 +02:00
Javier Segarra	4609e59cd9	feat: i18n	2024-05-10 22:06:40 +02:00
Javier Segarra	7f185c091b	feat: add descriptor	2024-05-10 08:13:02 +02:00
William Buezas	d227d4b09b	Zone create	2024-05-09 11:32:04 -03:00
Javier Segarra	c68ad5be34	feat #7311: minor changes	2024-05-09 08:40:00 +02:00
Javier Segarra	034342beb2	Merge branch 'dev' into 7311_boilerplate_users	2024-05-09 08:29:18 +02:00
Javier Segarra	99ef7fad76	feat #7311: subsections	2024-05-09 08:28:58 +02:00
Javier Segarra	c8b9233c87	feat #7311: i18n pageTitles	2024-05-09 08:00:53 +02:00
William Buezas	712d7e13ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/Monitors	2024-05-08 10:45:05 -03:00
William Buezas	5bdbbf426a	Tables development	2024-05-08 10:43:18 -03:00
Javier Segarra	61519595a9	Merge branch 'dev' into 6321_negative_tickets	2024-05-08 12:30:01 +02:00
Jorge Penadés	a1f785ccbe	feat: refs #5919 WIP workerlocker	2024-05-08 11:02:40 +02:00
Javier Segarra	ccc87a0958	Merge branch 'dev' into 7271_boilerplate_zones	2024-05-08 07:52:59 +02:00
Alex Moreno	a139c11a22	Merge branch 'test' into fix_Customer_1	2024-05-07 07:05:25 +00:00
William Buezas	dbc9e9dd71	Sales monitor base	2024-05-05 19:13:36 -03:00
Jon Elias	312985b427	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7271_boilerplate_zones	2024-05-03 12:37:30 +02:00
Jon Elias	1a5f2fbea2	feat: refs #7271 advanced structure	2024-05-03 12:30:53 +02:00
William Buezas	d2e178a41b	resolve conflicts	2024-05-02 12:02:44 -03:00
Javier Segarra	9fa03beda1	Merge branch 'dev' into 6887-endClaimMigration	2024-05-02 12:44:02 +00:00
Javier Segarra	988be19b96	Merge branch 'dev' into 6887-endClaimMigration	2024-05-02 12:42:46 +00:00
Javier Segarra	03759d2746	Merge branch 'dev' into feature/ItemLastEntries	2024-05-02 14:34:54 +02:00
Jon Elias	c1a464d9ae	fix: refs #6887 fix conflicts	2024-05-02 13:02:59 +02:00
Javier Segarra	1907301852	Merge branch 'dev' into 6321_negative_tickets	2024-05-02 12:48:45 +02:00
Javier Segarra	ef63d0cb6a	Merge remote-tracking branch 'origin/dev' into feature/ItemTax	2024-05-02 10:25:49 +02:00
Javier Segarra	cd5389fb91	fix: i18n	2024-05-02 10:25:46 +02:00
Javier Segarra	b530101cda	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-05-02 07:44:20 +00:00
William Buezas	ac219bfbb7	Item shelvings	2024-04-30 16:15:48 -03:00
Jon Elias	d5762f65b3	refactor: refs #6887 fixed errors	2024-04-30 10:34:48 +02:00
Jon Elias	5b15558dbf	refactor: refs #6887 fixed errors	2024-04-30 10:32:32 +02:00
William Buezas	ac9063e166	Item Last entries	2024-04-29 17:01:26 -03:00
Javier Segarra	b7bfb4b056	feat: updates	2024-04-29 15:08:12 +02:00
William Buezas	0b5aea76d9	Move translations	2024-04-29 09:39:04 -03:00
Javier Segarra	df29ad31fd	minor changes	2024-04-29 13:22:31 +02:00
Javier Segarra	5425902918	Merge branch 'dev' into 6321_negative_tickets	2024-04-29 11:55:56 +02:00
Javier Segarra	2f55272df7	fix: WorkerDescriptor	2024-04-29 11:23:50 +02:00
Javier Segarra	34c8874468	fix: i18n	2024-04-29 10:17:18 +02:00
Jon Elias	b8380bc9c5	Merge branch 'dev' into 6887-endClaimMigration	2024-04-29 07:51:16 +00:00
Jon Elias	6ae38d2611	refactor: refs #6887 pending claim changes	2024-04-29 09:49:06 +02:00
William Buezas	cf193b07c5	Item tax	2024-04-26 08:02:17 -03:00
Javier Segarra	2deeada1f5	Merge remote-tracking branch 'origin/dev' into fix_Customer_1	2024-04-26 12:50:46 +02:00
Javier Segarra	94a948c933	fix: add socialName	2024-04-26 12:29:55 +02:00
Javier Segarra	7831a69aa9	fix: i18n and icon class	2024-04-26 11:03:40 +02:00
Javier Segarra	33f3024246	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-26 07:47:24 +00:00
Javier Segarra	98846bbd1a	Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical	2024-04-26 09:28:40 +02:00
Javier Segarra	3c033458d3	fix: minor changes	2024-04-26 09:02:51 +02:00
Pablo Natek	cb22eaee4d	Merge branch 'dev' into 4988-agencySection	2024-04-26 06:58:53 +00:00
Javier Segarra	22d9d369c8	Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical	2024-04-26 08:52:05 +02:00
Javier Segarra	aa87d54f57	Merge remote-tracking branch 'origin/dev' into feature/ItemLog	2024-04-26 08:34:05 +02:00
Pablo Natek	f29f7a55a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-25 16:28:30 +02:00
Pablo Natek	5544676a1b	fix: mistakes like console.log an disables	2024-04-25 16:18:06 +02:00
William Buezas	823351f76d	Item botanical	2024-04-25 10:55:48 -03:00
Javier Segarra	b4e3157887	feat #7271 i18n	2024-04-25 14:28:06 +02:00
Pablo Natek	d490d85ecc	feat: agencyWorkCenter	2024-04-25 12:34:19 +02:00
Pablo Natek	e184f70be5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-25 09:59:17 +02:00
William Buezas	726699bbc5	Item log	2024-04-24 10:38:00 -03:00
Javier Segarra	e1f50f5daf	fix: minorchanges	2024-04-24 15:05:10 +02:00
Javier Segarra	dcb06918dd	Merge remote-tracking branch 'mindshore/feature/ItemRequests' into feature/ItemFamily	2024-04-24 14:35:20 +02:00
Javier Segarra	e65ffb63c9	Merge remote-tracking branch 'mindshore/feature/ItemsSummary' into feature/ItemRequests	2024-04-24 14:26:12 +02:00
Javier Segarra	299838bfa5	Merge branch 'dev' into feature/ItemsSummary	2024-04-24 14:23:49 +02:00
Javier Segarra	f4eb14f487	feat: i18n Clone	2024-04-24 14:22:14 +02:00
Javier Segarra	1c3660050b	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-24 12:15:34 +02:00
Javier Segarra	de91364ee8	Merge remote-tracking branch 'origin/dev' into feature/FixedPrices	2024-04-24 09:33:34 +02:00
Javier Segarra	bf08ca7655	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-24 06:25:14 +00:00
Javier Segarra	861e4385bb	Merge branch 'dev' into feature/ItemsSummary	2024-04-24 07:34:49 +02:00
Javier Segarra	5dc41f8236	Merge branch 'dev' into feature/ItemFamily	2024-04-24 07:01:46 +02:00
Javier Segarra	9a78b8ac3b	Merge branch 'dev' into feature/ItemRequests	2024-04-23 13:55:43 +02:00
Javier Segarra	bfb7dfb472	Merge branch 'dev' into feature/WorkerTimeControl	2024-04-23 13:31:41 +02:00
Pablo Natek	663c093a00	feat: refs #4988 agency e2e	2024-04-22 18:17:01 +02:00
Javier Segarra	5779d37bbd	feat: #6321 i18n to yml	2024-04-22 14:08:58 +02:00
William Buezas	78561c5f42	Item types	2024-04-22 08:34:38 -03:00
Javier Segarra	5a588ead87	Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia	2024-04-22 07:38:07 +02:00
William Buezas	9212e53905	resolve conflicts	2024-04-19 12:48:07 -03:00
William Buezas	3a03e42cf9	Resolve conflicts	2024-04-19 10:40:04 -03:00
Javier Segarra	fb26219354	refs #7190 feat: useTokenConfig	2024-04-19 12:09:04 +02:00
Alex Moreno	6db5c56f5a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3	2024-04-19 09:36:10 +02:00
William Buezas	6c4901076f	Apply ItemsFilterPanel to EntryLatestBuys	2024-04-18 13:14:23 -03:00
William Buezas	5f01e5c705	change es translations	2024-04-18 09:09:22 -03:00
William Buezas	5addd0056d	Add filter panel	2024-04-17 17:18:38 -03:00
William Buezas	5551189f2f	resolve conflicts	2024-04-17 08:46:37 -03:00
William Buezas	1dfaef2ffa	Resolve conflicts	2024-04-17 08:26:12 -03:00
William Buezas	da06e7bc87	WIP	2024-04-17 08:13:34 -03:00
Alex Moreno	c4c317ef41	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3	2024-04-17 10:53:18 +02:00
William Buezas	ba2499db9d	resolve conflicts	2024-04-16 12:11:57 -03:00
William Buezas	e36949ad07	resolve conflicts	2024-04-16 10:11:03 -03:00
Alex Moreno	4f286cd032	Merge branch 'dev' into 6425-fixDevTranslations	2024-04-16 12:32:46 +00:00
William Buezas	2ab7a45114	resolve conflicts	2024-04-16 08:49:34 -03:00
William Buezas	5664ec1313	WIP	2024-04-16 08:21:44 -03:00
Jon Elias	b216112d2a	refactor: refs #6425 fix failed tests	2024-04-16 11:42:43 +02:00
Jon Elias	73c5a5b7d2	fix: refs #6425 fixed dev translations	2024-04-16 11:00:38 +02:00
Robert Ferrús	87ae6870a9	feat: refs #6679 add icon	2024-04-16 09:33:56 +02:00
Robert Ferrús	d178d7dc6a	feat: refs #6679 add icon	2024-04-16 08:04:57 +02:00
William Buezas	00dfa171b0	WIP	2024-04-15 15:37:41 -03:00
William Buezas	d9d868a6af	Waste breakdown	2024-04-15 09:02:35 -03:00
William Buezas	c50741b4bf	Remove single quotes	2024-04-15 08:51:48 -03:00
Alex Moreno	f176312163	feat(VnNotes): refs #6336 better design	2024-04-15 12:28:43 +02:00
William Buezas	9c7c98d64d	Merge with dev	2024-04-12 16:55:51 -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	f2dc50d229	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into WorkerCalendar	2024-04-12 08:13:58 -03:00
Jon Elias	f83de74f01	refs #6425 fix conflicts	2024-04-12 11:44:56 +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
William Buezas	c032c83e7f	Item create view	2024-04-11 08:40:41 -03:00
Javier Casado	6002800000	Merge branch 'dev' into 7179-changesClaimSummary	2024-04-11 11:37:11 +00:00
William Buezas	4a0ae8aa45	Item summary	2024-04-10 17:18:57 -03: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	c881fe6577	Resolve conflicts	2024-04-10 09:19:54 -03:00