7596-devToTest_2426 #452

Merged

alexm merged 378 commits from 7596-devToTest_2426 into test 2024-06-19 08:49:21 +00:00

Conversation 0 Commits 378 Files Changed 200 +7493 -6934

378 Commits

Author	SHA1	Message	Date
Alex Moreno	9f3a266239	Merge branch 'test' into 7596-devToTest_2426	2024-06-19 08:46:41 +00:00
Alex Moreno	cd6c0f586e	Merge pull request 'fix: refs #7599 fix spec remove enter key' (!460) from 7599-fixspec into dev ... Reviewed-on: #460 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 08:25:13 +00:00
Pablo Natek	188f225cf7	Merge branch 'dev' into 7599-fixspec	2024-06-19 08:24:07 +00:00
Pablo Natek	83428d0398	fix: refs #7599 fix spec remove enter key	2024-06-19 10:16:33 +02:00
Jon Elias	97c4130b05	Merge pull request '#7566 fixed summary cards and table' (!444) from 7566-FixCustomerSummary into dev ... Reviewed-on: #444 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-19 07:55:58 +00:00
Javier Segarra	d5bd8c4432	fix: #7566 remove v-if	2024-06-19 09:54:24 +02:00
Jon Elias	a80caa7c93	Merge branch 'dev' into 7566-FixCustomerSummary	2024-06-19 07:07:05 +00:00
Javier Segarra	6eb44b2cd6	Merge pull request 'Account Submodule' (!412) from hyervoni/salix-front-mindshore:feature/AccountList into dev ... Reviewed-on: #412 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-19 05:45:07 +00:00
Javier Segarra	ced1eaa801	Merge branch 'dev' into feature/AccountList	2024-06-19 05:43:46 +00:00
Jon Elias	fa425a4329	Merge branch 'dev' into 7566-FixCustomerSummary	2024-06-18 11:31:48 +00:00
Jon Elias	e0b4d86cab	Merge branch '7566-FixCustomerSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 7566-FixCustomerSummary	2024-06-18 13:29:18 +02:00
Jon Elias	546b43ffcf	refactor: refs #7566 fix customer summary	2024-06-18 13:29:17 +02:00
Alex Moreno	ae75908e46	refactor: simplify code	2024-06-18 10:53:21 +02:00
Javier Segarra	cd8e99e1df	perf: remove CLI warnings	2024-06-18 10:52:55 +02:00
Alex Moreno	cc0eb77228	Merge pull request '#7600 test vnLocation' (!454) from 7600-fix-vnLocation into dev ... Reviewed-on: #454 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 08:52:05 +00:00
Javier Segarra	dc0a938c4c	Merge branch 'dev' into feature/AccountList	2024-06-18 10:50:50 +02:00
Javier Segarra	f004ab3645	Merge branch 'feature/AccountList' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountList	2024-06-18 10:48:44 +02:00
Jorge Penadés	4ff0901950	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7600-fix-vnLocation	2024-06-18 10:44:58 +02:00
Jorge Penadés	4c40244d41	Merge pull request '#6238 addPercentageColumn' (!443) from 6238-addPercentageColumn into dev ... Reviewed-on: #443 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-18 08:41:42 +00:00
Jorge Penadés	cbbcddfd50	fix: refs #7600 test vnLocation	2024-06-18 10:37:49 +02:00
Jorge Penadés	14ef5ccefd	fix: refs #6238 rollback	2024-06-18 10:14:55 +02:00
Jorge Penadés	3f2779600a	fix: refs #6238 drop old fix	2024-06-18 10:13:43 +02:00
Jorge Penadés	1b4bd2e7f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-18 10:12:48 +02:00
Jorge Penadés	f280a7d4dd	Merge pull request '#7598 fix-formModel' (!453) from 7598-fix-formModel into dev ... Reviewed-on: #453 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 08:01:04 +00:00
Alex Moreno	741e6f27b1	Merge branch 'dev' into 7598-fix-formModel	2024-06-18 07:58:12 +00:00
Jorge Penadés	34069f4841	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-18 09:54:33 +02:00
Jorge Penadés	fcc41f0e57	Merge pull request '#6243 load warehouses & iron out column width' (!449) from 6243-fixColumnWidth into dev ... Reviewed-on: #449 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 07:53:42 +00:00
Jorge Penadés	b1b0f4efed	Merge branch 'dev' into 6243-fixColumnWidth	2024-06-18 07:49:46 +00:00
Jorge Penadés	024687e2d3	fix: refs #7598 fix evt & .value	2024-06-18 09:46:58 +02:00
Jorge Penadés	9725874d5d	fix: refs #7598 fix evt & .value	2024-06-18 09:44:50 +02:00
Jorge Penadés	37af8ba8f5	fix: refs #7598 fix evt & .value	2024-06-18 09:43:44 +02:00
Carlos Satorres	e6bf73c8d1	Merge pull request 'refs #6897 remove code fix section' (!415) from 6897-EntryMigration into dev ... Reviewed-on: #415 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 06:16:18 +00:00
Carlos Satorres	1cf630378b	Merge branch 'dev' into 6897-EntryMigration	2024-06-18 06:15:12 +00:00
Carlos Satorres	af59da33aa	Merge pull request '7366-travelMigration' (!430) from 7366-travelMigration into dev ... Reviewed-on: #430 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-18 06:03:41 +00:00
Carlos Satorres	0940872625	Merge branch '6897-EntryMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-18 07:18:47 +02:00
Carlos Satorres	bc30531d42	refs #6897 fix trad	2024-06-18 07:18:44 +02:00
Jorge Penadés	f64f42f473	fix: refs #6243 load warehouses & iron out column width	2024-06-17 10:46:51 +02:00
Jorge Penadés	94f4e154b0	refactor: refs #6238 use variable & link class	2024-06-17 10:39:36 +02:00
Carlos Satorres	f4b7d34a7f	refs #7366 fix redirect	2024-06-17 08:39:39 +02:00
Jorge Penadés	bd6e45d260	refactor: refs #6238 get percentage from back	2024-06-14 14:52:39 +02:00
Carlos Satorres	8002f0a94b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-14 12:59:16 +02:00
Carlos Satorres	7fccd0ae81	Merge branch '7366-travelMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-14 10:47:03 +02:00
Jon Elias	64648c77f6	Merge branch 'dev' into 7566-FixCustomerSummary	2024-06-14 07:11:09 +00:00
Jorge Penadés	fc54b44c7b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-14 09:05:49 +02:00
Javier Segarra	914a9afb92	Merge pull request 'Fix worker department: Create modal did not open' (!441) from hyervoni/salix-front-mindshore:bugfix/WorkerDepartment into dev ... Reviewed-on: #441 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-13 12:57:40 +00:00
Javier Segarra	7d73cd0e33	Merge branch 'dev' into bugfix/WorkerDepartment	2024-06-13 14:56:34 +02:00
Javier Segarra	648546888d	fix: DeleteDepartment VnConfirm	2024-06-13 14:56:19 +02:00
Carlos Satorres	548fc374c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration	2024-06-13 09:22:45 +02:00
Carlos Satorres	8c5ea42be2	Merge branch 'dev' into 6897-EntryMigration	2024-06-13 06:51:02 +00:00
Carlos Satorres	3958d5ab08	Merge branch 'dev' into 7366-travelMigration	2024-06-13 06:50:28 +00:00
Jon Elias	2b66148ff5	Merge branch 'dev' into 7566-FixCustomerSummary	2024-06-13 05:45:23 +00:00
Jon Elias	fa55e33b54	fix: refs #7566 fixed summary cards and table	2024-06-13 07:43:49 +02:00
Pablo Natek	78042ab109	Merge pull request 'fix: refs #7499 id article' (!428) from 7499-refactorEntrys into dev ... Reviewed-on: #428 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-13 05:41:26 +00:00
Pablo Natek	e10755d8fe	Merge branch 'dev' into 7499-refactorEntrys	2024-06-13 05:39:13 +00:00
Javier Segarra	ffd4109dc7	Merge branch 'dev' into bugfix/WorkerDepartment	2024-06-12 20:23:30 +00:00
Jorge Penadés	7393b82008	refactor: refs #6238 update getRate function and color logic	2024-06-12 16:46:14 +02:00
Jorge Penadés	19aa1bf01d	fix; refs #6238 fix test	2024-06-12 14:48:31 +02:00
Carlos Satorres	6e4843563c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration	2024-06-12 14:42:06 +02:00
Carlos Satorres	34e92d130a	refs #7366 fix basic-data	2024-06-12 14:31:18 +02:00
William Buezas	b0e4dc99b0	Fix worker department create modal did not open	2024-06-12 08:47:32 -03:00
Jorge Penadés	2641489d83	fix: refs #6238 use .value prop	2024-06-12 13:45:17 +02:00
Jorge Penadés	1052e9eb21	fix: refs #6238 use :deep	2024-06-12 13:14:02 +02:00
Jorge Penadés	a4c21c7673	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn	2024-06-12 12:42:23 +02:00
Jorge Penadés	51d497a1de	feat: refs #6238 add percentage & summary btn	2024-06-12 12:17:52 +02:00
Guillermo Bonet	9388cb3599	Merge branch 'test' into dev	2024-06-12 12:02:12 +02:00
Javier Segarra	ef24a5cd2f	Merge pull request '#7323 FIX default model value depends on route' (!437) from 7323_fix_workerTimeControl into dev ... Reviewed-on: #437 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-12 07:33:27 +00:00
Javier Segarra	11c0154c48	Merge branch 'dev' into 7323_fix_workerTimeControl	2024-06-12 07:31:51 +00:00
Alex Moreno	11d1fdd80e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-12 08:41:03 +02:00
Pablo Natek	b7a097fd13	Merge branch 'dev' into 7499-refactorEntrys	2024-06-12 06:16:48 +00:00
Jon Elias	79e84175a6	Merge pull request '#7154 new item descriptor field' (!436) from 7154-ItemDescriptor into dev ... Reviewed-on: #436 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-12 05:05:33 +00:00
Jon Elias	df364dca4a	Merge branch 'dev' into 7154-ItemDescriptor	2024-06-12 05:04:16 +00:00
Javier Segarra	e9051f1ee8	Merge pull request 'Account views: Accounts, Ldap, Samba' (!426) from hyervoni/salix-front-mindshore:feature/AccountFormsView into dev ... Reviewed-on: #426 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-11 19:14:29 +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
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
Javier Segarra	7ac2aed326	fix: default model value depends on route	2024-06-11 14:09:42 +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	57eadbc74e	Merge pull request 'Account connections' (!424) from hyervoni/salix-front-mindshore:feature/AccountConnections into dev ... Reviewed-on: #424 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-11 08:53:26 +00: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	fde004af3c	Merge pull request 'Worker descriptor menu' (!433) from hyervoni/salix-front-mindshore:feature/WorkerDescriptorMenu into dev ... Reviewed-on: #433 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 07:39:05 +00:00
Javier Segarra	adbc9dee2c	Merge branch 'dev' into feature/WorkerDescriptorMenu	2024-06-11 07:37:06 +00:00
Jorge Penadés	0624f8dfb7	Merge pull request '#6243 generalize cmr section' (!349) from 6243-generalizeCmrSection into dev ... Reviewed-on: #349 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 07:36:38 +00:00
Jorge Penadés	11bcfb0d2d	Merge branch 'dev' into 6243-generalizeCmrSection	2024-06-11 07:34:34 +00:00
Jorge Penadés	31081bd471	Merge pull request '#6598 create useAcl composable' (!345) from 6598-getUserAcl into dev ... Reviewed-on: #345 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-06-11 07:32:46 +00:00
Jorge Penadés	205e7d82a6	Merge branch 'dev' into 6598-getUserAcl	2024-06-11 07:31:15 +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	0cfaef2520	Merge pull request '#6273 fix redirect' (!434) from 6273-fixRedirect into dev ... Reviewed-on: #434 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 07:18:14 +00: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
Jorge Penadés	01658ee100	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl	2024-06-11 09:10:19 +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	9bcfd5c58a	Merge pull request '#6273 create freelance form option' (!347) from 6273-createFreelanceFormOpt into dev ... Reviewed-on: #347 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 13:34:59 +00: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	9c72597c2c	fix: refs #6273 tests	2024-06-10 14:42:41 +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	deca90c7ea	Merge pull request '#7003 new data order in section' (!398) from 7003-fixedPriceOrder into dev ... Reviewed-on: #398 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 05:14:53 +00: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
Jorge Penadés	b68547ac1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-07 15:43:17 +02:00
William Buezas	bf3c146317	resolve conflicts	2024-06-07 10:24:11 -03:00
Alex Moreno	2bdfc90241	build: increase version	2024-06-07 14:56:39 +02: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	59b85f24ea	fix: refs #6273 console error	2024-06-07 14:19:10 +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
Javier Segarra	301a62aa9d	Merge pull request 'Mail aliases' (!418) from hyervoni/salix-front-mindshore:feature/MailAliases into dev ... Reviewed-on: #418 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 10:54:36 +00:00
Javier Segarra	21a412f688	Merge branch 'dev' into feature/MailAliases	2024-06-07 10:53:17 +00: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	6368342be1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection	2024-06-07 12:04:00 +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
Alex Moreno	c392b44195	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-06-07 12:03:41 +02:00
Javi Gallego	9ceac32d89	feat: refs #7548 grafana	2024-06-07 11:59:26 +02:00
Carlos Satorres	6a9bba287b	Merge pull request 'refs #6905 fix userPanel' (!423) from 6905-fixUserPanelLocal into dev ... Reviewed-on: #423 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 09:50:24 +00:00
Carlos Satorres	3729817c2b	Merge branch 'dev' into 6905-fixUserPanelLocal	2024-06-07 09:47:48 +00: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	f01d83cfe5	Merge pull request 'Account ACLs' (!422) from hyervoni/salix-front-mindshore:feature/AccountAcls into dev ... Reviewed-on: #422 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 08:25:05 +00:00
Javier Segarra	3f22d098b0	Merge branch 'dev' into feature/AccountAcls	2024-06-07 08:22:35 +00: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
Alex Moreno	7f083bde5c	build: increase version	2024-06-07 10:13:32 +02:00
Javier Segarra	0ea44eb8db	Merge branch 'dev' into feature/AccountAcls	2024-06-07 10:07:15 +02:00
Javier Segarra	b54cb73c91	Merge pull request 'Zone Calendar' (!411) from hyervoni/salix-front-mindshore:feature/ZoneCalendar into dev ... Reviewed-on: #411 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 07:40:00 +00:00
Javier Segarra	ec5d5e52f4	Merge branch 'dev' into feature/ZoneCalendar	2024-06-07 09:32:51 +02:00
Javier Segarra	53c47301c7	Merge pull request '#6911 save on enter' (!207) from 6911-saveOnEnter into dev ... Reviewed-on: #207 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 07:20:46 +00:00
Alex Moreno	a56df46678	fix(AccountAcls): fix and optimization	2024-06-07 09:07:58 +02:00
Javier Segarra	7880f66c6e	Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-06-07 00:59:20 +02:00
Javier Segarra	28836fc514	test: fix test beacuse use {enter}	2024-06-07 00:59:17 +02:00
Javier Segarra	2a85fe21b0	Merge branch 'dev' into 6911-saveOnEnter	2024-06-07 00:46:42 +02:00
Javier Segarra	1237dd5c10	fix: style workweek	2024-06-07 00:13:49 +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	aba27c204a	Merge pull request '#6891 add toggle' (!417) from 6891-addToggleFilterPanel into dev ... Reviewed-on: #417 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-06 08:48:27 +00:00
Jorge Penadés	b27ae621f3	Merge branch 'dev' into 6891-addToggleFilterPanel	2024-06-06 08:45:12 +00:00
Javier Segarra	26c7b09b8a	perf: improve handleKeyUp method	2024-06-06 07:50:24 +00:00
Alex Moreno	f66d7b91f7	Merge pull request 'Account Roles' (!413) from hyervoni/salix-front-mindshore:feature/AccountRoles into dev ... Reviewed-on: #413 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-06 07:35:46 +00:00
Alex Moreno	454527b0a7	remove console.log	2024-06-06 09:34:42 +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
Jon Elias	a3d3d7d1e6	Merge pull request '#7502 new Lilium icons' (!420) from 7502-liliumIcons into dev ... Reviewed-on: #420 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-06 06:41:24 +00:00
Jon Elias	057e4780ae	Merge branch '7502-liliumIcons' of https://gitea.verdnatura.es/verdnatura/salix-front into 7502-liliumIcons	2024-06-06 08:38:21 +02:00
Jon Elias	516b905305	feat: refs #7502 new icons v1.73	2024-06-06 08:38:19 +02: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	56af348fdd	feat: refs #6273 update changelog	2024-06-05 17:29:40 +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
Carlos Satorres	b852faf91f	refs #6905 fix userPanel	2024-06-05 08:58:12 +02:00
Javier Segarra	0bb6498061	fix: minor i18n	2024-06-04 20:33:24 +02:00
William Buezas	9f6d0b4dc9	Remove roles	2024-06-04 15:15:12 -03: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
Jorge Penadés	a1bfe4c7ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt	2024-06-04 15:19:10 +02:00
William Buezas	969186c872	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases	2024-06-04 09:29:19 -03: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	253b54379c	Add submodules routes again	2024-06-04 09:14:48 -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	c96e6482f9	remove mail alias content	2024-06-04 08:42:32 -03:00
William Buezas	3efca6242d	Account ACLs	2024-06-04 08:41:41 -03:00
Jon Elias	4c50cb816d	Merge branch 'dev' into 7502-liliumIcons	2024-06-04 09:55:04 +00:00
Jon Elias	535798af25	feat: refs #7502 new Lilium icons	2024-06-04 11:53:24 +02:00
Javi Gallego	f1df969fa6	feat: refs #560 refactor descriptor	2024-06-04 10:52:00 +02:00
Alex Moreno	26ddb483f6	build: add new version	2024-06-04 10:08:49 +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
Jorge Penadés	0b92e98511	fix: refs #6891 show cross	2024-06-03 15:19:33 +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	f55e9d7c32	fix: refs #6891 Optimize RightMenu component rendering	2024-06-03 14:20:46 +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
Jorge Penadés	36ff4e9312	refactor: refs #6891 searchbar teleport	2024-06-03 12:58:26 +02:00
Jorge Penadés	c78828d6a6	refactor: refs #6891 Move filter panel rendering to RightMenu component	2024-06-03 12:29:44 +02:00
Javi Gallego	56a46cd130	4560	2024-06-03 11:52:19 +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	217f9bd86c	fix: refs #6891 rollback	2024-06-03 11:25:21 +02:00
Jorge Penadés	3a0f99ac22	feat: refs #6891 Add collapse menu button to filter panel	2024-06-03 11:10:46 +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
Javier Segarra	492e333d2f	fix: i18n VnNotes	2024-05-31 13:40:19 +02:00
Javier Segarra	d8bf95008a	fix: src/components/EditPictureForm.vue	2024-05-31 13:33:03 +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	5139bba5a0	fix: handle VnNotes keyup	2024-05-31 12:37:30 +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	4268f15d30	perf: remove unnecessary submodules	2024-05-31 10:23:03 +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
Javier Segarra	2c9ff60399	Merge branch 'dev' into feature/ZoneCalendar	2024-05-31 09:28:48 +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
William Buezas	ed2ba5458d	Avoif filter panel from redirecting	2024-05-30 08:34:53 -03:00
William Buezas	56dd5e0a76	change fn name	2024-05-29 16:27:44 -03:00
William Buezas	d82de6da58	Account roles	2024-05-29 16:14:29 -03:00
William Buezas	1414b93633	Account create	2024-05-29 11:53:11 -03:00
William Buezas	e47bda0afc	small changes	2024-05-29 08:47:33 -03:00
William Buezas	6c34a250db	Remove more unnecesary files	2024-05-29 08:28:17 -03:00
William Buezas	5c9f62bd59	Remove unnecesary files	2024-05-29 08:26:07 -03:00
William Buezas	b5e72aec7c	Wip	2024-05-29 08:01:37 -03:00
Javier Segarra	3f76aea680	fix: dashOrCurrency filter	2024-05-29 12:17:45 +02:00
Javier Segarra	ed566e6ece	style: increase height	2024-05-29 12:13:11 +02:00
Javier Segarra	b7bc82aa3c	feat: use new filter	2024-05-29 12:12:50 +02:00
Javier Segarra	c5e2a40d3e	feat: add router.meta.moduleName as default param	2024-05-29 12:12:40 +02:00
Javier Segarra	f9fa68b0b1	feat: dashOrCurrency filter	2024-05-29 12:12:07 +02:00
Javier Segarra	532d60130d	Merge branch 'dev' into feature/ZoneCalendar	2024-05-29 11:28:53 +02:00
William Buezas	0659eac652	Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountRoles	2024-05-28 18:38:13 -03:00
William Buezas	fd7f46cbe2	several changes	2024-05-28 18:33:18 -03:00
William Buezas	21879b54ab	remove console.log	2024-05-28 17:41:17 -03:00
William Buezas	062de82bca	Account list	2024-05-28 17:30:39 -03:00
William Buezas	4292804922	Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountList	2024-05-28 11:30:10 -03:00
William Buezas	e80b9a71c6	Hide panel when ZoneEvent view unmounts	2024-05-28 11:24:52 -03:00
William Buezas	d4600a1181	resolve conflicts and adapt tree	2024-05-28 11:20:43 -03:00
William Buezas	b783adfc31	several changes	2024-05-28 09:30:13 -03:00
William Buezas	7cd2bf2319	watch fix	2024-05-27 14:44:44 -03:00
William Buezas	c4b88fae41	adapt tree	2024-05-27 14:30:36 -03:00
William Buezas	cff434c1a6	Add sticky form button	2024-05-27 13:20:42 -03:00
William Buezas	62443ff44b	Abstract ZoneCalendarGrid in a component and reuse it	2024-05-26 20:52:46 -03:00
William Buezas	f52f5df78b	Make searchbar work	2024-05-26 19:35:12 -03:00
William Buezas	dbcd701725	Change Zone Calendar name	2024-05-26 18:59:16 -03:00
William Buezas	3cb17eeb66	remove console.logs	2024-05-26 18:55:35 -03:00
William Buezas	bfba4875cc	Minor change in exclusion form	2024-05-26 18:54:59 -03:00
William Buezas	097197b8dc	Zone exclude form and tree implementation	2024-05-26 17:17:58 -03:00
Javier Segarra	d46b906020	feat: bolierplate layout samba and ldap	2024-05-25 10:37:52 +02:00
William Buezas	a1fde3f645	WIP	2024-05-24 15:25:00 -03:00
William Buezas	68bb4251a4	WIP	2024-05-24 14:12:17 -03:00
William Buezas	9b3135fd97	WIP	2024-05-24 08:18:38 -03:00
Javier Segarra	889263bfb8	feat: roleCreate as dialog	2024-05-23 13:47:14 +02:00
Jon Elias	68213721a7	feat: refs #7003 new data order in section	2024-05-23 13:09:11 +02:00
Javier Casado	103e3fe08a	Merge branch 'dev' into 6911-saveOnEnter	2024-05-23 07:31:08 +00:00
Javier Segarra	433564507e	Merge branch 'dev' into 7311_boilerplate_users	2024-05-23 08:53:10 +02:00
Javier Segarra	06664cc2d0	feat: newRole	2024-05-23 08:52:57 +02:00
William Buezas	790e69f659	WIP	2024-05-22 08:08:43 -03:00
jcasado	96719884fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-05-22 12:46:56 +02:00
jcasado	4de9895b38	refs: #6911-saveOnEnter	2024-05-22 12:07:27 +02:00
William Buezas	84845b7958	WIP	2024-05-21 09:50:36 -03:00
Javier Segarra	dc14116717	perf: RoleCard, BasicData, summary	2024-05-21 08:52:34 +02:00
Javier Segarra	2cae2168ac	perf: AccountCard, BasicData, summary	2024-05-21 08:52:19 +02:00
Javier Segarra	026997a369	role updates	2024-05-20 23:25:20 +02:00
Javier Segarra	bbd51c5773	feat: AccountDescriptorMenu	2024-05-18 11:40:32 +02:00
Javier Segarra	474e2c3a48	style: align-center	2024-05-18 11:19:04 +02:00
Javier Segarra	0397f9ee68	feat: AccountDescriptor & AccountDescriptorMenu	2024-05-18 11:18:23 +02:00
Javier Segarra	c64a403ee2	feat: AccountSummary	2024-05-18 11:17:58 +02:00
Javier Segarra	a2316fb222	feat: change skeleteon different components	2024-05-18 10:35:08 +02:00
Javier Segarra	aa007117a7	Merge branch 'dev' into 7311_boilerplate_users	2024-05-18 10:16:28 +02:00
Jorge Penadés	12811692eb	feat: refs #6598 add more tests	2024-05-17 12:09:42 +02:00
Jorge Penadés	94bf6ff381	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl	2024-05-16 16:30:04 +02:00
Jorge Penadés	1d67233e69	feat: refs #6598 unit tests	2024-05-16 16:29:42 +02:00
Jorge Penadés	74e330e523	fix: refs #6598 fix unit tests	2024-05-16 14:05:39 +02:00
Jorge Penadés	b63735a709	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl	2024-05-16 12:35:52 +02:00
Jorge Penadés	12ff55a010	fix: refs #6598 get acls	2024-05-15 17:24:01 +02:00
Jorge Penadés	4f38ae3745	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl	2024-05-15 16:43:34 +02:00
jcasado	bdfafe9319	Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-05-14 08:49:19 +02:00
Javier Segarra	4609e59cd9	feat: i18n	2024-05-10 22:06:40 +02:00
Javier Segarra	f9e77596e4	feat: roles sections	2024-05-10 22:01:57 +02:00
Javier Segarra	555b5a663c	feat: role router	2024-05-10 18:06:40 +02:00
Javier Segarra	c045b0d1f4	feat accountRoutes	2024-05-10 17:47:34 +02:00
Javier Segarra	2cb402d3d4	feat: AccountList	2024-05-10 17:30:04 +02:00
Javier Segarra	f836857288	feat: remove unnused content	2024-05-10 17:16:41 +02:00
Javier Segarra	f6d3e37787	feat: accountRoles	2024-05-10 08:02:12 +02:00
Javier Segarra	5f607823b7	feat AccountCreate	2024-05-09 19:50:31 +02:00
Javier Segarra	f51af69fdd	updates	2024-05-09 19:48:46 +02:00
Javier Segarra	a15530dba2	fix: replace key value	2024-05-09 15:48:51 +00:00
Javier Casado	8128e22645	Merge branch 'dev' into 6911-saveOnEnter	2024-05-09 11:17:38 +00:00
jcasado	e68b9e63fe	Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-05-09 10:25:11 +02:00
Javier Casado	9e7301d32e	Merge branch 'dev' into 6911-saveOnEnter	2024-05-09 07:28:03 +00:00
Javier Segarra	c68ad5be34	feat #7311: minor changes	2024-05-09 08:40:00 +02:00
Javier Segarra	034342beb2	Merge branch 'dev' into 7311_boilerplate_users	2024-05-09 08:29:18 +02:00
Javier Segarra	99ef7fad76	feat #7311: subsections	2024-05-09 08:28:58 +02:00
Javier Segarra	0947dcc17e	feat #7311:sunmodules	2024-05-09 08:28:50 +02:00
Javier Casado	b1f25266aa	Merge branch 'dev' into 6911-saveOnEnter	2024-05-09 06:04:26 +00:00
Javier Segarra	c8b9233c87	feat #7311: i18n pageTitles	2024-05-09 08:00:53 +02:00
Javier Segarra	01bedb94d0	feat #7311: enable leftmenu option	2024-05-09 07:54:16 +02:00
Jorge Penadés	e1bf3f5404	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection	2024-05-07 13:07:16 +02:00
jcasado	49603e5b37	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-05-06 13:30:59 +02:00
Javier Casado	fc94454cfd	Merge branch 'dev' into 6911-saveOnEnter	2024-05-06 11:24:48 +00:00
Jorge Penadés	733f7a0702	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection	2024-05-06 08:55:09 +02:00
Jorge Penadés	7c1ce7f560	feat: refs #6243 replace url	2024-05-03 17:38:16 +02:00
Jorge Penadés	4b4c02c01a	feat: refs #6273 create worker form toggle	2024-05-03 16:40:11 +02:00
Jorge Penadés	0e7e804475	feat: refs #6598 create useAcl composable	2024-05-03 13:18:46 +02:00
Javier Casado	bdfcba5c3e	Merge branch 'dev' into 6911-saveOnEnter	2024-05-03 05:22:00 +00:00
Javier Casado	e44e182fec	Merge branch 'dev' into 6911-saveOnEnter	2024-05-02 05:28:23 +00:00
jcasado	d8d805a0ca	refs #6911 changesSaveOnEnter	2024-04-30 08:16:31 +02:00
Javier Casado	38f25eb02d	Merge branch 'dev' into 6911-saveOnEnter	2024-04-30 06:15:38 +00:00
jcasado	c4748cc9b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-04-29 09:42:09 +02:00
Jorge Penadés	44d59d5e55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-03-27 11:47:38 +01:00
Jorge Penadés	2eead3a69e	Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-03-27 11:43:23 +01:00
Jorge Penadés	c2c100458e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-03-27 11:43:21 +01:00
Jorge Penadés	5e43af9efd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-03-27 11:42:50 +01:00
Javier Segarra	7ae05a3e52	refs #6911: perf KeyCode is deprecated	2024-03-22 06:35:47 +00:00
Jorge Penadés	8604c86828	Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-03-04 13:36:42 +01:00
Jorge Penadés	149235f817	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-03-04 13:32:29 +01:00
Javier Segarra	ef979f05a3	refs #6911 feat: reaneme method and remove keyup	2024-03-04 11:38:18 +01:00
Javier Segarra	6bc8cdc0c3	refs #6911 feat: reaneme method and remove keyup	2024-03-04 11:36:46 +01:00
Javier Segarra	58dc4c253a	refs #6911 perf: use QForm instead classList	2024-03-04 11:14:59 +01:00
Javier Segarra	628d5453a8	refs #6911 feat: remove keyup.eneter=submit for each form	2024-03-04 11:14:36 +01:00
Javier Segarra	901c8c8f71	refs #6911 feat: qFormMixin keyup.enter	2024-03-04 10:23:45 +01:00
Javier Segarra	82e31d4dcf	refs #6911 feat: setDefaults	2024-03-04 10:18:28 +01:00
Jorge Penadés	7c5f55dee4	Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-03-01 14:58:03 +01:00
Jorge Penadés	492fb945d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-03-01 14:47:23 +01:00
Jorge Penadés	b0cc7283b6	Merge branch 'dev' into 6911-saveOnEnter	2024-02-29 14:28:42 +00:00
Jorge Penadés	f8d1b3d935	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-02-28 08:36:59 +01:00
Jorge Penadés	ba1dea32a5	fix: refs #6911 save onKeyup enter	2024-02-27 11:24:49 +01:00
Jorge Penadés	c070969d7d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter	2024-02-27 10:35:57 +01:00
Jorge Penadés	2c4676780e	fix: refs #6911 add icons, fix invoiceIn & save on enter	2024-02-27 09:28:01 +01:00
Vicent Llopis	3bd8e3c454	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4560-gastos-reparto	2023-05-24 08:11:01 +02:00
Alexandre Riera	20e284fe59	wornking on invoiceAllocation	2022-12-01 15:16:41 +01:00
Alexandre Riera	e499fd1511	working on create deliveryMan	2022-11-30 15:00:02 +01:00