#7897 - masterTest_24_36 #669

Merged

jsegarra merged 115 commits from 7897_masterTest_24_36 into master 2024-09-03 06:37:49 +00:00

Conversation 0 Commits 115 Files Changed 89 +1760 -1188

115 Commits

Author	SHA1	Message	Date
Javier Segarra	ecba084f8b	feat: reduce changelog.md lines	2024-09-03 08:31:27 +02:00
Javier Segarra	c4c4285b4b	fix: remove unnecessary console.log	2024-09-03 08:16:01 +02:00
Javier Segarra	6e2630c69e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7897_masterTest_24_36	2024-09-03 08:07:57 +02:00
Javier Segarra	84076309a5	feat: update changelog.md	2024-09-03 08:04:42 +02:00
Javier Segarra	61721b84b9	Merge pull request '#7897 - Solve conflicts masterTest_24_36' (!670) from 7897_masterTest_24_36 into test ... Reviewed-on: #670 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-03 05:40:47 +00:00
Javier Segarra	e9da8d44f0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7897_masterTest_24_36	2024-09-02 19:31:54 +02:00
Jorge Penadés	63f5f85e8d	Merge pull request 'fix: refs #7524 dynamic fetching' (!662) from 7524-warmfix-useLimit into test ... Reviewed-on: #662 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-02 08:54:27 +00:00
Jorge Penadés	56d226b36b	fix: refs #7524 dynamic fetching	2024-09-02 10:03:01 +02:00
Jorge Penadés	d55bf0ff75	Merge pull request '#7524 useLimit' (!645) from 7524-useLimit into test ... Reviewed-on: #645 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-02 07:50:45 +00:00
Jorge Penadés	7bac607746	fix: refs #7524 add sort-by	2024-08-29 14:20:52 +02:00
Jorge Penadés	42e7629c40	fix: refs #7524 use limit ticket section	2024-08-29 13:53:10 +02:00
Jorge Penadés	35829c743b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-useLimit	2024-08-29 13:18:37 +02:00
Jorge Penadés	77c9311760	fix: refs #7524 use limit travels section	2024-08-28 17:39:39 +02:00
Javi Gallego	3051b13478	warmFix fields with wrong name	2024-08-28 17:31:39 +02:00
Jorge Penadés	3fce76f2e2	Merge branch 'test' of https: refs #7524//gitea.verdnatura.es/verdnatura/salix-front into 7524-useLimit	2024-08-28 17:18:13 +02:00
Javier Segarra	61ae3edf18	Merge pull request '#7896 - 24.36 Dev To Test' (!648) from 7896_devToTest_2436 into test ... Reviewed-on: #648 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-27 10:33:01 +00:00
Javier Segarra	ceec78da17	test: ticketDescriptorMenu	2024-08-27 10:27:51 +02:00
Javier Segarra	4a81598883	fix: ticketDescriptorMenu	2024-08-27 10:27:43 +02:00
Jorge Penadés	4d7a4be2c0	fix: refs #7524 use limit entry Section wip	2024-08-27 09:54:21 +02:00
Javier Segarra	2ae482ff8c	Merge branch 'test' into dev	2024-08-27 09:38:12 +02:00
Jorge Penadés	717c52fc02	fix: refs #7524 use id	2024-08-26 16:55:16 +02:00
Jorge Penadés	7c2a13db0b	fix: refs #7524 use limit shelving Section	2024-08-26 16:39:17 +02:00
Jorge Penadés	566a649c20	fix: refs #7524 use limit item Section	2024-08-26 16:34:46 +02:00
Jorge Penadés	89287c3ea3	Merge pull request '#7864 - Merge master into test' (!630) from master into test ... Reviewed-on: #630 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-08-26 12:01:53 +00:00
Javi Gallego	b4d1a4dab4	Merge pull request '#7710 - uses cloneAll' (!640) from 7710-cloneWithTicketPackaging into dev ... Reviewed-on: #640 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-23 13:42:42 +00:00
Javi Gallego	b82449b174	Merge branch 'dev' into 7710-cloneWithTicketPackaging	2024-08-23 13:41:17 +00:00
Javi Gallego	a14c0f3fe0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-23 13:52:51 +02:00
Javi Gallego	fb0ed9c4ce	para que no de el fallo de muchos registros	2024-08-23 13:52:46 +02:00
Javier Segarra	6358fdb320	Merge pull request 'Create ticket future filter' (!638) from hyervoni/salix-front-mindshore:feature/TicketFutureFilter into dev ... Reviewed-on: #638 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-23 11:28:46 +00:00
Javier Segarra	e7ce2a0ef6	Merge branch 'dev' into feature/TicketFutureFilter	2024-08-23 11:17:02 +00:00
Javi Gallego	efc7df5a60	delivery traducido a Reparto	2024-08-23 12:19:54 +02:00
Javi Gallego	6dc7d8f9a2	Merge pull request 'feat: refs #7346 add seriaType option' (!626) from 7346-invoiceOutMultilple into dev ... Reviewed-on: #626 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-23 09:08:52 +00:00
Javi Gallego	d0ccce2656	feat: refs #7346 elimino ===	2024-08-23 10:32:36 +02:00
Javi Gallego	1984e1d0d8	feat: refs #7710 uses cloneAll	2024-08-23 10:25:05 +02:00
Javi Gallego	defb11a6d7	Merge branch 'dev' into 7346-invoiceOutMultilple	2024-08-23 08:20:06 +00:00
Javier Segarra	91e52432ea	Merge branch 'dev' into feature/TicketFutureFilter	2024-08-23 07:13:43 +00:00
Javier Segarra	03ebf28712	Merge pull request '#7323 - Handle workerPhoto' (!633) from 7323_workerPhoto into dev ... Reviewed-on: #633 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-23 07:09:19 +00:00
Javier Segarra	54eb567e39	perf: date fields	2024-08-22 22:13:50 +02:00
William Buezas	6197d283e4	Create ticket future filter	2024-08-21 10:51:38 -03:00
Javi Gallego	b71d24cf3d	feat: refs #7346 sonarLint warnings	2024-08-21 14:13:36 +02:00
Javi Gallego	3d5807463b	feat: refs #7346 refactor	2024-08-21 13:46:19 +02:00
Javier Segarra	89eaf02800	feat: #7323 handle workerPhoto	2024-08-21 11:45:26 +02:00
Javier Segarra	f9fd1c1f90	Merge pull request '#6336 - FIX ClaimList states' (!627) from 6336_claim_fix_states into dev ... Reviewed-on: #627 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-20 09:42:41 +00:00
Javier Segarra	a5fc366081	Merge branch 'dev' into 6336_claim_fix_states	2024-08-20 09:34:46 +00:00
Javi Gallego	0eb699bcbe	feat: refs #7346 formdata uses serialType	2024-08-20 10:10:11 +02:00
Javier Segarra	c19585fb1b	fix: quasar build warnings	2024-08-19 11:36:12 +02:00
Jon Elias	5230b8f722	Merge pull request '#7717 fix OrderCatalog' (!558) from 7717_fixOrderCatalog into dev ... Reviewed-on: #558 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-19 09:22:34 +00:00
Jon Elias	ce8d12fe20	Merge branch 'dev' into 7717_fixOrderCatalog	2024-08-19 09:20:31 +00:00
Jon Elias	f3d7590edf	refactor: refs #7717 delete useless function and import	2024-08-19 10:49:04 +02:00
Javi Gallego	ca3406fbc0	Merge branch 'dev' into 7346-invoiceOutMultilple	2024-08-19 10:27:48 +02:00
Javier Segarra	74f335b22e	fix: #6336 ClaimListStates	2024-08-19 06:51:52 +00:00
Alex Moreno	00616939c6	Merge pull request 'feat(FormModel): trim data by default' (!625) from formModel_trimData into dev ... Reviewed-on: #625 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-16 11:13:38 +00:00
Alex Moreno	fa0ca732fc	feat(FormModel): trim data by default	2024-08-16 12:29:35 +02:00
Alex Moreno	4b2f4ffac1	fix(VnTable): orderBy v-model	2024-08-16 12:20:08 +02:00
Alex Moreno	2bea46b601	fix: test	2024-08-16 11:47:32 +02:00
Alex Moreno	ed29088d76	typo	2024-08-16 10:49:52 +02:00
Javi Gallego	06c0f49128	feat: refs #7346 add seriaType option	2024-08-16 10:10:40 +02:00
Alex Moreno	895441a8e4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-14 13:40:25 +02:00
Alex Moreno	a8f550fcc8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-14 13:39:54 +02:00
Alex Moreno	e9873a43b1	Merge pull request '7848-recoveryPassword' (!617) from 7848-recoveryPassword into dev ... Reviewed-on: #617 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-08-13 14:43:46 +00:00
Alex Moreno	0a0e8be39f	Merge branch 'dev' into 7848-recoveryPassword	2024-08-13 14:41:23 +00:00
Alex Moreno	3cbdf25410	delete name default	2024-08-13 16:40:02 +02:00
Alex Moreno	fdb508de97	delete cy.logs	2024-08-13 16:31:34 +02:00
Carlos Satorres	b5537d6ae5	Merge pull request '7355-accountMigration2' (!619) from 7355-accountMigration2 into dev ... Reviewed-on: #619 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-13 13:10:39 +00:00
Carlos Satorres	405092f66d	fix: account subsections cards	2024-08-13 13:11:23 +02:00
Carlos Satorres	aae881c24a	fix(account_card): redirection	2024-08-13 12:59:22 +02:00
Carlos Satorres	e144f0be01	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2	2024-08-13 12:52:14 +02:00
Alex Moreno	e88e7fa9db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-13 12:25:47 +02:00
Alex Moreno	b828fd35b7	test: add two factor e2e	2024-08-13 12:25:46 +02:00
Alex Moreno	dc1accff7a	test: add recover and reset password e2e	2024-08-13 12:25:37 +02:00
Alex Moreno	a46198e2d0	feat: add recover password and reset password	2024-08-13 12:25:08 +02:00
Jorge Penadés	e0473b589c	Merge pull request 'test to dev' (!616) from test into dev ... Reviewed-on: #616 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-08-13 09:29:29 +00:00
Carlos Satorres	94878b700b	refs #7355 account cards loads	2024-08-12 12:39:06 +02:00
Alex Moreno	3222a7a42c	fix(orderLines): reload when delete and redirect when confirm	2024-08-12 11:51:21 +02:00
Alex Moreno	1e4a309a84	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-08-12 11:47:01 +02:00
Alex Moreno	190579e7fd	fix: orderCatalogFilter order	2024-08-12 10:22:52 +02:00
Alex Moreno	e11e51f432	fix: order description to vnTable	2024-08-12 09:17:51 +02:00
Alex Moreno	37244cdbc7	feat(orderBasicData): add notes	2024-08-09 14:55:49 +02:00
Alex Moreno	dc7c686508	feat(orderList): correct create order	2024-08-09 14:19:08 +02:00
Carlos Satorres	b21ba3dc2c	refs #7355 account cards roles cards	2024-08-09 13:55:29 +02:00
Alex Moreno	ee71ae9d24	feat(orderList): use orderFilter and fixed this	2024-08-09 13:07:37 +02:00
Alex Moreno	5741cca878	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-08-09 12:39:00 +02:00
Alex Moreno	6df6e53f30	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-08-09 09:32:23 +02:00
Alex Moreno	d3f50ec9b2	Merge branch 'dev' into 7717_fixOrderCatalog	2024-08-09 06:52:13 +00:00
Jon Elias	cc3216f1f3	Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-08-09 07:46:33 +02:00
Jon Elias	3f76b5496a	fix: refs #7717 fix order sections	2024-08-09 07:46:32 +02:00
Carlos Satorres	40c3ba15e6	refs #7355 account acls roles cars	2024-08-08 14:55:53 +02:00
Carlos Satorres	3eaa5c864d	refs #7355 account fixes	2024-08-08 13:57:01 +02:00
Carlos Satorres	df1b63da98	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2	2024-08-07 12:23:22 +02:00
Carlos Satorres	6b69a16122	refs #7355 changes BasicData	2024-08-07 12:22:52 +02:00
Jon Elias	3dc2ac8bac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-08-07 07:25:57 +02:00
Jon Elias	8a4f723732	Merge branch 'dev' into 7717_fixOrderCatalog	2024-08-02 04:50:39 +00:00
Jon Elias	b9a0f926ce	Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-07-31 07:36:01 +02:00
Jon Elias	68ce5880dd	refactor: refs #7717 deleted useless code	2024-07-31 07:35:59 +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
Jon Elias	610e7c150b	Merge branch 'dev' into 7717_fixOrderCatalog	2024-07-30 11:32:05 +00:00
Jon Elias	7e3bfce732	fix: refs #7717 fix basic data form & minor errors	2024-07-30 13:31:12 +02:00
Jon Elias	2cd696aeb9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-07-30 08:03:46 +02:00
Jon Elias	be113656ae	Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-07-26 14:56:27 +02:00
Jon Elias	4d7fe0fd86	fix: refs #7717 fix volume and lines redirect	2024-07-26 14:56:26 +02:00
Jon Elias	356e7768b7	Merge branch 'dev' into 7717_fixOrderCatalog	2024-07-26 12:11:18 +00:00
Jon Elias	4cad7cbced	Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog	2024-07-26 14:09:10 +02:00
Jon Elias	d588db05ac	fix: refs #7717 fix OrderList table filters' and summary table style	2024-07-26 14:09:09 +02:00
Jon Elias	2de11d3ecf	Merge branch 'dev' into 7717_fixOrderCatalog	2024-07-25 08:07:26 +00:00
Jon Elias	3a9116987c	Merge branch 'dev' into 7717_fixOrderCatalog	2024-07-24 08:35:24 +00:00
Jon Elias	cc518d5a80	perf: refs #7717 right menu filter	2024-07-24 10:33:22 +02:00
Javier Segarra	e013e5571d	perf: use ref at component start	2024-07-23 20:18:53 +02:00
Javier Segarra	1ac0a85969	updates	2024-07-23 15:09:42 +02:00
Jon Elias	ce6a94bab8	fix: refs #7717 fix catalog searchbar and worker tests(refs #7323)	2024-07-23 11:46:21 +02:00
Javier Segarra	368b8404fa	updates: OrderCatlago	2024-07-22 15:13:03 +02:00
Jon Elias	848b267112	Merge branch 'dev' into 7717_fixOrderCatalog	2024-07-22 10:53:55 +00:00
Jon Elias	def3ca33a2	fix: refs #7717 fixed searchbar filter with rightmenu filters' applied	2024-07-22 12:52:58 +02:00
Jon Elias	02e1de083a	fix: duplicate key	2024-07-19 15:00:05 +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