9203 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Padawan	8800f76684	Translations recovered	2021-02-12 11:35:33 +01:00
Jorge Padawan	dad3e7c155	Requested changes realized	2021-02-12 11:27:24 +01:00
Jorge Padawan	2a2009b287	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date	2021-02-12 11:25:44 +01:00
Carlos Jimenez Ruiz	d3d94e8925	Merge pull request '2783-itemPriceFixed_advanced_search' (#546) from 2783-itemPriceFixed_advanced_search into dev ... Reviewed-on: #546 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-12 09:24:13 +00:00
Jorge Padawan	211ffb8f30	Delete supplierAccount from this branch	2021-02-12 09:50:23 +01:00
Jorge Padawan	433a0094c4	Fixed errors detected	2021-02-12 09:11:43 +01:00
Jorge Padawan	eb3ac6de72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date	2021-02-11 18:48:58 +01:00
Jorge Padawan	53b06bc464	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2783-itemPriceFixed_advanced_search	2021-02-11 18:41:41 +01:00
Jorge Padawan	1634c81682	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module	2021-02-11 18:38:27 +01:00
Jorge Padawan	0c335b9705	Put bankEntity on global components, and fixed conflict updates	2021-02-11 18:35:23 +01:00
Jorge Padawan	a1ca8d90c3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section	2021-02-11 16:07:04 +01:00
Joan Sanchez	ec41fca964	Merge pull request 'both created tickets are now discarded after tests' (#544) from 2792-fix_backend_unit_test into dev ... Reviewed-on: #544 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-02-11 14:07:49 +00:00
Joan Sanchez	c270ec6207	Contextmenu fixes	2021-02-11 15:06:41 +01:00
Carlos Jimenez Ruiz	3374356d58	both created tickets are now discarded after tests	2021-02-11 11:53:30 +01:00
Jorge Padawan	f146c6a279	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2783-itemPriceFixed_advanced_search	2021-02-11 11:15:10 +01:00
Jorge Padawan	745d25f0c7	Showed filter on browser search bar	2021-02-11 11:14:52 +01:00
Jorge Padawan	31e5d3fd1e	Created test and optimized sql query	2021-02-11 08:32:16 +01:00
Jorge Padawan	bb02a0de6b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date	2021-02-10 16:59:29 +01:00
Joan Sanchez	84c82ed32d	2595 - Added invoiceIn module	2021-02-10 15:03:11 +01:00
Carlos Jimenez Ruiz	40a7ac1e5c	Merge pull request 'done' (#542) from 2725-ticket-create-crear-shimpent into dev ... Reviewed-on: #542 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-02-10 11:17:26 +00:00
Jorge Padawan	2cf37a9e96	Added permissions to role administrative	2021-02-10 09:10:15 +01:00
Jorge Padawan	1c6bddbfb6	Added functionality to autocomplete the inputs	2021-02-10 08:47:58 +01:00
Joan Sanchez	dcad6dc8c8	Merge branch 'dev' into 2725-ticket-create-crear-shimpent	2021-02-10 07:21:29 +00:00
Javi Gallego	f87ea1b051	arrow-spacing	2021-02-10 08:13:45 +01:00
Javi Gallego	3a3dae179c	done	2021-02-10 07:58:11 +01:00
Joan Sanchez	ab6eb5a64e	Merge pull request 'texfield no longer performs queries' (#541) from 2780-item_tags_textfield_queries into dev ... Reviewed-on: #541 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-02-09 12:22:59 +00:00
Carlos Jimenez Ruiz	8b97236f22	texfield no longer performs queries	2021-02-09 12:53:40 +01:00
Joan Sanchez	7cba7b7cf3	Merge pull request '2722-item_log_highlighted_by_clientType' (#540) from 2722-item_log_highlighted_by_clientType into dev ... Reviewed-on: #540 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-02-09 10:07:52 +00:00
Carlos Jimenez Ruiz	83ed70abda	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2722-item_log_highlighted_by_clientType	2021-02-09 10:43:26 +01:00
Carlos Jimenez Ruiz	3d948ef317	warning color added lines with clientType loses	2021-02-09 10:43:19 +01:00
Joan Sanchez	8db5735e8a	Merge pull request '2737-supplier_basic_data_worker' (#539) from 2737-supplier_basic_data_worker into dev ... Reviewed-on: #539 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-02-08 09:32:52 +00:00
Carlos Jimenez Ruiz	a62bebd51e	minor refactor	2021-02-08 10:14:41 +01:00
Carlos Jimenez Ruiz	ee6934af3f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2737-supplier_basic_data_worker	2021-02-08 09:47:57 +01:00
Joan Sanchez	4782d216b2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-08 09:25:40 +01:00
Jorge Padawan	1adaeca615	Added controller with sql	2021-02-08 08:41:26 +01:00
Joan Sanchez	b3f5559fc3	Updated node version	2021-02-08 07:30:36 +01:00
Joan Sanchez	623b90279b	Update dms fix access	2021-02-08 07:28:00 +01:00
Joan Sanchez	ef2a7f9110	Merge branch 'dev' into 2764-Ticket_sale_consignee	2021-02-05 16:43:42 +00:00
Joan Sanchez	cd78ebc4c1	Merge branch 'dev' into 2737-supplier_basic_data_worker	2021-02-05 16:41:14 +00:00
Joan Sanchez	a849330eb4	Changed node version	2021-02-05 17:26:48 +01:00
Carlos Jimenez Ruiz	5ce8d8eb8c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2737-supplier_basic_data_worker	2021-02-05 15:26:54 +01:00
Carlos Jimenez Ruiz	76d6e2d4b7	worker added to supplier basic data and summary	2021-02-05 15:26:49 +01:00
Jorge Padawan	c3109c142a	Line breaks have been put for better understanding	2021-02-05 13:11:18 +01:00
Jorge Padawan	25de8904b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee	2021-02-05 13:04:52 +01:00
Jorge Padawan	8dc291798f	Added tooltip on address and removed workhouse	2021-02-05 13:04:32 +01:00
Joan Sanchez	3f4e102860	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-05 12:18:32 +01:00
Joan Sanchez	2c9fd45958	2778 - Allow edit order number	2021-02-05 12:09:48 +01:00
Joan Sanchez	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