2409 Commits

Author	SHA1	Message	Date
Joan Sanchez	0438171a47	Merge branch 'dev' into 2381-mariaDB	2020-09-28 06:09:48 +00:00
Bernat Exposito Domenech	790c9bfe6f	update models and fixtures	2020-09-25 14:50:04 +02:00
Joan Sanchez	4d25fe88cf	Added functions to call sql from def	2020-09-25 14:45:00 +02:00
Javi Gallego	c909470f41	merge	2020-09-25 08:10:37 +02:00
Joan Sanchez	f1d36df558	#2458 - Removed states from pending tickets	2020-09-24 15:00:00 +02:00
Joan Sanchez	de3c7acb08	Merge branch 'dev' into 2381-mariaDB	2020-09-24 12:30:44 +00:00
Joan Sanchez	d2dbf417f4	Updated to standard color	2020-09-24 11:15:35 +02:00
Joan Sanchez	d18d7670ec	Updated unit tests	2020-09-24 10:44:12 +02:00
Joan Sanchez	53e729eddd	2366 - Merge event colors	2020-09-24 10:14:53 +02:00
Joan Sanchez	5265202e65	Merge branch 'dev' into 2449-ticket_basicData	2020-09-23 13:10:32 +00:00
Joan Sanchez	75ac6ad8d3	Updated unit test	2020-09-23 14:20:41 +02:00
Joan Sanchez	a8589d6945	Autocomplete warehouse on agency selection	2020-09-23 14:13:44 +02:00
Joan Sanchez	c49614b8cf	Merge branch 'dev' into 2449-ticket_basicData	2020-09-23 09:23:09 +00:00
Joan Sanchez	5ec5979a3e	Updated tests	2020-09-23 11:21:25 +02:00
Carlos Jimenez Ruiz	87e4765a1c	fixed ticket-weekly backend unit test	2020-09-22 16:53:47 +02:00
Bernat Exposito Domenech	ce1c4e6f60	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap	2020-09-22 14:00:52 +02:00
Bernat Exposito Domenech	06f03c6b84	mail models and fix checkInbox	2020-09-22 13:59:00 +02:00
Joan Sanchez	89667a18c9	Handle ticket without old state	2020-09-22 07:50:30 +02:00
Joan Sanchez	ae3d00bad1	Added new method	2020-09-22 07:38:20 +02:00
Juan Ferrer	2d1cf566f8	All tests fixed	2020-09-21 22:54:36 +02:00
Juan Ferrer	6abd707a6d	Tests fixed	2020-09-21 19:16:51 +02:00
Juan Ferrer	3880e21ce3	Test fixes	2020-09-21 16:09:34 +02:00
Juan Ferrer	2b05827be1	Merge	2020-09-21 14:10:26 +02:00
Juan Ferrer	fc6a19b60d	Merge branch 'dev' into 2177-userModule	2020-09-21 14:10:15 +02:00
Juan Ferrer	b9c526c29c	LDAP user & role syncronization	2020-09-21 13:24:43 +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
Javi Gallego	8fb674819a	ticket service	2020-09-21 10:35:39 +02:00
Joan Sanchez	fa344f4ff6	2449 - Autocompletion	2020-09-19 13:02:00 +02:00
Carlos Jimenez Ruiz	5d461b119c	tests fix	2020-09-18 11:50:20 +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
Carlos Jimenez Ruiz	bde6c4495d	e2e path updated + 2 new tasks for broken tests	2020-09-16 16:10:43 +02:00
Joan Sanchez	b6499370e1	Merge branch 'dev' into 2430-catalog_multi_tag	2020-09-16 09:06:08 +00:00
Joan Sanchez	f8ea14ecab	Updated unit test	2020-09-16 10:11:09 +02:00
Joan Sanchez	312faeb3b0	Changes to lag list	2020-09-16 09:54:04 +02:00
Carlos Jimenez Ruiz	5b69ce983c	salesPersonUser replaces salesPerson relation	2020-09-15 19:43:07 +02:00
Joan Sanchez	b5b7172b72	Updated test	2020-09-15 14:26:23 +02:00
Joan Sanchez	1f1b09d456	Updated unit tests	2020-09-15 14:14:13 +02:00
Joan Sanchez	538c217b59	Store tagGroups on catalog url	2020-09-15 10:48:34 +02:00
Carlos Jimenez Ruiz	031e40df51	removed unused dash if empty	2020-09-14 16:34:11 +02:00
Carlos Jimenez Ruiz	1eb088521c	ticket.index ref and state columns merged	2020-09-14 16:08:37 +02:00
Carlos Jimenez Ruiz	13a5c4c4c9	test enhanced	2020-09-14 13:58:42 +02:00
Carlos Jimenez Ruiz	0b4c53a655	added invoiceOut descriptor	2020-09-14 13:11:53 +02:00
Carlos Jimenez Ruiz	a767d256b2	Merge branch 'dev' into 2444-entry_latestBuys_v2	2020-09-14 10:22:17 +00:00
Joan Sanchez	559a2e9721	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-14 11:56:58 +02:00
Joan Sanchez	746bf55bcd	Updated dms path	2020-09-14 11:54:34 +02:00
Carlos Jimenez Ruiz	22e7e035c3	column tags added	2020-09-14 11:44:47 +02:00
Joan Sanchez	f94728845e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2430-catalog_multi_tag	2020-09-14 10:32:34 +02:00
Carlos Jimenez Ruiz	43d011ea60	isIgnored displayed as vn-check	2020-09-14 09:43:00 +02:00
Joan Sanchez	9bbe50c62b	Changes to catalog filters	2020-09-14 07:42:43 +02:00
Carlos Jimenez Ruiz	bf17d428e4	entry basic data + some minor refactors	2020-09-11 14:51:58 +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
Carlos Jimenez Ruiz	de184c163e	color var	2020-09-10 17:17:46 +02:00
Carlos Jimenez Ruiz	42abeecede	hex color now displayed on catalog	2020-09-10 16:35:32 +02:00
Carlos Jimenez Ruiz	270e665291	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2404-catalog_color	2020-09-10 14:38:48 +02:00
Carlos Jimenez Ruiz	ecc7ae398c	column order	2020-09-10 14:32:44 +02:00
Carlos Jimenez Ruiz	e8384e3ec9	added packageFk as column	2020-09-10 13:26:04 +02:00
Bernat Exposito Domenech	0cf99a5a83	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production	2020-09-10 11:34:35 +02:00
Carlos Jimenez Ruiz	12ceedd80c	corrected some typos	2020-09-10 10:46:56 +02:00
Bernat Exposito Domenech	d91a354e4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production	2020-09-10 07:51:30 +02:00
Bernat Exposito Domenech	348412c5db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-09 15:50:06 +02:00
Bernat Exposito Domenech	d4b6d7cd96	cr changes	2020-09-09 15:49:59 +02:00
Bernat Exposito Domenech	9ff7232b50	export production and fix test	2020-09-09 12:54:10 +02:00
Carlos Jimenez Ruiz	46b67308fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2400-entry_summary_buys	2020-09-09 11:39:24 +02:00
Carlos Jimenez Ruiz	957096172d	entry summary buys listed	2020-09-09 11:39:18 +02:00
Bernat Exposito Domenech	5bb8aacfb0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-09 11:12:18 +02:00
Joan Sanchez	d0ac1b621c	Merge branch 'dev' into 2385-worker_descriptor_refactor	2020-09-09 09:06:11 +00:00
Joan Sanchez	88cf2e602c	Merge branch 'dev' into 2406-catalog_sort_by_occurrences	2020-09-09 08:22:45 +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
Bernat Exposito Domenech	f99fb69d48	front and back test	2020-09-09 08:20:27 +02:00
Joan Sanchez	db081501eb	2440 - Ticket filter hotfix	2020-09-09 08:14:17 +02:00
Joan Sanchez	5ef9afdb53	Empty url fix	2020-09-08 15:07:57 +02:00
Joan Sanchez	f56b0607ee	Filter changes	2020-09-08 14:19:21 +02:00
Joan Sanchez	ff5a942771	Updated unit test	2020-09-08 10:16:30 +02:00
Joan Sanchez	8daa3ae89c	html changes	2020-09-08 10:11:22 +02:00
Bernat Exposito Domenech	d79cffb2c3	back test for getComponentsSum	2020-09-08 08:13:54 +02:00
Bernat Exposito Domenech	174cea7bc3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-08 07:17:23 +02:00
Bernat Exposito Domenech	92e14d5292	update getComponentSum	2020-09-08 07:17:16 +02:00
Carlos Jimenez Ruiz	6cfb1a226a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create	2020-09-07 09:46:52 +02:00
Joan Sanchez	03a0a22526	Updated unit test	2020-09-07 08:53:47 +02:00
Joan Sanchez	f8bb4d86fb	State fix & supplier search fix	2020-09-07 08:15:43 +02:00
Joan Sanchez	ba9cfedec7	Worker calendar holiday name	2020-09-07 07:59:27 +02:00
Carlos Jimenez Ruiz	c3c7ef901a	version pre-hex in vn.ink table	2020-09-04 12:40:23 +02:00
Carlos Jimenez Ruiz	0116adeddb	Merge branch '2402-entry_create' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create	2020-09-03 16:59:41 +02:00
Joan Sanchez	5b4a3cd370	Travel autocomplete fix	2020-09-03 16:52:35 +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	5fa9489f9a	Added fields as required, added info icon	2020-09-03 08:09:37 +02:00
Carlos Jimenez Ruiz	c796132e77	e2e + fixtures amended + refactor	2020-09-02 15:20:28 +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
Joan Sanchez	e6790f6120	#2406 - Sort by occurrences	2020-09-02 10:06:25 +02:00
Carlos Jimenez Ruiz	1c0d5dbd76	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section	2020-09-02 09:42:13 +02:00
Carlos Jimenez Ruiz	742a1c9ea8	removed focus on test	2020-09-02 09:42:10 +02:00
Joan Sanchez	33aec33cba	Updated unit test	2020-09-02 08:12:32 +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	ecb98dfac5	Descriptor fix	2020-09-01 12:10:32 +02:00
Joan Sanchez	cb4fe1f610	Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk	2020-09-01 07:37:48 +00:00