3155 Commits

Author	SHA1	Message	Date
Joan Sanchez	1ed4dd27d6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report	2021-03-11 08:59:02 +01:00
Joan Sanchez	1719f53111	2734 - Recreate invoice	2021-03-11 08:58:34 +01:00
Carlos Jimenez Ruiz	4c0d583556	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2824-ticket_totalWith_and_without_VAT	2021-03-10 19:25:43 +01:00
Carlos Jimenez Ruiz	0cb7ddd9ce	ticket.total with and witout VAT refactor	2021-03-10 19:25:26 +01:00
Joan Sanchez	e29dd4db42	Updated it description	2021-03-10 11:14:50 +01:00
Joan Sanchez	a0358044a1	Acl fix	2021-03-10 11:11:04 +01:00
Joan Sanchez	a7c2e08f8f	ACl fixes	2021-03-10 11:04:56 +01:00
Joan Sanchez	b39ec70a2c	Merge branch 'dev' into 2752-entry_import_buys	2021-03-10 09:54:14 +00:00
Joan Sanchez	c144d9ed47	Unit test changed query path	2021-03-10 10:53:22 +01:00
Joan Sanchez	a4d2c531a3	Changes	2021-03-10 10:29:58 +01:00
jorgebl	2f68509e65	WIP: added styles	2021-03-10 09:49:24 +01:00
jorgebl	45f9c1188d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys	2021-03-10 09:48:17 +01:00
Joan Sanchez	2a2e276c6b	Added back unit test plus fixes	2021-03-10 09:01:32 +01:00
Joan Sanchez	ab755e29c7	Merge branch 'dev' into 2787-change_css_date_time	2021-03-09 14:01:04 +00:00
Joan Sanchez	31205f4556	Added front unit test	2021-03-09 13:39:22 +01:00
Joan Sanchez	5cbd8d632d	Changes	2021-03-09 10:01:40 +01:00
Joan Sanchez	9da59949fd	Merge branch 'dev' into 2733-supplier_descriptor_icon	2021-03-09 08:31:03 +00:00
jorgebl	59882cca77	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2733-supplier_descriptor_icon	2021-03-09 09:26:02 +01:00
jorgebl	2d36d4e610	Added line break in vn-icon	2021-03-09 09:25:10 +01:00
Joan Sanchez	ff6c80aa7e	Merge branch 'dev' into 2832-summary_validate_h4	2021-03-09 08:24:10 +00:00
jorgebl	1922280c61	QA rename some descriptions in test and reworked the test	2021-03-08 17:49:04 +01:00
jorgebl	1379691576	Added icon for supplier descriptor	2021-03-08 13:52:11 +01:00
jorgebl	43dc158d7c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4	2021-03-08 13:17:38 +01:00
jorgebl	5cb959f5b8	removed controller.data from submit	2021-03-08 13:12:13 +01:00
jorgebl	27816b29e7	Removed ids on controller.data	2021-03-08 13:06:35 +01:00
jorgebl	134365dd9c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2831-item_botanical_refactor	2021-03-08 12:55:44 +01:00
jorgebl	d09e47835e	Rename the statements for correctly description the action	2021-03-08 12:40:13 +01:00
jorgebl	6e08a66343	Added acl action for logistic boss and show the recent data added on species and genus in their fields in item botanical	2021-03-08 12:38:54 +01:00
jorgebl	32ea2dbda6	Added permisions from models in table salix ACL	2021-03-08 12:32:35 +01:00
Carlos Jimenez Ruiz	5c776c0f11	Merge branch 'dev' into 2703-ticket_step_one	2021-03-08 09:48:38 +00:00
Joan Sanchez	2aff48c42d	2837 - Updated fonts	2021-03-08 09:34:58 +01:00
jorgebl	192d7627b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4	2021-03-08 09:12:34 +01:00
jorgebl	28b9da82ed	change conditional	2021-03-08 09:12:10 +01:00
Joan Sanchez	d7651ba4ac	2837 - Updated fonts	2021-03-08 07:53:00 +01:00
jorgebl	1fd18cae5a	QA	2021-03-05 11:40:01 +01:00
jorgebl	4ae418698b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component	2021-03-05 11:39:25 +01:00
Joan Sanchez	7ec9ddb6d9	Translation fix	2021-03-05 09:23:31 +01:00
jorgebl	b6bf61f410	description put correctly	2021-03-05 09:09:09 +01:00
jorgebl	63ac492845	Added message for duplicated names	2021-03-05 08:45:14 +01:00
jorgebl	4cc3fc90c5	conditionals if name already exists	2021-03-04 21:30:56 +01:00
jorgebl	5ebd70a8f0	Fixed error filter on itemBotanical when item hasn't specie and genus data + front test	2021-03-04 20:11:10 +01:00
jorgebl	12ad71d0fe	translate some words	2021-03-04 20:08:07 +01:00
jorgebl	300f78f31e	added permisions logistic boss	2021-03-04 20:07:45 +01:00
jorgebl	92db67292c	Removed botanical field and changes "edi" for "vn"	2021-03-04 07:56:31 +01:00
Joan Sanchez	0b532880c0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys	2021-03-04 07:54:15 +01:00
jorgebl	cdd903dedf	removed line break because the app interpretate it's a space	2021-03-03 15:09:01 +01:00
jorgebl	763eb412c0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component	2021-03-03 13:39:47 +01:00
jorgebl	56154181aa	QA done	2021-03-03 13:39:25 +01:00
Joan Sanchez	b22f58ae80	Issued filter fix	2021-03-03 12:28:37 +01:00
Joan Sanchez	e50dcf467f	Requested changes	2021-03-03 12:21:04 +01:00
jorgebl	2ba7e922e6	Put time in 00:00 when field "shipped" change	2021-03-03 10:57:00 +01:00
Joan Sanchez	7c7aba86a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index	2021-03-03 09:36:55 +01:00
Joan Sanchez	e52f0eea92	Added front unit tests	2021-03-03 07:44:09 +01:00
jorgebl	60ca3e87a5	Test git	2021-03-02 16:53:54 +01:00
jorgebl	3c82a4997b	Test gitea	2021-03-02 16:52:14 +01:00
Joan Sanchez	fed3657487	Export changes & backtest fixes	2021-03-02 14:59:02 +01:00
jorgebl	022d31c952	remove line break	2021-03-02 14:43:55 +01:00
jorgebl	325a7e7235	Translate note	2021-03-02 12:50:07 +01:00
jorgebl	d6c1f73cf6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component	2021-03-02 12:46:19 +01:00
jorgebl	a7973ba276	Resolved question PR	2021-03-01 11:59:05 +01:00
jorgebl	69550dc380	Added number of rows that are going to be modificated	2021-03-01 11:54:02 +01:00
Joan Sanchez	718021cff8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index	2021-03-01 11:49:31 +01:00
jorgebl	094552e0f2	Added ellipsize and align label	2021-02-26 12:32:05 +01:00
jorgebl	3fcd5f9dbc	removed line break	2021-02-26 11:40:46 +01:00
jorgebl	af8f4e88f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2786-get_tags_from_item	2021-02-26 11:36:56 +01:00
jorgebl	f63baafe7d	get values from model item	2021-02-26 11:36:22 +01:00
jorgebl	0d7a41f862	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2804-ticket_descriptor_salesPerson	2021-02-25 15:52:18 +01:00
jorgebl	b9594f5238	Add descriptor popover	2021-02-25 15:51:51 +01:00
jorgebl	4cedd53bce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2820-add_item_scopeDays	2021-02-25 11:02:51 +01:00
jorgebl	c55d65a7fd	QA refactor	2021-02-25 10:49:19 +01:00
jorgebl	218a506a4b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2789-entry_multiple_changes	2021-02-25 09:54:21 +01:00
Joan Sanchez	89abf424fb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-25 08:17:26 +01:00
jorgebl	c9730929e8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary	2021-02-24 16:14:41 +01:00
jorgebl	1f1db53d41	Summary boss shown on descriptor	2021-02-24 16:12:44 +01:00
Joan Sanchez	c2a2204437	Regex change	2021-02-24 16:04:09 +01:00
Joan Sanchez	ddb77a5c05	Regex change	2021-02-24 15:55:09 +01:00
Joan Sanchez	d3879635a8	Regex changes	2021-02-24 15:54:02 +01:00
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
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	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
jorgebl	56424925e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time	2021-02-22 13:02:32 +01: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