2470 Commits

Author	SHA1	Message	Date
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
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
Jorge Penadés	54155961fe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker	2024-05-02 12:04:16 +02:00
Javier Segarra	6a958a0807	Actualizar src/pages/InvoiceIn/Card/InvoiceInDueDay.vue	2024-05-02 08:32:39 +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
Jorge Penadés	455f47d46f	feat: refs #5919 set store.data	2024-05-02 10:23:35 +02: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	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	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
William Buezas	ac219bfbb7	Item shelvings	2024-04-30 16:15:48 -03: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	6a03038c3a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-04-30 07:58:56 +02:00
Alex Moreno	2dfb2300a2	hotFix: refs #6336 fix vnLog user?.id	2024-04-30 07:51:22 +02: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	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
Alex Moreno	5378ed6f2e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-04-29 10:34:48 +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	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	f83ef4eb4c	Merge branch 'dev' into feature/ItemListFilter	2024-04-29 06:02:02 +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	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	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
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
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	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
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
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
Jon Elias	c56b6b2dbc	refactor: better syntax	2024-04-26 08:22:08 +02:00
Javier Segarra	3116bf0944	Merge branch 'dev' into feature/ItemRequests	2024-04-26 06:21:36 +00:00
Jon Elias	443f4a4443	refactor: refs #7239 changed spanish translations	2024-04-26 07:49:28 +02:00
Javier Casado	6d5e0484cd	Merge branch 'dev' into 6697-changeClaimQuantity	2024-04-26 05:32:32 +00: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
Javier Segarra	6e5ac0eeb9	fix: CustomerAdress layout	2024-04-25 14:44:32 +02:00
Javier Segarra	f14d631051	feat #7271 ZoneDescriptor	2024-04-25 14:32:42 +02:00
Javier Segarra	b1871c33fd	feat #7271 Zone Components boilerplate	2024-04-25 14:30:16 +02:00
Javier Segarra	b4e3157887	feat #7271 i18n	2024-04-25 14:28:06 +02:00
Javier Segarra	42591d0781	feat #7271 router	2024-04-25 14:27:56 +02:00
Alex Moreno	08a40e13f9	Merge branch 'dev' into 6764-rename-VnSelectFilter	2024-04-25 12:10:32 +00: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
Javier Segarra	ccc6885172	Fix: minor bugs, layout & vnlocation	2024-04-25 04:41:44 +00: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
William Buezas	934db32973	WIP	2024-04-24 10:31:33 -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