968 Commits

Author	SHA1	Message	Date
Joan Sanchez	f53ebb7641	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-04-17 08:59:34 +02:00
Carlos Satorres	af8603185c	refs #5439 inheritedRole	2023-04-17 08:35:44 +02:00
Juan Ferrer	add3a8b1fa	merge with dev	2023-04-15 01:49:23 +02:00
Joan Sanchez	35f94c58b7	reafactor(image): upload image using gm library	2023-04-14 13:04:40 +02:00
Alexandre Riera	b9b52c6b1d	Merge branch 'dev' into 5418-buscador-lateral-fixed-price	2023-04-14 07:08:02 +00:00
Alexandre Riera	ac4772e44e	refs #5418 mistake doing git pull origin dev	2023-04-13 13:46:29 +02:00
Vicent Llopis	3790e3457f	refs #5517 añadidas más traducciones	2023-04-13 08:43:42 +02:00
Vicent Llopis	2a2d03e05a	refs #5517 añadidas traducciones de algunos modelos	2023-04-12 15:02:21 +02:00
Alexandre Riera	0666163ca0	refs #5546 deleted log property, fixed back tests	2023-04-12 12:33:14 +02:00
Pablo Natek	ccf26c5413	Merge branch 'dev' into 5211-cleanItemShelvings	2023-04-11 11:56:33 +00:00
Vicent Llopis	ec03c6edfa	fix intermittent backTest	2023-04-11 10:23:33 +02:00
Alexandre Riera	161fc25c5b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price	2023-04-11 10:01:21 +02:00
Vicent Llopis	ba31613ac9	Merge branch 'dev' into 5275-item.fixed-price_refactor	2023-04-06 09:58:07 +00:00
David Domenech	44d4df9c21	Merge branch 'dev' into 5211-cleanItemShelvings	2023-04-05 11:00:08 +00:00
Carlos Satorres	8741a9f913	Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra	2023-04-05 06:51:21 +00:00
Vicent Llopis	fb5969a120	refs #5275 add test	2023-04-05 08:43:47 +02:00
Carlos Satorres	77b91b77b2	refs #5439 requesterFk solve	2023-04-05 08:19:50 +02:00
Vicent Llopis	e97b5a9f80	refs #5275 fix backTest	2023-04-05 07:54:56 +02:00
Vicent Llopis	28a12d0706	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5275-item.fixed-price_refactor	2023-04-05 07:36:53 +02:00
Joan Sanchez	c126c6044a	Updated format	2023-04-04 13:55:44 +02:00
Alexandre Riera	1a14c793cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price	2023-04-04 09:47:31 +02:00
Joan Sanchez	8b4c70e8ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-30 14:57:00 +02:00
Vicent Llopis	67689695e4	refs #5275 filtra por defecto por el this.vnConfig.warehouseFk	2023-03-30 14:29:19 +02:00
Joan Sanchez	26bddef5e5	Merge pull request 'refs #5425 modificacion de los campos' (!1394) from 5425-modCamposBasicos(pesoycaja) into dev ... Reviewed-on: #1394 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-03-30 05:19:50 +00:00
Vicent Llopis	3b615d9879	refs #5275 fix: actualiza correctamete los elementos del checkedDummy	2023-03-29 09:11:40 +02:00
Vicent Llopis	c53c54b6cd	refs #5275 feat: modificar masivamente	2023-03-28 14:59:08 +02:00
Vicent Llopis	b4e04fcdad	refs #5275 feat: colorear fechas	2023-03-28 14:40:14 +02:00
Vicent Llopis	fb1b39da17	refs #5275 fix: al añadir artículo desde cero se muestra el nombre y se establecen las fechas por defecto	2023-03-28 10:30:02 +02:00
Vicent Llopis	06ac8f9910	refs #5275 fix: si tenia valor el minPrice el checkbox siempre se marcaba. El checkbox no funcionaba cuando le pulsabas	2023-03-28 09:41:39 +02:00
Alexandre Riera	0c8fe855ac	refs #5418 lateral search panel added, missing e2e	2023-03-27 09:11:29 +02:00
Carlos Satorres	fa78649607	refs #5439 url filter	2023-03-24 08:54:03 +01:00
Carlos Satorres	36af9d45e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-newFilterEnPeticionesDeCompra	2023-03-23 11:56:40 +01:00
Alexandre Riera	4e5364dc0b	refs #5036 fix tests logs	2023-03-23 10:05:02 +01:00
Carlos Satorres	79c42384ee	refs #5439 role actualizado	2023-03-23 08:26:06 +01:00
Joan Sanchez	7b5e0bae8e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-23 08:20:33 +01:00
Carlos Satorres	3fd1e7a086	refs #5439 se elimina el filtro de fecha añadido	2023-03-22 15:41:36 +01:00
Carlos Satorres	1ab8570ed3	Merge branch 'dev' into 5425-modCamposBasicos(pesoycaja)	2023-03-22 13:28:07 +00:00
Alexandre Riera	60eabbf7a0	Merge branch 'test' into hotfix-added-grabUser-logs	2023-03-22 10:37:57 +00:00
Alexandre Riera	59c3ef23de	grabUser added	2023-03-22 11:03:13 +01:00
Carlos Satorres	1bc3103d9f	refs #5439 filtro comercial	2023-03-21 08:44:28 +01:00
Carlos Satorres	306573b1bf	refs #5439 campos fecha y salesperson	2023-03-20 15:11:55 +01:00
Carlos Satorres	78d8bbd82a	refs #5423 tercer decimal en entrada	2023-03-20 10:44:44 +01:00
Carlos Satorres	9e42ab52ce	refs #5425 modificación usuario	2023-03-17 09:32:20 +01:00
Carlos Satorres	9565bb33f2	refs #5425 modificacion de los campos	2023-03-16 14:12:54 +01:00
Carlos Satorres	70beaf9b6c	refs #5423 añadido 3r decimal	2023-03-16 09:03:16 +01:00
Joan Sanchez	1f52326091	Merge pull request 'feat(print): added reusable pdf print functions' (!1390) from 5182-print_publish into dev ... Reviewed-on: #1390 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-03-16 06:22:45 +00:00
Joan Sanchez	596a017cfd	Don't throw error on file unlink	2023-03-16 07:18:29 +01:00
Joan Sanchez	a947666838	refactor(imageQueue): remplaced sharp with gm	2023-03-15 14:24:30 +01:00
Joan Sanchez	6495e016a8	Endpoints refactor	2023-03-14 08:17:46 +01:00
Joan Sanchez	1b984f4325	Event callback	2023-03-12 20:51:22 +01:00
Pablo Natek	8a4d9bd2bf	refs #5211	2023-03-10 12:52:51 +01:00
Joan Sanchez	aeb50b2c19	Removed callback syntax	2023-03-08 10:19:02 +01:00
Joan Sanchez	37043beb68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-03-03 07:44:31 +01:00
Joan Sanchez	b8881a050c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-03-02 07:41:16 +01:00
Joan Sanchez	ee6d292d6a	Merge pull request 'fixes #5063 Añadir campo doPhoto en la ficha de Item' (!1264) from 5063-item-module-doPhoto into dev ... Reviewed-on: #1264 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-03-02 06:34:45 +00:00
Alexandre Riera	d744cbb1a3	hotFix itemDiary reload card conditional	2023-03-01 12:22:01 +01:00
Alexandre Riera	7aedbda98b	refs #5202 changed vn-tr for a	2023-03-01 10:08:51 +01:00
Alexandre Riera	698a3396fc	refs #5063 deleted changes in item hook	2023-02-24 10:40:24 +01:00
Alexandre Riera	9da3593dff	Merge branch '5063-item-module-doPhoto' of https://gitea.verdnatura.es/verdnatura/salix into 5063-item-module-doPhoto	2023-02-24 10:37:38 +01:00
Alexandre Riera	6d6fa11da1	refs #5063 fixed front test	2023-02-24 10:37:35 +01:00
Alexandre Riera	113b37e56f	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-24 09:25:44 +00:00
Alexandre Riera	afb14044cc	refs #5063 deleted item checked in image, added front test	2023-02-24 10:25:08 +01:00
Joan Sanchez	3d8add4d6f	Merge branch 'dev' into 5192-db_export	2023-02-21 13:12:27 +00:00
Joan Sanchez	0d16f71fd3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-21 14:10:36 +01:00
Vicent Llopis	c30242f9cc	fix: front test	2023-02-21 12:17:16 +01:00
Vicent Llopis	eda70b009b	fix: cuando haces F5 en cualquier sección que no sea Diary, te coge el warehouse por defecto	2023-02-21 11:48:56 +01:00
Joan Sanchez	58548164d2	Merge branch 'dev' into 5192-db_export	2023-02-21 09:20:30 +00:00
Joan Sanchez	c9840f6985	Updated entry structure	2023-02-21 08:32:46 +01:00
Alexandre Riera	04877c1425	refs #5063 refactor hook	2023-02-20 13:15:47 +01:00
Joan Sanchez	90e1136ee2	fix(image): store images with a name generated through uuid instead of url path ... Refs: #5266	2023-02-20 12:40:13 +01:00
Alexandre Riera	c7f22a10ba	refs #5063 refactored hook	2023-02-20 10:39:12 +01:00
Alexandre Riera	08476fe2a6	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-17 13:30:47 +00:00
Joan Sanchez	ceab11cc41	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-02-17 13:33:34 +01:00
Vicent Llopis	853e06f523	fix: card reload automatic	2023-02-17 12:38:07 +01:00
Vicent Llopis	3dd870f7df	fix: test e2e	2023-02-16 09:44:20 +01:00
Vicent Llopis	bb2eddc462	fix: test front	2023-02-16 07:32:44 +01:00
Vicent Llopis	73ae45c2c0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-15 15:08:58 +01:00
Pau	6a732819ba	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-14 09:58:10 +00:00
Alexandre Riera	4787de3df5	fixing merge	2023-02-10 09:04:49 +01:00
Alexandre Riera	a468fb2c66	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance	2023-02-10 09:02:44 +01:00
Alexandre Riera	194069c0c2	refs #5194 fixed stock, lines	2023-02-10 08:46:54 +01:00
Joan Sanchez	ebee9144b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-02-09 09:16:30 +01:00
Vicent Llopis	b70311999d	refactor: eliminado codigo innecesario y quitado update que se hará directamente en producción	2023-02-08 09:41:09 +01:00
Vicent Llopis	cec7602e1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-07 13:44:53 +01:00
Vicent Llopis	6cb3930be0	feat: añadido icono info, que indica de que almacén se saca la información	2023-02-07 13:40:39 +01:00
Vicent Llopis	4f76465246	fix: no recarga cada vez	2023-02-06 12:24:26 +01:00
Vicent Llopis	ba5616055b	feat: item.descriptor en summary coge el warehouse por defecto	2023-02-03 14:31:50 +01:00
Juan Ferrer	f4fc597c2c	Merge pull request 'master to test' (!1302) from master into test ... Reviewed-on: #1302	2023-02-03 08:12:09 +00:00
Vicent Llopis	508bce73bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available	2023-02-03 08:41:35 +01:00
Pau	e3de54b811	changed styles on summary	2023-02-03 08:35:15 +01:00
Joan Sanchez	7a700de5c2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser	2023-02-02 08:23:17 +01:00
Pau	ec73b512fc	Merge branch 'dev' into 5063-item-module-doPhoto	2023-02-01 09:26:25 +01:00
Alex Moreno	2528b2d3ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-02-01 07:10:51 +01:00
Alex Moreno	292898708b	result not null	2023-01-31 11:24:09 +01:00
Alex Moreno	320ceb3e2c	fix: getRate2	2023-01-31 11:17:31 +01:00
Vicent Llopis	19120ef102	feat: el descriptor coge el warehouseFk dependiendo de la sección	2023-01-31 09:28:28 +01:00
Alexandre Riera	444d2ae4c4	refs #5104 grouping/packing unified	2023-01-30 15:28:47 +01:00
Alex Moreno	c990b9a564	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-30 14:37:24 +01:00
Alex Moreno	4e65e88621	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-30 07:56:12 +01:00
Vicent Llopis	79bf1739ba	fix: backTest	2023-01-27 13:52:14 +01:00
Vicent Llopis	29c6ca35ff	fix: test e2e	2023-01-27 13:39:19 +01:00
Joan Sanchez	9bf4cd5cff	Merge branch 'dev' into 4480-vnUser	2023-01-27 08:20:32 +00:00
Vicent Llopis	67a64582e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-27 08:21:30 +01:00
Vicent Llopis	caf1dcd690	feat: añadido almacén por defecto	2023-01-25 15:19:33 +01:00
Pau	ef6b06e147	added logs	2023-01-25 14:44:00 +01:00
Joan Sanchez	3076123c04	Updated models relation	2023-01-24 09:05:50 +01:00
Joan Sanchez	89eb065f6d	Updated models	2023-01-24 09:04:43 +01:00
Alex Moreno	8a844917ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date	2023-01-23 08:07:14 +01:00
Pau	b446f5cf5f	Merge branch 'dev' into 5063-item-module-doPhoto	2023-01-23 07:21:53 +01:00
Pau	2e988ea701	doPhoto updated on item upload	2023-01-20 13:34:36 +01:00
Alexandre Riera	a473d3a6f9	refs #4945 changed input-number for autocomplete	2023-01-20 12:01:13 +01:00
Vicent Llopis	ef7a0508ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-20 08:29:42 +01:00
Vicent Llopis	eefafb3ac2	fix: available is cero	2023-01-19 15:14:31 +01:00
Alexandre Riera	200a256016	Merge branch 'dev' into 4945-dejar-buscar-tag-nombreTemporal	2023-01-18 12:15:12 +00:00
Alexandre Riera	be5f987b0a	refs #4945 added defaultTag, validPriorities, defaultPriority in itemConfig	2023-01-18 13:14:49 +01:00
Alexandre Riera	98d6322b0e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5020-borradoLogico-IPT	2023-01-18 08:00:20 +01:00
Pau	99338bb6f8	isPhotoRequired implemented	2023-01-17 10:11:41 +01:00
Alexandre Riera	4e1c43eb4d	refs #4945 nombre temporal removed	2023-01-17 10:01:49 +01:00
Alexandre Riera	c47cac7d55	refs #5020 isActive column added, filter in front	2023-01-17 08:54:26 +01:00
Alex Moreno	ff39a81b8c	Merge branch 'dev' into 4523-item_fixed-price_rate2	2023-01-17 06:07:14 +00:00
Alex Moreno	e27a559416	refactor: replace all Date	2023-01-16 15:18:24 +01:00
Vicent Llopis	2451d00998	Merge branch 'dev' into 4925-item.tags	2023-01-12 07:59:43 +00:00
Vicent Llopis	e4603a06f2	refacotor: borrados los await para que devuelva la promesa	2023-01-12 08:59:24 +01:00
Vicent Llopis	ff653ad834	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-10 09:18:02 +01:00
Vicent Llopis	cdee85e1e8	refacotor: change description	2023-01-10 08:31:32 +01:00
Vicent Llopis	3abbfc4fa7	refacotr	2023-01-05 10:35:55 +01:00
Vicent Llopis	fd9ca3a4c1	add test	2023-01-05 10:35:49 +01:00
Vicent Llopis	21a62a0fab	refactor	2023-01-03 13:29:44 +01:00
Vicent Llopis	fec965a8dd	refs 4925 refactor: borrados console.log y actualizada descripción	2023-01-03 13:29:27 +01:00
Vicent Llopis	22d0da273e	refs #4925 fix: coge únicamente los últimos cambios aplicados	2023-01-03 13:21:51 +01:00
Vicent Llopis	3792a80ad5	refs #4925 feat: añadido back para editar tags	2022-12-29 14:24:32 +01:00
Vicent Llopis	d5b626434b	refactor: add translations, change css...	2022-12-28 12:42:51 +01:00
Vicent Llopis	3dd0c79629	feat: add ItemShelvingSales/filter	2022-12-27 15:00:49 +01:00
Alexandre Riera	96a6f0b9d9	refs #4926 packingOut added	2022-12-27 07:48:09 +01:00
Vicent Llopis	d3a9e9ac89	delete: columnas que ya no existen en la tabla	2022-12-23 12:17:24 +01:00
Vicent Llopis	16c20e4700	feat: add itemShelvingSale popup	2022-12-23 12:08:16 +01:00
Alex Moreno	502a692521	test(item_fixedPrice_rate2): backTest and e2e	2022-12-21 12:55:11 +01:00
Alex Moreno	5d2b69d063	test(item_fixedPrice): front recalculateRate2	2022-12-19 15:06:59 +01:00
Alex Moreno	f82870bec6	feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item	2022-12-19 14:39:38 +01:00
Pau	da8ebf1509	Merge branch '4492-item.create-same-as-item.isLaid' of https://gitea.verdnatura.es/verdnatura/salix into 4492-item.create-same-as-item.isLaid	2022-11-10 07:17:57 +01:00
Pau	638fd62aae	added requested changes, refs #4492 @40m	2022-11-10 07:17:54 +01:00
Pau	ae95b5d3ef	Merge branch 'dev' into 4492-item.create-same-as-item.isLaid	2022-11-04 07:22:37 +00:00
Pau	37292cee89	remove comments	2022-11-04 08:12:46 +01:00
Pau	11cf1ba414	fix back test error	2022-11-04 07:50:54 +01:00
Pau	7d7af6eb49	Modified model to allow modifications to isLaid	2022-11-04 07:42:21 +01:00
Alex Moreno	ec9139f985	Merge branch 'dev' into 4159-tableQ_filter	2022-11-03 07:24:05 +00:00
Alex Moreno	9891f7060d	fix(smart-table): monitor only ticketFilter use url and add ?q in routes	2022-11-02 09:40:09 +01:00
Pau	ff5e601a1e	Item islaid and test	2022-10-31 14:43:31 +01:00
Vicent Llopis	21e2945d4f	refactor: delete destroyAll	2022-10-26 09:30:17 +02:00
Vicent Llopis	8a3573474a	refactor: move 'lastEntries' to thrid position in descriptor	2022-10-25 07:40:32 +02:00