2358 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
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	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
Jon Elias	675b764c82	refactor: fixed invoiceInVat tests	2024-04-11 09:05:02 +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	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
Alex Moreno	e459c14dd3	Merge pull request 'Se crea submodulo mis documentos en worker' (!253) from hyervoni/salix-front-mindshore:features/ms_19_worker_my_documents into dev ... Reviewed-on: #253 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-10 12:15:32 +00:00
William Buezas	e676933942	Update worker dms remove	2024-04-10 08:59:05 -03:00
William Buezas	eceb60f6e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList	2024-04-10 08:46:00 -03:00
William Buezas	9ae79a5631	Add translation again	2024-04-10 08:43:57 -03:00
William Buezas	e8486099fc	Resolve conflicts	2024-04-10 08:37:52 -03:00
William Buezas	39af4278a6	Add delete model to worker dms	2024-04-10 08:27:30 -03:00
Jon Elias	6a203f593f	Merge branch '6425-translationProposal' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal	2024-04-10 12:53:45 +02:00
Jon Elias	eb91c0b1c2	Merge branch 'dev' into 6425-translationProposal	2024-04-10 12:53:44 +02:00
Jon Elias	81d0e397f0	Merge pull request '#7186 - tabIndexVATExpenses' (!277) from 7186-tabIndexVATExpenses into dev ... Reviewed-on: #277 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-10 07:37:01 +00:00
Jon Elias	e3e6c74afa	Merge branch 'dev' into 7186-tabIndexVATExpenses	2024-04-10 07:36:17 +00:00
jcasado	c640ba1298	fix set	2024-04-10 09:31:38 +02:00
jcasado	70c9f1dea4	refs #7179 changes pr	2024-04-10 09:29:26 +02:00
Jon Elias	09ceefb7c5	style: refs #7186 fixed style	2024-04-10 08:49:54 +02:00
Jorge Penadés	a153146f82	Merge pull request '#6992 add URL params' (!273) from 6992-addQueryParamsUrl into dev ... Reviewed-on: #273 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-10 06:45:14 +00:00
Jon Elias	f9de26933a	refactor: refs #7186 fill-icon change	2024-04-10 08:00:36 +02:00
William Buezas	e88194eb88	Update worker dms model prop	2024-04-09 16:00:12 -03:00
William Buezas	9c3407846b	Fix translation	2024-04-09 10:30:40 -03:00
Jorge Penadés	83bf8183f0	fix: refs #6992 warning console & formModel hook	2024-04-09 15:12:54 +02:00
Jorge Penadés	6349a3e790	feat: refs #6992 comments	2024-04-09 15:08:54 +02:00
jcasado	d8ef199b14	refs #7179 remove code	2024-04-09 14:55:27 +02:00
William Buezas	0144aab7a5	Mini fix	2024-04-09 08:51:00 -03:00
Jon Elias	15d4b54dda	refactor: refs #7186 fixed changes	2024-04-09 13:34:45 +02:00
jcasado	97ad1c7579	refs #7179 changes customer proxy and client Id	2024-04-09 13:32:01 +02:00
William Buezas	f6e140e369	Apply workerDms changes	2024-04-09 08:28:00 -03:00
William Buezas	e51ea9996b	Item list view	2024-04-09 08:18:18 -03:00
Jon Elias	65626446fd	refactor: refs #7186 fixed style and tab	2024-04-09 13:01:29 +02:00
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
Jorge Penadés	50bce40613	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6992-addQueryParamsUrl	2024-04-09 10:09:41 +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
Jorge Penadés	fdfa99c718	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6992-addQueryParamsUrl	2024-04-09 09:55:44 +02:00