234 Commits

Author	SHA1	Message	Date
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
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
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	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
Vicent Llopis	2451d00998	Merge branch 'dev' into 4925-item.tags	2023-01-12 07:59:43 +00:00
Vicent Llopis	21a62a0fab	refactor	2023-01-03 13:29:44 +01:00
Vicent Llopis	3792a80ad5	refs #4925 feat: añadido back para editar tags	2022-12-29 14:24:32 +01:00
Vicent Llopis	3dd0c79629	feat: add ItemShelvingSales/filter	2022-12-27 15:00:49 +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	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	7d7af6eb49	Modified model to allow modifications to isLaid	2022-11-04 07:42:21 +01:00
Pau	ff5e601a1e	Item islaid and test	2022-10-31 14:43:31 +01: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
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
Vicent Llopis	761563edc5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route	2022-10-05 13:38:17 +02:00
Vicent Llopis	68e4f3a8bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route	2022-10-04 09:10:15 +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
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	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
Vicent Llopis	eb7bd3dc59	update brach	2022-09-14 14:03:15 +02:00
Vicent Llopis	1fd97f167c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk	2022-09-13 11:35:15 +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	c3d396b042	fix: test e2e	2022-08-04 13:52:59 +02:00
Vicent Llopis	224ea61a62	fix: delete warehouseFk from itemType model	2022-07-29 13:07:25 +02:00
Joan Sanchez	ae79163048	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-30 13:17:04 +02:00
Joan Sanchez	140af7e808	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-30 13:14:08 +02:00
Joan Sanchez	ad021265c7	Deprecated field taxTypeFk	2022-06-30 11:42:37 +02:00
Alex Moreno	a98a927663	fix back test and e2e that now fail	2022-06-27 11:17:45 +02:00
Carlos Jimenez Ruiz	a76dd11825	Merge branch 'dev' into 3870-models	2022-05-23 12:33:08 +00: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	ebbb0466a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models	2022-05-17 10:13:05 +02:00
Vicent Llopis	3335cb8a01	feat(item.itemType): add fields	2022-05-17 08:32:45 +02:00
Vicent Llopis	7ad56327a1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType	2022-05-17 08:21:49 +02:00
Carlos Jimenez Ruiz	d31f7f1b6b	all type Dates replaced to date as per convention	2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz	b5ccd32800	Merge branch 'dev' into 3409-clientCredit_maxRows	2022-05-16 07:23:08 +00:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +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
Vicent Llopis	a6b8674302	feat(invoiceIn.tax): add button for create an expence	2022-05-09 14:34:20 +02:00
Vicent Llopis	bad90c12f4	feat: add required fields and models	2022-04-27 14:17:41 +02:00
Vicent Llopis	eba3ac40a5	refactor: delete item.compression	2022-04-06 11:48:12 +02: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	e5977be502	Merge branch 'dev' into 3374-itemPackingType	2021-11-19 11:47:37 +00: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
Vicent Llopis	f87f60f00a	feat(item-itemPackingType): add model and dumpedFixtures	2021-11-18 09:16:36 +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
Alex Moreno	54dc9aacaa	feat(item): add checkbox isFloramondo in search-panel	2021-11-15 13:53:18 +01:00
Alex Moreno	5c7efbb838	feat(item): back filter buyer in search panel ans test	2021-11-11 10:33:21 +01:00
Carlos Jimenez Ruiz	d87e8ac226	refactor(entry.lastBuys): usage of smart table on latests buys	2021-11-10 17:07:16 +01:00
Carlos Jimenez Ruiz	262e46d7c9	added autocompletes to item index	2021-11-08 17:46:40 +01:00
Carlos Jimenez Ruiz	cec04a307d	refactor:(item): deprecation of isBargain and isOnOffer columns at model and fixtures	2021-10-18 12:05:38 +02:00
Carlos Jimenez Ruiz	3e0f2b5c26	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3070_deprecate_item_niches	2021-08-30 13:31:57 +02:00
Carlos Jimenez Ruiz	e6bc856b35	removed niches model, relations and its usages	2021-08-30 13:29:16 +02:00
Joan Sanchez	74dfa9f757	3063 - Get item from card without a name	2021-08-30 11:23:46 +02:00
Joan Sanchez	531937ebbc	2985 - Create a manual invoice from a ticket or client	2021-07-27 09:07:04 +02:00
Carlos Jimenez Ruiz	4cbaf247ed	removed unused showfield in model log	2021-07-20 09:33:45 +02:00
Carlos Jimenez Ruiz	7370269e4d	ticket.sale now shows Packing type	2021-06-16 17:06:11 +02:00
Carlos Jimenez Ruiz	7004ad5ade	removed several columns from bulk edit and added packingOut	2021-06-15 12:47:40 +02:00
Carlos Jimenez Ruiz	c776d34cdf	invoiceIn basic data and summary added some fields	2021-06-10 17:08:21 +02:00
Carlos Jimenez Ruiz	72a0b774de	add and get sales now sets item.price from packaging for EMB items	2021-05-19 14:15:28 +02:00
Joan Sanchez	4aa616601e	2615 - Waste changes	2021-03-30 10:28:44 +02:00
jorgebl	32ea2dbda6	Added permisions from models in table salix ACL	2021-03-08 12:32:35 +01:00
jorgebl	63ac492845	Added message for duplicated names	2021-03-05 08:45:14 +01:00
jorgebl	4cc3fc90c5	conditionals if name already exists	2021-03-04 21:30:56 +01:00
jorgebl	300f78f31e	added permisions logistic boss	2021-03-04 20:07:45 +01:00
jorgebl	92db67292c	Removed botanical field and changes "edi" for "vn"	2021-03-04 07:56:31 +01:00
Joan Sanchez	f041e0d897	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-04 18:44:25 +01:00
Joan Sanchez	a845f53f0a	Bug fixes	2021-02-03 12:43:30 +01:00
Carlos Jimenez Ruiz	ff94b182a1	error is not a required field	2021-02-03 10:16:46 +01:00
Joan Sanchez	ca47fe6827	2476 - downloadImages() method refactor	2021-01-28 12:23:18 +01:00
Carlos Jimenez Ruiz	464366fdbe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed	2021-01-18 17:17:02 +01:00
Carlos Jimenez Ruiz	8d6dd3e03a	minor refactors	2021-01-18 14:17:01 +01:00
Carlos Jimenez Ruiz	3251d737e6	fixed price index implementation	2021-01-18 14:16:39 +01:00
Jorge Padawan	97c8faaf50	Add column multiplier on item section	2021-01-18 11:43:48 +01:00
Joan Sanchez	08af948eb0	Merge branch 'dev' into 2574-itemTag_refactor	2020-11-10 12:39:17 +00:00
Carlos Jimenez Ruiz	54d31f15bb	fixed collection tests pollution	2020-11-09 14:53:26 +01:00
Joan Sanchez	a325ef2a78	2574 - ItemTag refactor sourceTable	2020-11-04 11:29:10 +01:00
Bernat Exposito Domenech	cc35998f62	new module supplier, created section index and searchpanel	2020-10-15 08:15:04 +02:00
Javi Gallego	1b13e58e10	item basic-data añadir isFragile	2020-09-17 09:58:00 +02:00
Carlos Jimenez Ruiz	a00f64e7a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create	2020-09-03 16:29:38 +02:00
Joan Sanchez	a3382300f9	2402 - Added create entry section	2020-09-02 14:08:56 +02:00
Carlos Jimenez Ruiz	9fa3f17a9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section	2020-09-01 17:45:00 +02:00
Joan Sanchez	8aa9918d84	2409 - Added filter by selection	2020-08-31 15:03:00 +02:00
Carlos Jimenez Ruiz	c70ad808a0	refactor	2020-08-27 17:54:43 +02:00
Joan Sanchez	c9ed17d981	Changes to dowload item photos endpoint	2020-08-13 12:16:25 +02:00
Joan Sanchez	e557bd2815	Renamed method	2020-07-14 11:16:50 +02:00
Joan Sanchez	159b5f3bb8	#2351 Item image queue scheduler	2020-07-13 11:58:31 +02:00
Javi Gallego	8453d25852	#2224item.diary provar directiva $anchorScroll	2020-05-06 18:42:50 +02:00
Joan Sanchez	27b1376799	changes	2020-03-23 11:21:25 +01:00
Joan Sanchez	b9a482fc37	2181 - Ticket sale fix item search	2020-03-11 15:56:02 +01:00
Joan Sanchez	fe8a0b4583	Added translation. taxClassCode.sql removed	2020-02-18 07:21:35 +01:00
Joan Sanchez	844b27acb9	2118 - Create new intrastat	2020-02-17 12:47:03 +01:00
Joan Sanchez	d9ed7cda38	Added form dialog	2020-02-17 07:22:55 +01:00
Joan Sanchez	826dfe8092	changes to percentage filter	2020-01-17 11:46:45 +01:00
Joan Sanchez	780f1e4773	renamed expence to expense and added field	2019-12-13 11:59:25 +01:00
Joan Sanchez	1b70721b0e	#1864 added restrictions, send rocketchat message	2019-11-12 14:53:58 +01:00
Juan Ferrer	1b2c383502	vnDialog opens in body, nightmare extensions with detailed errors	2019-10-28 17:31:33 +01:00
Bernat	2172bdee4e	#1689	2019-09-12 12:27:19 +02:00
Joan Sanchez	183bf137f6	added workerTimeControl #1360	2019-05-17 13:27:51 +02:00
Gerard	93bca3b3f0	merge master	2019-04-04 12:47:02 +02:00
Gerard	4861b789f7	Loggable now inserts the correct values for FK values	2019-04-04 12:38:54 +02:00
Gerard	a23c636c16	#1279 loggable rawSql	2019-04-02 14:36:49 +02:00
Gerard	8bf4190d12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-29 07:37:23 +01:00
Gerard	280efdae50	#732 Loggable now inserts the correct values for FK values	2019-03-29 07:36:26 +01:00
Carlos Jimenez Ruiz	a14ba28629	#1263 invoiceOut.summary	2019-03-28 11:55:23 +01:00
Carlos Jimenez Ruiz	d38ca72fd8	orden de resultados por defecto DESC de id y fecha	2019-03-20 11:49:11 +01:00
Gerard	fb75ff0eae	#1222 Activar log en el modulo ítem	2019-03-12 11:47:53 +01:00
Gerard	86b3407e35	item barcode to item created	2019-02-22 08:32:18 +01:00
Javi Gallego	58706b8694	backPreparado	2019-02-18 07:57:15 +01:00
Joan Sanchez	1bcaf27563	changed currency filter, fixed tag value errors	2019-01-31 11:44:03 +01:00
Joan Sanchez	a49d937fd9	ita-tag validation error + home shortcuts	2019-01-31 09:47:52 +01:00
Carlos Jimenez Ruiz	8cbde4c137	removed global variable serviceRoot	2019-01-24 09:08:28 +01:00
Gerard	601295a170	#936 item.create	2019-01-16 08:46:40 +01:00
Juan Ferrer	9cdfe0c5d9	#814 First stable version	2018-12-27 12:54:16 +01:00