9936 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Padawan	69e8dfc334	Merge branch '2692-add_advanced_search_engine2' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-01-28 16:10:23 +01:00
Joan Sanchez	7bcbf5303e	Fix where	2021-01-28 16:08:57 +01:00
Joan Sanchez	ade2d9f4a2	Removed catch	2021-01-28 16:01:49 +01:00
Joan Sanchez	9d5d2e9177	Added method prune again	2021-01-28 15:57:33 +01:00
Carlos Jimenez Ruiz	4ab42e5850	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2580-fetched_tags_refactor	2021-01-28 15:10:54 +01:00
Carlos Jimenez Ruiz	5c466e1163	vn-fetched-tags visual refactor	2021-01-28 15:10:47 +01:00
Jorge Padawan	797f96f4c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-01-28 14:14:22 +01:00
Jorge Padawan	bef8fca529	Rework the test on main section	2021-01-28 14:14:14 +01:00
Joan Sanchez	ca47fe6827	2476 - downloadImages() method refactor	2021-01-28 12:23:18 +01:00
Javi Gallego	4b302915b5	fallo validateasync	2021-01-27 09:14:37 +01:00
Joan Sanchez	7b85b968f2	Merge pull request 'fix test updateVolume' (#525) from 2735-test_route_updateVolume into dev ... Reviewed-on: #525 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-01-27 06:25:12 +00:00
Joan Sanchez	e86deee03c	Merge branch 'dev' into 2735-test_route_updateVolume	2021-01-27 06:10:21 +00:00
Joan Sanchez	30e8d7291e	Merge pull request 'export production' (#526) from 2756-export_production into dev ... Reviewed-on: #526 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-01-27 06:08:25 +00:00
Bernat Exposito	01c96272bd	export production	2021-01-26 10:55:30 +01:00
Bernat Exposito	df073094f8	fix test updateVolume	2021-01-26 09:07:00 +01:00
Joan Sanchez	8c71d76988	2752 - Import json file	2021-01-26 07:21:05 +01:00
Carlos Jimenez Ruiz	b7765a7162	Merge branch '2517-clientBalanceCompensaciones' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-01-25 15:28:10 +01:00
Carlos Jimenez Ruiz	22af1ce989	e2e first steps for balance compensations	2021-01-25 15:27:57 +01:00
Javi Gallego	3026ca8d69	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-25 14:16:41 +01:00
Jorge Padawan	2b4f4cf8f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2723-Format_emails_for_summaries	2021-01-25 11:04:45 +01:00
Jorge Padawan	6d9967ba9f	Add list of emails from client	2021-01-25 10:59:24 +01:00
Carlos Jimenez Ruiz	de94d62f2e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones	2021-01-25 10:56:50 +01:00
Joan Sanchez	5e0f594234	Merge pull request '2745-ticket_descriptor_regenerate_invoice_e2e' (#522) from 2745-ticket_descriptor_regenerate_invoice_e2e into dev ... Reviewed-on: #522 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-01-25 09:54:34 +00:00
Carlos Jimenez Ruiz	3f12bfe8ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2745-ticket_descriptor_regenerate_invoice_e2e	2021-01-25 09:28:07 +01:00
Carlos Jimenez Ruiz	fb798f4300	regenerate invoice added to descriptor path	2021-01-25 09:28:01 +01:00
Joan Sanchez	54a2ea31fa	#2753 - Don't apply description text to autocomplete	2021-01-25 09:21:27 +01:00
Javi Gallego	d61ab94398	acl conflicto	2021-01-25 07:49:57 +01:00
Joan Sanchez	7bd89009cb	Requested changes	2021-01-25 07:26:35 +01:00
Joan Sanchez	257b61d256	Requested changes	2021-01-25 07:25:02 +01:00
Javi Gallego	e48f4cb417	Merge pull request '2479-factura-ticket' (#521) from 2479-factura-ticket into dev ... Reviewed-on: #521 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-01-22 15:15:46 +00:00
Joan Sanchez	a6e4d68017	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-22 15:05:39 +00:00
Javi Gallego	16931693c7	slice error	2021-01-22 15:46:03 +01:00
Javi Gallego	93417e9676	refactor	2021-01-22 14:45:02 +01:00
Javi Gallego	161514582d	movido de directorio	2021-01-22 14:41:40 +01:00
Javi Gallego	e1711af265	sin keep	2021-01-22 14:32:35 +01:00
Javi Gallego	228a642634	Merge branch 'dev' into 2479-factura-ticket	2021-01-22 14:31:28 +01:00
Javi Gallego	7bdfb36f25	minor refactor	2021-01-22 14:30:46 +01:00
Joan Sanchez	4d1c2ff8ee	Requested changed	2021-01-22 12:57:21 +01:00
Joan Sanchez	d26505d25e	Requested changed	2021-01-22 12:56:46 +01:00
Joan Sanchez	51d1a826a5	Merge pull request '2677 - Added rating component to order catalog' (#520) from 2677-rating_component into dev ... Reviewed-on: #520 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-22 11:41:42 +00:00
Carlos Jimenez Ruiz	9a349e789c	added missin icon property to fixedPrice route	2021-01-22 12:15:03 +01:00
Carlos Jimenez Ruiz	293dbb3948	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2677-rating_component	2021-01-22 12:14:19 +01:00
Carlos Jimenez Ruiz	5ea222dc00	fixed translations	2021-01-22 12:02:03 +01:00
Carlos Jimenez Ruiz	c3ac7b671f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2	2021-01-22 11:32:35 +01:00
Carlos Jimenez Ruiz	c4f673e089	relocated sql code	2021-01-22 11:28:47 +01:00
Carlos Jimenez Ruiz	4bf6051e73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section	2021-01-22 10:19:39 +01:00
Joan Sanchez	ad7be8f9b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-01-22 07:27:51 +01:00
Joan Sanchez	1c7325c1c0	2739 - Invoice fix	2021-01-22 07:26:29 +01:00
Bernat Exposito	030c87217a	Merge pull request 'order index changes' (#517) from 2717-order_index into dev ... Reviewed-on: #517 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-01-21 20:21:25 +00:00
Bernat Exposito	b25ef7016a	cr changes	2021-01-21 18:42:40 +01:00