3823 Commits

Author	SHA1	Message	Date
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
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	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
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	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
Carlos Jimenez Ruiz	8373c6f5d1	filter by selection + unit tests for travel index	2020-11-13 13:04:22 +01:00
Juan Ferrer	80cbb53dfe	Merge branch 'test' into dev	2020-11-13 10:49:59 +01:00
Juan Ferrer	c20abad1ba	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-11-13 10:33:38 +01:00
Juan Ferrer	cdf6cb661f	Login sync fixes	2020-11-13 10:33:34 +01:00
Joan Sanchez	031051abcb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community	2020-11-13 09:33:24 +01:00
Bernat Exposito	6fc14d569c	Merge branch 'dev' into 2575-image_download	2020-11-13 08:32:39 +00:00
Joan Sanchez	4acdfd6d4e	Th refactor	2020-11-13 09:30:40 +01:00
Joan Sanchez	0edd6071c8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-13 07:43:02 +01:00
Joan Sanchez	2680ad2c07	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-11-13 07:39:24 +01:00
Joan Sanchez	d174d7b15b	Contextmenu filter hotfix	2020-11-13 07:38:18 +01: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	2a30f93e00	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-11-12 23:20:33 +01:00
Juan Ferrer	4b46b0787b	User syncronization fixes, improvements, refactor	2020-11-12 23:20:25 +01:00
Carlos Jimenez Ruiz	7f899cc4e9	index navigation through anchors	2020-11-12 16:03:23 +01:00
Joan Sanchez	785453fab3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community	2020-11-12 15:01:11 +01:00
Carlos Jimenez Ruiz	b9e3db61db	ticket advanced search grouped state translations	2020-11-12 13:33:33 +01:00
Joan Sanchez	23e8d64678	Contextmenu hotfix	2020-11-12 13:18:31 +01:00
Carlos Jimenez Ruiz	a62698330a	small refactor	2020-11-12 09:45:41 +01:00
Bernat Exposito	2454999938	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-12 08:14:55 +01:00
Carlos Jimenez Ruiz	95a62f66ad	2548 item diary columns width	2020-11-11 16:58:56 +01:00
Carlos Jimenez Ruiz	9a8a32ee9b	denied & accepted no longer show deny icon	2020-11-11 16:08:27 +01:00
Carlos Jimenez Ruiz	ba86693891	minor refactor	2020-11-11 15:14:05 +01:00
Carlos Jimenez Ruiz	6cd1332a18	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates	2020-11-11 14:45:22 +01:00
Joan Sanchez	b6f29d205c	Merge branch 'dev' into 2425-ticket_descriptor_menu	2020-11-11 13:06:14 +00: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	378982389a	Requested chagnes	2020-11-11 13:44:42 +01:00
Carlos Jimenez Ruiz	74e4a4e42a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates	2020-11-11 12:45:58 +01:00
Carlos Jimenez Ruiz	3a0ff3be38	summary title amended + clientDescriptor for alias	2020-11-11 12:45:45 +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
Joan Sanchez	75ff7c297f	Removed max width	2020-11-11 12:37:59 +01:00
Joan Sanchez	024fda0f65	2591 - Data checked icon	2020-11-11 12:37:45 +01:00
Joan Sanchez	a0d50410aa	Added section	2020-11-11 12:34:07 +01:00
Carlos Jimenez Ruiz	5d70794326	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2500-display_dates	2020-11-11 12:02:49 +01:00
Carlos Jimenez Ruiz	c2f92cb127	small refactor	2020-11-11 12:02:40 +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
Joan Sanchez	9d5765724b	Removed max width	2020-11-11 09:17:34 +01:00
Joan Sanchez	5a08798b22	2591 - Data checked icon	2020-11-11 09:11:11 +01:00
Joan Sanchez	d959dbc058	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu	2020-11-11 07:34:34 +01:00
Carlos Jimenez Ruiz	e22e74a725	expanded date columns + order index translations	2020-11-10 16:47:39 +01:00
Joan Sanchez	53566be56a	Merge branch 'dev' into 2584-client_consumption	2020-11-10 14:03:38 +00:00
Carlos Jimenez Ruiz	45a2a2d8e6	Merge branch 'dev' into 2584-client_consumption	2020-11-10 13:30:38 +00:00
Joan Sanchez	dfbe1a02d2	Removed unused import	2020-11-10 14:06:41 +01:00
Joan Sanchez	08af948eb0	Merge branch 'dev' into 2574-itemTag_refactor	2020-11-10 12:39:17 +00:00
Bernat Exposito	44d3cf748b	change id in ticketLastState model	2020-11-10 11:44:41 +01:00
Joan Sanchez	a93d9f91cc	Updated unit tests	2020-11-10 10:38:25 +01:00
Carlos Jimenez Ruiz	282adfa7b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu	2020-11-09 16:06:29 +01:00
Carlos Jimenez Ruiz	54d31f15bb	fixed collection tests pollution	2020-11-09 14:53:26 +01:00
Joan Sanchez	637116b17d	Added descriptor-menu component	2020-11-09 14:52:25 +01:00
Juan Ferrer	58563edbab	Focus fixes	2020-11-07 21:05:14 +01:00
Juan Ferrer	0e2c6ed79a	Account focus fix	2020-11-07 14:05:48 +01:00
Juan Ferrer	2628faa9d0	Sync hotfixes	2020-11-06 22:55:47 +01:00
Joan Sanchez	bcd5e6ea76	2584 - Client consumption fixes	2020-11-06 08:21:25 +01:00
Carlos Jimenez Ruiz	a4ad852390	translations refactor	2020-11-05 13:59:24 +01:00
Bernat Exposito	8765a18bbb	fix supplier routes	2020-11-05 11:46:15 +01:00
Bernat Exposito	0e3d636845	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2544-supplier_basicData	2020-11-05 10:50:21 +01:00
Joan Sanchez	a30cfd2218	Added unit test	2020-11-05 09:21:20 +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
Carlos Jimenez Ruiz	cd04ad8518	Merge branch '2563-supplier_fiscalData' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-04 15:21:23 +01:00
Carlos Jimenez Ruiz	c826c1ccc1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-04 15:19:07 +01:00
Joan Sanchez	b65f48f0d9	Updated unit test	2020-11-04 14:35:27 +01:00
Joan Sanchez	2a0d2f4394	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor	2020-11-04 14:34:59 +01:00
Joan Sanchez	c5421ee543	Merge branch 'dev' into 2534-sage_taxDataChecked	2020-11-04 12:39:30 +00:00
Joan Sanchez	0570d83a6d	Requested changes	2020-11-04 13:38:09 +01:00
Joan Sanchez	16b774d585	Catalog tag selection	2020-11-04 13:19:43 +01:00
Joan Sanchez	2b6048ca4d	Removed comment block	2020-11-04 12:45:02 +01:00
Carlos Jimenez Ruiz	d933568745	Merge branch '2563-supplier_fiscalData' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-04 11:49:11 +01:00
Joan Sanchez	fd05455027	Postcode auto-fill fix	2020-11-04 11:37:54 +01:00
Joan Sanchez	a325ef2a78	2574 - ItemTag refactor sourceTable	2020-11-04 11:29:10 +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
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
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
Carlos Jimenez Ruiz	7ac1807495	removed focus from html template	2020-11-02 14:04:11 +01:00
Carlos Jimenez Ruiz	ffaf93ab83	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact	2020-11-02 11:14:20 +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
Carlos Jimenez Ruiz	117270e3fc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact	2020-11-02 09:19:23 +01:00
Joan Sanchez	61e63cdd48	Updated unit tests	2020-11-02 08:53:28 +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
Joan Sanchez	9e3186c0df	Updated unit tests	2020-11-02 08:16:42 +01:00
Juan Ferrer	e25a978b19	Merge branch 'test' into dev	2020-11-01 00:03:05 +01:00
Juan Ferrer	414c0931eb	Sync management UI	2020-10-31 22:56:02 +01:00
Juan Ferrer	9b4f8697b9	User sync fixes	2020-10-31 21:16:58 +01:00
Bernat Exposito	c1125916f6	supplier basicData	2020-10-31 11:22:56 +01:00
Juan Ferrer	937d5beefe	User sync fixes	2020-10-31 03:13:17 +01:00
Juan Ferrer	f39fa33b83	User sync fixes	2020-10-31 02:53:48 +01:00
Juan Ferrer	7763bcc1ef	User sync fixes	2020-10-31 02:34:59 +01:00
Juan Ferrer	fdf6df4ca8	User sync fixes	2020-10-31 02:31:42 +01:00
Juan Ferrer	1354d4647d	User sync fixes	2020-10-31 02:26:17 +01:00
Juan Ferrer	ae94d7db02	User sync fixes	2020-10-31 02:20:43 +01:00
Juan Ferrer	ba5a03c980	User sync fixes	2020-10-31 01:56:19 +01:00
Juan Ferrer	76ee8e6f38	User sync fixes	2020-10-31 00:40:54 +01:00
Juan Ferrer	9b563cb8bf	LDAP & Samba synchronization fixes + improvements	2020-10-31 00:02:27 +01:00
Javi Gallego	a472ce9a81	Merge branch 'dev' into 2510-client-address-create-test	2020-10-30 17:24:20 +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	89c9a1e858	add title in notes.contact	2020-10-30 13:26:56 +01:00
Bernat Exposito	18ebbe80d7	supplier contact	2020-10-30 11:40:12 +01:00
Javi Gallego	71fe677a7e	fix getSummary	2020-10-30 10:50:13 +01:00
Carlos Jimenez Ruiz	28ec55b440	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2482-fix_worker_timeControl_e2e	2020-10-30 10:46:05 +01:00
Carlos Jimenez Ruiz	2f6b3f0c38	small refactors for #2512	2020-10-30 10:45:55 +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	e75c275409	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log	2020-10-30 08:24:13 +01:00
Joan Sanchez	ea6fc0fb04	Card fix	2020-10-30 07:23:21 +01:00
Carlos Jimenez Ruiz	25684ec521	small refactor timeControl index	2020-10-29 13:46:36 +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	ea03d06a62	Merge branch '2522-ticket_component' of https://gitea.verdnatura.es/verdnatura/salix into 2522-ticket_component	2020-10-29 11:46:57 +01:00
Bernat Exposito Domenech	551feed16f	fix translate	2020-10-29 11:46:37 +01:00
Bernat Exposito	361af260a5	Merge branch 'dev' into 2522-ticket_component	2020-10-29 10:11:24 +00:00
Bernat Exposito Domenech	42d16d0258	ticket component refactor	2020-10-29 11:09:58 +01:00
Bernat Exposito Domenech	403d4b9118	cr changes	2020-10-29 08:17:06 +01:00
Bernat Exposito Domenech	a4bf680ca5	Merge branch '2502-supplier_summary' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary	2020-10-29 08:07:58 +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	8d32f93512	cr changes	2020-10-29 07:44:04 +01:00
Joan Sanchez	146b4f5bcd	2534 - Fill sage data before enable taxDataChecked	2020-10-28 14:12:57 +01:00
Carlos Jimenez Ruiz	a4c57d7618	e2e path for supplier summary and descriptor	2020-10-28 12:29:50 +01:00
Carlos Jimenez Ruiz	687d9618cb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary	2020-10-28 12:16:18 +01:00
Joan Sanchez	109fcb3ca4	2532 - Added icon taxDataChecked on ticket index	2020-10-28 09:57:39 +01:00
Carlos Jimenez Ruiz	8dba3fbb93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary	2020-10-28 09:54:26 +01:00
Bernat Exposito Domenech	77bc1b562e	create section supplier log	2020-10-28 09:08:27 +01:00
Joan Sanchez	4a8eadfc6a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2511-claim_claimManager	2020-10-27 14:43:05 +01:00
Joan Sanchez	343358c231	Updated translations	2020-10-27 14:42:43 +01:00
Joan Sanchez	770b6a30bb	Added unit test	2020-10-27 14:35:04 +01:00
Joan Sanchez	7f63213de0	Merge branch 'dev' into 2540-entry_descriptorPopover	2020-10-27 13:22:41 +00:00
Joan Sanchez	e3145944a4	Merge pull request 'link zone in ticket summary' (#427) from 2513_ticket-summary into dev ... Reviewed-on: #427 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-10-27 13:22:14 +00:00
Bernat Exposito Domenech	665d46dec3	fix translate	2020-10-27 12:44:46 +01:00
Joan Sanchez	3d86e59890	#2540 - Added entry descriptor popover to referenced places	2020-10-27 12:02:49 +01:00
Bernat Exposito Domenech	15a906af24	link zone in ticket summary	2020-10-27 08:45:34 +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	d06d935c70	fix client fiscal data	2020-10-26 08:43:08 +01:00
Bernat Exposito Domenech	58168e78ab	test, translate and supplier searpanel, summary	2020-10-26 08:38:43 +01:00
Joan Sanchez	5ba439d9bf	2524 - Added search by socialName	2020-10-26 08:13:13 +01:00
Carlos Jimenez Ruiz	a797a2db8b	fixed the absences unit test	2020-10-23 13:34:57 +02:00
Joan Sanchez	3779a7c7a5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-10-22 13:00:48 +02:00
Bernat Exposito Domenech	e3757e9191	changes supplier models	2020-10-22 13:00:11 +02:00
Joan Sanchez	f87a7664e5	Added loggable utils	2020-10-22 11:24:53 +02:00
Bernat Exposito Domenech	fe2f12cd8f	first test step	2020-10-22 09:35:11 +02:00
Joan Sanchez	0466d50c00	2518 - Item tag search	2020-10-22 07:50:01 +02:00
Joan Sanchez	fc9b9eb718	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-10-22 07:49:04 +02:00
Joan Sanchez	d3532608e1	Changed oldValue	2020-10-21 14:05:14 +02:00
Joan Sanchez	628154b7e8	Trigger jenkins	2020-10-21 13:40:54 +02:00
Joan Sanchez	c87783b446	2528 - Rocket notifications hotfix	2020-10-21 13:25:52 +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
Carlos Jimenez Ruiz	1b4015a4dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2433-sage_fiscalData	2020-10-21 10:46:38 +02:00
Joan Sanchez	3c37f0e993	Merge branch 'dev' into 2428-anchor_directive	2020-10-21 08:32:31 +00:00
Javi Gallego	ef7a886d86	Merge branch 'dev' into 2510-client-address-create-test	2020-10-21 10:13:04 +02:00
Carlos Jimenez Ruiz	e989ef6a06	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2433-sage_fiscalData	2020-10-21 09:06:52 +02:00
Bernat Exposito Domenech	0f6e1eae24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary	2020-10-21 08:22:51 +02:00
Joan Sanchez	3730bf86cc	Updated destinatary	2020-10-20 16:05:05 +02:00
Joan Sanchez	86d3e2d689	Changed message destinatary	2020-10-20 16:03:07 +02:00
Joan Sanchez	611e1a3802	Updated unit test	2020-10-20 15:13:12 +02:00
Joan Sanchez	f7e9372bf0	2525 - Change to past date	2020-10-20 15:12:00 +02:00
Joan Sanchez	ffcb3629c5	Updated unit test	2020-10-20 15:01:02 +02:00
Joan Sanchez	7d0790684b	2525 - Change to past date	2020-10-20 14:54:23 +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
Joan Sanchez	12bf0e6df7	Credit insurance hotfix	2020-10-20 11:44:14 +02:00
Joan Sanchez	0acb1e649d	Updated unit test	2020-10-20 10:46:04 +02:00
Joan Sanchez	d68aacc78a	2525 - Ticket basic data validate zone	2020-10-20 10:46:03 +02:00
Joan Sanchez	ef42e95cef	Updated unit test	2020-10-20 10:29:16 +02:00
Joan Sanchez	c61c25fb91	2525 - Ticket basic data validate zone	2020-10-20 10:19:12 +02:00
Bernat Exposito Domenech	256206ace4	supplier summary dscriptor and card	2020-10-20 09:44:44 +02:00
Carlos Jimenez Ruiz	133a4cc907	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2433-sage_fiscalData	2020-10-20 09:20:27 +02:00
Joan Sanchez	5f93848afd	Added unit test	2020-10-20 07:43:36 +02:00
Carlos Jimenez Ruiz	a61a6e7c6a	e2e path updated + test fix	2020-10-19 20:49:38 +02:00
Joan Sanchez	011bba1660	Added vn-anchor to client and ticket index	2020-10-19 09:05:38 +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
Carlos Jimenez Ruiz	b96007aa62	fixed login/out problems at random + others	2020-10-16 11:16:24 +02:00
Joan Sanchez	6412f29685	2428 - Added anchor directive	2020-10-16 10:40:45 +02:00
Carlos Jimenez Ruiz	c622175192	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-15 18:57:33 +02:00
Carlos Jimenez Ruiz	dd6035606f	some more tests fixed + refactors	2020-10-15 18:57:27 +02:00
Joan Sanchez	334891cfe9	2497 - Groupped lines	2020-10-15 14:40:41 +02:00
Joan Sanchez	39ea51764b	Some fixes made	2020-10-15 13:59:28 +02:00
Joan Sanchez	ca7601a9f2	2433 - Added sage fields	2020-10-15 11:53:01 +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	a5b8df2121	fix translate	2020-10-15 09:41:36 +02:00
Bernat Exposito Domenech	cc35998f62	new module supplier, created section index and searchpanel	2020-10-15 08:15:04 +02:00
Joan Sanchez	9c962cb0b4	Merge branch 'dev' into 2509-add_geolocation	2020-10-14 09:35:42 +00:00
Joan Sanchez	6fa8aae161	2509 - Added forms to create new locations	2020-10-14 11:33:42 +02:00
Carlos Jimenez Ruiz	64b65d204a	excluded confirm with no easy fix for pollution	2020-10-14 11:16:23 +02:00
Carlos Jimenez Ruiz	30d00d0f63	fix getWasteDetail test	2020-10-14 10:53:20 +02:00
Joan Sanchez	2e3402b0cd	Updated method description	2020-10-14 07:18:39 +02:00
Carlos Jimenez Ruiz	2045e35170	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2473-restore_ticket	2020-10-13 15:41:04 +02:00
Carlos Jimenez Ruiz	984a91d544	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-13 11:04:23 +02:00
Carlos Jimenez Ruiz	c04b7a0657	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-13 10:31:06 +02:00
Joan Sanchez	bcf566ce28	Merge branch 'dev' into 2499-sale_quantity_zero	2020-10-13 08:11:56 +00:00
Joan Sanchez	f59bb07aaf	Merge pull request 'route ticket fixes' (#407) from 2452-route_tickets into dev ... Reviewed-on: #407 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-10-13 08:11:01 +00:00
Joan Sanchez	7538b1c941	Merge branch 'dev' into 1447-updateClaim_refactor	2020-10-13 06:56:23 +00:00
Bernat Exposito Domenech	8a58017597	fix route/ticket	2020-10-13 08:50:47 +02:00
Joan Sanchez	3f8a675785	2499 - Allow zero quantity	2020-10-13 08:42:13 +02:00
Bernat Exposito Domenech	6e081df4e8	fix test	2020-10-13 08:17:00 +02:00
Carlos Jimenez Ruiz	b6b84cfea7	more tests fixed + small refactors	2020-10-08 16:00:19 +02:00
Joan Sanchez	498841b274	Added unit test	2020-10-08 14:22:55 +02:00
Joan Sanchez	355f95ae40	2473 - Added ticket restore option	2020-10-08 13:42:20 +02:00
Joan Sanchez	eceb33cce0	2473 - Added restore method	2020-10-07 11:00:26 +02:00
Bernat Exposito Domenech	e5557be3dc	route ticket fixes	2020-10-07 10:52:28 +02:00
Carlos Jimenez Ruiz	641eb93282	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-06 14:50:23 +02:00
Bernat Exposito Domenech	fcebbb68b6	delete comments	2020-10-06 14:46:58 +02:00
Joan Sanchez	a29d92718a	Updated description	2020-10-06 14:37:03 +02:00
Joan Sanchez	254c391138	Removed test exclusion	2020-10-06 14:32:24 +02:00
Bernat Exposito Domenech	3d39467613	refactor updateclaim	2020-10-06 14:23:35 +02:00
Bernat Exposito Domenech	134d1c4385	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1447-updateClaim_refactor	2020-10-06 13:06:43 +02:00
Bernat Exposito Domenech	e6b4d21ddb	refactor updateClaim	2020-10-06 10:57:40 +02:00
Carlos Jimenez Ruiz	0dbdb5103e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-06 10:16:08 +02:00
Carlos Jimenez Ruiz	89fb980f14	some tests fixed	2020-10-06 10:15:27 +02:00
Joan Sanchez	2856fa63fc	Added ACL for module account	2020-10-06 09:50:40 +02:00
Carlos Jimenez Ruiz	b8b32d20bc	Merge branch 'dev' into 2486-last_entries_fix	2020-10-06 07:12:00 +00:00
Joan Sanchez	6ecf595a11	2486 - Changed date filter	2020-10-06 08:52:11 +02:00
Joan Sanchez	085df7119f	Merge branch 'dev' into 2492-index_refactor	2020-10-06 06:51:11 +00:00
Joan Sanchez	0b8d8a4f65	Added focus directive to searchbar	2020-10-06 08:17:12 +02:00
Joan Sanchez	f00828cf57	Merge branch 'dev' into 2481-campaign_filter	2020-10-06 05:44:11 +00:00
Carlos Jimenez Ruiz	27d2c59358	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-05 16:09:30 +02:00
Javi Gallego	77064d85a0	Merge branch 'dev' into 2443	2020-10-05 12:54:02 +00:00
Joan Sanchez	71e29e747a	Requested changes	2020-10-05 14:45:39 +02:00
Joan Sanchez	86025b88e3	Merge branch 'dev' into 2481-campaign_filter	2020-10-05 09:36:02 +00:00
Joan Sanchez	d0ece57219	Updated unit test	2020-10-05 10:09:36 +02:00
Carlos Jimenez Ruiz	9c139b49aa	enabled jasme random + indentations	2020-10-05 10:04:00 +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
Javi Gallego	e95514d967	reorganiza campos	2020-10-05 09:24:49 +02:00
Javi Gallego	0294d2a845	Merge branch 'dev' into 2443	2020-10-05 09:07:00 +02:00
Joan Sanchez	0dee59f66f	Merge branch 'dev' into 2455-socialname_validation	2020-10-05 07:01:11 +00:00
Joan Sanchez	e3b14405b7	Added unit tests	2020-10-05 08:50:07 +02:00
Joan Sanchez	cdde4d95d7	Added filter	2020-10-05 07:53:03 +02:00
Bernat Exposito Domenech	161313ad15	refactor getComponentSum	2020-10-02 13:58:48 +02:00
Joan Sanchez	420dfdbdff	Send notification by email	2020-10-02 12:23:48 +02:00
Carlos Jimenez Ruiz	9dca47be97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2484-Sale_priceDifference_test_fails	2020-10-02 09:40:15 +02:00
Carlos Jimenez Ruiz	ff3b75267a	priceDifference test fix + refactor	2020-10-02 09:39:58 +02:00
Javi Gallego	8d1709ea51	Merge branch 'dev' into 2443	2020-10-01 16:46:33 +02:00
Javi Gallego	2714857227	Merge branch 'dev' into 2443	2020-09-30 14:07:38 +02:00
Bernat Exposito Domenech	90e948aeda	fix lastActiveTickets	2020-09-30 13:35:37 +02:00
Bernat Exposito Domenech	1bff4e3c4e	fix test and refactor transferlines	2020-09-30 12:24:33 +02:00
Joan Sanchez	9423216616	Fix	2020-09-30 11:19:52 +02:00
Joan Sanchez	503e1d0ed9	2455 - Validate socialname when isDataChecked is changed	2020-09-30 09:31:01 +02:00
Joan Sanchez	58965a9687	Enabled loggable on calendar model	2020-09-30 07:38:43 +02:00
Joan Sanchez	5bdc67f96e	Merge branch 'dev' into 2457-fix_regularizeClaim_unit_test	2020-09-29 12:22:11 +00:00
Carlos Jimenez Ruiz	1e55632b94	refactor & fix regularize claim and prices Diff	2020-09-29 13:28:02 +02:00
Carlos Jimenez Ruiz	40abd68734	fix byWarehouse and ticket.filter tests	2020-09-29 13:11:11 +02:00
Carlos Jimenez Ruiz	6afee4924c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2457-fix_regularizeClaim_unit_test	2020-09-29 08:44:33 +02:00
Joan Sanchez	dee7e844ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1047-print_sql_def	2020-09-28 08:36:46 +02:00
Joan Sanchez	a1349de32d	Merge branch 'dev' into 2381-mariaDB	2020-09-28 06:18:53 +00:00
Joan Sanchez	3e2f85dbd2	Merge branch 'dev' into 2458-ticket_index_pending	2020-09-28 06:13:39 +00: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
Joan Sanchez	4d25fe88cf	Added functions to call sql from def	2020-09-25 14:45:00 +02:00
Javi Gallego	c909470f41	merge	2020-09-25 08:10:37 +02:00
Joan Sanchez	f1d36df558	#2458 - Removed states from pending tickets	2020-09-24 15:00:00 +02:00
Joan Sanchez	de3c7acb08	Merge branch 'dev' into 2381-mariaDB	2020-09-24 12:30:44 +00:00
Joan Sanchez	d2dbf417f4	Updated to standard color	2020-09-24 11:15:35 +02:00
Joan Sanchez	d18d7670ec	Updated unit tests	2020-09-24 10:44:12 +02:00
Joan Sanchez	53e729eddd	2366 - Merge event colors	2020-09-24 10:14:53 +02:00
Joan Sanchez	5265202e65	Merge branch 'dev' into 2449-ticket_basicData	2020-09-23 13:10:32 +00:00
Joan Sanchez	75ac6ad8d3	Updated unit test	2020-09-23 14:20:41 +02:00
Joan Sanchez	a8589d6945	Autocomplete warehouse on agency selection	2020-09-23 14:13:44 +02:00
Joan Sanchez	c49614b8cf	Merge branch 'dev' into 2449-ticket_basicData	2020-09-23 09:23:09 +00:00
Joan Sanchez	5ec5979a3e	Updated tests	2020-09-23 11:21:25 +02:00
Carlos Jimenez Ruiz	87e4765a1c	fixed ticket-weekly backend unit test	2020-09-22 16:53:47 +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
Joan Sanchez	89667a18c9	Handle ticket without old state	2020-09-22 07:50:30 +02:00
Joan Sanchez	ae3d00bad1	Added new method	2020-09-22 07:38:20 +02:00
Juan Ferrer	2d1cf566f8	All tests fixed	2020-09-21 22:54:36 +02:00
Juan Ferrer	6abd707a6d	Tests fixed	2020-09-21 19:16:51 +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	ed905341b3	removed autoload for where/searchF	2020-09-21 11:17:40 +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
Javi Gallego	1b13e58e10	item basic-data añadir isFragile	2020-09-17 09:58:00 +02:00
Carlos Jimenez Ruiz	bde6c4495d	e2e path updated + 2 new tasks for broken tests	2020-09-16 16:10:43 +02:00
Joan Sanchez	b6499370e1	Merge branch 'dev' into 2430-catalog_multi_tag	2020-09-16 09:06:08 +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	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	13a5c4c4c9	test enhanced	2020-09-14 13:58:42 +02:00
Carlos Jimenez Ruiz	0b4c53a655	added invoiceOut descriptor	2020-09-14 13:11:53 +02:00
Carlos Jimenez Ruiz	a767d256b2	Merge branch 'dev' into 2444-entry_latestBuys_v2	2020-09-14 10:22:17 +00: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
Carlos Jimenez Ruiz	22e7e035c3	column tags added	2020-09-14 11:44:47 +02:00
Joan Sanchez	f94728845e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2430-catalog_multi_tag	2020-09-14 10:32:34 +02:00
Carlos Jimenez Ruiz	43d011ea60	isIgnored displayed as vn-check	2020-09-14 09:43:00 +02:00
Joan Sanchez	9bbe50c62b	Changes to catalog filters	2020-09-14 07:42:43 +02:00
Carlos Jimenez Ruiz	bf17d428e4	entry basic data + some minor refactors	2020-09-11 14:51:58 +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	de184c163e	color var	2020-09-10 17:17:46 +02:00
Carlos Jimenez Ruiz	42abeecede	hex color now displayed on catalog	2020-09-10 16:35:32 +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
Carlos Jimenez Ruiz	ecc7ae398c	column order	2020-09-10 14:32:44 +02:00
Carlos Jimenez Ruiz	e8384e3ec9	added packageFk as column	2020-09-10 13:26:04 +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
Carlos Jimenez Ruiz	12ceedd80c	corrected some typos	2020-09-10 10:46:56 +02:00
Bernat Exposito Domenech	d91a354e4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production	2020-09-10 07:51:30 +02:00
Bernat Exposito Domenech	348412c5db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-09 15:50:06 +02:00
Bernat Exposito Domenech	d4b6d7cd96	cr changes	2020-09-09 15:49:59 +02:00
Bernat Exposito Domenech	9ff7232b50	export production and fix test	2020-09-09 12:54:10 +02:00
Carlos Jimenez Ruiz	46b67308fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2400-entry_summary_buys	2020-09-09 11:39:24 +02:00
Carlos Jimenez Ruiz	957096172d	entry summary buys listed	2020-09-09 11:39:18 +02:00
Bernat Exposito Domenech	5bb8aacfb0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-09 11:12:18 +02:00
Joan Sanchez	d0ac1b621c	Merge branch 'dev' into 2385-worker_descriptor_refactor	2020-09-09 09:06:11 +00:00
Joan Sanchez	88cf2e602c	Merge branch 'dev' into 2406-catalog_sort_by_occurrences	2020-09-09 08:22:45 +00:00
Joan Sanchez	004c9d7341	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-09 08:27:08 +02:00
Bernat Exposito Domenech	f99fb69d48	front and back test	2020-09-09 08:20:27 +02:00
Joan Sanchez	db081501eb	2440 - Ticket filter hotfix	2020-09-09 08:14:17 +02:00
Joan Sanchez	5ef9afdb53	Empty url fix	2020-09-08 15:07:57 +02:00
Joan Sanchez	f56b0607ee	Filter changes	2020-09-08 14:19:21 +02:00
Joan Sanchez	ff5a942771	Updated unit test	2020-09-08 10:16:30 +02:00
Joan Sanchez	8daa3ae89c	html changes	2020-09-08 10:11:22 +02:00
Bernat Exposito Domenech	d79cffb2c3	back test for getComponentsSum	2020-09-08 08:13:54 +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
Bernat Exposito Domenech	92e14d5292	update getComponentSum	2020-09-08 07:17:16 +02:00
Carlos Jimenez Ruiz	6cfb1a226a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create	2020-09-07 09:46:52 +02:00
Joan Sanchez	03a0a22526	Updated unit test	2020-09-07 08:53:47 +02:00
Joan Sanchez	f8bb4d86fb	State fix & supplier search fix	2020-09-07 08:15:43 +02:00
Joan Sanchez	ba9cfedec7	Worker calendar holiday name	2020-09-07 07:59:27 +02:00
Carlos Jimenez Ruiz	c3c7ef901a	version pre-hex in vn.ink table	2020-09-04 12:40:23 +02:00
Carlos Jimenez Ruiz	0116adeddb	Merge branch '2402-entry_create' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create	2020-09-03 16:59:41 +02:00
Joan Sanchez	5b4a3cd370	Travel autocomplete fix	2020-09-03 16:52:35 +02:00
Carlos Jimenez Ruiz	a00f64e7a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2402-entry_create	2020-09-03 16:29:38 +02:00
Joan Sanchez	b848fa52f2	2385 - Replaced worker nickname	2020-09-03 15:11:16 +02:00
Joan Sanchez	5fa9489f9a	Added fields as required, added info icon	2020-09-03 08:09:37 +02:00
Carlos Jimenez Ruiz	c796132e77	e2e + fixtures amended + refactor	2020-09-02 15:20:28 +02:00
Joan Sanchez	a3382300f9	2402 - Added create entry section	2020-09-02 14:08:56 +02:00
Carlos Jimenez Ruiz	605fbe7999	refactor	2020-09-02 13:09:30 +02:00
Joan Sanchez	e6790f6120	#2406 - Sort by occurrences	2020-09-02 10:06:25 +02:00
Carlos Jimenez Ruiz	1c0d5dbd76	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section	2020-09-02 09:42:13 +02:00
Carlos Jimenez Ruiz	742a1c9ea8	removed focus on test	2020-09-02 09:42:10 +02:00
Joan Sanchez	33aec33cba	Updated unit test	2020-09-02 08:12:32 +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	ecb98dfac5	Descriptor fix	2020-09-01 12:10:32 +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
Javi Gallego	a567738f2c	set addressFk	2020-09-01 08:33:11 +02:00
Joan Sanchez	0a542a2057	Updated unit test	2020-09-01 07:38:03 +02:00
Joan Sanchez	b34545b316	Merge branch 'dev' into 2408-item_request	2020-08-31 13:11:07 +00:00
Joan Sanchez	8aa9918d84	2409 - Added filter by selection	2020-08-31 15:03:00 +02:00
Javi Gallego	daee9081d1	test excepto invoiceOut	2020-08-31 12:29:51 +02:00
Joan Sanchez	6297d09de2	Updated syntax	2020-08-31 12:14:39 +02:00
Joan Sanchez	4a870213ce	Merge branch 'dev' into 2408-item_request	2020-08-31 09:03:41 +00:00
Joan Sanchez	7a1d697375	Merge branch 'dev' into 2391-client_balance_description	2020-08-31 08:26:02 +00:00
Joan Sanchez	95601f5d55	Updated translations	2020-08-31 10:15:02 +02:00
Joan Sanchez	8b67c6f1a5	Merge branch 'dev' into 2394-order_index_total	2020-08-31 08:01:48 +00:00
Joan Sanchez	baf9ec6e70	2416 - Item request - Added state filter	2020-08-31 08:32:30 +02:00
Javi Gallego	8b26c41b7f	campo packageFk	2020-08-28 17:06:27 +02:00
Carlos Jimenez Ruiz	0b4f65724e	semantics, traductions and small aditions	2020-08-28 10:40:47 +02:00
Carlos Jimenez Ruiz	c70ad808a0	refactor	2020-08-27 17:54:43 +02:00
Carlos Jimenez Ruiz	2f81e41881	grping and pcking shown as per item last entries	2020-08-27 16:42:01 +02:00
Carlos Jimenez Ruiz	58fc25d91f	grouping & packaging according to grouping mode	2020-08-27 16:40:08 +02:00
Carlos Jimenez Ruiz	5614a39f91	traductuctions	2020-08-27 15:29:48 +02:00
Carlos Jimenez Ruiz	a66656dcce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section	2020-08-27 15:14:41 +02:00
Carlos Jimenez Ruiz	d156ca95ba	front and back unit tests	2020-08-27 15:14:30 +02:00
Joan Sanchez	f4a63e0876	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-08-27 14:32:10 +02:00
Joan Sanchez	7c4d9b9460	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-08-27 14:31:54 +02:00
Joan Sanchez	a75938b6d0	Updated error handler	2020-08-27 14:23:40 +02:00
Joan Sanchez	55d047c0dd	Renamed error var	2020-08-27 14:11:22 +02:00
Joan Sanchez	fd67a85fe8	Changed to 1 second	2020-08-27 14:09:21 +02:00
Joan Sanchez	6f3fb83cd7	Changes	2020-08-27 13:53:11 +02:00
Joan Sanchez	914407012a	Fixed bank search expression	2020-08-27 11:58:28 +02:00
Joan Sanchez	f14b484faf	Added ACL to td-editable	2020-08-27 11:23:39 +02:00
Joan Sanchez	ac181bb845	Updated unit tests	2020-08-27 11:16:36 +02:00
Joan Sanchez	1b764e0b3a	Merge branch 'dev' into 2394-order_index_total	2020-08-27 07:54:53 +00: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	30a4bbfe1a	Css changes	2020-08-26 12:41:38 +02:00
Joan Sanchez	a343d5eb9a	2394 - Removed call to order_total()	2020-08-26 11:27:36 +02:00
Carlos Jimenez Ruiz	d23e3eff76	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section	2020-08-26 09:49:52 +02:00
Joan Sanchez	55c88514bd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-08-26 08:29:03 +02:00
Joan Sanchez	e12612b0ea	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-08-26 08:28:41 +02:00
Joan Sanchez	ea4f561bcf	Added try-catch	2020-08-26 07:33:00 +02:00
Joan Sanchez	7e494962cd	Merge branch 'dev' into 2358-route_download_pdf	2020-08-25 12:27:17 +00:00
Joan Sanchez	9ef58cabd4	Removed console log	2020-08-25 14:10:38 +02:00
Joan Sanchez	f480bdbd9a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-08-25 13:46:50 +02:00
Joan Sanchez	74f3229fc5	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-08-25 13:45:20 +02:00
Joan Sanchez	17497c3f2d	Added unit test	2020-08-25 10:22:57 +02:00
Joan Sanchez	cd74e9684a	Download route PDF on route index	2020-08-25 10:00:21 +02:00
Joan Sanchez	957c1c01b9	Html changes	2020-08-24 07:54:30 +02:00
Joan Sanchez	80e1577d4f	Updated e2e	2020-08-20 09:50:22 +02:00
Joan Sanchez	4d8a84e774	Fixed back unit tests	2020-08-20 08:45:03 +02:00
Joan Sanchez	f0818acf32	2387 - Fixed error when deleting a zone	2020-08-19 13:04:12 +02:00
Joan Sanchez	a3d3ed4aba	Fixed unit test	2020-08-18 14:14:34 +02:00
Joan Sanchez	55b3e962a4	Merge branch 'dev' into 1361-calendar_date_filter	2020-08-18 12:03:31 +00:00
Joan Sanchez	540d5e9e71	Fixed errors	2020-08-18 13:50:08 +02:00
Joan Sanchez	4ef540c8f3	Changed download path	2020-08-18 09:48:02 +02:00
Joan Sanchez	2a7495bac9	Image queue fixes	2020-08-18 09:45:26 +02:00
Joan Sanchez	1ef6637ad3	Added clearInterval()	2020-08-18 08:37:39 +02:00
Joan Sanchez	8968f41b75	Queue changes	2020-08-18 08:10:40 +02:00
Joan Sanchez	10aed9d40d	Merge branch 'dev' into 2324-ticket_problems	2020-08-17 12:33:05 +00:00
Joan Sanchez	f13c47ce6d	Ticket problems filter fix	2020-08-17 14:31:26 +02:00
Carlos Jimenez Ruiz	dee3ab166a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section	2020-08-17 14:18:44 +02:00
Joan Sanchez	b382e765a0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-08-17 10:10:17 +02:00
Joan Sanchez	dd5e71c9fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-08-17 09:42:29 +02:00
Carlos Jimenez Ruiz	0e4fc7e2bd	removed unused code.	2020-08-14 18:43:57 +02:00
Carlos Jimenez Ruiz	69cc18be12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2330-Implement_print_service_testing	2020-08-14 18:42:51 +02:00
Carlos Jimenez Ruiz	a679ebfce8	quick fix for updateClaim from other branch	2020-08-14 18:42:45 +02:00
Carlos Jimenez Ruiz	b711728999	ultimate edition deluxe	2020-08-14 17:47:13 +02:00
Carlos Jimenez Ruiz	3df9ae2946	section no longer nukes salesPerson-user relation	2020-08-14 17:10:59 +02:00
Carlos Jimenez Ruiz	9a9ef5c03f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1361-calendar_date_filter	2020-08-14 09:23:33 +02:00
Joan Sanchez	a10e091b62	Added limit	2020-08-13 16:26:35 +02:00
Joan Sanchez	7a3de746cc	Added limit	2020-08-13 14:00:40 +02:00
Joan Sanchez	bbf15da16f	Changed tmp uri	2020-08-13 13:38:52 +02:00
Joan Sanchez	c0794808f0	Updated tmp directory	2020-08-13 13:09:53 +02:00
Joan Sanchez	c9ed17d981	Changes to dowload item photos endpoint	2020-08-13 12:16:25 +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
Joan Sanchez	88c5b6f8a6	Changed ticket problems min date	2020-08-13 08:23:55 +02:00
Bernat Exposito Domenech	689245c27d	fix test	2020-08-12 14:23:13 +02:00
Bernat Exposito Domenech	a523030c54	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2388_export-structure	2020-08-12 14:22:55 +02:00
Bernat Exposito Domenech	1e56619c33	export structure and fix test	2020-08-12 13:07:58 +02:00
Joan Sanchez	1486cbb4e7	Updated unit test	2020-08-12 12:00:46 +02:00
Joan Sanchez	de9d1268b7	Updated unit test	2020-08-12 11:38:39 +02:00
Joan Sanchez	b0df4973e9	2384 - Searchbar filters fixed	2020-08-12 08:26:00 +02:00
Joan Sanchez	b50b30c792	Updated unit test	2020-08-11 12:16:19 +02:00
Joan Sanchez	d17f289af9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1361-calendar_date_filter	2020-08-11 07:42:26 +02:00
Joan Sanchez	7833b87475	Added filter	2020-08-10 14:44:57 +02:00
Joan Sanchez	e2c742c893	#2383 - Changed model	2020-08-10 14:29:25 +02:00
Bernat Exposito	1ad9f544eb	Merge branch 'dev' into 2368-entry_buy	2020-08-03 06:12:47 +00:00
Carlos Jimenez Ruiz	6007506633	wider space for tags	2020-07-31 11:43:56 +02:00
Carlos Jimenez Ruiz	810b072e14	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2368-entry_buy	2020-07-31 10:51:34 +02:00
Carlos Jimenez Ruiz	ede73bfe92	removed id from descriptor	2020-07-30 16:40:40 +02:00
Carlos Jimenez Ruiz	e974f638dd	2361 ticket sale multi check fix-ish +popover size	2020-07-30 16:05:48 +02:00
Carlos Jimenez Ruiz	9402f368f6	ticket index and zone descriptor refactor	2020-07-30 12:51:19 +02:00
Carlos Jimenez Ruiz	85b3b52e39	took a while to confirm this one	2020-07-29 10:54:45 +02:00
Carlos Jimenez Ruiz	e2481366a2	removed on response if just accept	2020-07-29 10:47:48 +02:00
Carlos Jimenez Ruiz	e126350079	scroll removed as it comes from layaout	2020-07-28 19:22:21 +02:00
Carlos Jimenez Ruiz	c62801e741	modules component to vnComponent working	2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz	6913f2db72	$httpBackend.when and .expect no longer misused	2020-07-23 17:10:07 +02:00
Carlos Jimenez Ruiz	4ca004f833	angular.mock.injet shorten to inject	2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz	7d5dc776c1	replaced most of the translate.instant for $t	2020-07-23 16:07:08 +02:00
Bernat Exposito Domenech	b972353bb4	create method getComponentSum	2020-07-21 11:11:09 +02:00
Carlos Jimenez Ruiz	f9da489a96	excluded unfinished tests WIP	2020-07-20 11:50:21 +02:00
Carlos Jimenez Ruiz	f2730dd51c	some parts of latestsBuys WIP	2020-07-20 11:31:47 +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
Joan Sanchez	a07d960a2e	Fixed test	2020-07-16 12:09:50 +02:00
Joan Sanchez	cbb2ad7f44	Removed duplicated test	2020-07-16 11:59:16 +02:00
Joan Sanchez	87fa66fe8c	Updated methods description	2020-07-16 11:45:44 +02:00
Joan Sanchez	bbf3b72001	Added front & back tests	2020-07-16 10:04:16 +02:00
Joan Sanchez	4397060f36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1876-worker_calendar	2020-07-16 09:21:11 +02:00
Bernat Exposito Domenech	f7100f11ee	first step add right menu in ticket components	2020-07-16 07:43:07 +02:00
Joan Sanchez	871b97d3c6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-07-15 12:37:22 +02:00
Joan Sanchez	da3d20bb16	Restored limit	2020-07-15 12:11:44 +02:00
Joan Sanchez	72dfa4262a	Removed limit	2020-07-15 12:00:38 +02:00
Joan Sanchez	2f9d80be7a	Added ACL + unit tests	2020-07-15 11:35:34 +02:00
Joan Sanchez	68c19fa22a	Removed test	2020-07-14 11:17:53 +02:00
Joan Sanchez	e557bd2815	Renamed method	2020-07-14 11:16:50 +02:00
Joan Sanchez	3074c9ce35	Fixed async image registration	2020-07-14 09:32:50 +02:00
Joan Sanchez	80075a6471	Added limit	2020-07-13 14:46:00 +02:00
Joan Sanchez	99aa6b666d	Mkdir recursive	2020-07-13 14:31:50 +02:00
Joan Sanchez	838b8a5382	Fix scope var	2020-07-13 14:22:19 +02:00
Joan Sanchez	ee19ea2993	Restricted to itemFk	2020-07-13 14:13:21 +02:00
Joan Sanchez	ccc5b95b48	Updated mount paths	2020-07-13 12:23:47 +02:00
Joan Sanchez	159b5f3bb8	#2351 Item image queue scheduler	2020-07-13 11:58:31 +02:00
Joan Sanchez	91e739547b	Changes	2020-07-11 18:30:27 +02:00
Bernat Exposito Domenech	ab8d2be1ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1880-refactor_loggable	2020-07-09 14:14:57 +02:00
Bernat Exposito Domenech	02c82f894a	fix e2e errors	2020-07-09 14:14:11 +02:00
Joan Sanchez	24eb400c31	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-07-09 14:02:36 +02:00
Joan Sanchez	7b61e129ff	HOTFIX: Change claim claimed quantity	2020-07-09 13:24:56 +02:00
Joan Sanchez	3a8d5c192c	HOTFIX: Pagination limit	2020-07-09 12:49:07 +02:00
Bernat Exposito Domenech	c31825331d	refactor loggable	2020-07-09 11:45:38 +02:00
Bernat Exposito Domenech	b2e3ebc262	cr changes	2020-07-09 11:21:06 +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 Sanchez	c04d9b0854	Merge branch 'dev' into 2338-ticket_weekly	2020-07-08 16:22:54 +00:00
Joan Sánchez	01b32d2b89	Calendar changes	2020-07-08 15:05:56 +02:00
Joan Sánchez	b00f6e6d04	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-07-07 15:13:01 +02:00
Joan Sánchez	7efba25603	Removed role salesPerson for a ticket request	2020-07-07 15:12:36 +02:00
Joan Sanchez	6aca80b075	Merge branch 'dev' into 2338-ticket_weekly	2020-07-07 12:34:04 +00: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	ee704b302c	update order filter	2020-07-06 10:20:45 +02:00
Carlos Jimenez Ruiz	663b5fb9aa	descriptor can now have 4 quicklinks	2020-07-03 13:28:49 +02:00
Carlos Jimenez Ruiz	36f4998e75	e2e nad canCreateTicket unit tests	2020-07-02 09:35:52 +02:00
Bernat Exposito Domenech	c42c6c19d6	changes in order index	2020-07-02 07:46:55 +02:00
Joan Sanchez	23664dd3c5	Refresh total on sale changes	2020-07-01 15:00:48 +02:00
Carlos Jimenez Ruiz	c801d8a969	Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor	2020-07-01 14:45:53 +02:00
Carlos Jimenez Ruiz	354123dc86	e2e toolkit 2.0 + refactors	2020-07-01 14:45:48 +02:00
Joan Sanchez	b40e09a6cb	Methods refactor & updated back unit tests	2020-07-01 14:28:05 +02:00
Joan Sanchez	78ee6f1aff	Updated unit tests	2020-07-01 12:53:56 +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
Joan Sanchez	defe7e7a17	Added front unit tests	2020-07-01 11:57:01 +02:00
Javi Gallego	f57e332503	Merge branch 'dev' into #2344-ticket-sale--descuento--al-usuario	2020-06-30 13:25:33 +02:00
Carlos Jimenez Ruiz	1dfd0c26ef	Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor	2020-06-30 11:15:28 +02:00
Carlos Jimenez Ruiz	b451b400bf	e2e toolkit	2020-06-30 11:15:20 +02:00
Javi Gallego	039eec7d26	test excepto fallo e2e	2020-06-30 10:16:22 +02:00
Joan Sanchez	a0f625d019	Changed methods order, minor fixes	2020-06-30 10:01:30 +02:00
Joan Sanchez	c9d94ca814	Reset watcher changes if there's no new data to save	2020-06-30 09:37:09 +02:00
Bernat Exposito Domenech	e7a866553c	fix test	2020-06-30 09:15:08 +02:00
Bernat Exposito Domenech	d77297941f	fix date in a front test	2020-06-30 09:08:08 +02:00
Bernat Exposito Domenech	d414db73de	order index add buton and columns	2020-06-30 08:32:04 +02:00
Javi Gallego	db06626675	refactor	2020-06-29 14:26:27 +02:00
Joan Sanchez	2c23f3417a	Sale selection fixes	2020-06-29 11:43:53 +02:00
Joan Sanchez	789769ad7d	Destroy edit prop fix	2020-06-29 09:38:42 +02:00
Bernat Exposito Domenech	faee28cb01	fix bugs in ticket weekly	2020-06-29 09:35:18 +02:00
Javi Gallego	87de2bd2fb	Merge branch 'dev' into #2344-ticket-sale--descuento--al-usuario	2020-06-29 07:37:27 +02:00
Bernat Exposito Domenech	ea1eb16060	export structure	2020-06-29 07:32:08 +02:00
Javi Gallego	962436b8bb	2344 ticket sale descuento usuario	2020-06-25 17:12:53 +02:00
Joan Sanchez	a8377950f5	Fixes	2020-06-23 16:39:20 +02:00
Carlos Jimenez Ruiz	9d88b9359a	removed unused column	2020-06-23 16:07:07 +02:00
Carlos Jimenez Ruiz	984e8fd794	added total price of services	2020-06-23 14:53:41 +02:00
Carlos Jimenez Ruiz	31b1599f2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2335-zone_descriptor	2020-06-23 13:49:15 +02:00
Joan Sanchez	d4c78b46c1	1368 - First sale refactor	2020-06-23 13:40:49 +02:00
Carlos Jimenez Ruiz	ec6a3e00f7	removed unused argument in test	2020-06-23 13:26:21 +02:00
Carlos Jimenez Ruiz	bc9ab1a837	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2328-claim_detail	2020-06-23 13:10:12 +02:00
Bernat Exposito Domenech	2275541bb1	change on-response for on-accept	2020-06-23 12:46:24 +02:00
Carlos Jimenez Ruiz	7c72cd8f2d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2322-order_index	2020-06-23 12:33:16 +02:00
Carlos Jimenez Ruiz	1b683f5dc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 902-zone_unit_tests	2020-06-23 11:41:18 +02:00
Bernat Exposito Domenech	ee2a4771ff	delete coment code	2020-06-23 11:22:33 +02:00
Bernat Exposito Domenech	6a021b5767	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2061-ticket_descriptor	2020-06-23 10:00:50 +02:00
Bernat Exposito Domenech	e96df49622	refactor delete zone	2020-06-23 07:38:36 +02:00
Joan Sanchez	356c1a7b45	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-22 11:54:50 +02:00
Joan Sanchez	4ad3334de6	Allow change to discount 0%	2020-06-22 11:49:44 +02:00
Joan Sanchez	3cb783740f	Added unit tests	2020-06-22 10:01:55 +02:00
Joan Sanchez	8729d1c765	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-19 10:35:57 +02:00
Joan Sanchez	2930b60adc	Entitlement rate	2020-06-19 10:28:08 +02:00
Joan Sanchez	41eeaeef0b	Entitlement rate	2020-06-19 09:58:09 +02:00
Carlos Jimenez Ruiz	e6a72d0f09	clean code refactor	2020-06-18 15:26:15 +02:00
Carlos Jimenez Ruiz	3c2a392cb8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note	2020-06-18 13:51:00 +02:00
Carlos Jimenez Ruiz	4d97357213	update estate without model.refresh()	2020-06-18 13:50:52 +02:00
Joan Sanchez	322085ffd7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-18 13:15:45 +02:00
Joan Sanchez	7c45858764	Sms dialog fix	2020-06-18 12:59:37 +02:00
Joan Sanchez	fa73911452	Added tests	2020-06-18 12:43:33 +02:00
Bernat Exposito Domenech	9af33d1b96	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2322-order_index	2020-06-18 11:23:35 +02:00
Bernat Exposito Domenech	84bacfd379	add message before delete a line on a claim	2020-06-18 10:10:42 +02:00
Joan Sanchez	765d3c7553	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-18 07:19:57 +02:00
Joan Sanchez	43a48994e0	Image path fix	2020-06-17 16:33:58 +02:00
Carlos Jimenez Ruiz	edea60dd94	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note	2020-06-17 15:38:49 +02:00
Carlos Jimenez Ruiz	2abd45f498	setDelivered and open delivery notes and tests	2020-06-17 15:38:37 +02:00
Joan Sanchez	fd97845979	Revert "Removed sms excluded tests" ... This reverts commit 30912bd5e9.	2020-06-17 14:00:04 +02:00
Juan Ferrer	8e51104e1b	Merge branch 'test' into dev	2020-06-17 13:31:54 +02:00
Bernat Exposito Domenech	f1b26133cf	refactor order index	2020-06-17 13:25:12 +02:00
Joan Sanchez	63ed592312	902 - Added unit tests	2020-06-17 11:51:57 +02:00
Bernat Exposito Domenech	ebcbd5068f	add restrictions in ticket descriptor	2020-06-17 09:49:14 +02:00
Carlos Jimenez Ruiz	fb37e156d4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note	2020-06-17 09:22:09 +02:00
Joan Sanchez	686203db18	Merge pull request '2275-claim_detail' (#311) from 2275-claim_detail into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-17 05:44:17 +00:00
Bernat Exposito Domenech	930e167a8e	fix test	2020-06-17 07:25:05 +02:00
Joan Sanchez	30912bd5e9	Removed sms excluded tests	2020-06-16 15:11:24 +02:00
Carlos Jimenez Ruiz	98300b2fec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note	2020-06-16 13:10:56 +02:00
Carlos Jimenez Ruiz	b44942c7d7	open delivery notes on ticket index	2020-06-16 12:36:34 +02:00
Bernat Exposito Domenech	d80d520fba	fix claim.beggining	2020-06-16 12:00:38 +02:00
Bernat Exposito Domenech	b6d50f7d8d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2275-claim_detail	2020-06-16 11:36:06 +02:00
Javi Gallego	9e62fd78a2	hasta precio	2020-06-16 10:57:18 +02:00
Javi Gallego	552828a1ba	hasta precio	2020-06-16 10:47:01 +02:00
Joan Sanchez	2f8fa59561	2332 - Fixed on load error	2020-06-16 09:04:13 +02:00
Joan Sanchez	7fd77bdaef	2332 - Fixed on load error	2020-06-16 08:50:59 +02:00
Bernat Exposito Domenech	b33f42d05e	add restrictions in claim detail	2020-06-16 07:47:46 +02:00
Bernat Exposito Domenech	9d80ec11af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2275-claim_detail	2020-06-15 09:54:46 +02:00
Joan Sanchez	279677bda9	Removed report from descriptor	2020-06-15 09:07:13 +02:00
Joan Sanchez	ed83fd5f73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2290-client_consumption	2020-06-15 09:00:24 +02:00
Bernat Exposito	e335775cdb	Merge pull request '2325 - Search address' (#308) from 2325-address_searchbar into dev ... Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-06-15 06:24:23 +00:00
Bernat Exposito	70d5c641ad	Merge pull request '2293 - getVolume() call to saleVolume' (#309) from 2293-getVolume into dev ... Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-06-15 06:16:55 +00:00
Joan Sanchez	25b1c6bd8f	2239 - Added services	2020-06-12 14:28:29 +02:00
Joan Sanchez	36ec930878	Updated test	2020-06-12 12:01:53 +02:00
Joan Sanchez	3d388ad226	Updated unit test	2020-06-12 11:39:33 +02:00
Joan Sanchez	dddfe2773a	2293 - getVolume() call to saleVolume	2020-06-12 11:26:32 +02:00
Joan Sanchez	48034b234f	2325 - Search address	2020-06-12 10:53:33 +02:00
Joan Sanchez	cba5fb01a6	Removed onused styles	2020-06-12 09:28:44 +02:00
Joan Sanchez	b3db5681fe	2290 - Added consumption section	2020-06-12 09:18:19 +02:00
Bernat Exposito Domenech	12468afa3c	refactor claim detail	2020-06-11 12:31:52 +02:00
Joan Sanchez	8688c2899b	Merge pull request '2321-log_web_access' (#306) from 2321-log_web_access into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-11 09:41:35 +00:00
Bernat Exposito Domenech	f9025bef98	delete test	2020-06-11 10:37:40 +02:00
Bernat Exposito Domenech	5d426c490c	fix traductions	2020-06-11 09:04:17 +02:00
Bernat Exposito Domenech	061dceb2b0	test client hook	2020-06-11 08:46:03 +02:00
Bernat Exposito Domenech	2c5f44f94a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2321-log_web_access	2020-06-11 08:45:16 +02:00
Carlos Jimenez Ruiz	538ae75b89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2283_e2e_delete_ticket_with_stowaway	2020-06-10 16:24:17 +02:00
Joan Sanchez	5edfc59d97	Updated unit test	2020-06-10 13:57:32 +02:00
Joan Sanchez	461fec7e64	Updated unit test	2020-06-10 13:57:08 +02:00
Carlos Jimenez Ruiz	4b1e79a433	2314 server side unit test fixed	2020-06-10 13:50:03 +02:00
Joan Sanchez	5fbcb5c439	2290 - Client consumption	2020-06-10 13:35:41 +02:00
Joan Sanchez	3cfb8b4730	2323 - Filter by myTeam fix	2020-06-10 12:13:07 +02:00
Bernat Exposito Domenech	d2aca11e16	log web access, create hook in client	2020-06-10 12:09:27 +02:00
Bernat Exposito Domenech	704e27a657	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2321-log_web_access	2020-06-10 12:08:54 +02:00
Bernat Exposito Domenech	ee58aebe16	first step, client hook	2020-06-10 09:26:51 +02:00
Joan Sanchez	4b262dc3cc	Disabled contextmenu option	2020-06-09 13:18:29 +02:00
Joan Sanchez	1abe0addcb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-09 12:43:40 +02:00
Joan Sanchez	1fed4c7913	Contextmenu fixes	2020-06-09 12:16:40 +02:00
Bernat Exposito Domenech	294021391d	fix travel descritor	2020-06-09 08:32:57 +02:00
Joan Sanchez	7d53f274de	Merge pull request '2303-fix_descriptor_show' (#300) from 2303-fix_descriptor_show into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-08 14:08:56 +00:00
Carlos Jimenez Ruiz	d8593ea3e0	Merge pull request '2176-contextmenu' (#302) from 2176-contextmenu into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-06-08 12:59:59 +00:00
Joan Sanchez	05b5c452a9	Removed attribute	2020-06-08 13:17:18 +02:00
Joan Sanchez	cda6e37620	Removed console.log	2020-06-08 13:07:34 +02:00
Joan Sanchez	ba9a44dec1	Updated back unit test	2020-06-08 13:06:33 +02:00
Bernat Exposito Domenech	cc569769b0	fix client balance	2020-06-08 12:48:23 +02:00
Joan Sanchez	ab1e8fb622	2176 First working version	2020-06-08 12:14:27 +02:00
Bernat Exposito Domenech	e24c5b00e9	fix descriptors	2020-06-08 11:05:17 +02:00
Joan Sanchez	181f2f0148	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu	2020-06-08 08:19:18 +02:00
Javi Gallego	762c39eb23	:: para watcher	2020-06-08 07:52:30 +02:00
Bernat Exposito Domenech	56c9b08101	fix show.descriptor	2020-06-08 07:52:23 +02:00
Bernat Exposito Domenech	90541a4c13	fix client descriptor in log section	2020-06-05 12:13:05 +02:00
Javi Gallego	faa053a3d2	Merge branch 'dev' into 2035-el-parametro-vShowExpiredZones	2020-06-05 10:01:52 +02:00
Javi Gallego	b40be5cca9	2035	2020-06-05 10:01:21 +02:00
Bernat Exposito	49d4f881ad	Merge pull request '2296-fix_back_test' (#295) from 2296-fix_back_test into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-05 07:15:10 +00:00
Bernat Exposito Domenech	a81862baad	set deleteded skiped	2020-06-05 08:29:51 +02:00
Bernat Exposito Domenech	81757fb9b5	fix test 2302	2020-06-04 14:24:12 +02:00
Bernat Exposito Domenech	f340466daf	fix test 2296	2020-06-04 14:23:48 +02:00
Bernat Exposito Domenech	3a6efebfd9	skipp back test and create task 2304	2020-06-04 14:22:56 +02:00
Joan Sanchez	e2391e5595	Changes made	2020-06-04 10:12:54 +02:00
Joan Sanchez	30c721b0e2	Added ACL	2020-06-04 08:21:08 +02:00
Joan Sanchez	0695ec01bc	Updated unit test	2020-06-04 07:53:06 +02:00
Joan Sanchez	f39719cc46	2281 - Added claim pickup checkbox	2020-06-03 14:46:58 +02:00
Joan Sanchez	696de03ad1	Changed translation	2020-06-03 13:42:36 +02:00
Joan Sanchez	ca19581a5d	Merge pull request 'item diary, fix ticket descriptor' (#290) from 2288-item_diary into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-03 11:09:19 +00:00
Joan Sanchez	94dcf7679b	Merge pull request '2265-item_request_filters' (#289) from 2265-item_request_filters into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-06-03 10:54:41 +00:00
Bernat Exposito Domenech	1cd9c75468	fix item diary descriptor	2020-06-03 12:37:01 +02:00
Bernat Exposito Domenech	34b6641e5c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2288-item_diary	2020-06-03 12:32:27 +02:00
Joan Sanchez	613937dc8d	Fixed order	2020-06-03 12:21:03 +02:00
Joan Sanchez	f71a2a3665	Removed isOk param	2020-06-03 11:58:53 +02:00
Joan Sanchez	18edd523d2	Excluded failing test	2020-06-03 11:40:18 +02:00
Joan Sanchez	b7ceeae65a	Excluded back unit tests. TLS error	2020-06-03 11:27:14 +02:00
Bernat Exposito Domenech	0b3608433c	item diary, fix ticket descriptor	2020-06-03 10:37:17 +02:00
Joan Sanchez	16d7186829	Fixed initial filters	2020-06-02 14:42:58 +02:00
Joan Sanchez	751f79373a	Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 09:28:14 +00:00
Bernat Exposito	fac64c45c0	Merge pull request 'zone delete' (#285) from 2244-zone_descriptor into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 09:18:24 +00:00
Bernat Exposito Domenech	aac47e52e9	update log	2020-06-02 11:15:07 +02:00