693 Commits

Author	SHA1	Message	Date
Javier Segarra	778e6299ce	fix: solve conflicts from test to dev	2024-10-01 08:57:04 +02:00
Pablo Natek	7fa0a5b28c	fix: refs #7404 path name	2024-09-30 10:47:02 +02:00
Jorge Penadés	14b7654db3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-26 15:16:32 +02:00
Jorge Penadés	478d4695b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-26 09:16:59 +02:00
Pablo Natek	1ee3691cc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues	2024-09-25 08:26:27 +02:00
Pablo Natek	8124a341a0	feat: refs #7129 route extended list and simplify route list	2024-09-24 07:25:17 +02:00
Jon Elias	44d98865fe	fix: refs #7553 requested changes	2024-09-20 09:04:31 +02:00
Carlos Satorres	b2c2f42243	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT	2024-09-18 07:57:58 +02:00
Jorge Penadés	41c43fde76	feat: refs #7323 hide log section	2024-09-17 16:08:48 +02:00
Pablo Natek	cead2c2b5e	Merge branch 'dev' into 7404-stockBought	2024-09-17 11:40:42 +00:00
Pablo Natek	c59c8127cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-16 08:59:46 +02:00
Javier Segarra	025436b4b8	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-13 09:27:38 +02:00
Jon Elias	ed5987630f	Merge branch 'dev' into 6346-fixWagonModule	2024-09-13 06:14:05 +00:00
Pablo Natek	e2dbe0fd38	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-12 09:09:21 +02:00
Jorge Penadés	f7975069d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-09-10 08:59:01 +02:00
Jon Elias	b4fb9ceb2e	Merge branch 'dev' into 6346-fixWagonModule	2024-09-10 06:29:51 +00:00
Alex Moreno	3164209bef	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-10 08:13:56 +02:00
Jon Elias	6790067a89	Merge branch 'dev' into 6346-fixWagonModule	2024-09-10 06:02:18 +00:00
Jorge Penadés	381b236a18	refactor: refs #4074 use acl & drop useless roles	2024-09-09 12:56:37 +02:00
Jorge Penadés	803ce3b909	refactor: refs #4074 rollback	2024-09-09 11:53:59 +02:00
Jorge Penadés	c978cca8c5	refactor: refs #4074 useAcl in navigationStore & router	2024-09-09 11:35:49 +02:00
Jon Elias	f78ca3f357	Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule	2024-09-09 10:04:44 +02:00
Pablo Natek	e083d6a802	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-08 07:54:26 +02:00
Jorge Penadés	d0131dd552	fix: refs #4074 drop wrong acl	2024-09-06 15:52:06 +02:00
Jorge Penadés	34a9b4d4d0	Merge branch 'dev' of https: refs #4074//gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-09-06 13:23:02 +02:00
Jon Elias	ef98f60486	refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu	2024-09-06 10:30:32 +02:00
Jon Elias	5d78f564dd	refactor: refs #7889 deleted subtitle attr and use keyBinding instead	2024-09-06 10:00:07 +02:00
Jon Elias	585919a4d9	feat: refs #7889 added shortcuts to modules	2024-09-06 09:19:38 +02:00
Jorge Penadés	763cf2e345	refactor: refs #6900 create setRectificative composable	2024-09-04 10:30:14 +02:00
Carlos Satorres	3a703141c6	Merge branch 'dev' into 7407-MedicalWorker2	2024-09-04 07:49:14 +00:00
Jorge Penadés	a5887114ef	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-hotfix-fineTunning	2024-09-03 12:50:35 +02:00
Pablo Natek	2fb974af0f	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-03 08:01:19 +02:00
Jon Elias	a2eb298733	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-03 04:36:22 +00:00
Carlos Satorres	7bd3c0802e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7407-MedicalWorker2	2024-09-02 15:05:51 +02:00
Javier Segarra	5d511c7b1b	Merge branch 'dev' into 7889_main_shortcuts	2024-09-02 13:02:07 +00:00
Carlos Satorres	0475083a2b	refs #7407 Medical Section	2024-09-02 14:57:01 +02:00
Javier Segarra	c51af96ca7	fix: module icon	2024-09-02 12:56:44 +00:00
Jorge Penadés	f24daa4ebd	feat: refs #6900 hide menu item	2024-09-02 13:15:06 +02:00
Jon Elias	1af4a559fc	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-02 10:50:22 +00:00
Jorge Penadés	90b2cf09b9	feat: refs #7353 add right icons	2024-08-29 16:54:09 +02:00
Javier Segarra	d8e3f9dfd9	feat: apply mixin	2024-08-28 16:11:25 +02:00
Jorge Penadés	25be0df2e3	Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor	2024-08-27 09:55:52 +02:00
Javier Segarra	2ae482ff8c	Merge branch 'test' into dev	2024-08-27 09:38:12 +02:00
Javier Segarra	461b764f0e	Merge branch 'test' into dev	2024-08-27 07:11:20 +02:00
Jorge Penadés	fdacdf1a12	feat: refs #7353 add filter & fix customTags	2024-08-23 12:43:27 +02:00
Jon Elias	a31931f8cf	Merge branch 'dev' of https: refs #7354//gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End	2024-08-21 08:13:19 +02:00
Jorge Penadés	206253ac6b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor	2024-08-19 16:03:23 +02:00
Jon Elias	ce8d12fe20	Merge branch 'dev' into 7717_fixOrderCatalog	2024-08-19 09:20:31 +00:00
Jon Elias	6fd0083870	fix: refs #7354 fix validation in price field	2024-08-19 10:45:13 +02:00
Jorge Penadés	ada1c948f6	feat: refs #7353 split sections	2024-08-19 10:14:02 +02:00
Jon Elias	926fba27b8	Merge branch 'dev' into 7354_ZoneMigration_End	2024-08-14 08:45:37 +00:00
Javier Segarra	55b9cd9ff4	feat: handle same multiple CP	2024-08-14 09:18:24 +02:00
Alex Moreno	0a0e8be39f	Merge branch 'dev' into 7848-recoveryPassword	2024-08-13 14:41:23 +00:00
Alex Moreno	a46198e2d0	feat: add recover password and reset password	2024-08-13 12:25:08 +02:00
Jorge Penadés	c4de1beabf	feat: refs #6900 add InvoiceInSerial	2024-08-12 13:46:56 +02:00
Alex Moreno	37244cdbc7	feat(orderBasicData): add notes	2024-08-09 14:55:49 +02:00
Alex Moreno	d3f50ec9b2	Merge branch 'dev' into 7717_fixOrderCatalog	2024-08-09 06:52:13 +00:00
Alex Moreno	3ee7692bbc	fix(zone): zoneLocation and the others searchbar	2024-08-09 08:45:48 +02:00
Carlos Satorres	3eaa5c864d	refs #7355 account fixes	2024-08-08 13:57:01 +02:00
Pablo Natek	f2be2b4300	fea: stockBought add form and formDetail	2024-08-05 15:42:57 +02:00
Alex Moreno	810e579ea9	refactor(customer_recovery): to vnTable	2024-08-05 12:10:15 +02:00
Jorge Penadés	53aec24790	chore: refs #4074 drop workerCreate	2024-08-02 09:04:16 +02:00
Jon Elias	cf90007023	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-07-30 14:33:28 +02:00
Alex Moreno	026c632a4c	feat(customer): improve basicData to balance	2024-07-26 09:47:28 +02:00
Jon Elias	8ceee6f182	fix: fix conflicts	2024-07-25 07:06:27 +02:00
Jon Elias	3a9116987c	Merge branch 'dev' into 7717_fixOrderCatalog	2024-07-24 08:35:24 +00:00
Jon Elias	a7a1b7801c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule	2024-07-23 13:25:58 +02:00
Jon Elias	12370b6437	feat: refs #6346 new wagon type section	2024-07-23 13:22:54 +02:00
Jon Elias	18dac38fb2	Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer	2024-07-23 09:14:14 +02:00
Jon Elias	33ad8fcb9d	refactor: refs #7014 improved route.js & deleted RouteMain	2024-07-23 09:12:00 +02:00
Jon Elias	eb2df02ad6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-07-19 14:55:09 +02:00
Jon Elias	7f376c8ea4	fix: refs #7717 fix catalog filter, searchbar redirect and search	2024-07-19 14:53:44 +02:00
Jon Elias	94aa3bc7a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End	2024-07-15 12:47:59 +02:00
Javier Segarra	be86b69079	fix: ticket menu order and i18n	2024-07-15 11:53:10 +02:00
Javier Segarra	8ea1fb6793	Merge branch 'dev' into feature/TicketDms	2024-07-15 09:30:10 +00:00
Javier Segarra	c56610515c	Merge branch 'dev' into TicketDms	2024-07-15 11:29:27 +02:00
Pablo Natek	35a165b9f3	Merge branch 'dev' into 7129-finishMigration	2024-07-15 09:25:52 +00:00
Pablo Natek	9098e63793	refactor: refs #7129 refactor with vnTable	2024-07-12 10:41:18 +02:00
Jon Elias	a4a9572c96	feat: refs #7323 fixed tests, changed calendar styles and fix workerCreate	2024-07-12 09:16:32 +02:00
Javier Segarra	c5c96bf51b	Merge branch 'dev' into feature/SaleTracking	2024-07-09 09:41:45 +02:00
Javier Segarra	3f2b675d07	feat: change ticketDms leftMenuItem position	2024-07-09 09:15:20 +02:00
Javier Segarra	cededb54e8	Merge branch 'dev' into feature/TicketDms	2024-07-09 09:14:40 +02:00
Javier Segarra	6bd119abc3	Merge branch 'dev' into 6896_Order_End	2024-07-08 13:01:34 +00:00
Jon Elias	7d90b536b0	Merge branch 'dev' into 6899_InvoiceOut_End	2024-07-08 09:32:32 +00:00
Javier Segarra	aabd575854	Merge branch 'dev' into feature/TicketPackages	2024-07-08 10:55:14 +02:00
Javier Segarra	84462fe201	Merge branch 'dev' into feature/TicketComponents	2024-07-08 10:14:13 +02:00
Javier Segarra	f87b806406	Merge branch 'dev' into feature/TicketPhotos	2024-07-08 10:10:24 +02:00
Javier Segarra	a303942f76	Merge branch 'dev' into feature/TicketExpedition	2024-07-08 08:05:33 +00:00
Jon Elias	0436dbae51	fix: refs #6896 fixed OrderList path	2024-07-05 10:21:02 +02:00
Javier Segarra	9d4cfbd90c	Merge branch 'dev' into feature/TicketPackages	2024-07-05 09:28:31 +02:00
William Buezas	decf33c0b7	small changes	2024-07-04 09:46:10 -03:00
Jon Elias	1b839a89f7	refactor: refs #6896 Order migration	2024-07-04 13:35:27 +02:00
Javier Segarra	d6cc447989	Merge branch 'dev' into feature/SaleTracking	2024-07-04 10:44:50 +02:00
Javier Segarra	14e26f0285	Merge branch 'dev' into feature/TicketComponents	2024-07-04 09:40:00 +02:00
Jon Elias	fcc8d59cb3	Merge branch 'dev' into 6899_InvoiceOut_End	2024-07-04 06:28:17 +00:00
William Buezas	91eb966586	Ticket photos	2024-07-03 14:44:36 -03:00
Jon Elias	7914387735	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End	2024-07-03 09:46:54 +02:00
Pablo Natek	61bd1eaf04	merge dev	2024-07-03 09:33:04 +02:00
Javier Segarra	d15dc7336b	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-03 08:26:27 +02:00
William Buezas	5c36ad14f4	Ticket components	2024-07-02 21:33:19 -03:00