9293 Commits

All Branches

Search

Author	SHA1	Message	Date
jorgebl	8deb11d333	Added boss on basic data and summary	2021-02-19 17:45:45 +01:00
Joan Sanchez	ddb443ab8f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-18 13:17:34 +01:00
Joan Sanchez	8ddbcc24a7	Added priority to image download queue	2021-02-18 13:03:49 +01:00
Joan Sanchez	bc9168aaa0	Merge pull request '2583-create_account_supplier' (#552) from 2583-create_account_supplier into dev ... Reviewed-on: #552 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-02-17 15:22:43 +00:00
Joan Sanchez	5b40edb284	Line break	2021-02-17 16:11:34 +01:00
Jorge Padawan	3763b95f62	Added multiplier in sections and filter selection	2021-02-17 15:38:57 +01:00
Jorge Padawan	aa29f546ae	put global bank entity model	2021-02-17 15:05:17 +01:00
Joan Sanchez	68dc2488ca	Updated sharp version	2021-02-17 14:38:47 +01:00
Jorge Padawan	d5e53909c6	Fixed test	2021-02-17 13:32:09 +01:00
Jorge Padawan	29ca6c52af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_account_supplier	2021-02-17 12:32:26 +01:00
Jorge Padawan	f10092d2cf	Added autocomplete on bank entity	2021-02-17 12:07:04 +01:00
Jorge Padawan	0732ff38b1	Quit clogs	2021-02-17 11:04:46 +01:00
Jorge Padawan	b71b959b49	Formated sql and tests passed	2021-02-17 11:01:50 +01:00
Jorge Padawan	2296727f8d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee	2021-02-16 08:32:24 +01:00
Carlos Jimenez Ruiz	661950f94a	Merge pull request 'refactor-loopback-context' (#549) from refactor-loopback-context into dev ... Reviewed-on: #549 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-15 15:57:45 +00:00
Javi Gallego	7c0e690f8f	sin console	2021-02-15 14:34:13 +01:00
Jorge Padawan	bf3391f7f2	added test of lastActiveTickets	2021-02-15 13:20:17 +01:00
Jorge Padawan	4e36fd118e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee	2021-02-15 10:45:46 +01:00
Javi Gallego	737f5a1c91	Merge branch 'dev' into refactor-loopback-context	2021-02-12 18:11:50 +01:00
Carlos Jimenez Ruiz	c6333e7982	Merge pull request '2603-travel_create_autocomplete_date' (#547) from 2603-travel_create_autocomplete_date into dev ... Reviewed-on: #547 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-12 16:32:51 +00:00
Jorge Padawan	366f241b3f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date	2021-02-12 17:04:10 +01:00
Carlos Jimenez Ruiz	e049d6ccfb	Merge pull request 'Added permissions to role administrative' (#543) from 2782-Add_permisions_administrative_entry_module into dev ... Reviewed-on: #543 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-12 16:01:39 +00:00
Jorge Padawan	2b8a4ca62e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date	2021-02-12 16:55:15 +01:00
Jorge Padawan	bff88a13c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module	2021-02-12 16:42:39 +01:00
Jorge Padawan	4bcb948aff	Updated code for better read	2021-02-12 16:41:29 +01:00
Jorge Padawan	a2ad1887a4	ACL bug fixed + package lock updated	2021-02-12 15:20:30 +01:00
Jorge Padawan	4b1d86c9b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section	2021-02-12 15:12:15 +01:00
Jorge Benedito	4e88f6d8c3	Merge pull request 'description clears before changes' (#548) from e2e_quick_fix into dev ... Reviewed-on: #548 Reviewed-by: Jorge Benedito <jorgebl@verdnatura.es>	2021-02-12 14:10:32 +00:00
Carlos Jimenez Ruiz	b3b99e651b	description clears before changes	2021-02-12 15:02:30 +01:00
Javi Gallego	a3d7fc9313	done	2021-02-12 13:18:02 +01:00
Joan Sanchez	d7ad90d573	Updated caniuse	2021-02-12 12:25:44 +01:00
Joan Sanchez	e7c1dc2210	Changes	2021-02-12 12:19:42 +01:00
Jorge Padawan	1512a34a73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee	2021-02-12 11:57:54 +01:00
Jorge Padawan	1ef2c2ff0a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module	2021-02-12 11:48:00 +01:00
Jorge Padawan	86580727e5	Requested changes resolved	2021-02-12 11:47:53 +01:00
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