7383-testToMaster #370

Merged

alexm merged 365 commits from 7383-testToMaster into master 2024-05-14 05:46:56 +00:00

Conversation 0 Commits 365 Files Changed 229 +17016 -7873

365 Commits

Author	SHA1	Message	Date
Jorge Penadés	0e7c2c7118	Merge pull request '#6938-warmfix' (!359) from 6938-warmfix into test ... Reviewed-on: #359 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-07 14:21:13 +00:00
Jorge Penadés	5e0db81a21	fix: refs #6938 conflicts	2024-05-07 15:51:55 +02:00
Jorge Penadés	ac0ebf431f	Merge pull request '#6938 wamfix workerCard' (!357) from 6938-warmfix-masterToTest into test ... Reviewed-on: #357 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-07 13:37:05 +00:00
Jorge Penadés	0a71060f60	fix: refs #6938 workerCard	2024-05-07 15:28:00 +02:00
Alex Moreno	13f8937f12	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-05-07 14:18:36 +02:00
Alex Moreno	82db1fac11	Merge pull request '7336_devToTest' (!354) from 7336_devToTest into test ... Reviewed-on: #354 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-07 06:33:59 +00:00
Alex Moreno	e4ffd4fcdd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-05-07 08:04:46 +02:00
Javier Casado	f6abcc6693	Merge pull request 'refs #7113 fix test' (!318) from 7113-fixClaimPhoto into dev ... Reviewed-on: #318 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-06 06:38:47 +00:00
jcasado	e744077d65	Merge branch '7113-fixClaimPhoto' of https://gitea.verdnatura.es/verdnatura/salix-front into 7113-fixClaimPhoto	2024-05-03 10:21:49 +02:00
jcasado	f7e91424b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7113-fixClaimPhoto	2024-05-03 10:21:41 +02:00
Javier Casado	534f71c9e3	Merge branch 'dev' into 7113-fixClaimPhoto	2024-05-03 07:26:10 +00:00
Javier Segarra	e3a36c0ab1	Merge pull request 'refactor: refs #6887 pending claim changes' (!335) from 6887-endClaimMigration into dev ... Reviewed-on: #335 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-05-02 12:45:12 +00:00
Javier Segarra	9fa03beda1	Merge branch 'dev' into 6887-endClaimMigration	2024-05-02 12:44:02 +00:00
Javier Segarra	9dcce336a8	Merge pull request 'Item last entries' (!342) from hyervoni/salix-front-mindshore:feature/ItemLastEntries into dev ... Reviewed-on: #342 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 12:43:04 +00:00
Javier Segarra	988be19b96	Merge branch 'dev' into 6887-endClaimMigration	2024-05-02 12:42:46 +00:00
Javier Segarra	d069ca5095	Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration	2024-05-02 14:40:59 +02:00
Javier Segarra	1a79bd6fb8	feat: zoneSummary	2024-05-02 14:40:56 +02:00
Javier Segarra	03759d2746	Merge branch 'dev' into feature/ItemLastEntries	2024-05-02 14:34:54 +02:00
Javier Segarra	1675919801	fix: minor build bugs	2024-05-02 14:33:24 +02:00
Javier Segarra	7e842f2ce1	Merge pull request 'Item tax' (!337) from hyervoni/salix-front-mindshore:feature/ItemTax into dev ... Reviewed-on: #337 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 12:23:53 +00:00
William Buezas	8043d72676	Merge branch 'feature/ItemLastEntries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemLastEntries	2024-05-02 09:16:44 -03:00
William Buezas	120e84f439	Add condition to packing and grouping badge colors	2024-05-02 09:16:24 -03:00
Javier Segarra	793376139c	Merge branch 'dev' into 6887-endClaimMigration	2024-05-02 12:05:30 +00:00
Javier Segarra	f90bd908a5	Merge branch 'dev' into feature/ItemTax	2024-05-02 14:00:01 +02:00
Carlos Satorres	104b159039	Merge pull request 'refs #6895 remove autoload' (!341) from 6895-removeShelving into dev ... Reviewed-on: #341 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 11:43:48 +00:00
Jon Elias	0fa2a99080	Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration	2024-05-02 13:03:04 +02:00
Jon Elias	c1a464d9ae	fix: refs #6887 fix conflicts	2024-05-02 13:02:59 +02:00
Carlos Satorres	8bb5f77b57	Merge branch 'dev' into 6895-removeShelving	2024-05-02 10:09:41 +00:00
Javier Segarra	6a958a0807	Actualizar src/pages/InvoiceIn/Card/InvoiceInDueDay.vue	2024-05-02 08:32:39 +00:00
Javier Segarra	c81e20e22e	Merge pull request 'Item diary' (!339) from hyervoni/salix-front-mindshore:feature/ItemDiary into dev ... Reviewed-on: #339 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 08:29:17 +00:00
Javier Segarra	e4f787f2fa	Merge branch 'dev' into feature/ItemDiary	2024-05-02 08:28:00 +00: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	29b215ac2e	Merge branch 'feature/ItemTax' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemTax	2024-05-02 10:25:27 +02:00
Javier Segarra	f46b78131c	perf: remove onMounted and reload	2024-05-02 10:24:07 +02:00
Carlos Satorres	e685b58adf	Merge pull request 'refs #7172 change vnselectfilter' (!274) from 7172-fixClaimBasicData into dev ... Reviewed-on: #274 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 08:23:21 +00:00
Carlos Satorres	73ade834e9	Merge branch 'dev' into 7172-fixClaimBasicData	2024-05-02 08:21:43 +00:00
Javier Segarra	494f0be44a	Merge branch 'dev' into feature/ItemDiary	2024-05-02 08:13:41 +00:00
Javier Segarra	6482f5680d	Merge pull request '#7190 - Renew tokenMultimedia' (!278) from 7190_renewTokenMultimedia into dev ... Reviewed-on: #278 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 08:11:08 +00:00
Javier Segarra	94fc856bea	Merge branch 'dev' into feature/ItemDiary	2024-05-02 08:05:17 +00:00
Javier Segarra	b530101cda	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-05-02 07:44:20 +00:00
Javier Segarra	43093cfa7d	Merge pull request 'Item types' (!319) from hyervoni/salix-front-mindshore:feature/ItemFamily into dev ... Reviewed-on: #319 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-02 07:39:58 +00:00
Javier Segarra	57736654f1	Merge branch 'dev' into feature/ItemFamily	2024-05-02 07:38:41 +00:00
Javier Segarra	4fdf2bacf8	fix: pvp tooltip	2024-05-01 13:52:45 +02:00
Javier Segarra	4ef7b0e17c	fix: item routes order	2024-05-01 13:31:32 +02:00
Javier Segarra	d2531efdd6	fix: Botanical icon	2024-05-01 13:27:40 +02:00
William Buezas	72ad524c68	change prop names	2024-04-30 16:23:19 -03:00
William Buezas	0890de3771	change prop name	2024-04-30 16:21:06 -03:00
William Buezas	2e85b9c063	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemLastEntries	2024-04-30 16:19:06 -03:00
Alex Moreno	2c4cd56102	Merge pull request 'fix: refs #6336 fix reload and disable button when is loading' (!340) from 6336-claims_v4_action into dev ... Reviewed-on: #340 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-04-30 13:01:09 +00:00
Alex Moreno	f3387cf120	fix: refs #6336 fix reload and disable button when is loading	2024-04-30 12:39:50 +02:00
Carlos Satorres	38cd54a7f0	refs #6895 remove autoload	2024-04-30 12:10:30 +02:00
Javier Segarra	a512f094d6	perf: ZoneDescriptor	2024-04-30 12:06:24 +02:00
Jon Elias	9563a1a6ed	Merge branch 'dev' into 6887-endClaimMigration	2024-04-30 08:35:35 +00: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
Carlos Satorres	acb4e2d98e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData	2024-04-30 09:44:06 +02:00
Javier Segarra	3cb662d406	Merge branch 'dev' into feature/ItemTax	2024-04-30 07:29:07 +00:00
Alex Moreno	34797450af	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-30 07:59:14 +02:00
Alex Moreno	0abc31d96d	Merge pull request 'feat: refs #6336 v4' (!334) from 6336-claims_v4 into dev ... Reviewed-on: #334 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-30 05:38:37 +00:00
Alex Moreno	8390a8b7b0	Merge branch 'dev' into 6336-claims_v4	2024-04-30 05:37:46 +00:00
William Buezas	ccac3a54f9	move translations	2024-04-29 17:39:37 -03:00
William Buezas	ac9063e166	Item Last entries	2024-04-29 17:01:26 -03:00
William Buezas	1b619055eb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemDiary	2024-04-29 10:32:53 -03:00
Javier Segarra	4be559bbe8	fix: hansChanges to false	2024-04-29 15:16:37 +02:00
William Buezas	0b5aea76d9	Move translations	2024-04-29 09:39:04 -03:00
William Buezas	bd5bf2419b	Merge branch 'feature/ItemFamily' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemFamily	2024-04-29 08:23:50 -03:00
William Buezas	6276c433d1	Fix exprBuilder	2024-04-29 08:23:29 -03:00
Javier Segarra	a5d6ca447b	fix: TicketSummary.packages label	2024-04-29 12:12:20 +02:00
Javier Segarra	b3aaf35c6a	Merge branch 'dev' into 6887-endClaimMigration	2024-04-29 09:58:26 +00:00
Javier Segarra	f713b830ee	Merge branch 'feature/ItemFamily' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemFamily	2024-04-29 11:47:02 +02:00
Javier Segarra	e01b988ee8	Merge branch 'dev' into feature/ItemFamily	2024-04-29 11:46:56 +02:00
Javier Segarra	761bc7724f	fix: redirect	2024-04-29 11:46:40 +02:00
Javier Segarra	0fff6cd446	perf: VnCard	2024-04-29 11:46:33 +02:00
Javier Segarra	7e2ec588c5	fix: remove Warning	2024-04-29 11:24:20 +02:00
Javier Segarra	2f55272df7	fix: WorkerDescriptor	2024-04-29 11:23:50 +02:00
Alex Moreno	b71aeb1d07	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-29 10:39:44 +02:00
Javier Segarra	1e23666943	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-29 08:33:53 +00:00
Javier Segarra	6c69c44dfd	remove comment	2024-04-29 08:33:38 +00:00
Alex Moreno	806f3a13d5	fix(claimLines): refs #6336 fix total calc	2024-04-29 10:33:32 +02:00
Javier Segarra	0e66f08674	Merge branch 'dev' into feature/ItemFamily	2024-04-29 10:22:03 +02:00
Javier Segarra	34c8874468	fix: i18n	2024-04-29 10:17:18 +02:00
Javier Segarra	8c3d32ec86	fix: remove VnFilterPanel inside Summary	2024-04-29 10:12:50 +02:00
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
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
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
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
Pablo Natek	cb22eaee4d	Merge branch 'dev' into 4988-agencySection	2024-04-26 06:58:53 +00:00
Carlos Satorres	dbdcc7cdf1	Merge pull request 'refs #6905 fix bank select' (!322) from 6905-fixUserPanel into dev ... Reviewed-on: #322 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 06:56:50 +00:00
Carlos Satorres	1d9f4e30af	Merge branch 'dev' into 6905-fixUserPanel	2024-04-26 06:54:39 +00:00
Javier Segarra	7f4155cde9	fix: replace VnSelectFilter by VnSelect	2024-04-26 08:54:26 +02:00
Javier Segarra	22d9d369c8	Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical	2024-04-26 08:52:05 +02:00
Javier Segarra	b3be7c8bc3	Merge pull request 'Item log' (!323) from hyervoni/salix-front-mindshore:feature/ItemLog into dev ... Reviewed-on: #323 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-26 06:37:22 +00:00
Carlos Satorres	7fd053b842	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-fixUserPanel	2024-04-26 08:36:15 +02:00
Javier Segarra	aa87d54f57	Merge remote-tracking branch 'origin/dev' into feature/ItemLog	2024-04-26 08:34:05 +02:00
Pablo Natek	faa6d0e4fa	feat: setup commit	2024-04-26 08:33:41 +02:00
Carlos Satorres	fc275d9274	refs #6976 remove logs	2024-04-26 08:29:34 +02:00
Pablo Natek	d7bebfecb1	fix: fix translates	2024-04-26 08:28:42 +02:00
Javier Segarra	22478bed48	Merge pull request 'Item requests' (!297) from hyervoni/salix-front-mindshore:feature/ItemRequests into dev ... Reviewed-on: #297 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 06:22:11 +00:00
Javier Segarra	3116bf0944	Merge branch 'dev' into feature/ItemRequests	2024-04-26 06:21:36 +00:00
Javier Casado	433ca7c456	Merge pull request 'refs #6697 fix claimQuantity' (!317) from 6697-changeClaimQuantity into dev ... Reviewed-on: #317 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 05:33:40 +00:00
Javier Casado	6d5e0484cd	Merge branch 'dev' into 6697-changeClaimQuantity	2024-04-26 05:32:32 +00:00
Javier Casado	f76f3cae7e	Merge pull request 'refs: #6764 rename VnSelectFilter' (!320) from 6764-rename-VnSelectFilter into dev ... Reviewed-on: #320 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 05:28:01 +00:00
Pablo Natek	fff9ec4184	fix: e2e test	2024-04-25 17:17:28 +02:00
Pablo Natek	436f24b674	fix: translates	2024-04-25 17:11:30 +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	e5eb3010a3	fix: Change method because X updates row	2024-04-25 15:31:14 +02:00
Javier Segarra	fb4170d83d	fix Double request when update row	2024-04-25 15:25:20 +02:00
Alex Moreno	08a40e13f9	Merge branch 'dev' into 6764-rename-VnSelectFilter	2024-04-25 12:10:32 +00:00
Javier Segarra	166d678d0b	Merge branch 'dev' into feature/ItemRequests	2024-04-25 12:05:09 +00:00
jcasado	7875df4b02	refs #6697 fix tfront	2024-04-25 14:03:00 +02:00
Alex Moreno	da89f4d731	Merge pull request 'Items summary' (!281) from hyervoni/salix-front-mindshore:feature/ItemsSummary into dev ... Reviewed-on: #281 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-25 12:01:08 +00:00
Pablo Natek	f2d0d3f3ff	fix: remove test from vitest	2024-04-25 13:09:54 +02:00
Pablo Natek	a3ba68e865	fix: test	2024-04-25 13:04:50 +02:00
Pablo Natek	914c3fb169	fix: test and console log	2024-04-25 12:40:17 +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
Pablo Natek	897ddc44fe	fix: search bar	2024-04-25 09:57:04 +02:00
jcasado	13d38c8b02	refactor: refs #6764 fix conflicts	2024-04-25 09:02:24 +02:00
Javier Segarra	68dba82763	Merge branch 'dev' into feature/ItemListFilter	2024-04-25 08:54:24 +02:00
jcasado	c6c925a105	refs: #6764 fixConflicts	2024-04-25 08:50:12 +02:00
jcasado	4b3df372cd	refs: #6764 fixConflicts	2024-04-25 08:49:40 +02:00
jcasado	aa58838ad7	refs: #6764 rename VnSelect	2024-04-25 08:34:40 +02:00
William Buezas	969087a347	Remove unused things	2024-04-24 17:48:47 -03:00
William Buezas	84a9dc8319	Fix ItemDescriptor labels	2024-04-24 17:30:53 -03:00
William Buezas	a6ebe9cf19	Item barcode	2024-04-24 12:54:38 -03: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	e6c9a692f5	feat moduleName	2024-04-24 14:33:10 +02:00
Javier Segarra	51b432dfd0	fix icon	2024-04-24 14:28: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
Carlos Satorres	6961a048e5	refs #6905 fix bank select	2024-04-24 13:29:32 +02:00
Carlos Satorres	391ca36764	fix conflicts	2024-04-24 12:47:56 +02:00
Javier Segarra	1c3660050b	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-24 12:15:34 +02:00
Javier Segarra	a555d11663	fix: #7190 test	2024-04-24 12:15:12 +02:00
jcasado	c9ab98471e	refs #6697 fix changes	2024-04-24 12:01:55 +02:00
jcasado	5103b5b365	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6697-changeClaimQuantity	2024-04-24 12:01:15 +02:00
jcasado	6391ed1360	refs #6697 changes claim	2024-04-24 11:26:32 +02:00
Javier Segarra	331484dbc7	Merge pull request 'Item Fixed prices' (!307) from hyervoni/salix-front-mindshore:feature/FixedPrices into dev ... Reviewed-on: #307 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-24 07:39:22 +00:00
Javier Segarra	8bb3d48c81	Merge branch 'dev' into feature/FixedPrices	2024-04-24 07:37:39 +00:00
Jon Elias	bda232f1c3	Merge pull request 'refactor: refs #6899 corrected Lilium styles and functionalities' (!304) from 6899-endInvoiceOutMigration into dev ... Reviewed-on: #304 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-24 07:36:51 +00:00
Javier Segarra	de91364ee8	Merge remote-tracking branch 'origin/dev' into feature/FixedPrices	2024-04-24 09:33:34 +02:00
Jon Elias	39685c222f	refactor: refs #6899 fixed css and minor changes	2024-04-24 09:14:35 +02:00
Jon Elias	ca3b280dcb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899-endInvoiceOutMigration	2024-04-24 09:06:24 +02:00
Jorge Penadés	77798cbae4	Merge pull request '#6480 improve Card' (!271) from 6480-improveCard into dev ... Reviewed-on: #271 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-24 06:57:38 +00:00
Jorge Penadés	d93963e2c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-24 08:48:43 +02:00
Javier Segarra	bf08ca7655	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-24 06:25:14 +00:00
Alex Moreno	1206cc2292	warmFix: duplicated button after merge min	2024-04-24 08:11:33 +02:00
jcasado	716dd4e28f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6764-rename-VnSelectFilter	2024-04-24 08:02:19 +02:00
Javier Segarra	1ea74d0639	fix: minor updates	2024-04-24 07:55:01 +02: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
William Buezas	42fe189e9f	Add module name in Item router file	2024-04-23 16:45:28 -03:00
William Buezas	f3b5bf7f4b	Item list filter	2024-04-23 15:34:52 -03:00
Alex Moreno	7dd8835716	Merge pull request 'refs #6551 feature/WorkerTimeControl' (!254) from hyervoni/salix-front-mindshore:feature/WorkerTimeControl into dev ... Reviewed-on: #254 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-23 13:12:51 +00:00
Javier Segarra	e259a38214	Merge branch 'feature/ItemRequests' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemRequests	2024-04-23 14:23:28 +02:00
William Buezas	672bc9ca9d	Change form model popup buttons order	2024-04-23 09:18:28 -03:00
Javier Segarra	dc1444641d	Merge branch 'feature/ItemRequests' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemRequests	2024-04-23 14:13:19 +02:00
William Buezas	4396f7d6ba	Fill thumb_down icon on hover	2024-04-23 09:13:10 -03:00
Javier Segarra	4f475a045d	Merge branch 'feature/ItemRequests' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemRequests	2024-04-23 14:12:15 +02:00
William Buezas	81a630d6cd	Add more translations	2024-04-23 09:10:28 -03:00
William Buezas	b7ba664e45	WIP	2024-04-23 09:05:34 -03:00
Javier Segarra	f959b5dc37	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-23 11:57:22 +00: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
jcasado	c621ccb5a6	refs #7113 fix test	2024-04-23 13:19:21 +02:00
jcasado	7f07b9780c	refs: #6764 rename VnSelectFilter	2024-04-23 13:03:32 +02:00
Jorge Penadés	c8b08b9e2d	fix: refs #6480 fix workerCard	2024-04-23 12:34:38 +02:00
Jorge Penadés	f8c238f443	fix: refs #6480 fix workerCard	2024-04-23 12:04:24 +02:00
Jorge Penadés	f9a88ea8c2	fix: refs #6480 fix workerCard	2024-04-23 12:00:29 +02:00
Jorge Penadés	54f9cf36c2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-23 11:49:06 +02:00
Jon Elias	c99a7bed22	Merge pull request 'refactor: refs #7239 changed translations' (!311) from 7239-changeTranslations into dev ... Reviewed-on: #311 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-23 09:46:13 +00:00
Jon Elias	02637556fb	Merge branch 'dev' into 7239-changeTranslations	2024-04-23 09:45:25 +00:00
Jorge Penadés	ba6a5d2fd2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-23 11:09:25 +02:00
Pablo Natek	ecbde3a536	Merge pull request 'fix: slow test on skipped comment all test' (!316) from fixSlowTest into dev ... Reviewed-on: #316 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-23 09:06:36 +00:00
Pablo Natek	948440ebc4	fix: slow test on skipped comment all test	2024-04-23 10:23:21 +02:00
Jon Elias	f21fcc8959	Merge branch '7239-changeTranslations' of https://gitea.verdnatura.es/verdnatura/salix-front into 7239-changeTranslations	2024-04-23 10:15:56 +02:00
Jon Elias	fe600d9318	refactor: refs #7239 requested changes	2024-04-23 10:15:54 +02:00
Alex Moreno	1c137bea4d	deploy: refs #7253 init version 2420	2024-04-23 10:15:46 +02:00
Carlos Satorres	5cce1df708	refs #6976 fix supplierConsumption	2024-04-23 10:06:57 +02:00
Javier Segarra	62c66ff952	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-23 08:04:13 +00:00
Jorge Penadés	a3ce0440e8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-23 09:53:38 +02:00
Jorge Penadés	f3c1608403	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-23 09:17:41 +02:00
Javier Segarra	04fe9330d4	fix: #7190 tests	2024-04-23 08:03:09 +02:00
Javier Segarra	6018d51642	perf: #7190 remove comments	2024-04-23 07:56:07 +02:00
Javier Segarra	74eec098ac	Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia	2024-04-23 07:49:35 +02:00
Jon Elias	781e863aca	Merge branch 'dev' into 7239-changeTranslations	2024-04-23 05:16:34 +00:00
Jon Elias	87ce1f0217	Merge branch '7239-changeTranslations' of https://gitea.verdnatura.es/verdnatura/salix-front into 7239-changeTranslations	2024-04-23 07:15:41 +02:00
Jon Elias	4ddcbaeacd	refactor: refs #7239 fixed errors	2024-04-23 07:15:39 +02:00
Pablo Natek	663c093a00	feat: refs #4988 agency e2e	2024-04-22 18:17:01 +02:00
William Buezas	e11625e05f	set columns default attrs to avoid repeating code	2024-04-22 11:30:16 -03:00
William Buezas	dce48b536d	Change in newPrice assign	2024-04-22 09:42:28 -03:00
William Buezas	2105d7870b	Refactor isBigger and isLower	2024-04-22 09:38:16 -03:00
William Buezas	1398a146ff	Change restOfData to restOfItem	2024-04-22 09:07:48 -03:00
William Buezas	78561c5f42	Item types	2024-04-22 08:34:38 -03:00
Jon Elias	2e493258fd	Merge branch 'dev' into 7239-changeTranslations	2024-04-22 11:19:15 +00:00
Jon Elias	dd74c7d507	refactor: refs #7239 changed translations	2024-04-22 13:17:22 +02:00
Pablo Natek	43aadd4fc6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-22 12:22:04 +02:00
Pablo Natek	6b4cb4ed12	feat: refs #4988 add agency section	2024-04-22 12:19:22 +02:00
Carlos Satorres	d2ec47fe1c	refs #6976 total Stems	2024-04-22 11:25:32 +02:00
Jon Elias	3b8761dc7c	refactor: refs #6899 moved css to app.scss	2024-04-22 11:21:28 +02:00
Jon Elias	ab61a68f28	refactor: refs #6899 moved css to app.scss	2024-04-22 11:20:25 +02:00
Jon Elias	3c2f281e0a	Merge branch 'dev' into 6899-endInvoiceOutMigration	2024-04-22 06:00:26 +00:00
Javier Segarra	5a588ead87	Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia	2024-04-22 07:38:07 +02:00
Javier Segarra	2b24e18f75	FEAT: SETiNTERVAL WITH RENEWpERIOD	2024-04-22 07:37:35 +02:00
William Buezas	d5832eaf41	improvement	2024-04-19 12:52:45 -03:00
William Buezas	9212e53905	resolve conflicts	2024-04-19 12:48:07 -03:00
William Buezas	3f5c711fa1	Improvements	2024-04-19 12:26:49 -03:00
Jon Elias	cfe03aeffa	Merge branch 'dev' into 6899-endInvoiceOutMigration	2024-04-19 12:31:47 +00:00
Jorge Penadés	7a4f975cc9	fix: refs #6480 fix warning	2024-04-19 13:52:19 +02:00
Jorge Penadés	bd539449a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-19 13:33:47 +02:00
Jorge Penadés	da6e121137	refactor: refs #6480 use VnCard	2024-04-19 13:33:29 +02:00
Jorge Penadés	c3db9e17a8	fix: refs #6480 reactive summary	2024-04-19 13:30:07 +02:00
William Buezas	b22d54f490	WIP	2024-04-19 08:23:23 -03:00
Jorge Penadés	e38b53ca25	fix: refs #6480 reactive descriptor	2024-04-19 13:12:14 +02:00
Javier Segarra	aecea5f273	refs #7190 feat: renewToken	2024-04-19 12:26:43 +02:00
Javier Segarra	fb26219354	refs #7190 feat: useTokenConfig	2024-04-19 12:09:04 +02:00
Jorge Penadés	3fb155e697	fix: refs #6480 reactivity	2024-04-19 11:57:04 +02:00
Jorge Penadés	2450d5bf7a	reafacto: refs #6480 slots	2024-04-19 11:40:52 +02:00
Javier Segarra	bd01fcdd88	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-19 08:54:36 +00:00
Jorge Penadés	de0468bb99	fix: refs #6480 summary reactivity	2024-04-19 10:32:52 +02:00
Jorge Penadés	b352dcde21	fix: refs #6480 summary data-key	2024-04-19 09:42:42 +02:00
Jorge Penadés	ff36f82333	fix: refs #6480 disable popup on no observe changes	2024-04-19 09:39:17 +02:00
Jorge Penadés	9887d59808	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-19 09:01:37 +02:00
Jon Elias	988fd1f449	Merge branch 'dev' into 6899-endInvoiceOutMigration	2024-04-19 06:09:58 +00:00
Jon Elias	6021e1e4ce	refactor: refs #6899 changed comercial value in negativeBases table	2024-04-19 07:37:33 +02:00
William Buezas	6c4901076f	Apply ItemsFilterPanel to EntryLatestBuys	2024-04-18 13:14:23 -03:00
William Buezas	a3cc6ed95b	Add filter dates tooltip	2024-04-18 10:32:32 -03:00
Jorge Penadés	dfdfb6ec93	feat: refs #6480 locale	2024-04-18 15:25:32 +02:00
William Buezas	7165e48bff	Add states translations	2024-04-18 09:19:15 -03:00
Jorge Penadés	246944d2a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-18 14:10:41 +02:00
William Buezas	5f01e5c705	change es translations	2024-04-18 09:09:22 -03:00
William Buezas	b52b70041c	resolve pnpm lock conflicts and change some colors	2024-04-18 08:33:23 -03:00
Jorge Penadés	f8da680e98	feat: refs #6480 setArrayData	2024-04-18 13:33:21 +02:00
William Buezas	75dc81eba7	add column filters	2024-04-18 08:16:37 -03:00
Jon Elias	3f8cafd201	style: refs #6899 fixed style	2024-04-18 13:14:59 +02:00
Jorge Penadés	75975b631e	feat: refs #6480 include SearchBar into VnCard	2024-04-18 11:32:03 +02:00
Jorge Penadés	90ed6ad09a	fix: refs #6480 drop secondary acroos	2024-04-18 10:49:17 +02:00
Jorge Penadés	b71068ac64	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-18 08:44:10 +02:00
Jon Elias	ace55c554f	refactor: refs #6899 corrected Lilium styles and functionalities	2024-04-18 08:03:57 +02:00
William Buezas	5addd0056d	Add filter panel	2024-04-17 17:18:38 -03:00
William Buezas	2903c6a2bf	table adjustments	2024-04-17 14:55:17 -03:00
Jorge Penadés	d6508f1930	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-17 14:20:00 +02:00
William Buezas	da06e7bc87	WIP	2024-04-17 08:13:34 -03:00
William Buezas	ba2499db9d	resolve conflicts	2024-04-16 12:11:57 -03:00
William Buezas	df2760ef60	Add dense attr to inputs	2024-04-16 11:49:59 -03:00
William Buezas	8e6538b369	Item request view	2024-04-16 11:47:15 -03:00
William Buezas	813bab4e9d	manage QCalendar customization classes from wrapper	2024-04-16 10:47:16 -03:00
William Buezas	e36949ad07	resolve conflicts	2024-04-16 10:11:03 -03:00
William Buezas	c82f4652f5	Move capitalize header week day to wrapper	2024-04-16 09:44:52 -03:00
William Buezas	256461a5bb	Change current day colors	2024-04-16 09:41:03 -03:00
William Buezas	a808491c5e	use the color of calendar background for the border of panel card	2024-04-16 09:37:31 -03:00
William Buezas	1577fb701b	remove unused span	2024-04-16 09:30:17 -03:00
William Buezas	51eba2ea77	Add calendar wrapper	2024-04-16 09:28:48 -03:00
William Buezas	5664ec1313	WIP	2024-04-16 08:21:44 -03:00
Pablo Natek	c65c09c39c	feat(agency): refs #4988 add agency router and sections	2024-04-16 07:45:33 +02:00
William Buezas	00dfa171b0	WIP	2024-04-15 15:37:41 -03:00
William Buezas	fcce2b5070	Add filter	2024-04-15 08:46:26 -03: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
Carlos Satorres	ee80b1d617	refs #6976 changes table	2024-04-12 14:34:11 +02: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
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	f72ea07b09	WIP	2024-04-12 08:07:33 -03: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	98f273cb93	WIP	2024-04-11 18:04:11 -03:00
jcasado	ad8007fe6b	refs #6641 add checkbox	2024-04-11 13:42:37 +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
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
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
Carlos Satorres	0cc672d75a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData	2024-04-10 14:20:19 +02:00
Carlos Satorres	904f647a5b	refs #7172 fix vnSelectFilter	2024-04-10 14:16: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
Carlos Satorres	f60670cb87	refs #7172 change vnselectfilter	2024-04-08 10:49:53 +02:00
Jorge Penadés	dfac40adb3	feat: refs #6480 vnCard	2024-04-08 10:27:37 +02:00
Jorge Penadés	4fa311120d	feat: refs #6480 hide if no content	2024-04-08 10:11:50 +02:00
William Buezas	7584857c87	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/WorkerTimeControl	2024-04-05 09:11:23 -03:00
William Buezas	52611beaf1	Changes in isHimSelf computed and FormPopup buttons order	2024-04-05 08:57:25 -03:00
William Buezas	580af396d1	Change buttons group	2024-04-04 08:45:03 -03:00
William Buezas	95b19d35e7	Change form model popup buttons order	2024-04-03 13:50:25 -03:00
Pablo Natek	fb6a2c8097	feat: refs #4988 add agencyList and searchBar	2024-04-03 14:59:51 +02:00
jcasado	cd49ebe7a6	refs #6697 fix claimQuantity	2024-04-03 12:54:14 +02:00
Pablo Natek	6c39c7da97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-03 08:40:15 +02:00
Pablo Natek	f404243d63	feat(route): refs # agency add agencyList	2024-04-03 08:38:26 +02:00
William Buezas	835174612c	Make value comparision not strict	2024-04-02 10:09:28 -03:00
William Buezas	026588c03d	WorkerTimeForm set initial data	2024-04-02 09:30:59 -03:00
William Buezas	772959ff81	Improve getLocales code	2024-04-02 09:13:12 -03:00
William Buezas	6bb0d30284	Move Worker Time control componente to Card folder	2024-04-01 21:19:55 -03:00
William Buezas	cb238476e7	Components reubication and change calendar selected date color	2024-03-28 09:47:39 -03:00
William Buezas	1fc6eed1d5	Clean props when switching between edit and create mode in WorkerTimeForm	2024-03-28 08:31:55 -03:00
William Buezas	b546b63352	resolve conflicts	2024-03-27 10:11:20 -03:00
William Buezas	112112b069	Small change	2024-03-27 09:13:53 -03:00
William Buezas	de912b266c	Finish calendar integration	2024-03-27 08:26:28 -03:00
William Buezas	0a74b2a96e	QCalendar implementation WIP	2024-03-26 15:38:06 -03:00
William Buezas	5964189a83	Implement WorkerDateLabel	2024-03-25 10:41:10 -03:00
William Buezas	71a4a20f20	Disable text area when is not himself	2024-03-22 18:38:18 -03:00
William Buezas	6f97ee1aeb	improvements	2024-03-22 18:33:25 -03:00
William Buezas	f1faf18523	General improvements	2024-03-22 14:10:00 -03:00
William Buezas	bdd0e657ec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/WorkerTimeControl	2024-03-22 08:36:41 -03:00
William Buezas	d20828ac7c	remove console.logs	2024-03-21 13:15:11 -03:00
William Buezas	65da9a3e69	resolve conflicts	2024-03-21 08:53:42 -03:00
William Buezas	fc5d858bf1	WIP	2024-03-21 08:37:11 -03:00
William Buezas	522b01b293	WIP	2024-03-20 10:31:42 -03:00
William Buezas	7ff8bc642e	WIP	2024-03-19 13:39:46 -03:00
William Buezas	d12fa85d73	WIP	2024-03-15 10:20:07 -03:00
William Buezas	c7b60346e9	WIP	2024-03-15 08:20:48 -03:00
William Buezas	6baaebf6bd	WIP	2024-03-14 09:48:04 -03:00