9971 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Padawan	25de8904b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee	2021-02-05 13:04:52 +01:00
Jorge Padawan	8dc291798f	Added tooltip on address and removed workhouse	2021-02-05 13:04:32 +01:00
Joan Sanchez	3f4e102860	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-05 12:18:32 +01:00
Joan Sanchez	2c9fd45958	2778 - Allow edit order number	2021-02-05 12:09:48 +01:00
Joan Sanchez	4fb466d8b2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys	2021-02-05 08:41:30 +01:00
Joan Sanchez	3dd8ff5194	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-05 08:28:32 +01:00
Joan Sanchez	5bd7e4a67f	Translation fix	2021-02-05 08:05:57 +01:00
Joan Sanchez	f041e0d897	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-04 18:44:25 +01:00
Joan Sanchez	84cef1949b	Image size fix	2021-02-04 18:28:58 +01:00
Joan Sanchez	d589dd435c	Default image refs to 1	2021-02-04 18:23:22 +01:00
Javi Gallego	a8bd657c77	Merge pull request 'invoiceOut advanced search by fiscal id' (#536) from 2746-invoiceOut_cif_advanced_search into dev ... Reviewed-on: #536 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2021-02-04 12:57:20 +00:00
Carlos Jimenez Ruiz	f1704f94f1	invoiceOut advanced search by fiscal id	2021-02-04 13:43:21 +01:00
Carlos Jimenez Ruiz	8f54dd5136	Merge pull request '2766-ticket_index_col_order' (#535) from 2766-ticket_index_col_order into dev ... Reviewed-on: #535 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2021-02-04 09:58:20 +00:00
Carlos Jimenez Ruiz	a9b0a5c2bd	order fixed	2021-02-04 10:04:16 +01:00
Carlos Jimenez Ruiz	073741607e	e2e updated	2021-02-03 17:01:53 +01:00
Carlos Jimenez Ruiz	532cb582cf	columns moved and no refresh on stateState changes	2021-02-03 17:01:43 +01:00
Joan Sanchez	215e0c9fc4	Image download fix for images without extension	2021-02-03 15:01:09 +01:00
Joan Sanchez	a845f53f0a	Bug fixes	2021-02-03 12:43:30 +01:00
Joan Sanchez	ddc1456bb0	Merge pull request 'error is not a required field' (#534) from 2768-image_downloadimages_unit_tests into dev ... Reviewed-on: #534 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-02-03 09:42:35 +00:00
Carlos Jimenez Ruiz	ff94b182a1	error is not a required field	2021-02-03 10:16:46 +01:00
Joan Sanchez	38311f526d	Calculate volume	2021-02-03 09:03:03 +01:00
Carlos Jimenez Ruiz	fcbf157c20	Merge pull request '2617-add_scope_days_on_travel_index' (#530) from 2617-add_scope_days_on_travel_index into dev ... Reviewed-on: #530 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 13:33:32 +00:00
Carlos Jimenez Ruiz	2aaed295c9	Merge branch 'dev' into 2617-add_scope_days_on_travel_index	2021-02-02 13:13:32 +00:00
Joan Sanchez	ea1066d664	Added changes version 10281	2021-02-02 14:08:12 +01:00
Carlos Jimenez Ruiz	dd9e9bac9b	removed unused character	2021-02-02 14:02:57 +01:00
Carlos Jimenez Ruiz	a77c5c5b66	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 14:02:30 +01:00
Carlos Jimenez Ruiz	a0d6e53dbb	polutd test removed	2021-02-02 14:00:35 +01:00
Carlos Jimenez Ruiz	1379b52d8a	Merge pull request '2692-add_advanced_search_engine2' (#519) from 2692-add_advanced_search_engine2 into dev ... Reviewed-on: #519 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 12:29:20 +00:00
Jorge Padawan	186e59c7ae	.	2021-02-02 13:18:17 +01:00
Jorge Padawan	b57578f933	Remove parenthesis on expectedParams	2021-02-02 13:12:54 +01:00
Jorge Padawan	b576c0ad69	Remove parenthesis on expectedParams	2021-02-02 13:11:17 +01:00
Jorge Padawan	1a87eb3085	Remove bad code	2021-02-02 12:52:24 +01:00
Jorge Padawan	218a19d7da	Removed bad code	2021-02-02 12:37:00 +01:00
Jorge Padawan	c7424997d5	Removed bad code	2021-02-02 12:22:18 +01:00
Jorge Padawan	ee6b694637	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-02-02 11:58:07 +01:00
Jorge Padawan	a1a3607d3c	Remove bad code	2021-02-02 11:57:42 +01:00
Jorge Padawan	6fed5a21b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 11:50:09 +01:00
Jorge Padawan	a2e78a8f25	Merge branch '2617-add_scope_days_on_travel_index' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 11:49:53 +01:00
Jorge Padawan	60015178a6	Remove bad code	2021-02-02 11:49:42 +01:00
Joan Sanchez	f6af7f14af	Merge pull request 'Add list of emails from client' (#523) from 2723-Format_emails_for_summaries into dev ... Reviewed-on: #523 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 10:06:22 +00:00
Carlos Jimenez Ruiz	6a2c131593	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 10:59:59 +01:00
Carlos Jimenez Ruiz	3ab59cbec8	Merge pull request '2762 - Delete entry as teamBoss' (#533) from 2762-worker_delete_entry into dev ... Reviewed-on: #533 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 09:32:09 +00:00
Jorge Padawan	f0f96f1ab5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2617-add_scope_days_on_travel_index	2021-02-02 10:27:52 +01:00
Jorge Padawan	db5e786235	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-02-02 10:26:27 +01:00
Jorge Padawan	7b7571ae77	Fixed problems with default search	2021-02-02 10:26:10 +01:00
Jorge Padawan	9d96a4a6a1	Fixed problems test e2e	2021-02-02 10:17:13 +01:00
Joan Sanchez	dea858c314	Removed focus	2021-02-02 10:12:37 +01:00
Joan Sanchez	524d1274c9	Merge branch 'dev' into 2762-worker_delete_entry	2021-02-02 09:11:48 +00:00
Carlos Jimenez Ruiz	1f29d6be16	Merge pull request '2741 - Claim detail deletion visual fix' (#532) from 2741-claim_detail_delete into dev ... Reviewed-on: #532 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-02 09:10:50 +00:00
Joan Sanchez	a21d8acde6	2762 - Delete entry ass teamBoss	2021-02-02 10:07:13 +01:00