2372 Commits

Author	SHA1	Message	Date
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
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
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
Jon Elias	82300fd292	refactor: refs #7239 changed french translations	2024-04-24 11:31:37 +02:00
jcasado	6391ed1360	refs #6697 changes claim	2024-04-24 11:26:32 +02:00
Javier Segarra	8bb3d48c81	Merge branch 'dev' into feature/FixedPrices	2024-04-24 07:37:39 +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	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
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	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	02637556fb	Merge branch 'dev' into 7239-changeTranslations	2024-04-23 09:45:25 +00: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
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
Alex Moreno	9cb662b6f5	Merge branch 'dev' into 6336_fix_vn_notes_VnAvatar	2024-04-23 07:22:34 +00: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
Jorge Penadés	498b8b3315	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into warmFix_hasMoreData	2024-04-23 08:39:33 +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
Alex Moreno	20ec141237	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-23 07:39:15 +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
Jorge Penadés	3abc504158	fix: unit test	2024-04-22 16:35:34 +02:00
William Buezas	e11625e05f	set columns default attrs to avoid repeating code	2024-04-22 11:30:16 -03:00
Alex Moreno	952d5bf543	fix(VnNotes): refs #6336 VnAvatar	2024-04-22 15:03:10 +02:00
Alex Moreno	72deeab2ef	Merge branch 'dev' into warmFix_hasMoreData	2024-04-22 13:01:28 +00:00
William Buezas	c9767e7b1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into bugfix/SupplierConsumptionDateRanges	2024-04-22 09:45:01 -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	7dac6ba910	Remove unused imports	2024-04-22 09:02:35 -03:00
William Buezas	64fc02e33b	Fix supplier consumption disabled buttons	2024-04-22 09:00:57 -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
Jorge Penadés	1f391dc49b	fix: skip	2024-04-22 13:17:05 +02:00
Jorge Penadés	80844e7869	fix: hasMoreData	2024-04-22 12:53:09 +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
Alex Moreno	4a5285358c	fix(VnNotes): refs #6336 restore index in key	2024-04-22 09:46:40 +02:00
Alex Moreno	918ce0dc86	fix(VnNotes): refs #6336 remove index in key	2024-04-22 09:38:38 +02:00
Jorge Penadés	9a3f714290	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into warmFix_hasMoreData	2024-04-22 08:57:26 +02:00
Alex Moreno	99af402281	fix(VnNotes): refs #6336 fix v-for key	2024-04-22 08:42:38 +02:00
Jon Elias	3c2f281e0a	Merge branch 'dev' into 6899-endInvoiceOutMigration	2024-04-22 06:00:26 +00:00
Alex Moreno	3eb5041bf5	fix: refs #6590 remove unnecessary import	2024-04-22 07:50:34 +02: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
Javier Segarra	edd1b66110	fix: merge toDateHourMin	2024-04-21 16:09:21 +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
William Buezas	3a03e42cf9	Resolve conflicts	2024-04-19 10:40:04 -03:00
Alex Moreno	ae2737673d	fix: hasMoreData	2024-04-19 14:43:38 +02:00
Alex Moreno	c638209f0e	fix: hasMoreData	2024-04-19 14:39:20 +02: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
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