9212 Commits

All Branches

Search

Author	SHA1	Message	Date
jorgebl	06dcb4b28c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary	2021-02-24 14:54:23 +01:00
jorgebl	f1c481de64	QA refactor	2021-02-24 14:49:58 +01:00
Joan Sanchez	1c819e692e	Floramondo image download fixes	2021-02-24 14:37:49 +01:00
jorgebl	d551389d3a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2781-add_stemMultiplier_item	2021-02-24 12:26:05 +01:00
jorgebl	df9ca2ad3e	Fixed filter description	2021-02-24 12:24:50 +01:00
Carlos Jimenez Ruiz	7ab77e6662	Merge pull request 'Formated sql and tests passed' (#551) from 2603-travel_create_autocomplete_date into dev ... Reviewed-on: #551 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-24 10:53:06 +00:00
jorgebl	3af50dfc80	QA refactor	2021-02-24 11:32:31 +01:00
Joan Sanchez	347ac77878	Changes to file names	2021-02-24 09:59:41 +01:00
jorgebl	7895af8a54	Fixed test	2021-02-23 17:00:31 +01:00
jorgebl	2c041b9912	Remove focus	2021-02-23 16:31:05 +01:00
jorgebl	e32914d990	Fixed error test	2021-02-23 16:27:18 +01:00
jorgebl	3eae322a6a	Added scope days and test	2021-02-23 16:09:29 +01:00
jorgebl	71eeaadb43	Removed focus on test	2021-02-23 14:54:07 +01:00
jorgebl	2e75bf376c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2789-entry_multiple_changes	2021-02-23 11:53:07 +01:00
jorgebl	da20eac685	Putting propertie name for order and showing the 3 digits of type	2021-02-23 11:52:29 +01:00
jorgebl	799bb3a955	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date	2021-02-23 11:10:06 +01:00
jorgebl	9855bd14fe	Translate Boss	2021-02-23 11:08:57 +01:00
jorgebl	5e549b4d0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary	2021-02-23 10:42:19 +01:00
jorgebl	69f53972d5	Added filter for selection	2021-02-22 16:43:40 +01:00
jorgebl	5ef48919ec	Added translate multiplier	2021-02-22 13:41:31 +01:00
jorgebl	3c3dc861ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2781-add_stemMultiplier_item	2021-02-22 13:37:43 +01:00
Carlos Jimenez Ruiz	2e838d9b97	Merge pull request '2764-Ticket_sale_consignee' (#537) from 2764-Ticket_sale_consignee into dev ... Reviewed-on: #537 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-02-22 11:59:43 +00:00
jorgebl	77d8388c43	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee	2021-02-22 09:59:38 +01:00
jorgebl	5692b5f07e	Added conditional and test	2021-02-22 09:53:03 +01:00
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