467 Commits

Author	SHA1	Message	Date
Joan Sanchez	dc44af148d	2863 - Added sales monitor	2021-05-11 09:43:15 +02:00
Joan Sanchez	fcc8ab4236	Added model ACL	2021-04-30 10:08:40 +02:00
Joan Sanchez	330b6bdf8a	2770 - Added supplier addresses section	2021-04-29 14:41:10 +02:00
Joan Sanchez	e952e995cb	Merge branch 'dev' into 2893-show-expedition.externalId	2021-04-26 11:52:42 +00:00
Joan Sanchez	5ad0f15720	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-04-26 13:41:05 +02:00
Joan Sanchez	1c52bd1618	SQL fixes	2021-04-26 13:40:52 +02:00
Javi Gallego	9ee1385cd1	test ok	2021-04-26 12:33:33 +02:00
Joan Sanchez	42957f9ace	Added new SQL version	2021-04-26 11:12:13 +02:00
Javi	f7fa363fa5	Merge branch 'dev' into 2873-create-supplier-beneficiary	2021-04-16 18:32:00 +02:00
Joan Sanchez	65dc0e3780	2615 - Waste breakdown	2021-04-06 13:46:38 +02:00
Javi Gallego	63ec7677c6	test ok	2021-04-01 18:43:28 +02:00
Javi Gallego	67f822ebdc	Merge branch 'dev' into 2873-create-supplier-beneficiary	2021-04-01 13:14:26 +02:00
Joan Sanchez	5712f1c43b	Changes	2021-04-01 13:12:02 +02:00
Joan Sanchez	41ee6e70a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail	2021-04-01 08:42:02 +02:00
Javi Gallego	c036c7c7fe	model ok	2021-03-31 07:33:00 +02:00
Joan Sanchez	d9834ae740	Removed old versions	2021-03-30 14:02:15 +02:00
Joan Sanchez	4aa616601e	2615 - Waste changes	2021-03-30 10:28:44 +02:00
Joan Sanchez	14f0cbaf42	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-24 11:06:15 +01:00
Joan Sanchez	53ae45d4c8	Deleted old .keep file	2021-03-24 11:05:41 +01:00
Joan Sanchez	c6ee58a278	Added new changes version	2021-03-24 11:05:05 +01:00
Joan Sanchez	a2165b6bfc	Updated E2E	2021-03-16 13:59:39 +01:00
jorgebl	32ea2dbda6	Added permisions from models in table salix ACL	2021-03-08 12:32:35 +01:00
Joan Sanchez	85920e5c07	Added new SQL version	2021-03-05 17:11:04 +01:00
jorgebl	4a22cd5f85	db changes and acl for logistic boss on section item-botanical	2021-03-04 20:09:35 +01:00
jorgebl	08cb69330a	ACL logisticBoss	2021-03-04 08:09:54 +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
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	cd084a53e5	styling update + acls	2021-03-01 16:13:47 +01:00
Carlos Jimenez Ruiz	bebaef7879	sql changes moved to correct folder	2021-03-01 13:07:23 +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
Carlos Jimenez Ruiz	3dff5f06ff	starred modules front and backend 1st steps	2021-02-26 09:08:31 +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	a2ad1887a4	ACL bug fixed + package lock updated	2021-02-12 15:20:30 +01:00
Jorge Padawan	86580727e5	Requested changes resolved	2021-02-12 11:47:53 +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	c270ec6207	Contextmenu fixes	2021-02-11 15:06:41 +01:00
Joan Sanchez	84c82ed32d	2595 - Added invoiceIn module	2021-02-10 15:03:11 +01:00
Jorge Padawan	2cf37a9e96	Added permissions to role administrative	2021-02-10 09:10:15 +01:00
Carlos Jimenez Ruiz	83ed70abda	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2722-item_log_highlighted_by_clientType	2021-02-09 10:43:26 +01:00
Carlos Jimenez Ruiz	3d948ef317	warning color added lines with clientType loses	2021-02-09 10:43:19 +01:00
Carlos Jimenez Ruiz	a62bebd51e	minor refactor	2021-02-08 10:14:41 +01:00
Carlos Jimenez Ruiz	76d6e2d4b7	worker added to supplier basic data and summary	2021-02-05 15:26:49 +01:00
Joan Sanchez	ea1066d664	Added changes version 10281	2021-02-02 14:08:12 +01:00
Joan Sanchez	4ac207c568	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2763-notify_urgent_issue	2021-02-01 12:58:50 +01:00
Joan Sanchez	f5f4c5936d	2763 - Notify urgen issues	2021-02-01 09:29:47 +01:00
Carlos Jimenez Ruiz	c442eaa0c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-01-29 09:13:58 +01:00
Joan Sanchez	ca47fe6827	2476 - downloadImages() method refactor	2021-01-28 12:23:18 +01:00
Bernat Exposito	01c96272bd	export production	2021-01-26 10:55:30 +01:00
Javi Gallego	d61ab94398	acl conflicto	2021-01-25 07:49:57 +01:00