3139 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	bdc5d7210f	fix: remove redirect	2024-04-29 10:12:37 +02:00
Javier Segarra	19fcacebc9	perf: VnSearchbar	2024-04-29 10:12:19 +02:00
Jon Elias	b8380bc9c5	Merge branch 'dev' into 6887-endClaimMigration	2024-04-29 07:51:16 +00:00
Carlos Satorres	abd1f72340	Merge branch '7172-fixClaimBasicData' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData	2024-04-29 09:49:32 +02:00
Carlos Satorres	a78c920ec8	refs #7172 fix VnSelect	2024-04-29 09:49:29 +02:00
Jon Elias	6ae38d2611	refactor: refs #6887 pending claim changes	2024-04-29 09:49:06 +02:00
Carlos Satorres	76a1227c0e	Merge branch 'dev' into 7172-fixClaimBasicData	2024-04-29 07:38:59 +00:00
Carlos Satorres	e3237ee4f1	refs #7172 refact VnSelect	2024-04-29 09:35:57 +02:00
Alex Moreno	8b55044891	feat: refs #6336 add ItemDescriptor	2024-04-29 08:56:35 +02:00
Javier Casado	e757fff4dd	Merge pull request 'refs #6641 add checkbox' (!283) from 6641-myTeamFilterClaim into dev ... Reviewed-on: #283 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-29 06:49:07 +00:00
Javier Casado	fe22fb26fb	Merge branch 'dev' into 6641-myTeamFilterClaim	2024-04-29 06:47:55 +00:00
Javier Segarra	1c435725f2	Merge branch 'dev' into feature/ItemFamily	2024-04-29 08:23:11 +02:00
Javier Segarra	9a840c9cee	Merge branch 'dev' into feature/ItemFamily	2024-04-29 06:03:50 +00:00
Javier Segarra	4d0b9707cf	Merge pull request 'feature/ItemListFilter' (!324) from hyervoni/salix-front-mindshore:feature/ItemListFilter into dev ... Reviewed-on: #324 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-29 06:02:41 +00:00
Javier Segarra	f83ef4eb4c	Merge branch 'dev' into feature/ItemListFilter	2024-04-29 06:02:02 +00:00
Alex Moreno	fdd088955b	Merge pull request 'Item Barcode' (!333) from hyervoni/salix-front-mindshore:feature/ItemBarCode into dev ... Reviewed-on: #333 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-29 05:24:59 +00:00
William Buezas	322ad816b9	item diary	2024-04-28 19:37:44 -03:00
Javier Segarra	1e1c88e55c	fix: reset fieldFilter.value when change model	2024-04-26 21:05:45 +02:00
William Buezas	ce55109dd3	fix more fields label when selected	2024-04-26 15:41:03 -03:00
William Buezas	4282463e51	Fill filter fields with user params	2024-04-26 14:29:11 -03:00
William Buezas	ad085974da	remove console.log	2024-04-26 13:51:20 -03:00
William Buezas	4792485214	Translate more fields label	2024-04-26 13:50:39 -03:00
Javier Segarra	955e196882	fix: filterPanelbug	2024-04-26 17:43:57 +02:00
Javier Segarra	a03049a721	fix: poc	2024-04-26 17:26:18 +02:00
William Buezas	dc0f4fb40e	resolve conflicts	2024-04-26 10:37:19 -03:00
Javier Segarra	0d50944c2d	fix: add exprBuilder	2024-04-26 15:24:44 +02:00
Javier Segarra	c1ed4ab032	fix: add exprBuilder	2024-04-26 14:49:54 +02:00
William Buezas	485e916f55	Add input focus	2024-04-26 09:16:26 -03:00
Carlos Satorres	76cd79173c	refs #7172 fix select	2024-04-26 13:50:11 +02:00
Javier Segarra	127567898d	fix: add filter panel	2024-04-26 13:27:58 +02:00
Alex Moreno	88e1e577c4	hotFix: refs #6636 fix ref optionsList	2024-04-26 13:10:29 +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	95fded4a83	Merge branch 'dev' into feature/ItemListFilter	2024-04-26 10:49:20 +00:00
Javier Casado	8864048a56	Merge branch 'dev' into 6641-myTeamFilterClaim	2024-04-26 09:14:54 +00:00
Jon Elias	8e4429a28c	Merge branch 'dev' into 6767-deleteDivCol	2024-04-26 07:48:23 +00:00
Jon Elias	e6dc7b9862	refactor: refs #6767 fix all conflicts	2024-04-26 09:47:44 +02:00
Javier Segarra	33f3024246	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-26 07:47:24 +00:00
Alex Moreno	8f064e3338	warmFix: replace VnSelectFilter to VnSelect	2024-04-26 09:37:02 +02:00
Javier Segarra	c84555b0a3	Merge pull request 'Item botanical' (!329) from hyervoni/salix-front-mindshore:feature/ItemBotanical into dev ... Reviewed-on: #329 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 07:31:29 +00:00
Javier Segarra	98846bbd1a	Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical	2024-04-26 09:28:40 +02:00
Javier Segarra	36e99e2c6c	fix: bug when save	2024-04-26 09:28:32 +02:00
Pablo Natek	119f625435	Merge pull request '#4988 - agencySection' (!293) from 4988-agencySection into dev ... Reviewed-on: #293 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 07:19:07 +00:00
Carlos Satorres	022fd6caa4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData	2024-04-26 09:17:23 +02:00
Pablo Natek	7af802c306	Merge branch 'dev' into 4988-agencySection	2024-04-26 07:07:15 +00:00
Carlos Satorres	f53caac771	Merge pull request 'refs #6976 supplier onUnmounted' (!286) from 6976-supplierConsumption into dev ... Reviewed-on: #286 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 07:05:00 +00:00
Javier Segarra	3c033458d3	fix: minor changes	2024-04-26 09:02:51 +02:00
Jon Elias	652e85a6e0	Merge pull request 'refactor: refs #7239 changed spanish translations' (!331) from ES_smsTranslations into master ... Reviewed-on: #331 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 07:01:39 +00:00
Carlos Satorres	e64936da72	Merge branch 'dev' into 6976-supplierConsumption	2024-04-26 07:00:22 +00:00
Carlos Satorres	966831b6d3	refs #6976 fix pr	2024-04-26 09:00:42 +02:00