8749 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	3acc943d85	2639 - Permisos para añadir greuge con rol claimManager	2020-11-23 11:10:16 +01:00
Carlos Jimenez Ruiz	2e644c4c7d	back end files	2020-11-23 10:04:11 +01:00
Carlos Jimenez Ruiz	4028444d0a	front config refactor + package projects	2020-11-23 10:03:12 +01:00
Joan Sanchez	03158f04ae	Updated front unit tests	2020-11-23 08:12:33 +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
Bernat Exposito	d25dafc6b1	Merge branch 'dev' into 2579-worker_time_control	2020-11-20 12:36:01 +00:00
Bernat Exposito	4d91b26537	checkinbox moved to worker	2020-11-20 13:35:01 +01:00
Bernat Exposito	4b40038200	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2493-route_ticket_drag_and_drop	2020-11-20 12:12:11 +01:00
Bernat Exposito	f64a566447	route.ticket drag and drop validation	2020-11-20 12:12:06 +01:00
Joan Sanchez	234238d5a4	Merge pull request 'added a quick link to invoices and fiscal data refactor' (#460) from 2590-client_descriptor_invoices into dev ... Reviewed-on: #460 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-11-20 10:32:40 +00:00
Carlos Jimenez Ruiz	0465a38684	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2590-client_descriptor_invoices	2020-11-19 10:52:19 +01:00
Carlos Jimenez Ruiz	e8df57dae2	hasToInvoice gets enabled with isActive	2020-11-19 10:51:28 +01:00
Carlos Jimenez Ruiz	1ec1d6d81c	Merge pull request '2587-supplier_minor_changes' (#458) from 2587-supplier_minor_changes into dev ... Reviewed-on: #458 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-19 08:41:56 +00:00
Bernat Exposito	8d60f3fa45	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2587-supplier_minor_changes	2020-11-19 09:17:58 +01:00
Carlos Jimenez Ruiz	fcca5c5eab	added a quick link to invoices	2020-11-18 17:22:40 +01:00
Carlos Jimenez Ruiz	3f7115aee4	Merge pull request 'ticket descriptor path updated' (#459) from 2598-ticket_descriptor_dotmenu_e2e into dev ... Reviewed-on: #459 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-11-18 14:23:01 +00:00
Carlos Jimenez Ruiz	79ab228bca	ticket descriptor path updated	2020-11-18 15:00:41 +01:00
Bernat Exposito	85b2c96ffd	cr changes	2020-11-18 14:44:07 +01:00
Bernat Exposito	fcd7217435	fix test	2020-11-18 12:10:37 +01:00
Bernat Exposito	781766a155	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2587-supplier_minor_changes	2020-11-18 11:47:37 +01:00
Bernat Exposito	801fdb076b	supplier changes	2020-11-18 11:47:23 +01:00
Joan Sanchez	247ccc6ddc	Merge pull request '2575-image_download' (#448) from 2575-image_download into dev ... Reviewed-on: #448 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-11-18 10:36:12 +00:00
Joan Sanchez	d174a363d2	Removed wait	2020-11-18 11:23:51 +01:00
Joan Sanchez	9f5ba5bb85	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-18 10:44:00 +01:00
Joan Sanchez	ac5f30924a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-18 08:20:46 +01:00
Joan Sanchez	0fc01b2316	1419 - Claim update discount hotfix	2020-11-18 08:16:37 +01:00
Carlos Jimenez Ruiz	315cec6843	Merge pull request '2276-travel_summary - e2e in progress' (#457) from 2276-travel_summary into dev ... Reviewed-on: #457 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-11-17 17:13:02 +00:00
Carlos Jimenez Ruiz	7dff246e46	adapted e2e path for full run	2020-11-17 18:07:04 +01:00
Carlos Jimenez Ruiz	71f0a19320	descriptor path fix	2020-11-17 17:19:22 +01:00
Carlos Jimenez Ruiz	7dc8ae9dbc	e2e path for travel descriptor	2020-11-17 16:52:19 +01:00
Carlos Jimenez Ruiz	a7c830d87a	refactor	2020-11-17 15:54:45 +01:00
Carlos Jimenez Ruiz	cb88265471	removed commented code	2020-11-17 11:04:17 +01:00
Carlos Jimenez Ruiz	dc7a6d4ce1	dot menu along with clone option	2020-11-16 19:04:37 +01:00
Joan Sanchez	8a3f5345f4	Merge branch 'dev' into 2575-image_download	2020-11-16 13:54:47 +00:00
Carlos Jimenez Ruiz	c0b2ef9666	travel descriptor quicklinks	2020-11-16 14:50:03 +01:00
Carlos Jimenez Ruiz	55a1ae0348	added entry descriptor to item last entries	2020-11-16 14:43:35 +01:00
Joan Sanchez	f4e9fc83ec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community	2020-11-16 10:48:16 +01:00
Bernat Exposito	0542874fda	Merge pull request 'Supplier cargo migration to vn' (#456) from cargo_supplierFreighter into dev ... Reviewed-on: #456 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-11-16 08:21:25 +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
Joan Sanchez	d17a61d4c1	Version merge	2020-11-16 08:45:20 +01:00
Carlos Jimenez Ruiz	90d6018d34	Merge pull request 'e2e fix ticket sale' (#455) from e2e-fix into dev ... Reviewed-on: #455 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-13 19:59:54 +00:00
Javi Gallego	b01f18187d	e2e fix ticket sale	2020-11-13 17:37:02 +01:00
Juan Ferrer	235f0980a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-13 15:03:48 +01:00
Juan Ferrer	06adb3c9da	package-lock	2020-11-13 15:03:33 +01:00
Javi Gallego	0d2e3ab5bf	Merge pull request '2604-travel_index_colors' (#454) from 2604-travel_index_colors into dev ... Reviewed-on: #454 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-11-13 13:03:04 +00:00
Juan Ferrer	dde89e3b9f	Merge branch 'test' into dev	2020-11-13 13:50:15 +01:00
Carlos Jimenez Ruiz	1e35e199f7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2604-travel_index_colors	2020-11-13 13:22:09 +01:00
Juan Ferrer	6e5eac1f78	Account synchronization fixes	2020-11-13 13:20:37 +01:00