554 Commits

Author	SHA1	Message	Date
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	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
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	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	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	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
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
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
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
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	3abbfc4fa7	refacotr	2023-01-05 10:35:55 +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
Alexandre Riera	96a6f0b9d9	refs #4926 packingOut added	2022-12-27 07:48:09 +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
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
Vicent Llopis	8a3573474a	refactor: move 'lastEntries' to thrid position in descriptor	2022-10-25 07:40:32 +02:00
Vicent Llopis	888f612dbb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-21 11:41:53 +02:00
Alex Moreno	74383b61e7	hotFix(monitor): use left join in ticketState	2022-10-13 09:22:53 +02:00
Vicent Llopis	bfefec397e	feat: add testFront	2022-10-11 09:13:29 +02:00
Vicent Llopis	9c52508a88	feat: add total labels	2022-10-11 08:40:22 +02:00
Vicent Llopis	7b7e01f49e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-11 07:09:20 +02:00
Joan Sanchez	e3606c7273	Updated unit test	2022-10-10 14:46:06 +02:00
Joan Sanchez	7f023d7456	Set user default warehouse	2022-10-10 12:23:40 +02:00
Vicent Llopis	ddbe1057ad	feat: add new section	2022-10-06 09:47:53 +02:00
Vicent Llopis	2f17257e46	feat: add new sub section itemShelving	2022-10-05 15:13:48 +02:00
Joan Sanchez	377a0f7228	Attachments refactor	2022-10-04 13:41:37 +02:00
Joan Sanchez	a065d77929	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-10-03 13:37:59 +02:00
Javi Gallego	eb48685484	selectores reparados	2022-09-30 14:55:31 +02:00
Javi Gallego	a662bb90a2	Merge branch 'dev' into #4226-remove-density	2022-09-27 09:32:48 +02:00
Joan Sanchez	85698410db	Templates refactor	2022-09-26 08:07:45 +02:00
Alex Moreno	6b252f7e33	refactor(item_waste): refactor table and add totals in table_head	2022-09-14 10:13:30 +02:00
Javi Gallego	5cf102c7fd	sustituido density por weightByPiece	2022-08-24 14:13:26 +02:00
Joan Sanchez	d0185017b7	Removed translate from grouping and packing	2022-08-11 08:29:24 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	1b3f0ee026	refactor: added itemPackingType and temperature relations	2022-05-23 12:40:11 +02:00
Vicent Llopis	3c9800a7a3	refactor: pull request changes	2022-05-20 12:33:12 +02:00
Vicent Llopis	76515bdd3f	add: search-panel	2022-05-17 09:54:49 +02:00
Vicent Llopis	3335cb8a01	feat(item.itemType): add fields	2022-05-17 08:32:45 +02:00
Vicent Llopis	16fdf982c8	feat(item.itemtype): add frontTest	2022-05-12 07:40:24 +02:00
Vicent Llopis	13a6f1f8c1	feat(item): add section itemType	2022-05-11 14:47:54 +02:00
Vicent Llopis	734f9cb60d	feat(item.itemType): added section itemType	2022-05-11 07:28:17 +02:00
Joan Sanchez	91f111f609	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-04-13 11:33:49 +02:00
Vicent Llopis	804f5f4b2f	fix: delete vn-focus and duplicated pagination	2022-04-13 10:37:52 +02:00
Alex Moreno	786b7fa84f	feat(descriptor): button open summary popup	2022-04-11 08:02:05 +02:00
Vicent Llopis	eba3ac40a5	refactor: delete item.compression	2022-04-06 11:48:12 +02:00
Alex Moreno	1959340163	remove $applyAsync test	2022-03-28 14:04:26 +02:00
Alex Moreno	968ecab9b2	fix(item_diary): apply async scroll	2022-03-24 10:28:28 +01:00
Alex Moreno	3b80f6dec9	renaming	2022-03-23 12:26:58 +01:00
Alex Moreno	b56e1810c3	test(item_fixedPrice): fix back test & e2e	2022-03-18 10:30:30 +01:00
Alex Moreno	e8b4896e98	feat(item_fixed-price): add search, and defaultSerach	2022-03-17 09:13:09 +01:00
Alex Moreno	b4e5631cc7	feat(item_fixed-price): implement smart-table	2022-03-16 14:58:07 +01:00
Alex Moreno	e0924ea373	refactor(item_fixed-price): add checkbox hasMinPrice, tooltips, more witdh	2022-03-15 15:18:27 +01:00
Carlos Jimenez Ruiz	4b963804c6	added transalation to item waste	2022-02-28 10:54:32 +01:00
Carlos Jimenez Ruiz	401174b27a	removed focus on describe	2022-02-15 13:46:25 +01:00
Carlos Jimenez Ruiz	ac0e55107a	3595 feat(toggleHidden): itemWaste now can hide panels	2022-02-15 12:59:57 +01:00
Alex Moreno	902714ba7d	feat(item_index): add producer basic filter	2022-02-03 10:32:59 +01:00
Alex Moreno	56331da20b	feat(item_index): add column producer	2022-02-01 09:37:11 +01:00
Alex Moreno	f21cdeb3b6	fix(item_waste): title background dark	2022-01-31 13:27:33 +01:00
Joan Sanchez	b86c32c97b	fix(importBuy): prevent action	2022-01-14 08:06:38 +01:00
Alex Moreno	49e9fcaa7c	remove unnecesary on-accept	2021-11-29 10:11:47 +01:00
Alex Moreno	cff4c90651	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data	2021-11-29 10:10:04 +01:00
Joan Sanchez	452d4557d1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-26 14:11:33 +01:00
Joan Sanchez	9d6b870940	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-11-26 14:08:50 +01:00
Joan Sanchez	bcca33bc33	Updated icons	2021-11-26 13:04:07 +01:00
Alex Moreno	eea9413628	fix(item_basic-data): controller, test e2e and model	2021-11-26 08:34:32 +01:00
Alex Moreno	02d89e5774	feat(item): add field genericFk in basic-data	2021-11-24 08:51:07 +01:00
Carlos Jimenez Ruiz	51a3673160	Merge branch 'dev' into 3369-filterValue_sqli	2021-11-23 08:54:50 +00:00
Joan Sanchez	90ab78d26d	Updated unit tests	2021-11-22 15:49:32 +01:00
Joan Sanchez	a940d14256	fix(filterValue): fixed sql injection vulnerability ... Refs: 3369	2021-11-22 14:40:03 +01:00
Alex Moreno	d2729e67e9	feat(item and latest-buys: add supplier filter	2021-11-22 08:27:14 +01:00
Carlos Jimenez Ruiz	2bfcaa810c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel	2021-11-18 12:40:50 +01:00
Joan Sanchez	ba60523012	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-18 12:31:43 +01:00
Joan Sanchez	3ffbdc3fde	Updated fonts	2021-11-18 11:48:13 +01:00
Alex Moreno	b59cabe41a	feat(item): add filterParams in main	2021-11-17 09:11:26 +01:00
Alex Moreno	26815ad5a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel	2021-11-17 08:36:35 +01:00
Alex Moreno	f27420c14a	refactor(item): activeBuyers	2021-11-16 13:56:09 +01:00
Alex Moreno	23b567046b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel	2021-11-16 12:30:28 +01:00