9524 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	9fccc70069	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2806-e2e_account_index	2021-03-08 09:21:50 +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
Carlos Jimenez Ruiz	8b07a07619	Merge pull request '2837 - Updated fonts' (#566) from 2837-salix_fonts into dev ... Reviewed-on: #566 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-08 08:09:05 +00:00
Joan Sanchez	d7651ba4ac	2837 - Updated fonts	2021-03-08 07:53:00 +01:00
Joan Sanchez	85920e5c07	Added new SQL version	2021-03-05 17:11:04 +01:00
Carlos Jimenez Ruiz	dcbe625bc9	excluded e2e due to basic data error	2021-03-05 17:06:06 +01:00
Carlos Jimenez Ruiz	5908dea010	e2e path for account role	2021-03-05 16:25:09 +01:00
Carlos Jimenez Ruiz	f03de39433	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2806-e2e_account_index	2021-03-05 13:46:11 +01:00
Carlos Jimenez Ruiz	8027f108d9	Merge pull request '2823-e2e_travel_create' (#562) from 2823-e2e_travel_create into dev ... Reviewed-on: #562 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-05 12:43:04 +00:00
Carlos Jimenez Ruiz	32b527f3ec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2806-e2e_account_index	2021-03-05 13:40:56 +01:00
Carlos Jimenez Ruiz	3f8e4df54c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2823-e2e_travel_create	2021-03-05 12:37:30 +01:00
Carlos Jimenez Ruiz	f01733a8b1	Merge pull request '2788 Add ellipsis in log component' (#561) from 2788-add-ellipsize_log-component into dev ... Reviewed-on: #561 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-05 11:36:43 +00:00
Carlos Jimenez Ruiz	2c6609cf12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2823-e2e_travel_create	2021-03-05 12:14:25 +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
Carlos Jimenez Ruiz	3375189ff6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2806-e2e_account_index	2021-03-05 11:34:00 +01:00
Carlos Jimenez Ruiz	d68da2ad10	e2e paths for account index and alias	2021-03-05 11:33:55 +01:00
Carlos Jimenez Ruiz	b0a3a9b7bc	Merge pull request '2791-item_botanical_remove_field' (#564) from 2791-item_botanical_remove_field into dev ... Reviewed-on: #564 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-05 10:30:11 +00: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	5972526327	Merge branch '2791-item_botanical_remove_field' of https://gitea.verdnatura.es/verdnatura/salix into 2791-item_botanical_remove_field	2021-03-05 08:05:23 +01:00
jorgebl	7c234724d5	remove focus	2021-03-04 21:50:01 +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	4a22cd5f85	db changes and acl for logistic boss on section item-botanical	2021-03-04 20:09:35 +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
Joan Sanchez	49fbecfc59	Exported db	2021-03-04 08:41:42 +01:00
jorgebl	08cb69330a	ACL logisticBoss	2021-03-04 08:09:54 +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
Carlos Jimenez Ruiz	1a203d9c3f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2823-e2e_travel_create	2021-03-03 13:37:41 +01:00
Carlos Jimenez Ruiz	be82152e6f	Merge pull request '2595 - Added invoiceIn module' (#545) from 2595-invoiceIn-index into dev ... Reviewed-on: #545 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-03 11:47:38 +00: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	812a363cfe	removed package-lock	2021-03-03 10:47:19 +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
Carlos Jimenez Ruiz	1e6292ed13	e2e path for travel.create	2021-03-02 16:43:45 +01:00
Carlos Jimenez Ruiz	0d17336220	added salix.module to production dump (starred)	2021-03-02 16:43:33 +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