8935 Commits

All Branches

Search

Author	SHA1	Message	Date
Bernat Exposito	e0056e291e	Merge pull request '2401-entry_basic_data' (#375) from 2401-entry_basic_data into dev ... Reviewed-on: #375 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-09-14 05:24:08 +00:00
Carlos Jimenez Ruiz	8a8a200bdd	e2e for entry basic data	2020-09-11 16:36:56 +02:00
Carlos Jimenez Ruiz	bf17d428e4	entry basic data + some minor refactors	2020-09-11 14:51:58 +02:00
Juan Ferrer	901c00066f	Front test fixed	2020-09-11 14:47:23 +02:00
Juan Ferrer	61f3f82117	Merge branch 'dev' into 2381-mariaDB	2020-09-11 14:39:02 +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	fab76b0dfa	Merge pull request 'catalog colors' (#368) from 2404-catalog_color into dev ... Reviewed-on: #368 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-09-10 15:21:52 +00: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	30c9e42ded	Merge pull request '2438-export_production' (#372) from 2438-export_production into dev ... Reviewed-on: #372 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-09-10 12:37:52 +00: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
Bernat Exposito Domenech	87fab5f57c	delete duplicated fixtures	2020-09-10 11:34:32 +02:00
Carlos Jimenez Ruiz	a9c1f97b72	Merge pull request '2245-ticket_component' (#369) from 2245-ticket_component into dev ... Reviewed-on: #369 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-09-10 08:52:23 +00:00
Carlos Jimenez Ruiz	12ceedd80c	corrected some typos	2020-09-10 10:46:56 +02:00
Bernat Exposito Domenech	829d0c3b3c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap	2020-09-10 09:18:16 +02:00
Bernat Exposito Domenech	4f50106e92	fix fixtures	2020-09-10 08:08:00 +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	1985a37666	Merge branch '2245-ticket_component' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-10 07:36:07 +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	fb3f01151c	update fixtures	2020-09-09 13:49:03 +02:00
Joan Sanchez	c4b8cdf980	Merge pull request '2400-entry_summary_buys + e2e' (#370) from 2400-entry_summary_buys into dev ... Reviewed-on: #370 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-09 11:23:13 +00:00
Carlos Jimenez Ruiz	f570a07c7c	entry.summary e2e buys being listed	2020-09-09 13:07:06 +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	b153c60b99	Merge branch 'dev' into 2245-ticket_component	2020-09-09 09:28:59 +00:00
Bernat Exposito Domenech	ed926c39a1	fix e2e	2020-09-09 11:27:00 +02:00
Carlos Jimenez Ruiz	b625ea0eb8	Merge pull request '2385 - Replaced worker nickname' (#367) from 2385-worker_descriptor_refactor into dev ... Reviewed-on: #367 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-09-09 09:24:19 +00: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
Carlos Jimenez Ruiz	99b32ab3ad	Merge pull request '#2406 - Sort by occurrences' (#364) from 2406-catalog_sort_by_occurrences into dev ... Reviewed-on: #364 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-09-09 09:05:34 +00:00
Joan Sanchez	88cf2e602c	Merge branch 'dev' into 2406-catalog_sort_by_occurrences	2020-09-09 08:22:45 +00:00
Bernat Exposito Domenech	b3b2261b4a	delete fdescribe	2020-09-09 08:29:52 +02: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	d90fb3444c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap	2020-09-08 08:30:00 +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
Joan Sanchez	7b9205ee1e	Actualizados títulos de albarán	2020-09-07 15:06:00 +02:00
Joan Sanchez	fe53d1fd3c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-07 14:16:23 +02:00