8591 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	5b7a646245	Merge pull request '2584 - Client consumption fixes' (#445) from 2584-client_consumption into dev ... Reviewed-on: #445 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-10 14:10:30 +00:00
Joan Sanchez	53566be56a	Merge branch 'dev' into 2584-client_consumption	2020-11-10 14:03:38 +00:00
Joan Sanchez	8b699841e7	Merge pull request '2574 Filter tag by composed color' (#443) from 2574-itemTag_refactor into dev ... Reviewed-on: #443 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-10 14:01:48 +00:00
Carlos Jimenez Ruiz	45a2a2d8e6	Merge branch 'dev' into 2584-client_consumption	2020-11-10 13:30:38 +00:00
Joan Sanchez	dfbe1a02d2	Removed unused import	2020-11-10 14:06:41 +01:00
Joan Sanchez	08af948eb0	Merge branch 'dev' into 2574-itemTag_refactor	2020-11-10 12:39:17 +00:00
Carlos Jimenez Ruiz	95dae0ab1c	e2e toBe -> toContain for message.text	2020-11-10 12:06:21 +01:00
Bernat Exposito	44d3cf748b	change id in ticketLastState model	2020-11-10 11:44:41 +01:00
Joan Sanchez	b8784688b8	e2e fix	2020-11-10 11:41:10 +01:00
Bernat Exposito	c673f2130a	fix e2e	2020-11-10 11:33:01 +01:00
Joan Sanchez	a93d9f91cc	Updated unit tests	2020-11-10 10:38:25 +01:00
Bernat Exposito	e4e4f37609	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-10 08:46:37 +01:00
Bernat Exposito	4ea5993dcc	user image	2020-11-10 08:39:34 +01:00
Carlos Jimenez Ruiz	82c739eab2	stacktrace raw + e2e amends	2020-11-09 18:25:02 +01:00
Carlos Jimenez Ruiz	282adfa7b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu	2020-11-09 16:06:29 +01:00
Carlos Jimenez Ruiz	ca27e79d42	e2e path fix for ticket sales	2020-11-09 16:06:16 +01:00
Bernat Exposito	c3b5987a1e	Merge pull request 'fixed collection tests pollution' (#446) from 2495-updateCollectionSale_test_pollution_fix into dev ... Reviewed-on: #446 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-11-09 14:06:59 +00:00
Carlos Jimenez Ruiz	54d31f15bb	fixed collection tests pollution	2020-11-09 14:53:26 +01:00
Joan Sanchez	637116b17d	Added descriptor-menu component	2020-11-09 14:52:25 +01:00
Juan Ferrer	58563edbab	Focus fixes	2020-11-07 21:05:14 +01:00
Juan Ferrer	0e2c6ed79a	Account focus fix	2020-11-07 14:05:48 +01:00
Juan Ferrer	2628faa9d0	Sync hotfixes	2020-11-06 22:55:47 +01:00
Joan Sanchez	bcd5e6ea76	2584 - Client consumption fixes	2020-11-06 08:21:25 +01:00
Javi Gallego	53f69ae8e5	Merge pull request 'stowaway test included + supplier contact refactor' (#444) from 2581-e2e_misc_fixes into dev ... Reviewed-on: #444 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-11-05 15:00:22 +00:00
Carlos Jimenez Ruiz	223c8a8528	stowaway test included + supplier contact refactor	2020-11-05 15:58:02 +01:00
Carlos Jimenez Ruiz	e72869df6b	Merge pull request 'supplier basicData + e2e' (#438) from 2544-supplier_basicData into dev ... Reviewed-on: #438 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-05 13:35:18 +00:00
Carlos Jimenez Ruiz	9b7edb0830	updated path for log records	2020-11-05 14:18:48 +01:00
Carlos Jimenez Ruiz	a4ad852390	translations refactor	2020-11-05 13:59:24 +01:00
Carlos Jimenez Ruiz	18ed685c75	e2e path for supplier basic data	2020-11-05 13:53:19 +01:00
Bernat Exposito	8765a18bbb	fix supplier routes	2020-11-05 11:46:15 +01:00
Bernat Exposito	0e3d636845	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2544-supplier_basicData	2020-11-05 10:50:21 +01:00
Bernat Exposito	2c1b89db38	Merge pull request 'waitForState minor refactor' (#442) from 2568-ticket_basic_data_e2e_fix into dev ... Reviewed-on: #442 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-11-05 09:40:45 +00:00
Carlos Jimenez Ruiz	ead0994032	timeControlCalculate procedure updated	2020-11-05 10:33:02 +01:00
Joan Sanchez	a30cfd2218	Added unit test	2020-11-05 09:21:20 +01:00
Joan Sanchez	4c88a46b63	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor	2020-11-05 09:12:25 +01:00
Carlos Jimenez Ruiz	01ccef4786	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2568-ticket_basic_data_e2e_fix	2020-11-05 09:08:35 +01:00
Carlos Jimenez Ruiz	a8e7d12e99	Merge pull request '2563-supplier_fiscalData + e2e' (#439) from 2563-supplier_fiscalData into dev ... Reviewed-on: #439 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-05 08:07:45 +00:00
Carlos Jimenez Ruiz	840da5e6bc	e2e path for supplier.fiscalData	2020-11-04 18:14:08 +01:00
Carlos Jimenez Ruiz	cd04ad8518	Merge branch '2563-supplier_fiscalData' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-04 15:21:23 +01:00
Carlos Jimenez Ruiz	07d610ad7e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-04 15:21:00 +01:00
Carlos Jimenez Ruiz	074e10d4ca	translations file was corrupted on merge fix	2020-11-04 15:20:07 +01:00
Carlos Jimenez Ruiz	c826c1ccc1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-04 15:19:07 +01:00
Joan Sanchez	c77cd696c7	Test fix	2020-11-04 14:38:15 +01:00
Joan Sanchez	b65f48f0d9	Updated unit test	2020-11-04 14:35:27 +01:00
Joan Sanchez	2a0d2f4394	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor	2020-11-04 14:34:59 +01:00
Carlos Jimenez Ruiz	47b845da46	Merge pull request '2534 - Fill sage data before enable taxDataChecked' (#432) from 2534-sage_taxDataChecked into dev ... Reviewed-on: #432 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2020-11-04 12:54:13 +00:00
Joan Sanchez	c5421ee543	Merge branch 'dev' into 2534-sage_taxDataChecked	2020-11-04 12:39:30 +00:00
Joan Sanchez	0570d83a6d	Requested changes	2020-11-04 13:38:09 +01:00
Joan Sanchez	16b774d585	Catalog tag selection	2020-11-04 13:19:43 +01:00
Joan Sanchez	2b6048ca4d	Removed comment block	2020-11-04 12:45:02 +01:00