8194 Commits

All Branches

Search

Author	SHA1	Message	Date
Juan Ferrer	6abd707a6d	Tests fixed	2020-09-21 19:16:51 +02:00
Juan Ferrer	81de97c071	Merge branch 'dev' into 2381-mariaDB	2020-09-21 18:33:28 +02:00
Juan Ferrer	7464609157	Merge pull request '2177-accountModule' (#373) from 2177-userModule into dev ... Reviewed-on: #373	2020-09-21 15:58:05 +00:00
Juan Ferrer	9528fe0a19	Merge branch 'dev' into 2381-mariaDB	2020-09-21 17:47:55 +02:00
Juan Ferrer	5e056c315f	Tests fixed	2020-09-21 17:46:40 +02:00
Juan Ferrer	1c621cff85	Fixtures fixes	2020-09-21 16:43:17 +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	6e3acfaa29	Merge pull request '1988-autocomplete_autoload' (#381) from 1988-autocomplete_prefetch into dev ... Reviewed-on: #381 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-21 09:58:20 +00:00
Carlos Jimenez Ruiz	ed905341b3	removed autoload for where/searchF	2020-09-21 11:17:40 +02:00
Javi Gallego	b7721719ca	test arreglados	2020-09-21 11:07:10 +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
Joan Sanchez	3c203e4c8c	Merge pull request 'item basic-data añadir isFragile' (#380) from 2432-item-basic-data-añadir-isFragile into dev ... Reviewed-on: #380 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-09-17 09:38:56 +00:00
Javi Gallego	1b13e58e10	item basic-data añadir isFragile	2020-09-17 09:58:00 +02:00
Joan Sanchez	cf2c8ca0c8	Updated translation	2020-09-17 09:16:13 +02:00
Carlos Jimenez Ruiz	1d0e227ddc	Merge pull request '2430-catalog_multi_tag' (#371) from 2430-catalog_multi_tag into dev ... Reviewed-on: #371 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-09-16 14:15:26 +00:00
Carlos Jimenez Ruiz	bde6c4495d	e2e path updated + 2 new tasks for broken tests	2020-09-16 16:10:43 +02:00
Carlos Jimenez Ruiz	2ebe476751	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2430-catalog_multi_tag	2020-09-16 14:56:09 +02:00
Carlos Jimenez Ruiz	91f6a92036	Merge pull request 'Añadido campo CIF/NIF' (#379) from 2454-sepa_fiscal_id into dev ... Reviewed-on: #379 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-09-16 12:55:02 +00:00
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