6742 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	cdce4d063c	Merge branch 'dev' into 6943_customer_spec	2024-10-21 11:14:14 +00: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	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
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
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
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
Jorge Penadés	c42c811444	fix: refs #7353 load on scroll end	2024-10-17 17:39:49 +02:00
Jon Elias	e47cdff4ca	Merge pull request 'Hotfix: InvoiceOut summary' (!829) from Fix-InvoiceOutSummary into master ... Reviewed-on: #829 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-17 09:00:06 +00:00
Jon Elias	98a380e026	Merge branch 'master' into Fix-InvoiceOutSummary	2024-10-17 08:58:49 +00:00
Carlos Satorres	f2cb0111eb	fix: refs #7283 fix image	2024-10-16 14:45:33 +02:00
Carlos Satorres	3cdba5dafa	Merge branch 'dev' into 7986-workerMoto	2024-10-16 12:10:22 +00:00
Javier Segarra	70ae50a5f1	Merge branch 'dev' into 7679_improve_newPostcode_form	2024-10-16 12:07:26 +00:00
Carlos Satorres	d1c61c5aed	Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-10-16 14:01:01 +02:00
Javier Segarra	4115b1b303	Merge branch 'dev' into 6943_customer_spec	2024-10-16 07:22:43 +00:00
Javier Segarra	6b9dc8f3a6	Merge branch '6943_customer_spec' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_customer_spec	2024-10-16 09:22:11 +02:00
Javier Segarra	8262406eda	perf: refs #6943 Remove handle term	2024-10-16 09:21:57 +02:00
Alex Moreno	3069ac27d0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-16 09:17:00 +02:00
Alex Moreno	e0c294bce6	test(claimDevelopment): skip intermitent e2e	2024-10-16 09:16:57 +02:00
Carlos Satorres	e06ce4f8a4	fix: refs #7986 clean code	2024-10-15 14:56:32 +02:00
Carlos Satorres	cad3fddc3e	fix: refs #7986 descriptor fix	2024-10-15 14:52:52 +02:00
Carlos Satorres	a30915f99e	fix: refs #7986 fix operator, fix crudmodel update	2024-10-15 14:42:26 +02:00
Jon Elias	4fb3e0dadf	Merge pull request '#7825: Fill the bank field when a new entity is created' (!798) from 7825-FixCreatebankEntity into dev ... Reviewed-on: #798 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-15 11:42:38 +00:00
Jon Elias	c4670b57de	Merge branch 'dev' into 7825-FixCreatebankEntity	2024-10-15 11:13:35 +00:00
Jon Elias	15f171da0f	perf: refs #7825 create bank entity	2024-10-15 13:12:37 +02:00
Carlos Satorres	b4245d05fb	fix: refs #7986 crudModel	2024-10-15 13:00:01 +02:00
Carlos Satorres	22cc9d689d	Merge pull request 'refs #7767 check holiday' (!800) from 7767-holidayDaysExceeded into dev ... Reviewed-on: #800 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-15 10:55:45 +00:00
Carlos Satorres	3badfbcff9	Merge branch 'dev' into 7767-holidayDaysExceeded	2024-10-15 10:54:57 +00:00
Carlos Satorres	af830591b3	fix: refs #7986 front fixed	2024-10-15 09:44:55 +02:00
Alex Moreno	0f84baf1a8	build: init version 24.44	2024-10-15 09:29:06 +02:00
Alex Moreno	a33dde3dcf	Merge pull request '8093-devToTest_2442_3' (!831) from 8093-devToTest_2442_3 into test ... Reviewed-on: #831 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-10-15 07:22:03 +00:00
Jon Elias	cdce0771c9	Merge branch 'dev' into Fix-TicketsModule	2024-10-15 06:49:32 +00:00
Jon Elias	d416a34560	refactor: use docuware in ticket descriptor menu	2024-10-15 08:48:30 +02:00