3022 Commits

Author	SHA1	Message	Date
Jorge Padawan	6fed5a21b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 11:50:09 +01:00
Jorge Padawan	a2e78a8f25	Merge branch '2617-add_scope_days_on_travel_index' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 11:49:53 +01:00
Jorge Padawan	60015178a6	Remove bad code	2021-02-02 11:49:42 +01:00
Joan Sanchez	f6af7f14af	Merge pull request 'Add list of emails from client' (#523) from 2723-Format_emails_for_summaries into dev ... Reviewed-on: #523 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 10:06:22 +00:00
Carlos Jimenez Ruiz	6a2c131593	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 10:59:59 +01:00
Jorge Padawan	f0f96f1ab5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 10:27:52 +01:00
Jorge Padawan	db5e786235	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-02-02 10:26:27 +01:00
Jorge Padawan	7b7571ae77	Fixed problems with default search	2021-02-02 10:26:10 +01:00
Jorge Padawan	9d96a4a6a1	Fixed problems test e2e	2021-02-02 10:17:13 +01:00
Joan Sanchez	dea858c314	Removed focus	2021-02-02 10:12:37 +01:00
Joan Sanchez	524d1274c9	Merge branch 'dev' into 2762-worker_delete_entry	2021-02-02 09:11:48 +00:00
Joan Sanchez	a21d8acde6	2762 - Delete entry ass teamBoss	2021-02-02 10:07:13 +01:00
Joan Sanchez	3f4ebdebf6	Merge branch 'dev' into 2723-Format_emails_for_summaries	2021-02-02 08:22:34 +00:00
Joan Sanchez	20116ac620	2741 - Claim detail deletion visual fix	2021-02-02 09:08:11 +01:00
Jorge Padawan	94897a830a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 08:48:03 +01:00
Jorge Padawan	e1db173185	Changed scope days value to a correct sentence	2021-02-01 13:29:12 +01:00
Jorge Padawan	6bba5ec126	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-01 13:21:16 +01:00
Jorge Padawan	3f963f2d99	changed message	2021-02-01 13:19:26 +01:00
Jorge Padawan	4f644cb708	Changed name of value on scope days test	2021-02-01 13:13:18 +01:00
Jorge Padawan	811edc054b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-02-01 13:09:47 +01:00
Joan Sanchez	4ac207c568	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2763-notify_urgent_issue	2021-02-01 12:58:50 +01:00
Javi Gallego	a08c5c6ff7	error de ruta arreglado	2021-02-01 10:51:17 +01:00
Carlos Jimenez Ruiz	17c784e06f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-02-01 09:52:42 +01:00
Joan Sanchez	f5f4c5936d	2763 - Notify urgen issues	2021-02-01 09:29:47 +01:00
Jorge Padawan	7408d22b66	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date	2021-02-01 09:05:06 +01:00
Jorge Padawan	9cf5d73be7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2723-Format_emails_for_summaries	2021-01-29 16:15:26 +01:00
Jorge Padawan	b600c18950	Add scope days on travel	2021-01-29 11:45:35 +01:00
Joan Sanchez	f66a5ecfdc	2748 - Added module keybinds	2021-01-29 09:46:57 +01:00
Carlos Jimenez Ruiz	c442eaa0c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-01-29 09:13:58 +01:00
Jorge Padawan	81f5192d08	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-01-29 08:55:17 +01:00
Carlos Jimenez Ruiz	5d82d469a7	Merge branch 'dev' into 2580-fetched_tags_refactor	2021-01-28 16:04:37 +00:00
Jorge Padawan	69e8dfc334	Merge branch '2692-add_advanced_search_engine2' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-01-28 16:10:23 +01:00
Joan Sanchez	7bcbf5303e	Fix where	2021-01-28 16:08:57 +01:00
Joan Sanchez	9d5d2e9177	Added method prune again	2021-01-28 15:57:33 +01:00
Carlos Jimenez Ruiz	4ab42e5850	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2580-fetched_tags_refactor	2021-01-28 15:10:54 +01:00
Carlos Jimenez Ruiz	5c466e1163	vn-fetched-tags visual refactor	2021-01-28 15:10:47 +01:00
Jorge Padawan	797f96f4c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-01-28 14:14:22 +01:00
Jorge Padawan	bef8fca529	Rework the test on main section	2021-01-28 14:14:14 +01:00
Joan Sanchez	ca47fe6827	2476 - downloadImages() method refactor	2021-01-28 12:23:18 +01:00
Javi Gallego	4b302915b5	fallo validateasync	2021-01-27 09:14:37 +01:00
Bernat Exposito	df073094f8	fix test updateVolume	2021-01-26 09:07:00 +01:00
Javi Gallego	3026ca8d69	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-25 14:16:41 +01:00
Jorge Padawan	2b4f4cf8f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2723-Format_emails_for_summaries	2021-01-25 11:04:45 +01:00
Jorge Padawan	6d9967ba9f	Add list of emails from client	2021-01-25 10:59:24 +01:00
Carlos Jimenez Ruiz	3f12bfe8ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2745-ticket_descriptor_regenerate_invoice_e2e	2021-01-25 09:28:07 +01:00
Carlos Jimenez Ruiz	fb798f4300	regenerate invoice added to descriptor path	2021-01-25 09:28:01 +01:00
Javi Gallego	d61ab94398	acl conflicto	2021-01-25 07:49:57 +01:00
Joan Sanchez	7bd89009cb	Requested changes	2021-01-25 07:26:35 +01:00
Joan Sanchez	257b61d256	Requested changes	2021-01-25 07:25:02 +01:00
Joan Sanchez	a6e4d68017	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-22 15:05:39 +00:00
Javi Gallego	16931693c7	slice error	2021-01-22 15:46:03 +01:00
Javi Gallego	93417e9676	refactor	2021-01-22 14:45:02 +01:00
Javi Gallego	161514582d	movido de directorio	2021-01-22 14:41:40 +01:00
Javi Gallego	228a642634	Merge branch 'dev' into 2479-factura-ticket	2021-01-22 14:31:28 +01:00
Javi Gallego	7bdfb36f25	minor refactor	2021-01-22 14:30:46 +01:00
Joan Sanchez	4d1c2ff8ee	Requested changed	2021-01-22 12:57:21 +01:00
Joan Sanchez	d26505d25e	Requested changed	2021-01-22 12:56:46 +01:00
Carlos Jimenez Ruiz	9a349e789c	added missin icon property to fixedPrice route	2021-01-22 12:15:03 +01:00
Carlos Jimenez Ruiz	293dbb3948	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2677-rating_component	2021-01-22 12:14:19 +01:00
Carlos Jimenez Ruiz	5ea222dc00	fixed translations	2021-01-22 12:02:03 +01:00
Carlos Jimenez Ruiz	c3ac7b671f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-01-22 11:32:35 +01:00
Carlos Jimenez Ruiz	4bf6051e73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section	2021-01-22 10:19:39 +01:00
Joan Sanchez	ad7be8f9b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-01-22 07:27:51 +01:00
Joan Sanchez	1c7325c1c0	2739 - Invoice fix	2021-01-22 07:26:29 +01:00
Bernat Exposito	b25ef7016a	cr changes	2021-01-21 18:42:40 +01:00
Javi Gallego	aab9797d3f	Merge branch 'dev' into 2479-factura-ticket	2021-01-21 13:40:55 +01:00
Javi Gallego	3dc50e8a16	test ok	2021-01-21 13:39:40 +01:00
Carlos Jimenez Ruiz	0cf3f198ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section	2021-01-21 11:50:32 +01:00
Jorge Padawan	05d6484a33	Add message if BIC already exist	2021-01-21 10:48:25 +01:00
Carlos Jimenez Ruiz	42e7fa7047	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-01-21 10:25:39 +01:00
Carlos Jimenez Ruiz	9fc14c70ae	bug fixed	2021-01-21 10:25:25 +01:00
Joan Sanchez	5e4c320310	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2677-rating_component	2021-01-21 09:26:02 +01:00
Bernat Exposito	eda65c14c1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2717-order_index	2021-01-21 08:48:24 +01:00
Carlos Jimenez Ruiz	17b7ffeec3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry	2021-01-20 16:04:13 +01:00
Carlos Jimenez Ruiz	2f5eaf7318	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed	2021-01-20 14:51:37 +01:00
Jorge Padawan	e205ebba72	Added main spec and fixed line on search-panel spec	2021-01-20 14:49:06 +01:00
Carlos Jimenez Ruiz	01191b3f0f	excluded faling tests for future fixing	2021-01-20 14:43:20 +01:00
Carlos Jimenez Ruiz	fcf60ac297	excluded failing test for future fixing	2021-01-20 14:40:32 +01:00
Carlos Jimenez Ruiz	fe04f00c28	fixed unit test for upsertFixedPrice	2021-01-20 14:39:23 +01:00
Jorge Padawan	d8c4fa1e22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-01-20 14:37:29 +01:00
Joan Sanchez	6451d9d511	Merge branch 'dev' into 2677-rating_component	2021-01-20 13:03:33 +00:00
Joan Sanchez	5df35ea8e9	Removed unused code	2021-01-20 14:01:57 +01:00
Joan Sanchez	f125f7c80d	Changed weekly translation	2021-01-20 13:57:48 +01:00
Javi Gallego	4cdbb85e30	primer comit	2021-01-20 13:53:49 +01:00
Joan Sanchez	c9dc9495dc	2677 - Added rating component to order catalog	2021-01-20 13:51:30 +01:00
Jorge Padawan	0183f956d7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-01-20 13:23:40 +01:00
Jorge Padawan	91979f5d69	Add scopeDays to search bar on route	2021-01-20 13:19:28 +01:00
Bernat Exposito	a3d4f674c6	order index changes	2021-01-20 11:28:15 +01:00
Carlos Jimenez Ruiz	843608c47f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed	2021-01-20 09:17:55 +01:00
Joan Sanchez	3a2db713e0	Removed unused $httpBackend	2021-01-20 07:38:09 +01:00
Carlos Jimenez Ruiz	7ec1e4272a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed	2021-01-19 20:56:40 +01:00
Carlos Jimenez Ruiz	f946e63a86	e2e path for item fixed price	2021-01-19 20:56:33 +01:00
Carlos Jimenez Ruiz	fc0f9730da	Merge branch 'dev' into 1823-catalog_no_refresh	2021-01-19 14:13:38 +00:00
Joan Sanchez	bbfb230427	Removed clog	2021-01-19 14:30:06 +01:00
Joan Sanchez	9935f7f4ee	Updated unit test	2021-01-19 14:27:58 +01:00
Joan Sanchez	6d35a4a160	1823 - Added independent order object from card	2021-01-19 13:57:04 +01:00
Carlos Jimenez Ruiz	4f7c2f3afd	added placeholder and fixed css	2021-01-19 13:30:07 +01:00
Joan Sanchez	dfbf114161	Merge branch 'dev' into 2708-travel_extracommunity	2021-01-19 12:10:06 +00:00
Joan Sanchez	8c8891f8e3	Requested changes	2021-01-19 13:06:10 +01:00
Carlos Jimenez Ruiz	e859a1b837	removed incorrect icon	2021-01-19 11:14:43 +01:00
Javi Gallego	043a74b548	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-19 10:20:45 +01:00
Joan Sanchez	b99ac2c9d5	Merge branch 'dev' into 2678-Delete_description_on_travel_thermograph	2021-01-19 08:51:38 +00:00
Javi Gallego	49b0bca721	refactor autocomplete	2021-01-19 09:27:15 +01:00
Jorge Padawan	aea07832b1	Delete description from thermograph create	2021-01-19 09:24:37 +01:00
Carlos Jimenez Ruiz	464366fdbe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed	2021-01-18 17:17:02 +01:00
Carlos Jimenez Ruiz	52a1e3f652	fixed price controller tests	2021-01-18 16:32:54 +01:00
Carlos Jimenez Ruiz	3ec641f733	filter unit tests	2021-01-18 15:42:38 +01:00
Joan Sanchez	d6ac9dba4c	Updated e2e	2021-01-18 14:53:15 +01:00
Joan Sanchez	895fd4c9e8	Updated unit test	2021-01-18 14:22:27 +01:00
Carlos Jimenez Ruiz	8d6dd3e03a	minor refactors	2021-01-18 14:17:01 +01:00
Carlos Jimenez Ruiz	3251d737e6	fixed price index implementation	2021-01-18 14:16:39 +01:00
Joan Sanchez	b142d5800e	Merge branch 'dev' into 2724-ticket_service_fix	2021-01-18 11:24:11 +00:00
Jorge Benedito	622c43f4a0	Merge branch 'dev' into 2721-Add_column_stem_multiplier	2021-01-18 10:53:49 +00:00
Jorge Padawan	97c8faaf50	Add column multiplier on item section	2021-01-18 11:43:48 +01:00
Joan Sanchez	239e64db48	Updated unit test	2021-01-18 09:08:50 +01:00
Joan Sanchez	783a8dee48	2724 - Fix: Create new service type	2021-01-18 08:55:57 +01:00
Joan Sanchez	ddf5993277	2708 - Added report	2021-01-18 08:33:20 +01:00
Bernat Exposito	7da3aad2de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2602-entry_index_searchBar	2021-01-18 08:19:20 +01:00
Bernat Exposito	25535576c5	pr changes resolved	2021-01-18 08:19:17 +01:00
Jorge Padawan	fe6124b691	Put log in the section	2021-01-15 13:57:36 +01:00
Jorge Padawan	51627af395	Fixed open popup	2021-01-15 13:13:51 +01:00
Jorge Padawan	c5ace0a939	create the tests fields for create Account section	2021-01-15 11:24:32 +01:00
Jorge Padawan	daa8bafb09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section	2021-01-15 08:56:20 +01:00
Joan Sanchez	8fed9dacd7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-01-14 13:56:35 +01:00
Joan Sanchez	efb0d2f380	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-01-14 13:42:09 +01:00
Joan Sanchez	53e80d29c8	Consumption hotfix	2021-01-14 13:41:50 +01:00
Bernat Exposito	a45a76018b	entry search panel changes	2021-01-14 09:26:50 +01:00
Joan Sanchez	33289b3ac1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-01-13 11:18:02 +01:00
Joan Sanchez	5059abca80	Dms edit hotfix	2021-01-13 10:40:51 +01:00
Joan Sanchez	7bcad01bef	Disabled loggable	2021-01-12 14:25:47 +01:00
Joan Sanchez	dd29b351d2	Disabled loggable	2021-01-12 14:25:01 +01:00
Jorge Padawan	6bc7602d53	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section	2021-01-12 11:10:05 +01:00
Jorge Padawan	4e1b9b911b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section	2021-01-12 11:05:35 +01:00
Jorge Padawan	1a4c631c70	Fix for good practique code	2021-01-12 11:00:42 +01:00
Jorge Padawan	b4899fc0ff	Fix for good practique code	2021-01-12 10:17:12 +01:00
Jorge Padawan	9ca2e677bd	Fix for good practique code	2021-01-12 10:15:33 +01:00
Jorge Padawan	509de4fa0a	Fix for good practique code	2021-01-12 10:11:37 +01:00
Jorge Padawan	809811ea10	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2650-add_button_edit_on_summaries	2021-01-12 07:40:10 +01:00
Jorge Padawan	f45aa7937d	Added conditionals with rols to display or not the icons with link	2021-01-12 07:39:12 +01:00
Javi Gallego	6acfe7f1cf	minorBugs	2021-01-11 17:18:37 +01:00
Javi Gallego	d3b5300553	test	2021-01-11 16:30:14 +01:00
Joan Sanchez	7568a1c066	Updated unit tests	2021-01-11 14:54:24 +01:00
Jorge Padawan	af55e2cc32	Add tooltip and modified sref for previews	2021-01-11 10:36:20 +01:00
Bernat Exposito	5f1cdc790a	Merge branch '2609-travel_index_addEntry' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry	2021-01-11 10:20:59 +01:00
Joan Sanchez	035bdfb1ad	Rounded box	2021-01-11 10:08:33 +01:00
Bernat Exposito	0e0ce9f3e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry	2021-01-11 09:44:20 +01:00
Joan Sanchez	ffdc753ad4	2691 - Added "or" between date ranges and scope days	2021-01-11 08:48:53 +01:00
Javi Gallego	ea6e234cde	minor fixes	2021-01-11 08:01:57 +01:00
Jorge Padawan	b8827ec63d	Fix problems with ACL and the autocomplete of bank entity	2021-01-08 16:45:20 +01:00
Jorge Padawan	403964934d	Change order of iban and entity name	2021-01-08 16:01:13 +01:00