2446 Commits

Author	SHA1	Message	Date
Javier Segarra	d55c75089c	Merge branch 'dev' into 7323_department_descriptor_routerLink	2024-06-12 09:28:05 +00:00
Pablo Natek	b7a097fd13	Merge branch 'dev' into 7499-refactorEntrys	2024-06-12 06:16:48 +00:00
Alex Moreno	048685277f	Merge branch 'dev' into 6825-vnTable	2024-06-12 05:31:31 +00:00
Jon Elias	df364dca4a	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-12 05:04:16 +00:00
Javier Segarra	d0759cb654	Merge branch 'dev' into feature/AccountFormsView	2024-06-11 21:12:13 +02:00
Pablo Natek	a65f5dfe44	fix: refs #7499 use current colors	2024-06-11 16:38:12 +02:00
Carlos Satorres	a7b805a4ab	stash departmentFilter	2024-06-11 16:24:07 +02:00
Alex Moreno	3dfe3226ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-11 15:00:52 +02:00
Jon Elias	4045a3a631	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 12:56:52 +00:00
Javi Gallego	cb0559fee8	Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev ... Reviewed-on: #432 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 12:53:42 +00:00
Pablo Natek	6789f3d1cb	fix: refs #7499 fix style	2024-06-11 14:32:01 +02:00
Jon Elias	2d0b33c626	Merge branch '7154-ItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7154-ItemDescriptor	2024-06-11 14:29:44 +02:00
Jon Elias	de18b670ea	feat: refs #7154 changed label	2024-06-11 14:29:42 +02:00
Pablo Natek	be919f97b1	Merge branch '7499-refactorEntrys' of https://gitea.verdnatura.es/verdnatura/salix-front into 7499-refactorEntrys	2024-06-11 14:28:20 +02:00
Pablo Natek	80adeede81	fix: refs #7499 fix item reference	2024-06-11 14:28:19 +02:00
Jon Elias	989ea3d82c	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-11 11:49:25 +00:00
Jon Elias	e5a590a9f9	feat: refs #7154 new item descriptor field	2024-06-11 13:48:15 +02:00
Javier Segarra	25f4d1f654	fix: point 3	2024-06-11 11:58:27 +02:00
Javier Segarra	fe2412f6d9	fix: point 1	2024-06-11 11:58:20 +02:00
Alex Moreno	f753eddc43	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable	2024-06-11 11:40:58 +02:00
Carlos Satorres	ba0364e799	refs #6897 fix BasicData	2024-06-11 10:30:42 +02:00
Javier Segarra	fac9b6a439	Merge branch 'dev' into feature/AccountConnections	2024-06-11 07:39:41 +00:00
Javier Segarra	adbc9dee2c	Merge branch 'dev' into feature/WorkerDescriptorMenu	2024-06-11 07:37:06 +00:00
Jorge Penadés	11bcfb0d2d	Merge branch 'dev' into 6243-generalizeCmrSection	2024-06-11 07:34:34 +00:00
Carlos Satorres	31afa22de8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-11 09:20:23 +02:00
Jorge Penadés	c5889b2170	Merge branch 'dev' into 6273-fixRedirect	2024-06-11 07:16:59 +00:00
Carlos Satorres	8e9656f96a	refs #7366 remove warning	2024-06-11 09:10:25 +02:00
Carlos Satorres	313395ef7c	refs #7366 fix travelMigration	2024-06-11 09:06:09 +02:00
Jorge Penadés	f9b688fc37	Merge branch 'dev' into 6243-generalizeCmrSection	2024-06-11 07:02:37 +00:00
Carlos Satorres	b07f7b0003	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-11 08:35:35 +02:00
Alex Moreno	0289c167ee	refactor: unnecessary computed	2024-06-11 08:30:18 +02:00
Alex Moreno	5e7ef68439	feat: simplify html	2024-06-11 08:22:26 +02:00
Javi Gallego	b83285000b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-11 08:03:41 +02:00
Javi Gallego	d847b33def	minor change	2024-06-11 08:03:35 +02:00
Javier Segarra	fbecbd0c08	Merge remote-tracking branch 'origin/dev' into feature/WorkerDescriptorMenu	2024-06-10 17:10:05 +02:00
Jorge Penadés	992249c638	fix: refs #6273 redirect	2024-06-10 17:06:28 +02:00
William Buezas	c1df20a09b	Worker descriptor menu	2024-06-10 11:21:23 -03:00
Jorge Penadés	348310bc34	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection	2024-06-10 15:37:08 +02:00
Jorge Penadés	a5b71ecebc	feat: refs #6273 delete prop	2024-06-10 15:32:38 +02:00
Jorge Penadés	a64cd6fa73	refactor: refs #6273 update locale	2024-06-10 15:21:28 +02:00
Javi Gallego	3f94eabc3d	feat: refs #7548 añado link grafana	2024-06-10 14:47:43 +02:00
Jorge Penadés	9eed6e55be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-10 14:24:25 +02:00
Jorge Penadés	5869ad220c	feat: refs #6273 wip: add locale	2024-06-10 14:17:22 +02:00
Jorge Penadés	5e96ed3bd3	fix: refs #6273 fix arrayData changed	2024-06-10 14:03:57 +02:00
Jorge Penadés	d81ce9fe95	feat: refs #6273 add test & improve form	2024-06-10 13:54:02 +02:00
Javi Gallego	0e0e351805	Merge branch 'dev' into 7548-ticketSummaryCollection	2024-06-10 10:53:33 +02:00
Javi Gallego	911ff376fd	Merge pull request '#4560 - gastos-reparto' (!421) from 4560-gastos-reparto into dev ... Reviewed-on: #421 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-10 08:16:57 +00:00
Jorge Penadés	049783b16c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-10 08:58:10 +02:00
Jon Elias	f3a28edb5e	Merge branch 'dev' into 7003-fixedPriceOrder	2024-06-10 05:12:28 +00:00
William Buezas	91e0eb636f	resolve conflicts	2024-06-07 10:51:00 -03:00
William Buezas	bf3c146317	resolve conflicts	2024-06-07 10:24:11 -03:00
William Buezas	fa4a18fbbb	make account samba work again	2024-06-07 09:46:04 -03:00
William Buezas	1e67a0feca	Make AccountLdap work again	2024-06-07 09:35:36 -03:00
Jorge Penadés	695dd36c1f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-07 14:23:26 +02:00
Jorge Penadés	8d89fc2d90	feat: refs #6273 set payMethod to 0	2024-06-07 14:08:18 +02:00
William Buezas	4c84fd9326	resolve conflicts	2024-06-07 09:03:41 -03:00
Alex Moreno	dce95824be	fix(AccountAlias): fix and optimization	2024-06-07 12:51:38 +02:00
Jon Elias	deb6b448fb	Merge branch 'dev' into 7003-fixedPriceOrder	2024-06-07 10:48:09 +00:00
Jon Elias	d6bd3de971	refactor: refs #7003 fixed order param	2024-06-07 12:47:18 +02:00
Jon Elias	290325b677	refactor: refs #7003 changed order filter	2024-06-07 12:45:22 +02:00
Jorge Penadés	213ba4ba52	chore: refs #6273 Add default pay method for internal	2024-06-07 12:24:48 +02:00
Jorge Penadés	8b93dbc57d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-07 12:15:04 +02:00
Jorge Penadés	d35f9c9468	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection	2024-06-07 12:03:52 +02:00
Javi Gallego	9ceac32d89	feat: refs #7548 grafana	2024-06-07 11:59:26 +02:00
Pablo Natek	5197211cf0	Merge branch 'dev' into 7499-refactorEntrys	2024-06-07 09:38:51 +00:00
Pablo Natek	d0dccddcf3	fix: refs #7499 id article	2024-06-07 11:37:11 +02:00
Javier Segarra	5551077c92	fix: roles	2024-06-07 11:16:15 +02:00
Javier Segarra	6053d42442	fix: descriptor and i18n	2024-06-07 11:09:46 +02:00
Javier Segarra	567c9ad307	Merge branch 'dev' into feature/MailAliases	2024-06-07 10:46:24 +02:00
Javier Segarra	edad698f72	fix: update list when update record	2024-06-07 10:21:41 +02:00
Javier Segarra	6c608e86e6	Merge branch 'feature/AccountAcls' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountAcls	2024-06-07 10:19:55 +02:00
Javier Segarra	0ea44eb8db	Merge branch 'dev' into feature/AccountAcls	2024-06-07 10:07:15 +02:00
Javier Segarra	ec5d5e52f4	Merge branch 'dev' into feature/ZoneCalendar	2024-06-07 09:32:51 +02:00
Alex Moreno	a56df46678	fix(AccountAcls): fix and optimization	2024-06-07 09:07:58 +02:00
Pablo Natek	68e49e2ffa	fix: refs #7129 fix some issues on load and tools	2024-06-07 07:52:50 +02:00
Javier Segarra	2a85fe21b0	Merge branch 'dev' into 6911-saveOnEnter	2024-06-07 00:46:42 +02:00
Javier Segarra	17c3a89264	fix: show exclusionEvent in Calendar	2024-06-07 00:01:35 +02:00
Javier Segarra	a26401d8eb	feat: hide ID	2024-06-06 23:51:45 +02:00
Javier Segarra	e178778264	fix: styles	2024-06-06 23:46:26 +02:00
Javier Segarra	fe3ad9dc08	fix: styles and i18n	2024-06-06 23:40:52 +02:00
Javier Segarra	17924dfeb3	fix: styles and i18n	2024-06-06 23:39:38 +02:00
William Buezas	f305cee3ce	Account view forms	2024-06-06 14:07:40 -03:00
Alex Moreno	985ce9a643	deploy: test to dev	2024-06-06 12:24:08 +02:00
Jorge Penadés	b27ae621f3	Merge branch 'dev' into 6891-addToggleFilterPanel	2024-06-06 08:45:12 +00:00
Jorge Penadés	97dc299cfe	fix: refs #6942 fix emit on data saved	2024-06-06 09:53:48 +02:00
Alex Moreno	aee3c67ee0	clean code	2024-06-06 09:33:01 +02:00
Alex Moreno	395eb6bed7	Merge branch 'dev' into feature/AccountRoles	2024-06-06 07:32:15 +00:00
Javier Segarra	fe9adb7a3c	perf: minor changes	2024-06-06 08:09:05 +02:00
Javier Segarra	f3ec9ea58d	fix: VnPaginate order	2024-06-06 08:03:57 +02:00
William Buezas	9ed297207b	Make create form work	2024-06-05 14:52:45 -03:00
Javier Segarra	f453f42b06	feat: New and edit ACL from Popup	2024-06-05 19:37:53 +02:00
Javier Segarra	807460dfad	fix: info icon	2024-06-05 18:14:41 +02:00
Jorge Penadés	382591fb11	fix: refs #6273 set paymethodFk to 0 if it is external	2024-06-05 17:13:52 +02:00
Javier Segarra	de488169b7	feat: AccountDescriptor	2024-06-05 15:09:43 +02:00
Javier Segarra	30c912fa62	reset changes	2024-06-05 11:38:10 +02:00
Javier Segarra	c87629f2ec	fix: accountBasicData after update	2024-06-05 11:35:48 +02:00
Javier Segarra	3227d299e9	updates	2024-06-05 10:57:12 +02:00
Javier Segarra	0bb6498061	fix: minor i18n	2024-06-04 20:33:24 +02:00
William Buezas	946aa6b24d	Small changes	2024-06-04 15:10:00 -03:00
Jorge Penadés	7e0ceca623	feat: refs #6273 freelance form & vnRadio	2024-06-04 17:38:04 +02:00
William Buezas	c71877cdb1	Account connections	2024-06-04 12:23:28 -03:00
Carlos Satorres	06ddcc5030	refs #7366 fix travel	2024-06-04 15:55:30 +02:00
William Buezas	ddc149b6fc	adapt account privileges to new formModel changes	2024-06-04 09:25:03 -03:00
William Buezas	c574af9e9b	resolve conflicts	2024-06-04 09:15:55 -03:00
William Buezas	37a8956f86	Merge branch 'feature/AccountList' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountList	2024-06-04 09:11:37 -03:00
William Buezas	84ad1745e2	several changes	2024-06-04 09:10:40 -03:00
Javi Gallego	857aca49dd	feat: refs #4560 sin DeliveryMan	2024-06-04 14:06:04 +02:00
William Buezas	3efca6242d	Account ACLs	2024-06-04 08:41:41 -03:00
Javi Gallego	f1df969fa6	feat: refs #560 refactor descriptor	2024-06-04 10:52:00 +02:00
Jon Elias	93744fce65	Merge branch '6896-EndOrderMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration	2024-06-04 09:54:47 +02:00
Jon Elias	adf7c3a139	feat: refs #6896 new filters	2024-06-04 09:54:45 +02:00
Javi Gallego	5f00f3bad4	Merge branch 'dev' into 4560-gastos-reparto	2024-06-04 09:42:44 +02:00
Jorge Penadés	0b0754f76e	refactor: refs #6273 replace QBtnGroup with QRadio for worker type selection	2024-06-04 09:33:51 +02:00
Jorge Penadés	de4ea6271b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-04 09:00:57 +02:00
Jorge Penadés	1bc99cbd22	feat: refs #6243 show all cmrs & filter by warehouse	2024-06-03 16:30:59 +02:00
Jorge Penadés	b93b630c6a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection	2024-06-03 15:21:44 +02:00
Javier Segarra	ef47b34569	Merge branch 'dev' into feature/MailAliases	2024-06-03 13:09:54 +00:00
Javier Segarra	0d1453ddeb	feat: isPublic checkbox	2024-06-03 15:09:34 +02:00
Javier Segarra	668dc5fd53	fix: List without limit	2024-06-03 15:09:21 +02:00
Jorge Penadés	e6f0e6b089	refactor: refs #6891 Remove unused i18n	2024-06-03 14:12:49 +02:00
Jorge Penadés	2a61ca4dbb	refactor: refs #6891 drop isHeaderMounted condition	2024-06-03 14:11:40 +02:00
William Buezas	8320a75e61	make searchbar work	2024-06-03 09:03:37 -03:00
William Buezas	02d8254df9	rest of submodules	2024-06-03 08:47:32 -03:00
Javi Gallego	56a46cd130	4560	2024-06-03 11:52:19 +02:00
Jon Elias	f4f8dcfd71	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration	2024-06-03 11:43:56 +02:00
Javi Gallego	ca4193e11a	Merge branch 'dev' into 4560-gastos-reparto	2024-06-03 11:31:33 +02:00
Carlos Satorres	0d25c1b66b	refs #7366 fix travel	2024-06-03 11:27:44 +02:00
Jorge Penadés	d2180c67f7	refactor: refs #6600 replace QInput to VnInput	2024-06-03 09:35:59 +02:00
Jorge Penadés	f58b072964	feat: refs #6600 Add option to add comment for photo motivation	2024-06-03 09:30:37 +02:00
Jon Elias	aabf5420b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7003-fixedPriceOrder	2024-06-03 08:47:34 +02:00
William Buezas	8e1f7c24a4	submodules WIP	2024-06-02 13:26:46 -03:00
William Buezas	1c14841233	Several changes	2024-05-31 14:02:50 -03:00
Javier Segarra	0ad839dfc6	src/pages/Order/Card/OrderCatalogItemDialog.vue	2024-05-31 14:40:16 +02:00
Javier Segarra	e6a1c31119	fix: src/pages/InvoiceOut/InvoiceOutGlobalForm.vue	2024-05-31 14:31:41 +02:00
Alex Moreno	221ed7c534	feat(TravelSummary): isConfirmed checkbox	2024-05-31 14:02:32 +02:00
Javier Segarra	59f9cf4111	fix: src/pages/InvoiceIn/Card/InvoiceInBasicData.vue	2024-05-31 13:56:46 +02:00
Javier Segarra	25d5887a57	fix: src/pages/Entry/Card/EntryBuysImport.vue	2024-05-31 13:42:49 +02:00
Carlos Satorres	a39c827579	refs #7366 fix url	2024-05-31 13:23:16 +02:00
Javier Segarra	d5dc9d974c	fix: ClaimBasicData form	2024-05-31 13:20:55 +02:00
Carlos Satorres	c499cc8f09	refs #6897 remove code fix section	2024-05-31 12:40:27 +02:00
Javier Segarra	0450986025	fix InvoiceInBasicdata	2024-05-31 12:01:18 +02:00
Javier Segarra	d072fc858d	Merge branch 'dev' into 6911-saveOnEnter	2024-05-31 11:59:29 +02:00
Javier Segarra	28173ddee2	Merge branch 'dev' into feature/AccountRoles	2024-05-31 10:24:37 +02:00
Javier Segarra	c2dd7831d1	perf: remove unnecessary components	2024-05-31 10:17:44 +02:00
Javier Segarra	67b3888f8c	feat: AccountForm as dialog	2024-05-31 10:10:15 +02:00
Javier Segarra	5b9d64128b	fix: AccountFilter	2024-05-31 09:45:01 +02:00
William Buezas	4bd78922af	remove unnecesary files	2024-05-30 15:43:26 -03:00
William Buezas	05b7df9168	Role submodules	2024-05-30 15:34:37 -03:00
William Buezas	5c25c77f19	Mail aliases	2024-05-30 13:09:11 -03:00
William Buezas	0cf4f41d19	Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases	2024-05-30 08:38:23 -03:00