3270 Commits

Author	SHA1	Message	Date
Jorge Padawan	1c6bddbfb6	Added functionality to autocomplete the inputs	2021-02-10 08:47:58 +01:00
Joan Sanchez	dcad6dc8c8	Merge branch 'dev' into 2725-ticket-create-crear-shimpent	2021-02-10 07:21:29 +00:00
Javi Gallego	f87ea1b051	arrow-spacing	2021-02-10 08:13:45 +01:00
Javi Gallego	3a3dae179c	done	2021-02-10 07:58:11 +01:00
Carlos Jimenez Ruiz	8b97236f22	texfield no longer performs queries	2021-02-09 12:53:40 +01:00
Carlos Jimenez Ruiz	83ed70abda	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2722-item_log_highlighted_by_clientType	2021-02-09 10:43:26 +01:00
Carlos Jimenez Ruiz	3d948ef317	warning color added lines with clientType loses	2021-02-09 10:43:19 +01:00
Joan Sanchez	c092bf58b4	Import buys	2021-02-09 07:59:55 +01:00
Carlos Jimenez Ruiz	a62bebd51e	minor refactor	2021-02-08 10:14:41 +01:00
Jorge Padawan	1adaeca615	Added controller with sql	2021-02-08 08:41:26 +01:00
Joan Sanchez	411053bbec	Merge branch 'dev' into 2752-entry_import_buys	2021-02-05 16:51:50 +00:00
Carlos Jimenez Ruiz	5ce8d8eb8c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2737-supplier_basic_data_worker	2021-02-05 15:26:54 +01:00
Carlos Jimenez Ruiz	76d6e2d4b7	worker added to supplier basic data and summary	2021-02-05 15:26:49 +01:00
Jorge Padawan	c3109c142a	Line breaks have been put for better understanding	2021-02-05 13:11:18 +01:00
Jorge Padawan	25de8904b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee	2021-02-05 13:04:52 +01:00
Jorge Padawan	8dc291798f	Added tooltip on address and removed workhouse	2021-02-05 13:04:32 +01:00
Joan Sanchez	3f4e102860	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-05 12:18:32 +01:00
Joan Sanchez	2c9fd45958	2778 - Allow edit order number	2021-02-05 12:09:48 +01:00
Joan Sanchez	4fb466d8b2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys	2021-02-05 08:41:30 +01:00
Joan Sanchez	3dd8ff5194	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-05 08:28:32 +01:00
Joan Sanchez	5bd7e4a67f	Translation fix	2021-02-05 08:05:57 +01:00
Joan Sanchez	f041e0d897	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-04 18:44:25 +01:00
Joan Sanchez	84cef1949b	Image size fix	2021-02-04 18:28:58 +01:00
Carlos Jimenez Ruiz	f1704f94f1	invoiceOut advanced search by fiscal id	2021-02-04 13:43:21 +01:00
Carlos Jimenez Ruiz	a9b0a5c2bd	order fixed	2021-02-04 10:04:16 +01:00
Carlos Jimenez Ruiz	532cb582cf	columns moved and no refresh on stateState changes	2021-02-03 17:01:43 +01:00
Joan Sanchez	215e0c9fc4	Image download fix for images without extension	2021-02-03 15:01:09 +01:00
Joan Sanchez	a845f53f0a	Bug fixes	2021-02-03 12:43:30 +01:00
Carlos Jimenez Ruiz	ff94b182a1	error is not a required field	2021-02-03 10:16:46 +01:00
Joan Sanchez	38311f526d	Calculate volume	2021-02-03 09:03:03 +01:00
Carlos Jimenez Ruiz	dd9e9bac9b	removed unused character	2021-02-02 14:02:57 +01:00
Carlos Jimenez Ruiz	a77c5c5b66	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 14:02:30 +01:00
Carlos Jimenez Ruiz	a0d6e53dbb	polutd test removed	2021-02-02 14:00:35 +01:00
Jorge Padawan	186e59c7ae	.	2021-02-02 13:18:17 +01:00
Jorge Padawan	b57578f933	Remove parenthesis on expectedParams	2021-02-02 13:12:54 +01:00
Jorge Padawan	b576c0ad69	Remove parenthesis on expectedParams	2021-02-02 13:11:17 +01:00
Jorge Padawan	1a87eb3085	Remove bad code	2021-02-02 12:52:24 +01:00
Jorge Padawan	218a19d7da	Removed bad code	2021-02-02 12:37:00 +01:00
Jorge Padawan	c7424997d5	Removed bad code	2021-02-02 12:22:18 +01:00
Jorge Padawan	ee6b694637	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-02-02 11:58:07 +01:00
Jorge Padawan	a1a3607d3c	Remove bad code	2021-02-02 11:57:42 +01:00
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
Joan Sanchez	8c71d76988	2752 - Import json file	2021-01-26 07:21:05 +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
Bernat Exposito	81c14a649b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index	2021-01-21 09:46:22 +01:00
Bernat Exposito	678ee0644d	delete order by in entry index	2021-01-21 09:45:18 +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	0f17fca0a1	pr order by changes	2021-01-20 11:42:45 +01:00
Bernat Exposito	c1202789dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index	2021-01-20 11:31:06 +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
Bernat Exposito	e9f408d5ba	delete comments	2021-01-19 13:44:14 +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
Bernat Exposito	426249f9bf	entry index changes	2021-01-19 12:50:11 +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
Jorge Padawan	5a30bf5fa4	2650 add links to edit on summaries	2021-01-08 15:43:33 +01:00
Javi Gallego	6c2138a69a	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-08 15:24:05 +01:00
Javi Gallego	a9ec319d4f	test	2021-01-08 15:22:41 +01:00
Joan Sanchez	f8ba2534cc	2691 - Scope days changes	2021-01-08 14:32:48 +01:00
Jorge Padawan	5e201419f8	Second step, add component bankEntity	2021-01-08 10:46:50 +01:00
Joan Sanchez	1cc2710231	Fixes	2021-01-08 10:16:38 +01:00
Jorge Padawan	344840d2c9	First step add-button-edit-summaries	2021-01-08 08:43:28 +01:00
Jorge Padawan	31f18db72d	first step bankEntity	2021-01-07 15:14:50 +01:00
Jorge Padawan	6017894ba9	first step bankEntity	2021-01-07 15:14:38 +01:00
Joan Sanchez	88b2041fde	Changed order	2021-01-07 14:33:42 +01:00
Joan Sanchez	7172d6bcd1	Merge branch 'dev' into 2609-travel_index_addEntry	2021-01-07 13:32:37 +00:00
Joan Sanchez	56925be41f	2708 - Extra community changes	2021-01-07 14:21:17 +01:00
Javi Gallego	c0cc91b6c3	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-07 09:11:34 +01:00
Joan Sanchez	c454273405	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-01-06 12:44:28 +01:00
Joan Sanchez	e5b13267e2	2605 - Ticket request send chat notification	2021-01-05 15:03:35 +01:00
Joan Sanchez	94c8c115e5	Font hotfix	2021-01-05 13:51:17 +01:00
Joan Sanchez	062e1514c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-01-04 13:50:55 +01:00
Javi Gallego	1291fc4b6c	acl	2021-01-04 11:49:32 +01:00
Bernat Exposito	ccfeea8e74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2609-travel_index_addEntry	2021-01-04 10:55:53 +01:00
Bernat Exposito	f0fb906670	add in travel index, entry create	2021-01-04 10:54:46 +01:00
Carlos Jimenez Ruiz	b843914cec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2685-create_test_e2e_entryObservation	2020-12-31 16:13:40 +01:00
Joan Sanchez	a521ad4262	Fixed claim basicData back error	2020-12-31 14:18:06 +01:00
Carlos Jimenez Ruiz	fee454ca44	Merge branch 'dev' into 2696-geo_autocomplete	2020-12-31 11:53:50 +00:00
Carlos Jimenez Ruiz	4e7d64e5ca	re-enabled working unit test	2020-12-31 11:17:42 +01:00
Carlos Jimenez Ruiz	0471855372	Merge branch 'dev' into 2696-geo_autocomplete	2020-12-31 10:02:52 +00:00
Carlos Jimenez Ruiz	5dd7db23ec	submit should always be enabled for creation forms	2020-12-31 10:39:37 +01:00
Joan Sanchez	6bbe33433d	2696 - Geo autocompletion fix	2020-12-31 10:30:51 +01:00
Carlos Jimenez Ruiz	3b73e1bee2	supplier updateFiscalData changed to table config	2020-12-31 10:28:35 +01:00
Carlos Jimenez Ruiz	4754d5481b	added street arg to updateFiscalData method	2020-12-31 10:13:42 +01:00
Carlos Jimenez Ruiz	92d9435125	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries	2020-12-31 09:27:38 +01:00
Jorge Padawan	b403899072	modificated value of "order" on client and supplier	2020-12-30 15:39:27 +01:00
Carlos Jimenez Ruiz	e356dd9e5e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries	2020-12-30 14:55:14 +01:00
Jorge Padawan	f2742b88a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2689-add_id_in_typeTransaction_client_and_supplier	2020-12-30 10:49:58 +01:00
Jorge Padawan	c9ae5989f9	Add id on description of typeTransiction on client and supplier	2020-12-30 10:49:02 +01:00
Javi Gallego	0d5540b639	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-29 17:00:45 +01:00
Javi Gallego	3db3d65600	test	2020-12-29 17:00:22 +01:00
Joan Sanchez	c2d50c6044	Dup entry error handler	2020-12-29 14:02:26 +01:00
Joan Sanchez	a3f17ae302	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries	2020-12-29 13:55:06 +01:00
Joan Sanchez	2886e02328	Enabled loggable for locations	2020-12-29 08:50:12 +01:00
Joan Sanchez	f4ff31a294	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2657-zone_log	2020-12-29 08:09:49 +01:00
Joan Sanchez	f29840b37b	Buyer ACL	2020-12-29 07:52:36 +01:00
Carlos Jimenez Ruiz	4a60e1da1e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2685-create_test_e2e_entryObservation	2020-12-28 15:36:35 +01:00
Joan Sanchez	910caf5689	2661 - Added clone options	2020-12-28 14:53:26 +01:00
Jorge Padawan	5af51763d6	Created back test field for entryObservation	2020-12-28 12:55:28 +01:00
Carlos Jimenez Ruiz	e6106b1aa9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2665-route_index_multi_clone	2020-12-24 11:31:27 +01:00
Carlos Jimenez Ruiz	8ede30398b	clone feature for routes index	2020-12-24 11:31:20 +01:00
Joan Sanchez	c192a0e125	Merge pull request '2667-create_entryObservation' (#490) from 2667-create_entryObservation into dev ... Reviewed-on: #490 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-12-24 08:59:33 +00:00
Jorge Padawan	259842c22d	Retirado el parametro required por no utilizarse	2020-12-23 13:32:58 +01:00
Joan Sanchez	87f9a39e50	Merge branch 'dev' into 2666-closure_invalid_email	2020-12-23 12:29:36 +00:00
Bernat Exposito	a21476e3df	fix searchbar index	2020-12-23 12:42:41 +01:00
Jorge Padawan	2948747da3	Seccion nueva, "Note" mas campo entryObservation	2020-12-23 12:25:12 +01:00
Juan Ferrer	d064bc0417	Merge branch 'master' into test	2020-12-23 00:00:38 +01:00
Joan Sanchez	6416b0ad79	2666 - Closure invalid email notification	2020-12-22 14:56:21 +01:00
Javi Gallego	0c7ddd863d	xdiario test ok	2020-12-22 10:08:11 +01:00
Javi Gallego	36bace2a94	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-22 07:42:28 +01:00
Carlos Jimenez Ruiz	be1a317df8	Merge branch 'dev' into 2663-route_dragdrop	2020-12-21 14:02:05 +00:00
Joan Sanchez	35dc2a533b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2663-route_dragdrop	2020-12-21 14:52:08 +01:00
Joan Sanchez	1419acb8a7	2663 - Drag & drop ticket to route index	2020-12-21 14:48:47 +01:00
Carlos Jimenez Ruiz	ec0ae8f07c	years previous to contrar error corrected	2020-12-21 13:52:37 +01:00
Carlos Jimenez Ruiz	482cbd7195	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2622-route_tickets_refactor	2020-12-21 12:39:26 +01:00
Carlos Jimenez Ruiz	369a79b79f	route.tickets refactor	2020-12-21 12:37:36 +01:00
Carlos Jimenez Ruiz	ffc9b8dba9	Merge pull request '2576 - Photo upload component' (#470) from 2576-photo_uploader into dev ... Reviewed-on: #470 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-12-21 09:55:45 +00:00
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
Bernat Exposito	d4ab25f974	Merge pull request '2616-supplier_consumption' (#480) from 2616-supplier_consumption into dev ... Reviewed-on: #480 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-12-21 07:08:12 +00:00
Bernat Exposito	1a641d1d4b	cr changes	2020-12-18 22:31:46 +01:00
Joan Sanchez	6717853efb	Updated front tests	2020-12-18 18:02:41 +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
Jorge Padawan	2fe22efe36	filter vehicles by worehouse	2020-12-18 15:12:52 +01:00
Bernat Exposito	ac6d97c026	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2616-supplier_consumption	2020-12-18 10:10:09 +01:00
Bernat Exposito	b9344832d6	cr changes	2020-12-18 10:08:51 +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
Jorge Padawan	33237dad86	Add acl to supplier billing data	2020-12-17 12:29:37 +01:00
Jorge Benedito Llopis	7b3128d646	Remove manager restriction to edit client credits	2020-12-17 10:07:17 +01:00
Javi Gallego	9abf23072a	frontTest	2020-12-16 16:25:19 +01:00
Carlos Jimenez Ruiz	9df29b8be3	supplier.billingData buttons css update	2020-12-16 15:44:35 +01:00
Carlos Jimenez Ruiz	c13e9383ba	css refactor + watcher from credit insurance	2020-12-16 13:46:04 +01:00
Carlos Jimenez Ruiz	ec7ad986ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2279-save_button_if_new_data	2020-12-16 11:36:21 +01:00
Carlos Jimenez Ruiz	6261f10576	last account module refactors	2020-12-16 11:36:11 +01:00
Carlos Jimenez Ruiz	57a6df762a	zone module refactors	2020-12-16 11:22:13 +01:00
Carlos Jimenez Ruiz	2a63a3b0a4	account or user module refactors	2020-12-16 11:07:06 +01:00
Carlos Jimenez Ruiz	e9f73c3299	worker module refactors	2020-12-16 10:32:32 +01:00
Carlos Jimenez Ruiz	2e9267a25e	route module refactors	2020-12-16 10:21:35 +01:00
Carlos Jimenez Ruiz	0258c4a276	ticket module refactors	2020-12-16 10:21:20 +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
Bernat Exposito	e1ac64a8d9	supplier consumption	2020-12-16 08:05:41 +01:00
Carlos Jimenez Ruiz	116730a3b2	claim module refactors	2020-12-15 17:24:13 +01:00
Carlos Jimenez Ruiz	5295d3ed06	supplier module refactors	2020-12-15 17:09:05 +01:00
Carlos Jimenez Ruiz	975e5c3b00	travel module refactors	2020-12-15 17:05:15 +01:00
Carlos Jimenez Ruiz	b071bfd229	entry module refactors	2020-12-15 16:53:56 +01:00
Carlos Jimenez Ruiz	eb19bce1ba	client module refactors + dialog css	2020-12-15 16:51:36 +01:00
Carlos Jimenez Ruiz	6f29dabec4	order module refactor	2020-12-15 16:16:02 +01:00
Carlos Jimenez Ruiz	1ba83e7741	cancel button css + item module refactor	2020-12-15 16:07:34 +01:00
Jorge Benedito Llopis	8e11cef8eb	Code review refactor	2020-12-15 09:59:53 +01:00
Carlos Jimenez Ruiz	8e13fa7852	entry module refactors	2020-12-14 17:35:32 +01:00
Jorge Benedito Llopis	f62d3139bb	Supplier.billingData section	2020-12-14 16:09:17 +01:00
Carlos Jimenez Ruiz	3ad6534160	client module refactors	2020-12-13 14:57:42 +01:00
Carlos Jimenez Ruiz	c0289f87e9	order module refactors	2020-12-13 13:55:54 +01:00
Carlos Jimenez Ruiz	cbaa95ebda	item module refactors	2020-12-13 13:54:17 +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	a1d8b3175e	ticket descriptor translate	2020-12-09 15:26:57 +01:00
Juan Ferrer	6f6f23bec4	LDAP user sync only syncs changed attributes	2020-12-09 12:28:18 +01:00
Bernat Exposito	96f603a44b	refactor descriptors	2020-12-04 13:40:58 +01:00
Joan Sanchez	4f40075c2e	Merge branch 'dev' into 2657-zone_log	2020-12-03 11:16:18 +00:00
Bernat Exposito	aaee855da3	fix ticket component	2020-12-03 10:26:49 +01:00
Bernat Exposito	6eeecc553b	zoneLog calendar	2020-12-02 12:49:50 +01:00
Bernat Exposito	6605e5ae4c	zoneLog	2020-12-02 12:05:47 +01:00
Juan Ferrer	b2a3adc96f	LDAP sync hotfix	2020-11-30 18:50:04 +01:00
Juan Ferrer	61bb2f14ba	LDAP sync hotfix	2020-11-30 18:45:50 +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
Joan Sanchez	5ff364dcf0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2588-summaries_refactor	2020-11-25 08:01:47 +01:00
Joan Sanchez	8eb14a8bdc	2588 - No ellipsize on summary notes or address	2020-11-24 14:56:10 +01:00
Joan Sanchez	561991f18c	2628 - Remove item name from search on tag removal	2020-11-24 13:54:31 +01:00
Joan Sanchez	d9e14a0c3a	2629 - Open ticket lines on new window	2020-11-24 12:10:02 +01:00
Joan Sanchez	b2794dc413	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community	2020-11-24 10:52:35 +01:00
Carlos Jimenez Ruiz	fbb2fc3bdd	Merge pull request '2607-preview_icon' (#464) from 2607-preview_icon into dev ... Reviewed-on: #464 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-24 09:33:44 +00:00
Joan Sanchez	3329d33ec9	Merge branch 'dev' into 2569-travel_extra_community	2020-11-24 09:27:14 +00:00
Bernat Exposito	6a7568eb29	Merge branch 'dev' into 2493-route_ticket_drag_and_drop	2020-11-24 07:36:52 +00:00
Joan Sanchez	80bae4de0a	2607 - Changed preview icon	2020-11-24 08:22:54 +01:00
Carlos Jimenez Ruiz	4172d0bb9b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community	2020-11-23 18:51:16 +01:00
Carlos Jimenez Ruiz	1b46359574	removed focus on describe	2020-11-23 18:42:11 +01:00
Joan Sanchez	52eb39ccda	Removed autoload from crud-model	2020-11-23 14:12:43 +01:00
Joan Sanchez	2469ce827e	Removed commented code	2020-11-23 14:02:07 +01:00
Joan Sanchez	c654e14cfe	2611 - Summary go to entity	2020-11-23 13:41:51 +01:00
Bernat Exposito	37ac312bd5	pr changes	2020-11-23 13:05:24 +01:00
Bernat Exposito	b07ae3f60c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2493-route_ticket_drag_and_drop	2020-11-23 13:04:38 +01:00
Bernat Exposito	82a7dd0f92	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2579-worker_time_control	2020-11-23 11:49:07 +01:00
Joan Sanchez	93ca804573	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-23 11:25:15 +01:00
Joan Sanchez	3acc943d85	2639 - Permisos para añadir greuge con rol claimManager	2020-11-23 11:10:16 +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	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
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
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	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	9f5ba5bb85	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-18 10:44:00 +01:00