1204 Commits

Author	SHA1	Message	Date
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
Carlos Jimenez Ruiz	b2f930911f	fixed problems in two spec files	2022-04-29 09:18:06 +02:00
Vicent Llopis	bad90c12f4	feat: add required fields and models	2022-04-27 14:17:41 +02:00
Alex Moreno	e00d63d7af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-04-20 14:30:23 +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
Alex Moreno	c7b8b61a08	feat(item): add model itemPackingType	2022-04-08 10:34:36 +02:00
Vicent Llopis	eba3ac40a5	refactor: delete item.compression	2022-04-06 11:48:12 +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	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
Vicent Llopis	a6e5123949	feat: add filter by item.longName	2021-12-22 13:16:45 +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
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	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	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
Carlos Jimenez Ruiz	ca0c3be843	Merge branch 'dev' into 3381-item_diary-claim	2021-11-19 12:55:11 +00:00
Carlos Jimenez Ruiz	e5977be502	Merge branch 'dev' into 3374-itemPackingType	2021-11-19 11:47:37 +00: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
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
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
Vicent Llopis	f87f60f00a	feat(item-itemPackingType): add model and dumpedFixtures	2021-11-18 09:16:36 +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	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
Joan Sanchez	a6f8a682db	fix(fixed-price): confirm on deletion	2021-11-16 08:41:27 +01:00
Joan Sanchez	5b22892500	fix(fixed-price): changed active buyers endpoint and added pagination	2021-11-16 07:45:15 +01:00
Alex Moreno	ec25df39e4	transaction activeWithBuyer.js	2021-11-15 14:50:02 +01:00
Carlos Jimenez Ruiz	c011a82edc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-15 14:40:50 +01:00
Alex Moreno	54dc9aacaa	feat(item): add checkbox isFloramondo in search-panel	2021-11-15 13:53:18 +01:00
Alex Moreno	73211c5b3b	Merge branch '3328-item_search-panel' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel	2021-11-15 12:14:37 +01:00
Alex Moreno	adf295ebf3	fix(item): add ng-model, add fixture and transaction back test	2021-11-15 12:14:34 +01:00
Carlos Jimenez Ruiz	d69ee4a597	Merge branch 'dev' into 3328-item_search-panel	2021-11-15 09:34:48 +00:00
Carlos Jimenez Ruiz	62e03f4752	item create e2e fix	2021-11-12 11:03:23 +01:00
Alex Moreno	6fe7875d73	change route	2021-11-12 09:28:19 +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	0bf553e11e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-10 17:07:39 +01:00
Carlos Jimenez Ruiz	d87e8ac226	refactor(entry.lastBuys): usage of smart table on latests buys	2021-11-10 17:07:16 +01:00
Vicent Llopis	d3ff60719c	fix(last-entries): dateFrom -75 days	2021-11-10 12:34:56 +01:00
Carlos Jimenez Ruiz	469c544536	item.index default columns and filter with like	2021-11-09 11:47:54 +01:00
Carlos Jimenez Ruiz	e4ea05fd07	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-08 17:46:50 +01:00
Carlos Jimenez Ruiz	262e46d7c9	added autocompletes to item index	2021-11-08 17:46:40 +01:00
Joan Sanchez	eb36f86b9d	Added smart-table to item index	2021-11-08 14:46:23 +01:00
Alex Moreno	bb0745532b	fix(claim): salesPersonFk where add officeBoss	2021-11-02 11:24:52 +01:00
Carlos Jimenez Ruiz	b41a0bd849	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3108-item_isBargain_isOnOffer_deprecation	2021-10-19 09:57:45 +02:00
Carlos Jimenez Ruiz	fa067f94d9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries	2021-10-18 16:55:28 +02: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
Vicent Llopis	e61e74ed36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries	2021-10-18 10:27:59 +02:00
Alex Moreno	bf100f339e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3173-item_diary	2021-10-18 10:22:53 +02:00
Vicent Llopis	6d05b046e8	feat(last-entries): add dateTo & delete style.scss	2021-10-15 10:34:32 +02:00
Alex Moreno	1684c1bf87	feat(diary): modify sql item_getBalance	2021-10-13 14:03:06 +02:00
Alex Moreno	a8f8248c41	feat(diary): Add column claim	2021-10-13 12:33:48 +02:00
Carlos Jimenez Ruiz	8e05301792	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-10-07 09:58:32 +02:00
Joan Sanchez	3d57e9a618	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-10-05 08:13:13 +02:00
Joan Sanchez	1ff3e1f429	Increased date range from +10 to +60 days	2021-10-05 08:12:25 +02:00
Carlos Jimenez Ruiz	e690febc7f	refactor(updateAll): usage of documented methods as update alias is not documented in loopback	2021-09-29 08:26:10 +02:00
Carlos Jimenez Ruiz	8fc17f05c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3098-item_tag_productor	2021-09-23 17:35:07 +02:00
Carlos Jimenez Ruiz	368f54b872	refactor(tags): unified the style rules for tags under fetched-tags component and all display subName if present	2021-09-23 17:19:47 +02:00
Carlos Jimenez Ruiz	f74d2cc302	test(tags): moved code used on a single test to the correct place	2021-09-22 15:16:45 +02:00
Javi Gallego	3365eadf5e	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-09-21 14:02:07 +02:00
Carlos Jimenez Ruiz	46b59473a3	refactor(lastbuyrefresh): moved last buy refresh calls to fixtures + some more fixtures	2021-09-09 16:06:44 +02:00
Javi Gallego	8160912fe7	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-09-08 10:41:26 +02:00
Carlos Jimenez Ruiz	538805828e	refactor(item): item index now shows last buy landing	2021-09-08 10:39:54 +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	52e1df2af5	removed the usage of niches from item index and summary	2021-08-30 13:31:24 +02:00
Carlos Jimenez Ruiz	8a6da66916	removed niche section	2021-08-30 13:31:07 +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
Javi Gallego	cffe25d41f	Merge branch 'dev' into 2995-supplierAccount-modificaciones	2021-08-18 12:38:41 +02:00
Javi Gallego	78a98cd6b7	shrink-datetime	2021-08-15 08:35:14 +02:00
Carlos Jimenez Ruiz	7a7bbe2ba8	more module transactions	2021-08-13 16:46:44 +02:00
Carlos Jimenez Ruiz	7d442c40ec	Merge branch 'dev' into 2985-invoiceOut_manual	2021-08-06 10:39:15 +00:00
Joan Sanchez	886d38ad8a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2879-import_buys	2021-08-05 14:33:28 +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	29f1f7e89e	itemTaxCountry and item bonanical no longer use the bonanical prop	2021-07-19 14:46:18 +02:00
Joan Sanchez	94b668c01e	Filter item from a dialog	2021-07-15 13:41:29 +02:00
Carlos Jimenez Ruiz	98a691c152	minor changes	2021-07-12 15:00:20 +02:00
Carlos Jimenez Ruiz	21e34de1dd	item module transactions	2021-07-12 12:54:59 +02:00
Joan Sanchez	057d138991	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-07-02 13:44:44 +02:00
Joan Sanchez	9ad54b9622	HOTFIX: Renamed 'in' to 'invalue'	2021-07-02 13:17:48 +02:00
Carlos Jimenez Ruiz	be850571d9	updated the field name	2021-07-01 13:14:36 +02:00
Carlos Jimenez Ruiz	243636ccf6	item category name as category	2021-07-01 12:34:30 +02:00
Carlos Jimenez Ruiz	2469540f66	item category filter is now working again	2021-06-30 10:48:19 +02:00
Carlos Jimenez Ruiz	8344a58ab8	updated client/worker/user IDs on tests	2021-06-23 13:24:23 +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	e418d6239b	fixed getSummary unit test	2021-05-24 11:28:23 +02:00
Carlos Jimenez Ruiz	2a4ff5a97b	fixed a problem where warehouseFk wasn't yet defined upon updateStock call	2021-05-24 10:31:51 +02:00
Carlos Jimenez Ruiz	1bfe537186	claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig	2021-05-21 15:31:05 +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	378175224c	HOTFIX: Buyer ACL	2021-05-17 07:24:24 +02:00
Joan Sanchez	6b8074e32f	2878 - Splitted method into activeWithRole and activeWithInheritedRole	2021-04-13 14:08:10 +02:00
Joan Sanchez	93399d6de6	Updated description	2021-04-07 11:18:44 +02:00
Joan Sanchez	6c36ab3905	Removed back button	2021-04-07 10:47:31 +02:00
Joan Sanchez	65dc0e3780	2615 - Waste breakdown	2021-04-06 13:46:38 +02:00
Joan Sanchez	5ef3ff40ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail	2021-04-06 09:14:11 +02:00
Joan Sanchez	a2144405ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-04-02 17:04:37 +02:00
Joan Sanchez	9bbf43c590	Replace http with https	2021-04-02 14:34:16 +02:00
Joan Sanchez	b4cceff4cb	2866 - Limit descriptor photo size to width 100%	2021-04-01 14:20:00 +02:00
Joan Sanchez	4aa616601e	2615 - Waste changes	2021-03-30 10:28:44 +02:00
Carlos Jimenez Ruiz	767665e3c9	endpoint indentation + type updated yo array of objects	2021-03-26 10:39:19 +01:00
Carlos Jimenez Ruiz	3c8ed85e69	sum is now made on backend and html amends	2021-03-26 10:33:53 +01:00
jorgebl	393b9ba38c	Correct name	2021-03-24 14:17:27 +01:00
jorgebl	e01b7420d9	Added total cost of item	2021-03-24 13:54:29 +01:00
Joan Sanchez	ff6c80aa7e	Merge branch 'dev' into 2832-summary_validate_h4	2021-03-09 08:24:10 +00:00
jorgebl	1922280c61	QA rename some descriptions in test and reworked the test	2021-03-08 17:49:04 +01:00
jorgebl	5cb959f5b8	removed controller.data from submit	2021-03-08 13:12:13 +01:00
jorgebl	27816b29e7	Removed ids on controller.data	2021-03-08 13:06:35 +01:00
jorgebl	d09e47835e	Rename the statements for correctly description the action	2021-03-08 12:40:13 +01:00
jorgebl	6e08a66343	Added acl action for logistic boss and show the recent data added on species and genus in their fields in item botanical	2021-03-08 12:38:54 +01:00
jorgebl	32ea2dbda6	Added permisions from models in table salix ACL	2021-03-08 12:32:35 +01:00
jorgebl	28b9da82ed	change conditional	2021-03-08 09:12:10 +01:00
Joan Sanchez	7ec9ddb6d9	Translation fix	2021-03-05 09:23:31 +01:00
jorgebl	b6bf61f410	description put correctly	2021-03-05 09:09:09 +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	5ebd70a8f0	Fixed error filter on itemBotanical when item hasn't specie and genus data + front test	2021-03-04 20:11:10 +01:00
jorgebl	12ad71d0fe	translate some words	2021-03-04 20:08:07 +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	e50dcf467f	Requested changes	2021-03-03 12:21:04 +01:00
Joan Sanchez	7c7aba86a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index	2021-03-03 09:36:55 +01:00
jorgebl	a7973ba276	Resolved question PR	2021-03-01 11:59:05 +01:00
Joan Sanchez	718021cff8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index	2021-03-01 11:49:31 +01:00
jorgebl	3fcd5f9dbc	removed line break	2021-02-26 11:40:46 +01:00
jorgebl	f63baafe7d	get values from model item	2021-02-26 11:36:22 +01:00
jorgebl	4cedd53bce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2820-add_item_scopeDays	2021-02-25 11:02:51 +01:00
Joan Sanchez	89abf424fb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-25 08:17:26 +01:00
Joan Sanchez	c2a2204437	Regex change	2021-02-24 16:04:09 +01:00
Joan Sanchez	ddb77a5c05	Regex change	2021-02-24 15:55:09 +01:00
Joan Sanchez	d3879635a8	Regex changes	2021-02-24 15:54:02 +01:00
jorgebl	f1c481de64	QA refactor	2021-02-24 14:49:58 +01:00
Joan Sanchez	1c819e692e	Floramondo image download fixes	2021-02-24 14:37:49 +01:00
jorgebl	df9ca2ad3e	Fixed filter description	2021-02-24 12:24:50 +01:00
Joan Sanchez	347ac77878	Changes to file names	2021-02-24 09:59:41 +01:00
jorgebl	e32914d990	Fixed error test	2021-02-23 16:27:18 +01:00
jorgebl	3eae322a6a	Added scope days and test	2021-02-23 16:09:29 +01:00
jorgebl	69f53972d5	Added filter for selection	2021-02-22 16:43:40 +01:00
jorgebl	5ef48919ec	Added translate multiplier	2021-02-22 13:41:31 +01:00
jorgebl	3c3dc861ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2781-add_stemMultiplier_item	2021-02-22 13:37:43 +01:00
Joan Sanchez	ddb443ab8f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-18 13:17:34 +01:00
Joan Sanchez	8ddbcc24a7	Added priority to image download queue	2021-02-18 13:03:49 +01:00
Jorge Padawan	3763b95f62	Added multiplier in sections and filter selection	2021-02-17 15:38:57 +01:00
Joan Sanchez	c270ec6207	Contextmenu fixes	2021-02-11 15:06:41 +01:00
Jorge Padawan	f146c6a279	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2783-itemPriceFixed_advanced_search	2021-02-11 11:15:10 +01:00
Jorge Padawan	745d25f0c7	Showed filter on browser search bar	2021-02-11 11:14:52 +01:00
Carlos Jimenez Ruiz	8b97236f22	texfield no longer performs queries	2021-02-09 12:53:40 +01:00
Carlos Jimenez Ruiz	3d948ef317	warning color added lines with clientType loses	2021-02-09 10:43:19 +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	215e0c9fc4	Image download fix for images without extension	2021-02-03 15:01:09 +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
Carlos Jimenez Ruiz	5d82d469a7	Merge branch 'dev' into 2580-fetched_tags_refactor	2021-01-28 16:04:37 +00:00
Joan Sanchez	7bcbf5303e	Fix where	2021-01-28 16:08:57 +01:00
Joan Sanchez	9d5d2e9177	Added method prune again	2021-01-28 15:57:33 +01:00
Carlos Jimenez Ruiz	5c466e1163	vn-fetched-tags visual refactor	2021-01-28 15:10:47 +01:00
Joan Sanchez	ca47fe6827	2476 - downloadImages() method refactor	2021-01-28 12:23:18 +01:00
Carlos Jimenez Ruiz	9a349e789c	added missin icon property to fixedPrice route	2021-01-22 12:15:03 +01:00
Carlos Jimenez Ruiz	fe04f00c28	fixed unit test for upsertFixedPrice	2021-01-20 14:39:23 +01:00
Carlos Jimenez Ruiz	f946e63a86	e2e path for item fixed price	2021-01-19 20:56:33 +01:00
Carlos Jimenez Ruiz	4f7c2f3afd	added placeholder and fixed css	2021-01-19 13:30:07 +01:00
Carlos Jimenez Ruiz	e859a1b837	removed incorrect icon	2021-01-19 11:14:43 +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	52a1e3f652	fixed price controller tests	2021-01-18 16:32:54 +01:00
Carlos Jimenez Ruiz	3ec641f733	filter unit tests	2021-01-18 15:42:38 +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
Jorge Padawan	509de4fa0a	Fix for good practique code	2021-01-12 10:11:37 +01:00
Jorge Padawan	f45aa7937d	Added conditionals with rols to display or not the icons with link	2021-01-12 07:39:12 +01:00
Jorge Padawan	af55e2cc32	Add tooltip and modified sref for previews	2021-01-11 10:36:20 +01:00
Jorge Padawan	5a30bf5fa4	2650 add links to edit on summaries	2021-01-08 15:43:33 +01:00
Joan Sanchez	d8a2184695	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader	2020-12-18 17:24:30 +01:00
Joan Sanchez	42cd2356a2	Refactor v2	2020-12-18 17:23:04 +01:00
Carlos Jimenez Ruiz	1ba83e7741	cancel button css + item module refactor	2020-12-15 16:07:34 +01:00
Carlos Jimenez Ruiz	cbaa95ebda	item module refactors	2020-12-13 13:54:17 +01:00
Joan Sanchez	0a4016be41	Updated unit tests & changed ACL	2020-12-11 15:04:55 +01:00
Joan Sanchez	260b502cd6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader	2020-12-10 07:30:31 +01:00
Bernat Exposito	96f603a44b	refactor descriptors	2020-12-04 13:40:58 +01:00
Joan Sanchez	1ba1d27ba0	2576 - Photo upload component	2020-11-27 13:10:39 +01:00
Joan Sanchez	b2794dc413	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community	2020-11-24 10:52:35 +01:00
Joan Sanchez	80bae4de0a	2607 - Changed preview icon	2020-11-24 08:22:54 +01:00
Carlos Jimenez Ruiz	4172d0bb9b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community	2020-11-23 18:51:16 +01:00
Joan Sanchez	c654e14cfe	2611 - Summary go to entity	2020-11-23 13:41:51 +01:00
Joan Sanchez	d40ea52560	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community	2020-11-20 15:06:34 +01:00
Joan Sanchez	7693a1c449	2569 - Section changes	2020-11-20 15:05:57 +01:00
Carlos Jimenez Ruiz	cb88265471	removed commented code	2020-11-17 11:04:17 +01:00
Carlos Jimenez Ruiz	55a1ae0348	added entry descriptor to item last entries	2020-11-16 14:43:35 +01:00
Carlos Jimenez Ruiz	a62698330a	small refactor	2020-11-12 09:45:41 +01:00
Carlos Jimenez Ruiz	95a62f66ad	2548 item diary columns width	2020-11-11 16:58:56 +01:00
Carlos Jimenez Ruiz	9a8a32ee9b	denied & accepted no longer show deny icon	2020-11-11 16:08:27 +01:00
Joan Sanchez	dfbe1a02d2	Removed unused import	2020-11-10 14:06:41 +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	a30cfd2218	Added unit test	2020-11-05 09:21:20 +01:00
Joan Sanchez	b65f48f0d9	Updated unit test	2020-11-04 14:35:27 +01:00
Joan Sanchez	a325ef2a78	2574 - ItemTag refactor sourceTable	2020-11-04 11:29:10 +01:00
Joan Sanchez	770b6a30bb	Added unit test	2020-10-27 14:35:04 +01:00
Joan Sanchez	3d86e59890	#2540 - Added entry descriptor popover to referenced places	2020-10-27 12:02:49 +01:00
Joan Sanchez	0466d50c00	2518 - Item tag search	2020-10-22 07:50:01 +02:00
Carlos Jimenez Ruiz	c622175192	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-15 18:57:33 +02:00
Carlos Jimenez Ruiz	dd6035606f	some more tests fixed + refactors	2020-10-15 18:57:27 +02:00
Bernat Exposito	0fbbe9b2ae	Merge pull request 'new module supplier, created section index and searchpanel' (#413) from 2501-supplier_index into dev ... Reviewed-on: #413 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-10-15 07:57:57 +00:00
Bernat Exposito Domenech	cc35998f62	new module supplier, created section index and searchpanel	2020-10-15 08:15:04 +02:00
Carlos Jimenez Ruiz	30d00d0f63	fix getWasteDetail test	2020-10-14 10:53:20 +02:00
Joan Sanchez	2e3402b0cd	Updated method description	2020-10-14 07:18:39 +02:00
Carlos Jimenez Ruiz	c04b7a0657	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-13 10:31:06 +02:00
Bernat Exposito Domenech	6e081df4e8	fix test	2020-10-13 08:17:00 +02:00
Carlos Jimenez Ruiz	b6b84cfea7	more tests fixed + small refactors	2020-10-08 16:00:19 +02:00
Carlos Jimenez Ruiz	b8b32d20bc	Merge branch 'dev' into 2486-last_entries_fix	2020-10-06 07:12:00 +00:00
Joan Sanchez	6ecf595a11	2486 - Changed date filter	2020-10-06 08:52:11 +02:00
Joan Sanchez	0b8d8a4f65	Added focus directive to searchbar	2020-10-06 08:17:12 +02:00
Juan Ferrer	fc6a19b60d	Merge branch 'dev' into 2177-userModule	2020-09-21 14:10:15 +02:00
Carlos Jimenez Ruiz	ed905341b3	removed autoload for where/searchF	2020-09-21 11:17:40 +02:00
Carlos Jimenez Ruiz	aff6784662	corrected a typo	2020-09-21 10:57:59 +02:00
Carlos Jimenez Ruiz	c5dc84cbc2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1988-autocomplete_prefetch	2020-09-17 20:16:29 +02:00
Carlos Jimenez Ruiz	ea077e8d4a	added auto-load to some combos	2020-09-17 20:12:52 +02:00
Javi Gallego	1b13e58e10	item basic-data añadir isFragile	2020-09-17 09:58:00 +02:00
Juan Ferrer	4b5d2cd0dd	2177 account module ... LDAP test RC1 SQL version changed Tests fixes Back & front tests fixed All tests passed Front and back tests plus some fixes	2020-09-11 14:36:16 +02:00
Joan Sanchez	d0ac1b621c	Merge branch 'dev' into 2385-worker_descriptor_refactor	2020-09-09 09:06:11 +00:00
Joan Sanchez	004c9d7341	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-09 08:27:08 +02:00
Joan Sanchez	5ef9afdb53	Empty url fix	2020-09-08 15:07:57 +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	b848fa52f2	2385 - Replaced worker nickname	2020-09-03 15:11:16 +02:00
Joan Sanchez	a3382300f9	2402 - Added create entry section	2020-09-02 14:08:56 +02:00
Carlos Jimenez Ruiz	605fbe7999	refactor	2020-09-02 13:09:30 +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	cb4fe1f610	Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk	2020-09-01 07:37:48 +00:00
Joan Sanchez	5a16a10b8f	Merge branch 'dev' into 2409-last_entries_contextmenu	2020-09-01 06:55:13 +00:00
Javi Gallego	b4952002a3	Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk	2020-09-01 06:49:09 +00:00
Joan Sanchez	0a542a2057	Updated unit test	2020-09-01 07:38:03 +02:00
Joan Sanchez	8aa9918d84	2409 - Added filter by selection	2020-08-31 15:03:00 +02:00
Javi Gallego	daee9081d1	test excepto invoiceOut	2020-08-31 12:29:51 +02:00
Joan Sanchez	4a870213ce	Merge branch 'dev' into 2408-item_request	2020-08-31 09:03:41 +00:00
Joan Sanchez	baf9ec6e70	2416 - Item request - Added state filter	2020-08-31 08:32:30 +02:00
Carlos Jimenez Ruiz	c70ad808a0	refactor	2020-08-27 17:54:43 +02:00
Carlos Jimenez Ruiz	a66656dcce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section	2020-08-27 15:14:41 +02:00
Joan Sanchez	7c4d9b9460	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-08-27 14:31:54 +02:00
Joan Sanchez	a75938b6d0	Updated error handler	2020-08-27 14:23:40 +02:00
Joan Sanchez	55d047c0dd	Renamed error var	2020-08-27 14:11:22 +02:00
Joan Sanchez	fd67a85fe8	Changed to 1 second	2020-08-27 14:09:21 +02:00
Joan Sanchez	6f3fb83cd7	Changes	2020-08-27 13:53:11 +02:00
Carlos Jimenez Ruiz	3a82ef0e06	2375 entry lastBuy seccion	2020-08-26 16:33:47 +02:00
Carlos Jimenez Ruiz	d23e3eff76	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section	2020-08-26 09:49:52 +02:00
Joan Sanchez	e12612b0ea	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-08-26 08:28:41 +02:00
Joan Sanchez	ea4f561bcf	Added try-catch	2020-08-26 07:33:00 +02:00
Joan Sanchez	74f3229fc5	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-08-25 13:45:20 +02:00
Joan Sanchez	4ef540c8f3	Changed download path	2020-08-18 09:48:02 +02:00
Joan Sanchez	2a7495bac9	Image queue fixes	2020-08-18 09:45:26 +02:00
Joan Sanchez	1ef6637ad3	Added clearInterval()	2020-08-18 08:37:39 +02:00
Joan Sanchez	8968f41b75	Queue changes	2020-08-18 08:10:40 +02:00
Carlos Jimenez Ruiz	dee3ab166a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section	2020-08-17 14:18:44 +02:00
Joan Sanchez	dd5e71c9fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-08-17 09:42:29 +02:00
Joan Sanchez	a10e091b62	Added limit	2020-08-13 16:26:35 +02:00
Joan Sanchez	7a3de746cc	Added limit	2020-08-13 14:00:40 +02:00
Joan Sanchez	bbf15da16f	Changed tmp uri	2020-08-13 13:38:52 +02:00
Joan Sanchez	c0794808f0	Updated tmp directory	2020-08-13 13:09:53 +02:00
Joan Sanchez	c9ed17d981	Changes to dowload item photos endpoint	2020-08-13 12:16:25 +02:00
Carlos Jimenez Ruiz	6007506633	wider space for tags	2020-07-31 11:43:56 +02:00
Carlos Jimenez Ruiz	c62801e741	modules component to vnComponent working	2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz	6913f2db72	$httpBackend.when and .expect no longer misused	2020-07-23 17:10:07 +02:00
Carlos Jimenez Ruiz	4ca004f833	angular.mock.injet shorten to inject	2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz	f2730dd51c	some parts of latestsBuys WIP	2020-07-20 11:31:47 +02:00
Joan Sanchez	da3d20bb16	Restored limit	2020-07-15 12:11:44 +02:00
Joan Sanchez	72dfa4262a	Removed limit	2020-07-15 12:00:38 +02:00
Joan Sanchez	68c19fa22a	Removed test	2020-07-14 11:17:53 +02:00
Joan Sanchez	e557bd2815	Renamed method	2020-07-14 11:16:50 +02:00
Joan Sanchez	3074c9ce35	Fixed async image registration	2020-07-14 09:32:50 +02:00
Joan Sanchez	80075a6471	Added limit	2020-07-13 14:46:00 +02:00
Joan Sanchez	99aa6b666d	Mkdir recursive	2020-07-13 14:31:50 +02:00
Joan Sanchez	838b8a5382	Fix scope var	2020-07-13 14:22:19 +02:00
Joan Sanchez	ee19ea2993	Restricted to itemFk	2020-07-13 14:13:21 +02:00
Joan Sanchez	ccc5b95b48	Updated mount paths	2020-07-13 12:23:47 +02:00
Joan Sanchez	159b5f3bb8	#2351 Item image queue scheduler	2020-07-13 11:58:31 +02:00
Javi Gallego	762c39eb23	:: para watcher	2020-06-08 07:52:30 +02:00
Joan Sanchez	ca19581a5d	Merge pull request 'item diary, fix ticket descriptor' (#290) from 2288-item_diary into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-03 11:09:19 +00:00
Bernat Exposito Domenech	1cd9c75468	fix item diary descriptor	2020-06-03 12:37:01 +02:00
Joan Sanchez	613937dc8d	Fixed order	2020-06-03 12:21:03 +02:00
Joan Sanchez	f71a2a3665	Removed isOk param	2020-06-03 11:58:53 +02:00
Bernat Exposito Domenech	0b3608433c	item diary, fix ticket descriptor	2020-06-03 10:37:17 +02:00
Joan Sanchez	16d7186829	Fixed initial filters	2020-06-02 14:42:58 +02:00
Joan Sanchez	a0767a6ea2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters	2020-06-02 10:56:40 +02:00
Juan Ferrer	3e5bab41d3	Merge branch 'test' into dev	2020-06-01 13:47:33 +02:00
Juan Ferrer	3fcb76246d	Merge branch 'master' into test	2020-06-01 13:38:59 +02:00
Joan Sanchez	3d8bc3b7b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-01 13:32:35 +02:00
Joan Sanchez	c188da88e8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-06-01 13:31:08 +02:00
Javi Gallego	5188f80da5	Merge branch 'dev' into 2234-getVisibleAvailable	2020-05-26 10:47:48 +02:00
Javi Gallego	d8871c0bce	cr	2020-05-26 10:37:52 +02:00
Bernat Exposito	17ef761ba4	Merge pull request '2226-item_last_entries' (#271) from 2226-item_last_entries into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-05-26 07:59:17 +00:00
Joan Sanchez	44160d2f3c	Changed order	2020-05-26 08:11:36 +02:00
Joan Sanchez	4d2d57d646	2265 Changes to filter	2020-05-26 08:08:09 +02:00
Javi Gallego	0f718ad065	Merge branch 'dev' into 2242-test	2020-05-22 07:56:00 +02:00
Bernat Exposito Domenech	52241e6f2c	update itemLastENtries	2020-05-21 15:26:00 +02:00
Carlos Jimenez Ruiz	55c4ccdb29	Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech	4133021e5c	fix translate on plural	2020-05-20 08:52:20 +02:00
Javi Gallego	670c5936ce	test2	2020-05-19 13:11:22 +02:00
Javi Gallego	529bd5673c	test	2020-05-19 13:06:59 +02:00
Juan Ferrer	c998097ba1	Merge branch 'dev' into 1882-descriptorRefactor	2020-05-19 12:30:00 +02:00
Javi Gallego	ff03133277	test	2020-05-19 12:21:02 +02:00
Bernat Exposito Domenech	d289c17530	searchbar translates	2020-05-19 10:27:22 +02:00
Javi Gallego	3815edfbea	falta CR	2020-05-15 12:17:34 +02:00
Juan Ferrer	b94c97d322	Hotfix: Clone option added to vnItemDescriptor	2020-05-13 17:51:27 +02:00
Juan Ferrer	07cbac7fcd	Merge fixes	2020-05-08 19:56:39 +02:00
Juan Ferrer	7a1bb7e68d	Merge branch 'dev' into 1882-descriptorRefactor	2020-05-08 14:01:49 +02:00
Javi Gallego	8453d25852	#2224item.diary provar directiva $anchorScroll	2020-05-06 18:42:50 +02:00
Juan Ferrer	6c14743017	Last fixes & tests passed	2020-05-06 14:38:09 +02:00
Juan Ferrer	6a8e1bf6b5	#1882 Boileplate code removed, declarative quicklinks	2020-04-30 12:48:52 +02:00
Juan Ferrer	b536c8291a	#1882 Popover::show() boilerplate code removed	2020-04-28 14:26:02 +02:00
Juan Ferrer	5826099601	#1882 First step, front tests passed	2020-04-25 11:50:04 +02:00
Juan Ferrer	4336a303c0	Merge branch 'dev' into 2026-itemDescriptorPopoverRelocate	2020-04-07 13:03:57 +02:00
Juan Ferrer	2249f68d6e	SCSS px to em: rem for font-size	2020-04-02 15:11:42 +02:00
Juan Ferrer	559cc5eb8c	SCSS em to px: Second step	2020-04-02 14:52:02 +02:00
Juan Ferrer	734c86c5f5	SCSS px to em - First step	2020-04-02 14:20:57 +02:00
Juan Ferrer	bf68d15264	E2E expeditions fixes, scss px/em fixes	2020-04-02 11:39:39 +02:00
Juan Ferrer	0bd09492d1	#2026 Implemented & tests passed	2020-03-25 20:44:59 +01:00
Joan Sanchez	f231fabef1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2195-setDeleted_itemShelving	2020-03-25 16:14:13 +01:00
Joan Sanchez	e71ace6da7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section	2020-03-25 15:59:41 +01:00
Juan Ferrer	8eb6590285	E2E fixes	2020-03-24 17:27:21 +01:00
Joan Sanchez	27b1376799	changes	2020-03-23 11:21:25 +01:00
Joan Sanchez	9b933e7d88	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section	2020-03-20 12:00:53 +01:00
Joan Sanchez	3d23583e0b	Fixes	2020-03-18 14:08:04 +01:00
Joan Sanchez	934e057a67	Fixed watcher changes	2020-03-18 09:41:23 +01:00
Joan Sanchez	526a92fd32	Order refactor	2020-03-17 15:18:02 +01:00
Joan Sanchez	88fe9a006e	Item refactor	2020-03-17 14:43:46 +01:00
Juan Ferrer	56a21edeca	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1992-goWhenOneResult	2020-03-16 18:33:39 +01:00
Juan Ferrer	9d1bc8eb54	First functional version (No tests)	2020-03-13 20:33:12 +01:00
Joan Sanchez	b9a482fc37	2181 - Ticket sale fix item search	2020-03-11 15:56:02 +01:00
Carlos Jimenez Ruiz	794b20fc83	#2131 jest.spyOn	2020-02-26 13:22:52 +01:00
Joan Sanchez	ad1e08ec70	2134 - Irem request load error	2020-02-24 14:29:48 +01:00
Carlos Jimenez Ruiz	081c742dcb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1835-e2e-item-request	2020-02-19 11:48:01 +01:00
Bernat Exposito Domenech	3f978bd32b	entry index refactor	2020-02-18 10:33:17 +01:00
Joan Sanchez	fe8a0b4583	Added translation. taxClassCode.sql removed	2020-02-18 07:21:35 +01:00
Joan Sanchez	7d8e88e884	Updated unit test	2020-02-17 13:32:12 +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
Carlos Jimenez Ruiz	4e2ab537ee	unstable with the rest of tests	2020-02-14 14:52:47 +01:00
Joan Sanchez	b623646f25	removed console	2020-02-07 07:02:27 +01:00
Joan Sanchez	3e0fd10b41	2029 - Item request fixes & searchbar filters working	2020-02-06 14:33:28 +01:00
Joan Sanchez	e3b1a4b58a	2076 - Item tags refactor	2020-02-06 07:41:51 +01:00
Carlos Jimenez Ruiz	f74792dbe9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2020-01-24 10:17:08 +01:00
Bernat Exposito Domenech	960b3c3f75	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-01-22 09:51:35 +01:00
Bernat Exposito Domenech	0b848adf03	fix back test	2020-01-22 09:43:10 +01:00
Joan Sanchez	1d6edabb10	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-01-21 09:23:58 +01:00
Joan Sanchez	e93e9d2947	getWasteDetail() now calls weekWaste_getDetail()	2020-01-21 09:17:55 +01:00
Joan Sanchez	826dfe8092	changes to percentage filter	2020-01-17 11:46:45 +01:00
Joan Sanchez	3a4c379033	Added waste section	2020-01-17 11:44:05 +01:00
Joan Sanchez	2b2e6532f6	changes to percentage filter	2020-01-16 13:39:32 +01:00
Joan Sanchez	708789502d	Added waste section	2020-01-15 13:07:33 +01:00
Carlos Jimenez Ruiz	e922a05e50	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2019-12-31 11:40:15 +01:00
Joan Sanchez	f2e9dbd597	added category name to item type autocompletes	2019-12-26 11:27:44 +01:00
Carlos Jimenez Ruiz	c992cbc5c6	Merge branch '1935-ticket_create_auto_fill' of verdnatura/salix into dev	2019-12-26 08:14:22 +00:00
Joan Sanchez	d2c5ab7297	trigger unit tests	2019-12-26 08:43:34 +01:00
Joan Sanchez	c95c7192da	Added template to specie autocomplete	2019-12-26 08:21:08 +01:00
Joan Sanchez	5273e90a30	Added params to ticket method & updated unit tests	2019-12-26 07:12:34 +01:00
Joan Sanchez	3d4fc9c18e	#1963 Entry & zone style changes	2019-12-23 08:05:58 +01:00
Juan Ferrer	4da83ef963	Hotfixes: vnTicketSale menu, vnItemDiary width	2019-12-17 12:23:31 +01:00
Carlos Jimenez Ruiz	e6130e78fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2019-12-13 15:12:55 +01:00
Joan Sanchez	780f1e4773	renamed expence to expense and added field	2019-12-13 11:59:25 +01:00
Bernat Exposito Domenech	eb2cfc5535	updated selectors	2019-12-11 14:14:44 +01:00
Joan Sanchez	5bb7f7f14a	deprecated getItemVisibleAvailable() #1887	2019-11-20 11:14:11 +01:00
Juan Ferrer	4436acec10	Merge	2019-11-14 14:07:48 +01:00
Joan Sanchez	1b70721b0e	#1864 added restrictions, send rocketchat message	2019-11-12 14:53:58 +01:00
Juan Ferrer	1c035ca045	All tests fixed	2019-11-12 14:18:46 +01:00
Juan Ferrer	efa6ddc0f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor	2019-11-11 16:25:00 +01:00
Joan Sanchez	6cedfceddd	Show ticket state #1836	2019-11-11 13:51:30 +01:00
Juan Ferrer	515234187a	First working version	2019-11-10 11:08:44 +01:00
Juan Ferrer	c41fb1d0f4	#1847 vnDialog refactor	2019-10-30 16:57:14 +01:00
Juan Ferrer	1b2c383502	vnDialog opens in body, nightmare extensions with detailed errors	2019-10-28 17:31:33 +01:00
Juan Ferrer	47998aaa97	vnDialog opens in body	2019-10-27 01:30:01 +02:00
Juan Ferrer	c7384bb3ac	API path prefix, repeated code removed from tests	2019-10-25 00:53:53 +02:00
Juan Ferrer	ee196df2ff	vnCompent with most common services as properties	2019-10-24 12:44:36 +02:00
Joan Sanchez	137f701434	changed order	2019-10-22 14:20:50 +02:00
Joan Sanchez	2ed4cf3e4a	Item request refactor #1818	2019-10-22 13:44:36 +02:00
Joan Sanchez	188f4ae3bf	mark item diary line	2019-10-21 11:08:41 +02:00
Bernat	e9f65cd2a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-21 08:42:30 +02:00
Joan Sanchez	e2a7c09e4a	Uploadfile parameters are now required + fixed date filters	2019-10-21 08:31:14 +02:00
Bernat	6477a1458d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-21 07:24:56 +02:00
Juan Ferrer	72017a64ac	Date timezone offset properly handled from backend DB connector	2019-10-19 01:18:25 +02:00
Juan Ferrer	485bc43b13	Style fixes	2019-10-18 22:07:55 +02:00
Juan Ferrer	17a150370c	Style fixes	2019-10-18 21:54:13 +02:00
Juan Ferrer	457034daad	Tests fixed	2019-10-18 21:36:30 +02:00
Bernat	7a89ab5335	#1778 Refactor worker.phone	2019-10-18 08:36:33 +02:00
Joan Sanchez	e79456374c	fixed item-popover width	2019-10-14 14:54:11 +02:00
Juan Ferrer	a72c12e1c9	Tests passed	2019-10-11 17:38:04 +02:00
Juan Ferrer	a9d5e87078	vnField alpha with ngModel	2019-10-10 00:47:29 +02:00
Juan Ferrer	fc09d76422	Merge	2019-10-08 23:57:54 +02:00
Juan Ferrer	757fc6fe23	vnField stable & applied to all field except vnTextfield	2019-10-08 23:57:02 +02:00
Carlos Jimenez Ruiz	7db4945a6d	#1702 Autocomplete data refresh and #1754 watcher	2019-10-08 17:27:27 +02:00
Juan Ferrer	eeef468964	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-05 00:17:10 +02:00
Juan Ferrer	b12a666653	CSS padding/margin refactor, glob styles in core	2019-10-05 00:16:57 +02:00
Carlos Jimenez Ruiz	4fa532abb8	#1744 ticket.index ocultar columnas expendables	2019-10-04 17:49:51 +02:00
Carlos Jimenez Ruiz	da2c763573	#1705 item.index optimizar velocidad	2019-10-04 10:07:45 +02:00
Juan Ferrer	c6e8498281	ModelProxy.status, Paging removed, locale fixes	2019-10-03 19:34:24 +02:00
Juan Ferrer	ec9797a4b3	vnDataViewer applied to all module indexes	2019-10-02 21:02:49 +02:00
Joan Sanchez	314b609060	fixed family translation	2019-09-24 08:34:14 +02:00
Carlos Jimenez Ruiz	7bcc908708	#1704 item.basicData	2019-09-20 16:39:20 +02:00
Bernat	526e4e34fa	skip e2e #1702	2019-09-19 09:05:11 +02:00
Bernat	86d793b9ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-18 11:11:53 +02:00
Bernat	7af4f3626d	#1691 item.basicData - Añadir campo hasKgPrice	2019-09-18 11:11:47 +02:00
Carlos Jimenez Ruiz	4c33f07e42	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-18 09:42:45 +02:00
Carlos Jimenez Ruiz	b12d0388c9	#1074 Undo changes button for forms	2019-09-18 09:41:25 +02:00
Bernat	cbbce91def	#1693 export structure, data and fix back test	2019-09-17 13:52:29 +02:00
Carlos Jimenez Ruiz	206dec59a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-13 16:09:27 +02:00
Carlos Jimenez Ruiz	2251fb65ad	#1615 migrar karma a jest	2019-09-13 16:09:14 +02:00
Bernat	2172bdee4e	#1689	2019-09-12 12:27:19 +02:00
Joan Sanchez	f6bd915ae6	Ticket dms CSS fixes #1692	2019-09-12 11:47:56 +02:00
Joan Sanchez	7ecb67052d	item.diary css chip fixed #1676	2019-09-10 08:47:46 +02:00
Joan Sanchez	176750046a	Scroll component #643	2019-09-05 13:06:40 +02:00
Bernat	b656db3a84	#1645 refactor search panel	2019-08-29 08:32:46 +02:00
Bernat	6daabed202	#1645 first part, delete hasVisible	2019-08-28 12:17:06 +02:00
Carlos Jimenez Ruiz	c2573d6853	css amends for item-request	2019-07-25 11:25:01 +02:00
Carlos Jimenez Ruiz	e1cbf781e1	#1608 item.request	2019-07-25 09:55:09 +02:00
Joan Sanchez	6f3b023644	Create postcode form #1585	2019-07-08 14:07:09 +02:00
Carlos Jimenez Ruiz	a2a9dfd7e5	#1567 refactor logs - worker descriptor	2019-07-03 11:08:44 +02:00
Bernat	65ec629221	Tarea #1518 route.tickets al eliminar un ticket de la ruta, tiene que logearse	2019-07-03 08:29:40 +02:00
Joan Sanchez	bddfbc4b34	add new item from ticket.sale #1414, checkedLines fixed	2019-07-02 12:12:15 +02:00
Bernat	dd38a21e8d	Refactor #1569 claim.delete, update fixtures and fix test	2019-07-01 11:56:16 +02:00
Bernat	682a75ac76	#1533 update fixtures and fix test	2019-06-25 14:00:55 +02:00
Joan Sanchez	dae43bb9b0	transactions refactor #1546	2019-06-21 08:26:59 +02:00
Carlos Jimenez Ruiz	fcc0ad6098	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-14 12:27:54 +02:00
Carlos Jimenez Ruiz	b8a4861f01	#1526 refactor fixtures	2019-06-14 12:27:41 +02:00
Juan Ferrer	03205e01ae	NPM fix, fdescribe removed	2019-06-13 09:49:36 +02:00
Juan Ferrer	89a563eaf9	Merge	2019-06-13 09:21:36 +02:00
Juan Ferrer	58cc90929f	TX fixes, debug disabled, glob transaction timeout	2019-06-12 17:31:45 +02:00
Joan Sanchez	4545d1f649	merge from test to dev - no structure	2019-06-07 13:06:54 +02:00
Joan Sanchez	073c457abb	Merge branch 'test'	2019-06-05 08:56:56 +02:00
Bernat	d742eef7c3	Tarea #1478 item.basicData	2019-05-30 08:04:46 +02:00
Javi Gallego	3776e0588c	merge paso 1	2019-05-23 13:05:02 +02:00
Joan Sanchez	e9c2ae073a	Clone item without size	2019-05-23 11:42:14 +02:00
Joan Sanchez	318c014fab	Clone item without size	2019-05-23 08:03:31 +02:00
Joan Sanchez	cc72432a37	accessType refactor #1460	2019-05-22 12:38:51 +02:00
Joan Sanchez	f73b42b0be	accessType refactor #1460	2019-05-22 12:35:24 +02:00
Joan Sanchez	183bf137f6	added workerTimeControl #1360	2019-05-17 13:27:51 +02:00
Bernat	b86cf1d98a	1354 refactor item-descriptor-popover	2019-05-17 07:34:25 +02:00
Carlos Jimenez Ruiz	8df885b19b	removed f from describe	2019-05-16 14:19:14 +02:00
Joan Sanchez	858916e528	remove description properties from item clone	2019-05-16 12:53:40 +02:00
Joan Sanchez	a0ffde8ed1	remove description properties from item clone	2019-05-16 12:51:16 +02:00
Carlos Jimenez Ruiz	41c20d977c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-15 13:07:44 +02:00
Carlos Jimenez Ruiz	2358c94aae	#1402 route.ticket	2019-05-15 13:07:32 +02:00
Joan Sanchez	307cffcb58	fixed item clone #1429	2019-05-15 13:05:49 +02:00
Joan Sanchez	11ae1dbe7c	fixed item clone #1429	2019-05-15 12:57:46 +02:00
Carlos Jimenez Ruiz	ed14f94fd6	small amends	2019-05-15 08:33:27 +02:00
Carlos Jimenez Ruiz	18d0aa9282	#1398 Test unitarios de filtros	2019-05-13 14:34:37 +02:00
Bernat	83898c9ba7	1354 refactor item-descriptor-popover	2019-05-07 11:32:35 +02:00
Carlos Jimenez Ruiz	8771098045	#1350 route.index	2019-05-03 18:23:44 +02:00
Carlos Jimenez Ruiz	46756dfdcb	#1351 e2e order.catalog	2019-05-02 11:41:24 +02:00
Joan Sanchez	0dbed4e102	fixed translation	2019-05-02 10:40:46 +02:00
Joan Sanchez	a2fd8ddc8a	buy requests translation & default order	2019-05-02 10:04:02 +02:00
Carlos Jimenez Ruiz	3cb7319efa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-25 14:24:08 +02:00
Carlos Jimenez Ruiz	511e33b835	#1350 route.index worker descriptor + filters	2019-04-25 14:24:02 +02:00
Joan Sanchez	4465f48afe	fix search by string barcode #1381	2019-04-25 13:51:34 +02:00
Carlos Jimenez Ruiz	4e5c6ff882	#1356 advanced search refactor	2019-04-25 08:28:08 +02:00
Bernat	bc005b2310	#1346 fix confirm.js and update item request	2019-04-18 11:02:28 +02:00
Carlos Jimenez Ruiz	e34cb8ce84	#1351 e2e order.catalog	2019-04-17 09:37:55 +02:00
Carlos Jimenez Ruiz	bafbd92802	Bug/Test #1331 cambio de rol	2019-04-17 08:21:58 +02:00
Carlos Jimenez Ruiz	9baa37b833	#1306 Renombrar controladores, rutas y carpetas	2019-04-16 14:30:01 +02:00
Bernat	dbe56b2496	#1330 add info in the search panel	2019-04-12 14:33:08 +02:00
Joan Sanchez	20ba05a655	item filter by id or barcode	2019-04-10 09:32:29 +02:00
Joan Sanchez	b3c00e5a29	updated td-editable styles #1313	2019-04-09 13:47:13 +02:00
Joan Sanchez	4f1a1ae004	Merge branch 'master' into dev	2019-04-09 13:19:34 +02:00
Joan Sanchez	a6308c7f1e	input-number refactor #1311	2019-04-09 13:18:55 +02:00
Gerard	633ab28c41	#1315 item.ticketRequest	2019-04-05 15:20:12 +02:00
Gerard	d7c063f389	removed unused binding	2019-04-05 09:27:43 +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
Joan Sanchez	ccb2505896	Merge branch 'master' into dev	2019-04-03 12:58:59 +02:00
Joan Sanchez	eea4f53151	removed field acl for buyer on item tags	2019-04-03 12:58:30 +02:00
Joan Sanchez	0a0aa3853a	Merge branch 'master' into dev	2019-04-03 12:48:21 +02:00
Joan Sanchez	1e99a890e2	allow item tags for accessory role	2019-04-03 12:47:51 +02:00
Gerard	a23c636c16	#1279 loggable rawSql	2019-04-02 14:36:49 +02:00
Joan Sanchez	5898d07822	Merge branch 'test' into dev	2019-04-01 09:02:13 +02:00
Joan Sanchez	dfe1a68d35	fix ticket basic data allow change company #1277	2019-04-01 09:01:11 +02:00
Gerard	164093af48	Merge branch 'test' into dev	2019-04-01 08:43:22 +02:00
Gerard	034bd77d52	Date is visible always	2019-04-01 08:42:19 +02:00
Joan Sanchez	8db51fdf64	added shrink class to item index #1278	2019-03-29 08:01:15 +01: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	2263da2e05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-28 11:55:31 +01:00
Carlos Jimenez Ruiz	a14ba28629	#1263 invoiceOut.summary	2019-03-28 11:55:23 +01:00
Bernat	4e27581045	cau 10269 fix test and update fixtures	2019-03-27 08:44:15 +01:00
Gerard	eaec968aa4	Now you can change the shipped hour of a ticket	2019-03-26 12:25:06 +01:00
Joan Sanchez	2ca5def095	build english locale on dist directory #1268	2019-03-26 12:05:53 +01:00
Joan Sanchez	500105675c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-26 07:29:57 +01:00
Joan Sanchez	3df5f4cae9	replaced numeric fields with input-number #1138	2019-03-26 07:29:45 +01:00
Carlos Jimenez Ruiz	d322c941a4	#1226 Ticket.index advanced filter añadir factura	2019-03-25 15:16:56 +01:00
Joan Sanchez	4a4b997e1b	added subName to fetched-tags #1246	2019-03-22 15:05:15 +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	5fcb9f61ab	Merge branch 'master' into test	2019-03-13 16:09:14 +01:00
Gerard	fd4fe288a5	has visible disabled temporally	2019-03-13 12:03:06 +01:00
Gerard	fb75ff0eae	#1222 Activar log en el modulo ítem	2019-03-12 11:47:53 +01:00
Gerard	987fc1e4e3	tranlations added	2019-03-11 08:40:35 +01:00
Gerard	d1ce85c81e	taxclass field temporally removed as it slows the query	2019-03-08 13:46:33 +01:00
Gerard	720803facb	#1220 item.index añadir campos a buscador avanzado	2019-03-08 13:12:13 +01:00
Gerard	7d8879a979	deleted default query on item index	2019-03-08 07:52:43 +01:00
Gerard	32893b49c1	#1174 item.index buscador avanzado mostrar comprador	2019-03-05 12:13:46 +01:00
Gerard	00f9754c1e	#1171 item.index mostrar campos medida y nicho	2019-03-05 12:03:34 +01:00
Gerard	7f10a509e0	#1188 item.index filtering doesnt work for some params	2019-03-05 11:34:05 +01:00
Gerard	1b2f851525	#1191 item not available icon added	2019-03-04 20:00:12 +01:00
Carlos Jimenez Ruiz	acbe9b8488	#1184 Propagar done en afterAll() de los test back	2019-03-01 11:50:26 +01:00
Gerard	9ef3eac480	#1136 item.buscador Avanzado añadir campo visible y isActive	2019-02-28 13:50:39 +01:00
Gerard	7dd08dc6e5	merge test	2019-02-28 10:19:31 +01:00
Gerard	87e8be0ede	time filter changed by dateTime	2019-02-27 17:04:00 +01:00
Carlos Jimenez Ruiz	c227784877	typoe fixed	2019-02-27 10:05:49 +01:00
Carlos Jimenez Ruiz	4b37b0fc1e	#1155 item.index añadir grouping y packing	2019-02-25 14:55:06 +01:00
Gerard	8a137e7713	grouping and packing added	2019-02-25 13:40:53 +01:00
Gerard	ea9d194368	traduction added	2019-02-22 13:18:53 +01:00
Gerard	86b3407e35	item barcode to item created	2019-02-22 08:32:18 +01:00
Carlos Jimenez Ruiz	413d2f2855	merge	2019-02-21 11:53:19 +01:00
Carlos Jimenez Ruiz	050c5c1126	#1131 Refactor vn-icon a vn-icon-button en las templates.	2019-02-21 11:40:27 +01:00
Gerard	03e168739b	updated icons	2019-02-21 10:17:13 +01:00
Gerard	c95b2d71d4	tag not closed correctly fixed	2019-02-20 16:43:01 +01:00
Juan Ferrer	8c401b6921	Style fixes	2019-02-20 14:38:41 +01:00
Juan Ferrer	8f1e41e744	Style fixes	2019-02-20 14:34:16 +01:00
Gerard	5d6951a610	deleted deprecated component	2019-02-20 11:41:06 +01:00
Gerard	efff9d2184	deleted duplicated data	2019-02-20 11:36:55 +01:00
Gerard	0f5d1e55c0	item descriptor not sending the correct warehouse fixed	2019-02-20 11:30:55 +01:00
Gerard	927957aed8	Merge remote-tracking branch 'upstream/dev' into jgallego	2019-02-19 16:12:01 +01:00
Gerard	b7db5f969b	fixed worker descriptor not showing the correct worker	2019-02-19 15:09:50 +01:00
Gerard	5ef524559e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-19 12:59:58 +01:00
Gerard	abfbf791f3	added one time bindings	2019-02-19 12:50:24 +01:00
Carlos Jimenez Ruiz	ff415dc654	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-19 12:14:27 +01:00
Gerard	280803f2ad	tests updated	2019-02-19 11:17:08 +01:00
Gerard	054cf21c1f	item index fixes	2019-02-19 10:15:39 +01:00
Javi Gallego	a0cf617cca	#498 e2e arreglado	2019-02-19 08:42:36 +01:00
Carlos Jimenez Ruiz	2d2ce304b5	merge	2019-02-19 08:16:36 +01:00
Javi Gallego	da4d961c8b	Merge branch 'dev' into jgallego	2019-02-18 13:35:33 +01:00
Javi Gallego	a3e69d604a	getAvailable aislado	2019-02-18 13:31:57 +01:00
Gerard	f5759f131b	#1145 item diary no va a la linea actual	2019-02-18 09:50:46 +01:00
Gerard	13473e7bec	#1145 item diary no va a la linea actual	2019-02-18 09:50:09 +01:00
Joan Sanchez	5eb4eb2e79	Merge branch 'dev' into test	2019-02-18 08:38:14 +01:00
Javi Gallego	58706b8694	backPreparado	2019-02-18 07:57:15 +01:00
Carlos Jimenez Ruiz	4186fbacb3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-16 17:15:03 +01:00
Joan Sanchez	42e3fede23	fixed ng-repeat transition	2019-02-15 17:33:03 +01:00
Gerard	cb9e2284eb	styles, imports of titles and traductions added	2019-02-15 17:30:22 +01:00
Javi Gallego	2b4f5984cc	principio 1146	2019-02-15 16:04:24 +01:00
Carlos Jimenez Ruiz	b034a8fab7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-15 15:33:11 +01:00
Javi Gallego	7f7f47d861	bug no results duplicado	2019-02-15 13:25:23 +01:00
Carlos Jimenez Ruiz	3ab0b2eb19	merge	2019-02-15 12:43:18 +01:00
Carlos Jimenez Ruiz	92a645f395	#1122 + worker descriptor popover + small refactors for worker.nickname	2019-02-15 12:39:21 +01:00
Gerard	16f92ce646	changed Type traduction	2019-02-14 12:05:46 +01:00
Gerard	f7968ff15b	tests fixed	2019-02-14 11:41:06 +01:00
Gerard	9c439e9a92	added category to item search panel	2019-02-14 11:24:04 +01:00
Gerard	2a48e183e9	information added to the table	2019-02-14 09:59:54 +01:00
Juan Ferrer	f3e3c1bbae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-13 14:01:38 +01:00
Juan Ferrer	1f759b6b8c	Style fixes	2019-02-13 14:01:37 +01:00
Gerard	b93e2f5359	#1114 item.regularize	2019-02-13 09:49:41 +01:00
Gerard	5063bd8137	#1128 item.index	2019-02-13 09:27:11 +01:00
Carlos Jimenez Ruiz	fb4a4cd3de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-13 08:19:44 +01:00
Joan Sanchez	7f96eae312	$applyAsync() with relocate() on catalog. Replaced $$postDigest() #1072	2019-02-13 07:57:08 +01:00
Carlos Jimenez Ruiz	b0e22febd3	#1127 mover ticket.descriptor al modulo ticket	2019-02-12 09:03:56 +01:00
Carlos Jimenez Ruiz	82d59b544d	removed unused fdescribe	2019-02-11 15:01:12 +01:00
Joan Sanchez	7365a1e001	updated delivery-note, fixed fallback locale	2019-02-11 10:06:26 +01:00
Juan Ferrer	c0dd1624f6	Table style	2019-02-10 22:52:35 +01:00
Juan Ferrer	f52d306db4	Color style unified	2019-02-08 17:49:51 +01:00
Juan Ferrer	2bf9244770	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-06 11:24:31 +01:00
Juan Ferrer	03406a7d9b	Style fixes	2019-02-06 11:24:29 +01:00
Joan Sanchez	35bd82c9cb	item summary fix & css report fixes	2019-02-06 10:53:12 +01:00
Gerard	a605b8f9b7	#1065 item.last-entries	2019-02-05 16:53:55 +01:00
Gerard	f59d022da8	#1078 risk.create	2019-02-05 16:46:02 +01:00
Gerard	48bb876bea	Revert "#1012 claim.action" ... This reverts commit 44893b57e7.	2019-02-05 16:42:28 +01:00
Gerard	44893b57e7	#1012 claim.action	2019-02-05 16:41:36 +01:00
Juan Ferrer	8f72fbad23	Merge	2019-02-05 09:14:22 +01:00
Juan Ferrer	1dbb75a1b8	vnSideMenu, vnBackground, style fixes	2019-02-05 09:13:15 +01:00