9398 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
Joan Sanchez	f3373ce98c	Merge pull request '2585-pinned_module_icons' (#560) from 2585-pinned_module_icons into dev ... Reviewed-on: #560 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-02 09:38:31 +00:00
Carlos Jimenez Ruiz	97667595e5	removed unused ACL and fixed typos	2021-03-02 10:33:35 +01:00
Carlos Jimenez Ruiz	177ed24892	css amends and sql fixtures for production	2021-03-02 09:58:17 +01:00
Carlos Jimenez Ruiz	fe7017f83c	final amends on tests and model descriptions	2021-03-01 22:21:04 +01:00
Carlos Jimenez Ruiz	021601fb26	re-generated package-lock due to npm error	2021-03-01 19:55:48 +01:00
Carlos Jimenez Ruiz	d6e440751b	e2e path for starred modules	2021-03-01 17:43:34 +01:00
Carlos Jimenez Ruiz	5d528ff768	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2585-pinned_module_icons	2021-03-01 16:14:23 +01:00
Carlos Jimenez Ruiz	cd084a53e5	styling update + acls	2021-03-01 16:13:47 +01:00
Joan Sanchez	97b06a48f6	Merge pull request '2786-get_tags_from_item' (#559) from 2786-get_tags_from_item into dev ... Reviewed-on: #559 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-01 12:17:00 +00:00
Carlos Jimenez Ruiz	bebaef7879	sql changes moved to correct folder	2021-03-01 13:07:23 +01:00
Carlos Jimenez Ruiz	0299becbfa	css adjusted for the pin icon	2021-03-01 12:41:23 +01:00
Carlos Jimenez Ruiz	23cc4bbfeb	starred modules working pre-e2e and css amends	2021-03-01 12:15:13 +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
Joan Sanchez	1e36b460a1	Added invoice incoterms report	2021-03-01 11:25:37 +01:00