7135 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	b4d4844100	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-22 07:42:54 +02:00
Javier Segarra	f4a7e20c57	test: refs #6943 #6943 add comands to solve tests	2024-10-21 14:31:31 +02:00
Jorge Penadés	0fbd5f45e1	fix: refs #7524 select department	2024-10-21 14:29:29 +02:00
Javi Gallego	69215851bb	Merge branch 'dev' into 7346-manualInvoice	2024-10-21 14:01:18 +02:00
Javier Segarra	29a7f3b2fe	fix: refs #7283 #7283 ItemDiary subToolbar	2024-10-21 13:48:43 +02:00
Jon Elias	665e84d338	Merge pull request '#7356: Changes to fix ticket section' (!806) from Fix-TicketsModule into dev ... Reviewed-on: #806 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 11:41:08 +00:00
Jon Elias	cd4b17048c	Merge branch 'dev' into Fix-TicketsModule	2024-10-21 11:40:02 +00:00
Alex Moreno	c69f7af390	test: refs #8039 axios not notify	2024-10-21 13:38:35 +02:00
Alex Moreno	8478d89183	Merge branch '8039-canceledError_not_notify' of https://gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify	2024-10-21 13:33:14 +02:00
Alex Moreno	9780fe596f	feat: refs #8039 notify error unify	2024-10-21 13:33:12 +02:00
Alex Moreno	6f79275521	Merge branch 'dev' into 8039-canceledError_not_notify	2024-10-21 11:24:08 +00:00
Alex Moreno	52981953f7	feat(): refs #8039 canceledError not notify	2024-10-21 13:23:45 +02:00
Javier Segarra	bc1a082fe1	Merge pull request '#7679 Improve NewPostCodeForm' (!787) from 7679_improve_newPostcode_form into dev ... Reviewed-on: #787 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 11:17:47 +00:00
Javier Segarra	e5064e8a37	Merge branch 'dev' into 7679_improve_newPostcode_form	2024-10-21 11:17:01 +00:00
Javier Segarra	76b69a7588	Merge pull request '#6943 - Customer specs' (!822) from 6943_customer_spec into dev ... Reviewed-on: #822 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 11:14:58 +00:00
Javier Segarra	cdce4d063c	Merge branch 'dev' into 6943_customer_spec	2024-10-21 11:14:14 +00:00
Jon Elias	df3b4e7a18	refactor: refs #7132 deleted useless code	2024-10-21 13:07:07 +02:00
Jon Elias	1d41647022	Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations	2024-10-21 12:57:32 +02:00
Jon Elias	e5cd9d4b8f	refactor: refs #7132 global translations files changed	2024-10-21 12:56:09 +02:00
Alex Moreno	fbd6633bdb	Merge pull request 'fix(TicketBasicData_zone): refs #6233 add acls and fix get zones' (!847) from 6233-fix_ticketBasicData_zone into dev ... Reviewed-on: #847 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-21 10:51:08 +00:00
Alex Moreno	0afcba0b07	Merge branch 'dev' into 6233-fix_ticketBasicData_zone	2024-10-21 10:49:43 +00:00
Alex Moreno	d61c690a70	Merge pull request 'feat(navBar): refs #7632 isLoading' (!844) from 7632-axios_isLoading into dev ... Reviewed-on: #844 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-21 10:48:57 +00:00
Jorge Penadés	a4358ec0ed	chore: refs #7524 refactor order	2024-10-21 12:36:16 +02:00
Jorge Penadés	2b2ccbc6a1	feat: refs #7524 myTeam filter & default params	2024-10-21 12:14:54 +02:00
Alex Moreno	d221b8e3c4	chore: refs #7632 change requests	2024-10-21 12:04:20 +02:00
Alex Moreno	fcc213f307	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7632-axios_isLoading	2024-10-21 12:03:15 +02:00
Jon Elias	2a7bebb0b6	Merge pull request 'Added new filter param and refactored link colors in item request' (!827) from Fix-ItemRequest into dev ... Reviewed-on: #827 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-21 09:35:07 +00:00
Alex Moreno	f2147311d3	fix(TicketBasicData_zone): refs #6233 add acls and fix get zones	2024-10-21 08:41:19 +02:00
Alex Moreno	0cc1090739	Merge branch 'dev' into 7632-axios_isLoading	2024-10-21 06:23:05 +00:00
Jon Elias	fa0625aa86	Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems	2024-10-18 14:12:25 +02:00
Jon Elias	11bf70d76c	fix: category and tags filters	2024-10-18 14:12:23 +02:00
Alex Moreno	bfc906a346	fix: refs #8036 only add where when required	2024-10-18 13:48:10 +02:00
Alex Moreno	8381a25017	fix: refs #8036 apply exprBuilder after save filters	2024-10-18 13:46:34 +02:00
Jon Elias	fbfb1c654a	Merge branch 'Fix-TicketsModule' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketsModule	2024-10-18 13:33:29 +02:00
Jon Elias	11092866b8	fix: merge conflicts	2024-10-18 13:33:28 +02:00
Jon Elias	64c0496f7a	Merge branch 'dev' into Fix-ItemRequest	2024-10-18 11:20:43 +00:00
Jon Elias	89cb9aacec	refactor: refs #7132 1st wave of changes in global translations files	2024-10-18 12:54:21 +02:00
Alex Moreno	f4caf6aecc	test: refs #7632 not use hash word	2024-10-18 11:06:06 +02:00
Alex Moreno	175ebbc343	feat(navBar): refs #7632 isLoading	2024-10-18 11:03:43 +02:00
Jon Elias	0e77d4b68f	refactor: refs #7132 account's module translations	2024-10-18 10:40:40 +02:00
Jorge Penadés	55f8b78eba	Merge pull request 'fix: refs #7353 load on scroll end' (!841) from 7353-fixLoadOnScroll into dev ... Reviewed-on: #841 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-18 08:16:21 +00:00
Jorge Penadés	2aaba93c3c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fixLoadOnScroll	2024-10-18 10:11:11 +02:00
Jorge Penadés	0c2d9e6ec6	fix: refs #7353 load on scroll end 80% zoom	2024-10-18 10:08:46 +02:00
Jon Elias	5c5393db6d	Merge pull request '#7010 added packing type field' (!762) from 7010-AddPackingField into dev ... Reviewed-on: #762 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-18 07:40:37 +00:00
Jon Elias	7d78ce7781	Merge branch 'dev' into 7010-AddPackingField	2024-10-18 07:29:17 +00:00
Carlos Satorres	da3364b424	Merge pull request '7986-workerMoto' (!830) from 7986-workerMoto into dev ... Reviewed-on: #830 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-18 07:25:06 +00:00
Jon Elias	8eef9c0009	refactor: refs #7132 customer's module translations	2024-10-18 09:21:18 +02:00
Carlos Satorres	8bc06593c5	Merge branch '7986-workerMoto' of https://gitea.verdnatura.es/verdnatura/salix-front into 7986-workerMoto	2024-10-18 08:44:31 +02:00
Carlos Satorres	1f4b681b5b	fix: refs #7986 clean code	2024-10-18 08:44:27 +02:00
Jon Elias	58e88f605c	refactor: refs #7132 delete duplicate translations' keys	2024-10-18 08:04:52 +02:00