236 Commits

Author	SHA1	Message	Date
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
Joan Sanchez	c177c0366d	Item PDF	2022-10-03 13:35:49 +02:00
Joan Sanchez	e4b61f81a9	Merge pull request '#4226-remove-density' (#1066) from #4226-remove-density into dev ... Reviewed-on: #1066 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-03 07:41:58 +00:00
Joan Sanchez	1ac35c0b68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-09-29 14:52:31 +02:00
Joan Sanchez	660842ca31	Osticket & waste refactor	2022-09-27 14:20:57 +02:00
Pau	901007d34b	change test case to expect the image to be defined	2022-09-27 13:58:27 +02:00
Pau	2dd6de1d47	Modified Fixtures, clone.js and the item model	2022-09-27 13:46:23 +02:00
Javi Gallego	a662bb90a2	Merge branch 'dev' into #4226-remove-density	2022-09-27 09:32:48 +02:00
Joan Sanchez	410e651edd	Buyer waste	2022-09-27 07:24:45 +02:00
Joan Sanchez	f9f09440ec	Merge pull request '4363-refactor(item_waste): refactor table and add totals in table_head' (#1053) from 4363-item_waste_refactor into dev ... Reviewed-on: #1053 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-16 07:10:48 +00:00
Joan	90229112e9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-15 06:35:03 +00:00
Alex Moreno	6b252f7e33	refactor(item_waste): refactor table and add totals in table_head	2022-09-14 10:13:30 +02:00
Joan Sanchez	5a46444875	Use POST request method instead of GET	2022-09-13 13:53:44 +02:00
Javi Gallego	5cf102c7fd	sustituido density por weightByPiece	2022-08-24 14:13:26 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	8f54365350	refator: parametrizardo con ?	2022-08-10 09:19:23 +02:00
Vicent Llopis	537c383cd2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk	2022-07-29 13:38:23 +02:00
Vicent Llopis	840e792d13	fix: backTest	2022-07-29 12:52:53 +02:00
Vicent Llopis	605da52286	fix: replace it.warehouseFk by userConfig.warehouseFk	2022-07-29 12:22:03 +02:00
Joan Sanchez	468da0c5a9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-07-27 08:12:06 +02:00
Joan Sanchez	f4825488c6	refactor(Tasks API): ghanged method to GET	2022-07-26 11:47:43 +02:00
Vicent Llopis	7bf9a8c100	delete itemType.warehouseFk	2022-07-12 11:52:47 +02:00
Vicent Llopis	6f3d4792d5	update backTest	2022-07-12 10:03:58 +02:00
Vicent Llopis	eaa7658b23	delete it.warehouseFk	2022-07-12 10:03:50 +02:00
Alex Moreno	eb9bd66ddb	prepare for static dates	2022-06-09 13:33:01 +02:00
Alex Moreno	7eec9de0aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-06-09 07:47:03 +02:00
Carlos Jimenez Ruiz	b2f930911f	fixed problems in two spec files	2022-04-29 09:18:06 +02:00
Alex Moreno	c904bf0bdf	feat(back): new Date mocked time	2022-04-01 13:55:45 +02:00
Alex Moreno	eec1c1ff86	feat(db): static dates	2022-03-30 12:45:01 +02:00
Alex Moreno	b56e1810c3	test(item_fixedPrice): fix back test & e2e	2022-03-18 10:30:30 +01:00
Alex Moreno	56331da20b	feat(item_index): add column producer	2022-02-01 09:37:11 +01:00
Vicent Llopis	a6e5123949	feat: add filter by item.longName	2021-12-22 13:16:45 +01:00
Carlos Jimenez Ruiz	51a3673160	Merge branch 'dev' into 3369-filterValue_sqli	2021-11-23 08:54:50 +00:00
Carlos Jimenez Ruiz	1f2417b55e	Merge branch 'dev' into 3290-entry_latest-buys	2021-11-22 15:34:55 +00:00
Carlos Jimenez Ruiz	cae3322c6b	Merge branch 'dev' into 3332-item_search-panel	2021-11-22 15:28:21 +00:00
Joan Sanchez	4ebad6b372	filter order was not properly being applied	2021-11-22 15:54:01 +01:00
Joan Sanchez	3a2e4c54b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3369-filterValue_sqli	2021-11-22 15:49:43 +01:00
Joan Sanchez	a940d14256	fix(filterValue): fixed sql injection vulnerability ... Refs: 3369	2021-11-22 14:40:03 +01:00
Alex Moreno	fe46dbd343	feat(entry_last-buys): add filter isFloramondo	2021-11-22 11:49:30 +01:00
Alex Moreno	97a66754a7	feat(item and entry): add back test	2021-11-22 08:58:54 +01:00
Alex Moreno	d2729e67e9	feat(item and latest-buys: add supplier filter	2021-11-22 08:27:14 +01:00
Alex Moreno	ac9ed90f4a	feat(item): modify item_getBalance and do test	2021-11-19 10:02:40 +01:00
Carlos Jimenez Ruiz	3eb7b4cf55	refactor(item.filter): buildFilter switch refactor	2021-11-18 14:49:05 +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
Carlos Jimenez Ruiz	4fc01e6a0d	typos corrected	2021-11-18 11:18:45 +01:00
Carlos Jimenez Ruiz	1d253fc53d	definitions corrected for myOptions of endpoints	2021-11-18 11:17:30 +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	6fa60e597a	refactor(item): activeBuyer.spec.js	2021-11-16 14:13:15 +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