8222 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	dc7c541b1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2509-add_geolocation	2020-10-19 11:24:47 +02:00
Joan Sanchez	f3dc6934f0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-10-19 08:23:40 +02:00
Joan Sanchez	2842b66cbd	Delivery note signature hotfix	2020-10-19 08:10:32 +02:00
Carlos Jimenez Ruiz	cc99c1e980	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2509-add_geolocation	2020-10-16 13:04:58 +02:00
Bernat Exposito	c14e13a2e6	Merge pull request '2488-jasmine_true_random' (#403) from 2488-jasmine_true_random into dev ... Reviewed-on: #403 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-10-16 10:39:40 +00:00
Carlos Jimenez Ruiz	b96007aa62	fixed login/out problems at random + others	2020-10-16 11:16:24 +02:00
Carlos Jimenez Ruiz	c622175192	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-15 18:57:33 +02:00
Carlos Jimenez Ruiz	dd6035606f	some more tests fixed + refactors	2020-10-15 18:57:27 +02:00
Carlos Jimenez Ruiz	eba892766f	Merge pull request '2497 - Groupped lines' (#415) from 2497-entry_summary_grouped into dev ... Reviewed-on: #415 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-10-15 13:08:09 +00:00
Joan Sanchez	334891cfe9	2497 - Groupped lines	2020-10-15 14:40:41 +02:00
Joan Sanchez	39ea51764b	Some fixes made	2020-10-15 13:59:28 +02:00
Bernat Exposito	0fbbe9b2ae	Merge pull request 'new module supplier, created section index and searchpanel' (#413) from 2501-supplier_index into dev ... Reviewed-on: #413 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-10-15 07:57:57 +00:00
Bernat Exposito Domenech	a5b8df2121	fix translate	2020-10-15 09:41:36 +02:00
Bernat Exposito Domenech	cc35998f62	new module supplier, created section index and searchpanel	2020-10-15 08:15:04 +02:00
Joan Sanchez	9c962cb0b4	Merge branch 'dev' into 2509-add_geolocation	2020-10-14 09:35:42 +00:00
Joan Sanchez	6fa8aae161	2509 - Added forms to create new locations	2020-10-14 11:33:42 +02:00
Carlos Jimenez Ruiz	64b65d204a	excluded confirm with no easy fix for pollution	2020-10-14 11:16:23 +02:00
Carlos Jimenez Ruiz	30d00d0f63	fix getWasteDetail test	2020-10-14 10:53:20 +02:00
Joan Sanchez	2e3402b0cd	Updated method description	2020-10-14 07:18:39 +02:00
Carlos Jimenez Ruiz	d190036944	Merge pull request '2473 - Added restore method + ese' (#408) from 2473-restore_ticket into dev ... Reviewed-on: #408 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-10-13 15:45:15 +00:00
Carlos Jimenez Ruiz	bf9f6bb1f6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-13 15:50:11 +02:00
Carlos Jimenez Ruiz	2045e35170	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2473-restore_ticket	2020-10-13 15:41:04 +02:00
Carlos Jimenez Ruiz	6a66445f94	updated path for ticked restored	2020-10-13 15:40:55 +02:00
Joan Sanchez	e48effca08	Stop container before remove	2020-10-13 12:28:58 +02:00
Carlos Jimenez Ruiz	984a91d544	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-13 11:04:23 +02:00
Carlos Jimenez Ruiz	49bdbc139d	fixed sytanx error	2020-10-13 11:04:17 +02:00
Bernat Exposito	642e2011af	Merge pull request '2471 - Renamed method backTestOnce to launchBackTest' (#409) from 2471-rename_backTestOnce into dev ... Reviewed-on: #409 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-10-13 09:01:27 +00:00
Bernat Exposito	587a94b028	Merge branch 'dev' into 2471-rename_backTestOnce	2020-10-13 08:43:40 +00:00
Bernat Exposito	f53c2b1f51	Merge pull request '2499 - Allow zero quantity' (#411) from 2499-sale_quantity_zero into dev ... Reviewed-on: #411 Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-10-13 08:42:52 +00:00
Carlos Jimenez Ruiz	c04b7a0657	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-13 10:31:06 +02:00
Joan Sanchez	bcf566ce28	Merge branch 'dev' into 2499-sale_quantity_zero	2020-10-13 08:11:56 +00:00
Joan Sanchez	f59bb07aaf	Merge pull request 'route ticket fixes' (#407) from 2452-route_tickets into dev ... Reviewed-on: #407 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-10-13 08:11:01 +00:00
Joan Sanchez	72ca310c32	Merge pull request '1447-updateClaim_refactor' (#405) from 1447-updateClaim_refactor into dev ... Reviewed-on: #405 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-10-13 08:09:50 +00:00
Joan Sanchez	7538b1c941	Merge branch 'dev' into 1447-updateClaim_refactor	2020-10-13 06:56:23 +00:00
Joan Sanchez	630e6ffac7	Merge pull request 'fix test' (#410) from 2494repair_xdescribe into dev ... Reviewed-on: #410 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-10-13 06:54:03 +00:00
Bernat Exposito Domenech	8a58017597	fix route/ticket	2020-10-13 08:50:47 +02:00
Joan Sanchez	3f8a675785	2499 - Allow zero quantity	2020-10-13 08:42:13 +02:00
Bernat Exposito Domenech	6e081df4e8	fix test	2020-10-13 08:17:00 +02:00
Carlos Jimenez Ruiz	5493c7437e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-08 16:00:35 +02:00
Carlos Jimenez Ruiz	b6b84cfea7	more tests fixed + small refactors	2020-10-08 16:00:19 +02:00
Joan Sanchez	12b623f5ee	Updated e2e	2020-10-08 14:55:37 +02:00
Joan Sanchez	498841b274	Added unit test	2020-10-08 14:22:55 +02:00
Joan Sanchez	355f95ae40	2473 - Added ticket restore option	2020-10-08 13:42:20 +02:00
Joan Sanchez	69f8687ab3	2471 - Renamed method backTestOnce to launchBackTest	2020-10-07 11:43:13 +02:00
Joan Sanchez	eceb33cce0	2473 - Added restore method	2020-10-07 11:00:26 +02:00
Bernat Exposito Domenech	e5557be3dc	route ticket fixes	2020-10-07 10:52:28 +02:00
Carlos Jimenez Ruiz	61872dec43	Merge pull request '2437 - Changed to "EN" default locale' (#406) from 2437-tests_locale_fix into dev ... Reviewed-on: #406 Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-10-07 08:25:27 +00:00
Joan Sanchez	5680e86363	2437 - Changed to "EN" default locale	2020-10-07 08:03:21 +02:00
Carlos Jimenez Ruiz	641eb93282	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-06 14:50:23 +02:00
Bernat Exposito Domenech	fcebbb68b6	delete comments	2020-10-06 14:46:58 +02:00