8118 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	27a1a45d71	Añadido CIF/NIF	2020-09-16 14:46:37 +02:00
Carlos Jimenez Ruiz	f50f4514fd	fixtures enhanced for tags	2020-09-16 11:11:18 +02:00
Joan Sanchez	b6499370e1	Merge branch 'dev' into 2430-catalog_multi_tag	2020-09-16 09:06:08 +00:00
Joan Sanchez	c980155e6f	Merge pull request 'salesPersonUser replaces salesPerson relation' (#378) from 2396-client_model_replace_relation_salesPerson into dev ... Reviewed-on: #378 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-16 08:36:26 +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	826b4a6f4b	Merge pull request 'added invoiceOut descriptor' (#377) from 2446-ticket_index_overlap_ref_and_state into dev ... Reviewed-on: #377 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-14 14:41:14 +00: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	f7a5b4bdce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2446-ticket_index_overlap_ref_and_state	2020-09-14 13:58:53 +02:00
Carlos Jimenez Ruiz	13a5c4c4c9	test enhanced	2020-09-14 13:58:42 +02:00
Joan Sanchez	652812bca4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-14 13:37:20 +02:00
Joan Sanchez	26f0958838	Trigger build	2020-09-14 13:25:37 +02:00
Carlos Jimenez Ruiz	0b4c53a655	added invoiceOut descriptor	2020-09-14 13:11:53 +02:00
Joan Sanchez	1348cc9df8	Merge pull request 'entry.latestBuys v2' (#376) from 2444-entry_latestBuys_v2 into dev ... Reviewed-on: #376	2020-09-14 10:34:39 +00:00
Joan Sanchez	c077afcfed	Changed var	2020-09-14 12:34:13 +02:00
Carlos Jimenez Ruiz	a767d256b2	Merge branch 'dev' into 2444-entry_latestBuys_v2	2020-09-14 10:22:17 +00:00
Joan Sanchez	076ee50c0f	Config file path fix	2020-09-14 12:14:22 +02: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	7043b833d0	Pdf optimization	2020-09-14 11:44:10 +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
Joan Sanchez	ea6aed351a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-14 09:56:48 +02:00
Carlos Jimenez Ruiz	43d011ea60	isIgnored displayed as vn-check	2020-09-14 09:43:00 +02:00
Joan Sanchez	279120dd03	Launch puppeteer browser on app start	2020-09-14 09:38:48 +02:00
Joan Sanchez	21c4b8db14	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-14 08:59:59 +02:00
Joan Sanchez	edf3f1e96e	Removed temporary table on ticket closure	2020-09-14 08:51:46 +02:00
Joan Sanchez	9bbe50c62b	Changes to catalog filters	2020-09-14 07:42:43 +02:00
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