878 Commits

Author	SHA1	Message	Date
Javi Gallego	340927799c	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-21 09:53:00 +01:00
Javi Gallego	3a6d62ac7d	xdiario	2020-12-21 09:52:27 +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
Bernat Exposito	d1793351fb	Merge pull request 'fixtures amended for calendar testing' (#484) from 2622-route_tickets_refactor into dev ... Reviewed-on: #484 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-12-18 12:33:18 +00:00
Carlos Jimenez Ruiz	177d3cd35b	fixtures amended for calendar testing	2020-12-18 13:16:44 +01:00
Jorge Benedito	29ec268113	Merge pull request '2682-supplier_billingData_e2e + fixes' (#482) from 2682-supplier_billingData_e2e into dev ... Reviewed-on: #482 Reviewed-by: Jorge Benedito <jorgebl@verdnatura.es>	2020-12-18 08:34:00 +00:00
Javi Gallego	87adbbfa3c	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-18 08:21:36 +01:00
Bernat Exposito	0b5a98c2fe	export production	2020-12-17 15:17:03 +01:00
Jorge Padawan	33237dad86	Add acl to supplier billing data	2020-12-17 12:29:37 +01:00
Joan Sanchez	5ecd589106	Updated delivery note	2020-12-16 09:24:11 +01:00
Javi Gallego	2bb9125eee	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-16 08:34:54 +01:00
Javi Gallego	963db11686	funcionalidad	2020-12-16 08:33:08 +01:00
Joan Sanchez	0a4016be41	Updated unit tests & changed ACL	2020-12-11 15:04:55 +01:00
Joan Sanchez	59c622481f	Updated image fixtures	2020-12-10 13:21:11 +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	6605e5ae4c	zoneLog	2020-12-02 12:05:47 +01:00
Joan Sanchez	1ba1d27ba0	2576 - Photo upload component	2020-11-27 13:10:39 +01:00
Bernat Exposito	06e7583f2b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2645-export_production	2020-11-25 12:47:17 +01:00
Bernat Exposito	78f25e0b46	export production	2020-11-25 12:37:44 +01:00
Javi Gallego	b23a441f31	fixtures	2020-11-23 12:20:58 +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
Joan Sanchez	8a3f5345f4	Merge branch 'dev' into 2575-image_download	2020-11-16 13:54:47 +00:00
Joan Sanchez	359dcc904d	Version merge	2020-11-16 09:08:39 +01:00
Joan Sanchez	8194801308	Supplier cargo migration to vn	2020-11-16 08:48:42 +01:00
Juan Ferrer	80cbb53dfe	Merge branch 'test' into dev	2020-11-13 10:49:59 +01:00
Juan Ferrer	cdf6cb661f	Login sync fixes	2020-11-13 10:33:34 +01:00
Bernat Exposito	6fc14d569c	Merge branch 'dev' into 2575-image_download	2020-11-13 08:32:39 +00:00
Joan Sanchez	cb8e9655af	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-13 07:22:12 +01:00
Juan Ferrer	4b46b0787b	User syncronization fixes, improvements, refactor	2020-11-12 23:20:25 +01:00
Bernat Exposito	5be616ad91	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production	2020-11-12 08:04:38 +01:00
Bernat Exposito	eb8931bca5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-11 13:57:37 +01:00
Joan Sanchez	db4f226f6f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-11 12:39:15 +01:00
Bernat Exposito	1e95f0105a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-11 10:52:46 +01:00
Bernat Exposito	75ffa108fb	refactor back download	2020-11-11 10:52:35 +01:00
Joan Sanchez	08af948eb0	Merge branch 'dev' into 2574-itemTag_refactor	2020-11-10 12:39:17 +00:00
Bernat Exposito	e4e4f37609	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-10 08:46:37 +01:00
Bernat Exposito	4ea5993dcc	user image	2020-11-10 08:39:34 +01:00
Juan Ferrer	2628faa9d0	Sync hotfixes	2020-11-06 22:55:47 +01:00
Carlos Jimenez Ruiz	ead0994032	timeControlCalculate procedure updated	2020-11-05 10:33:02 +01:00
Joan Sanchez	4c88a46b63	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor	2020-11-05 09:12:25 +01:00
Joan Sanchez	a325ef2a78	2574 - ItemTag refactor sourceTable	2020-11-04 11:29:10 +01:00
Bernat Exposito	2dc51e6125	update acl	2020-11-03 09:34:50 +01:00
Bernat Exposito	61c3d2233b	delete old sqls	2020-11-03 09:34:35 +01:00
Carlos Jimenez Ruiz	d533e9da2e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-03 09:22:07 +01:00
Bernat Exposito	8976034bb0	fix fixtures	2020-11-03 08:15:49 +01:00
Bernat Exposito	f2ee122778	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production	2020-11-03 07:51:25 +01:00
Juan Ferrer	fc957eda6c	Merge branch 'test' into dev	2020-11-02 19:58:45 +01:00
Juan Ferrer	b3ab1fe059	Sync fixes & improvements	2020-11-02 19:58:07 +01:00
Joan Sanchez	413283288f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-02 15:38:23 +01:00
Bernat Exposito	b2d69127cb	Merge branch 'dev' into 2565-address_fixtures	2020-11-02 14:31:36 +00:00
Joan Sanchez	15b7280222	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-02 14:31:39 +01:00
Joan Sanchez	590de622f5	Added model validations	2020-11-02 14:30:33 +01:00
Bernat Exposito	d07e95a7e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact	2020-11-02 11:14:42 +01:00
Bernat Exposito	e700f11863	acls	2020-11-02 11:14:21 +01:00
Bernat Exposito	7e2555ddf1	export production	2020-11-02 10:58:27 +01:00
Juan Ferrer	b6da896fe7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-02 10:11:34 +01:00
Bernat Exposito	d6c5e0ef0a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2565-address_fixtures	2020-11-02 09:27:35 +01:00
Joan Sanchez	565bd013bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-02 08:32:46 +01:00
Juan Ferrer	e25a978b19	Merge branch 'test' into dev	2020-11-01 00:03:05 +01:00
Juan Ferrer	9b4f8697b9	User sync fixes	2020-10-31 21:16:58 +01:00
Bernat Exposito	459f4068ab	fix fixtures	2020-10-31 11:05:16 +01:00
Juan Ferrer	15c39f93ca	root id changed from 0 to 100 due to loopback join problems with id 0	2020-10-31 01:10:32 +01:00
Juan Ferrer	9b563cb8bf	LDAP & Samba synchronization fixes + improvements	2020-10-31 00:02:27 +01:00
Javi Gallego	b50ae7b8ca	testback arreglados	2020-10-30 15:50:59 +01:00
Joan Sanchez	245b32a47f	Added section	2020-10-30 15:11:45 +01:00
Bernat Exposito	39de960b9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact	2020-10-30 10:23:47 +01:00
Bernat Exposito	7200aa3dfc	fixtures and sql for supplierContact	2020-10-30 10:23:42 +01:00
Javi Gallego	59cbe276f4	Merge branch 'dev' into 2510-client-address-create-test	2020-10-30 10:08:38 +01:00
Javi Gallego	31b5a140d4	test completados	2020-10-30 10:07:53 +01:00
Javi Gallego	3fdc9c315d	Merge branch 'dev' into 2510-client-address-create-test	2020-10-30 08:40:47 +01:00
Bernat Exposito	ea8d9e70b0	supplier log	2020-10-30 08:27:02 +01:00
Bernat Exposito	792b689b58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log	2020-10-29 13:40:21 +01:00
Bernat Exposito Domenech	a5e6f99b1f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary	2020-10-29 08:06:50 +01:00
Bernat Exposito Domenech	77bc1b562e	create section supplier log	2020-10-28 09:08:27 +01:00
Joan Sanchez	3675f7ed34	2511 - Changed salesAssitant role to claimManager	2020-10-26 12:16:57 +01:00
Bernat Exposito Domenech	1699e0619c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary	2020-10-26 08:43:20 +01:00
Bernat Exposito Domenech	58168e78ab	test, translate and supplier searpanel, summary	2020-10-26 08:38:43 +01:00
Bernat Exposito Domenech	fe2f12cd8f	first test step	2020-10-22 09:35:11 +02:00
Javi Gallego	7dfe7ee379	Merge branch 'dev' into 2510-client-address-create-test	2020-10-21 12:35:09 +02:00
Joan Sanchez	5daee49382	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-10-21 11:52:02 +02:00
Javi Gallego	ef7a886d86	Merge branch 'dev' into 2510-client-address-create-test	2020-10-21 10:13:04 +02:00
Joan Sanchez	f7e9372bf0	2525 - Change to past date	2020-10-20 15:12:00 +02:00
Javi Gallego	4aea284703	WIP: a falta de e2e	2020-10-20 14:42:23 +02:00
Bernat Exposito Domenech	7eed2ddd59	export structure and fix test	2020-10-20 12:47:37 +02:00
Carlos Jimenez Ruiz	cc99c1e980	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2509-add_geolocation	2020-10-16 13:04:58 +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
Joan Sanchez	6fa8aae161	2509 - Added forms to create new locations	2020-10-14 11:33:42 +02:00
Joan Sanchez	e48effca08	Stop container before remove	2020-10-13 12:28:58 +02:00
Joan Sanchez	f00828cf57	Merge branch 'dev' into 2481-campaign_filter	2020-10-06 05:44:11 +00:00
Javi Gallego	77064d85a0	Merge branch 'dev' into 2443	2020-10-05 12:54:02 +00:00
Javi Gallego	531bb6da25	quito copy	2020-10-05 13:22:56 +02:00
Joan Sanchez	86025b88e3	Merge branch 'dev' into 2481-campaign_filter	2020-10-05 09:36:02 +00:00
Joan Sanchez	cef2dc982f	Updated sql	2020-10-05 10:47:12 +02:00
Joan Sanchez	ad11a92c87	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2451-loggable_calendar	2020-10-05 10:02:44 +02:00
Joan Sanchez	cdde4d95d7	Added filter	2020-10-05 07:53:03 +02:00
Joan Sanchez	420dfdbdff	Send notification by email	2020-10-02 12:23:48 +02:00
Javi Gallego	8d1709ea51	Merge branch 'dev' into 2443	2020-10-01 16:46:33 +02:00
Javi Gallego	78e22df177	test e2e de expense ok	2020-10-01 16:45:28 +02:00
Juan Ferrer	6d8b13423f	SQL hotfix	2020-10-01 10:02:19 +02:00
Javi Gallego	2714857227	Merge branch 'dev' into 2443	2020-09-30 14:07:38 +02:00
Juan Ferrer	611aa9cafa	SQL hotfix	2020-09-29 10:55:04 +02:00
Joan Sanchez	ec2385cd15	Merge branch 'dev' into 2381-mariaDB	2020-09-29 06:53:14 +00:00
Bernat Exposito Domenech	5f9ef3aea3	export structure db	2020-09-29 07:37:29 +02:00
Juan Ferrer	991bece64a	SQL fixes	2020-09-28 21:25:53 +02:00
Juan Ferrer	82de0a30a4	Merge branch 'dev' into 2381-mariaDB	2020-09-28 10:41:16 +02:00
Juan Ferrer	5264b615d4	Optimización docker salix-db	2020-09-28 10:40:50 +02:00
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
Javi Gallego	c909470f41	merge	2020-09-25 08:10:37 +02:00
Joan Sanchez	de3c7acb08	Merge branch 'dev' into 2381-mariaDB	2020-09-24 12:30:44 +00:00
Joan Sanchez	164f636f3f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-09-24 09:02:16 +02:00
Joan Sanchez	44e23ca560	Removed sql version	2020-09-24 09:00:42 +02:00
Bernat Exposito Domenech	ca41b93995	mail models and fix checkInbox	2020-09-23 08:09:06 +02:00
Bernat Exposito Domenech	d4c819ebf7	new models and fixtures	2020-09-23 07:59:10 +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
Juan Ferrer	81de97c071	Merge branch 'dev' into 2381-mariaDB	2020-09-21 18:33:28 +02: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	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
Javi Gallego	8fb674819a	ticket service	2020-09-21 10:35:39 +02:00
Carlos Jimenez Ruiz	f50f4514fd	fixtures enhanced for tags	2020-09-16 11:11:18 +02:00
Joan Sanchez	1f1b09d456	Updated unit tests	2020-09-15 14:14:13 +02:00
Carlos Jimenez Ruiz	bf17d428e4	entry basic data + some minor refactors	2020-09-11 14:51:58 +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	270e665291	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2404-catalog_color	2020-09-10 14:38:48 +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
Bernat Exposito Domenech	4f50106e92	fix fixtures	2020-09-10 08:08:00 +02:00
Bernat Exposito Domenech	fb3f01151c	update fixtures	2020-09-09 13:49:03 +02:00
Bernat Exposito Domenech	9ff7232b50	export production and fix test	2020-09-09 12:54:10 +02:00
Bernat Exposito Domenech	ed926c39a1	fix e2e	2020-09-09 11:27:00 +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	174cea7bc3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-08 07:17:23 +02:00
Joan Sanchez	3efe14fc53	Removed unused vars	2020-09-07 12:52:27 +02:00
Joan Sanchez	ee52581a06	Updated param description	2020-09-07 12:52:21 +02:00
Joan Sanchez	8faddef7e8	Renamed sql file	2020-09-07 12:52:13 +02:00
Joan Sanchez	812847d82e	Changed sql folder	2020-09-07 12:52:06 +02:00
Joan Sanchez	e6804f6ee3	Removed procedures	2020-09-07 12:51:58 +02:00
Joan Sanchez	c3e8c0cc58	Changes	2020-09-07 12:51:49 +02:00
Joan Sanchez	fa634d2dad	2285 - Added closure paths	2020-09-07 12:51:38 +02:00
Joan Sanchez	bb092b1de9	Removed unused vars	2020-09-07 12:16:20 +02:00
Joan Sanchez	c10e24b7cd	Updated param description	2020-09-07 11:50:23 +02:00
Joan Sanchez	173aac0ba6	Renamed sql file	2020-09-07 11:45:54 +02:00
Joan Sanchez	13b3353e9a	Changed sql folder	2020-09-07 11:45:29 +02:00
Joan Sanchez	7b42497f88	Removed procedures	2020-09-07 11:44:44 +02:00
Joan Sanchez	f3a7fc514a	Changes	2020-09-07 10:54:39 +02:00
Joan Sanchez	66f4674392	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2285-ticket_closure	2020-09-07 10:05:52 +02:00
Joan Sanchez	52cbcf1fa3	Updated description	2020-09-07 08:34:04 +02:00
Carlos Jimenez Ruiz	c3c7ef901a	version pre-hex in vn.ink table	2020-09-04 12:40:23 +02:00
Carlos Jimenez Ruiz	c796132e77	e2e + fixtures amended + refactor	2020-09-02 15:20:28 +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	8ae7871318	Removed procedure	2020-09-01 07:56:56 +02:00
Javi Gallego	daee9081d1	test excepto invoiceOut	2020-08-31 12:29:51 +02:00
Javi Gallego	8b26c41b7f	campo packageFk	2020-08-28 17:06:27 +02:00
Carlos Jimenez Ruiz	c70ad808a0	refactor	2020-08-27 17:54:43 +02:00
Carlos Jimenez Ruiz	d156ca95ba	front and back unit tests	2020-08-27 15:14:30 +02:00
Joan Sanchez	17542472da	2391 - Editable description	2020-08-27 08:24:21 +02:00
Carlos Jimenez Ruiz	3a82ef0e06	2375 entry lastBuy seccion	2020-08-26 16:33:47 +02:00
Joan Sanchez	4d8a84e774	Fixed back unit tests	2020-08-20 08:45:03 +02:00
Joan Sanchez	7fdfd92a1c	Removed sql	2020-08-19 13:13:16 +02:00
Joan Sanchez	f0818acf32	2387 - Fixed error when deleting a zone	2020-08-19 13:04:12 +02:00
Carlos Jimenez Ruiz	3a723a2e3d	zone descriptor e2e	2020-08-14 15:35:50 +02:00
Bernat Exposito Domenech	0d689a8c01	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-08-13 10:43:25 +02:00
Bernat Exposito Domenech	689245c27d	fix test	2020-08-12 14:23:13 +02:00
Bernat Exposito Domenech	f180b73656	delete deprecated sql	2020-08-12 13:18:55 +02:00
Bernat Exposito Domenech	1e56619c33	export structure and fix test	2020-08-12 13:07:58 +02:00
Bernat Exposito Domenech	96af9bdcf1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap	2020-08-11 11:12:52 +02:00
Bernat Exposito Domenech	9a4e20bb31	new models and fixtures	2020-08-11 11:03:43 +02:00
Joan Sanchez	e2c742c893	#2383 - Changed model	2020-08-10 14:29:25 +02:00
Juan Ferrer	bbc5193970	#2381 First working version	2020-08-07 14:35:20 +02:00
Carlos Jimenez Ruiz	9402f368f6	ticket index and zone descriptor refactor	2020-07-30 12:51:19 +02:00
Joan Sanchez	0348b79f0d	Merge branch 'dev' into 1880-refactor_loggable	2020-07-16 12:03:22 +00:00
Bernat Exposito Domenech	8c926a1a7f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable	2020-07-16 13:20:41 +02:00
Joan Sanchez	cfceaa531e	Merge branch 'dev' into 2350-order_index	2020-07-16 11:18:22 +00:00
Joan Sanchez	171deeb82c	Merge branch 'dev' into 2350-order_index	2020-07-16 11:12:34 +00:00
Joan Sanchez	fa43c2ea2f	Merge branch 'dev' into 2369-export_db	2020-07-16 10:45:15 +00:00
Bernat Exposito Domenech	064b950773	export production	2020-07-16 12:10:18 +02:00
Bernat Exposito Domenech	f7100f11ee	first step add right menu in ticket components	2020-07-16 07:43:07 +02:00
Bernat Exposito Domenech	02c82f894a	fix e2e errors	2020-07-09 14:14:11 +02:00
Bernat Exposito Domenech	7d6ac265b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index	2020-07-09 08:17:03 +02:00
Joan Sánchez	01b32d2b89	Calendar changes	2020-07-08 15:05:56 +02:00
Joan Sánchez	dd8e03dd0f	Added absence selection	2020-07-07 14:29:57 +02:00
Joan Sanchez	53d672152b	Merge branch 'dev' into 2343-exportar_produccion	2020-07-07 06:19:12 +00:00
Bernat Exposito Domenech	122dacffb5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index	2020-07-06 10:20:59 +02:00
Bernat Exposito Domenech	c42c6c19d6	changes in order index	2020-07-02 07:46:55 +02:00
Joan Sanchez	b40e09a6cb	Methods refactor & updated back unit tests	2020-07-01 14:28:05 +02:00
Joan Sanchez	0a327087ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor	2020-07-01 11:57:16 +02:00
Javi Gallego	039eec7d26	test excepto fallo e2e	2020-06-30 10:16:22 +02:00
Javi Gallego	db06626675	refactor	2020-06-29 14:26:27 +02:00