2763 Commits

All Branches

Search

Author	SHA1	Message	Date
William Buezas	c12fd77218	Remove businessFk from FetchData	2024-04-12 08:10:14 -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	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
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
Javier Segarra	478ebfd0ea	Merge branch 'dev' into 6679-addCreateIcon	2024-04-10 12:22:19 +00:00
William Buezas	c881fe6577	Resolve conflicts	2024-04-10 09:19:54 -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	e4a8c45053	Change workweeks colod and capitalize	2024-04-10 08:32:04 -03:00
Robert Ferrús	a350de9119	Merge branch 'dev' into 6679-addCreateIcon	2024-04-10 11:30:21 +00:00
William Buezas	39af4278a6	Add delete model to worker dms	2024-04-10 08:27:30 -03:00
Robert Ferrús	933e6b88b1	feat: refs #6679 add icon	2024-04-10 13:24:20 +02:00
Jorge Penadés	14d9147cc1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-10 13:02:22 +02: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	fc4a69b2c6	resolve conflicts in worker routes	2024-04-09 15:28:11 -03:00
William Buezas	c3835dfd7a	resolve conflicts	2024-04-09 15:23:05 -03:00
William Buezas	9bffc9bb25	classes and size improvements	2024-04-09 15:20:29 -03:00
William Buezas	faa8d05313	Change saturday and sunday days color	2024-04-09 14:48:51 -03:00