549 Commits

Author	SHA1	Message	Date
Joan Sanchez	3dd8ff5194	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-05 08:28:32 +01:00
Joan Sanchez	5bd7e4a67f	Translation fix	2021-02-05 08:05:57 +01:00
Carlos Jimenez Ruiz	532cb582cf	columns moved and no refresh on stateState changes	2021-02-03 17:01:43 +01:00
Javi Gallego	7bdfb36f25	minor refactor	2021-01-22 14:30:46 +01:00
Javi Gallego	aab9797d3f	Merge branch 'dev' into 2479-factura-ticket	2021-01-21 13:40:55 +01:00
Javi Gallego	3dc50e8a16	test ok	2021-01-21 13:39:40 +01:00
Carlos Jimenez Ruiz	01191b3f0f	excluded faling tests for future fixing	2021-01-20 14:43:20 +01:00
Javi Gallego	4cdbb85e30	primer comit	2021-01-20 13:53:49 +01:00
Carlos Jimenez Ruiz	7ec1e4272a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed	2021-01-19 20:56:40 +01:00
Joan Sanchez	dfbf114161	Merge branch 'dev' into 2708-travel_extracommunity	2021-01-19 12:10:06 +00:00
Joan Sanchez	8c8891f8e3	Requested changes	2021-01-19 13:06:10 +01:00
Carlos Jimenez Ruiz	8d6dd3e03a	minor refactors	2021-01-18 14:17:01 +01:00
Joan Sanchez	e5b13267e2	2605 - Ticket request send chat notification	2021-01-05 15:03:35 +01:00
Carlos Jimenez Ruiz	4e7d64e5ca	re-enabled working unit test	2020-12-31 11:17:42 +01:00
Joan Sanchez	910caf5689	2661 - Added clone options	2020-12-28 14:53:26 +01:00
Jorge Padawan	259842c22d	Retirado el parametro required por no utilizarse	2020-12-23 13:32:58 +01:00
Joan Sanchez	42cd2356a2	Refactor v2	2020-12-18 17:23:04 +01:00
Joan Sanchez	260b502cd6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader	2020-12-10 07:30:31 +01:00
Joan Sanchez	1ba1d27ba0	2576 - Photo upload component	2020-11-27 13:10:39 +01:00
Bernat Exposito	78f25e0b46	export production	2020-11-25 12:37:44 +01:00
Joan Sanchez	9f5ba5bb85	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-18 10:44:00 +01:00
Joan Sanchez	ac5f30924a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-18 08:20:46 +01:00
Joan Sanchez	0fc01b2316	1419 - Claim update discount hotfix	2020-11-18 08:16:37 +01:00
Bernat Exposito	2454999938	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-12 08:14:55 +01:00
Bernat Exposito	44d3cf748b	change id in ticketLastState model	2020-11-10 11:44:41 +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	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
Javi Gallego	a472ce9a81	Merge branch 'dev' into 2510-client-address-create-test	2020-10-30 17:24:20 +01:00
Javi Gallego	b50ae7b8ca	testback arreglados	2020-10-30 15:50:59 +01:00
Carlos Jimenez Ruiz	28ec55b440	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2482-fix_worker_timeControl_e2e	2020-10-30 10:46:05 +01:00
Carlos Jimenez Ruiz	2f6b3f0c38	small refactors for #2512	2020-10-30 10:45:55 +01:00
Javi Gallego	31b5a140d4	test completados	2020-10-30 10:07:53 +01:00
Javi Gallego	3fdc9c315d	Merge branch 'dev' into 2510-client-address-create-test	2020-10-30 08:40:47 +01:00
Bernat Exposito Domenech	42d16d0258	ticket component refactor	2020-10-29 11:09:58 +01:00
Joan Sanchez	3779a7c7a5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-10-22 13:00:48 +02:00
Joan Sanchez	f87a7664e5	Added loggable utils	2020-10-22 11:24:53 +02:00
Joan Sanchez	fc9b9eb718	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-10-22 07:49:04 +02:00
Joan Sanchez	d3532608e1	Changed oldValue	2020-10-21 14:05:14 +02:00
Joan Sanchez	628154b7e8	Trigger jenkins	2020-10-21 13:40:54 +02:00
Joan Sanchez	c87783b446	2528 - Rocket notifications hotfix	2020-10-21 13:25:52 +02:00
Javi Gallego	ef7a886d86	Merge branch 'dev' into 2510-client-address-create-test	2020-10-21 10:13:04 +02:00
Joan Sanchez	3730bf86cc	Updated destinatary	2020-10-20 16:05:05 +02:00
Joan Sanchez	86d3e2d689	Changed message destinatary	2020-10-20 16:03:07 +02:00
Joan Sanchez	611e1a3802	Updated unit test	2020-10-20 15:13:12 +02:00
Joan Sanchez	f7e9372bf0	2525 - Change to past date	2020-10-20 15:12:00 +02:00
Joan Sanchez	ffcb3629c5	Updated unit test	2020-10-20 15:01:02 +02:00
Joan Sanchez	7d0790684b	2525 - Change to past date	2020-10-20 14:54:23 +02:00
Javi Gallego	4aea284703	WIP: a falta de e2e	2020-10-20 14:42:23 +02: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	64b65d204a	excluded confirm with no easy fix for pollution	2020-10-14 11:16:23 +02:00
Carlos Jimenez Ruiz	b6b84cfea7	more tests fixed + small refactors	2020-10-08 16:00:19 +02:00
Joan Sanchez	355f95ae40	2473 - Added ticket restore option	2020-10-08 13:42:20 +02:00
Joan Sanchez	eceb33cce0	2473 - Added restore method	2020-10-07 11:00:26 +02:00
Carlos Jimenez Ruiz	89fb980f14	some tests fixed	2020-10-06 10:15:27 +02:00
Carlos Jimenez Ruiz	27d2c59358	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-05 16:09:30 +02:00
Javi Gallego	0294d2a845	Merge branch 'dev' into 2443	2020-10-05 09:07:00 +02:00
Bernat Exposito Domenech	161313ad15	refactor getComponentSum	2020-10-02 13:58:48 +02:00
Carlos Jimenez Ruiz	ff3b75267a	priceDifference test fix + refactor	2020-10-02 09:39:58 +02:00
Javi Gallego	2714857227	Merge branch 'dev' into 2443	2020-09-30 14:07:38 +02:00
Carlos Jimenez Ruiz	1e55632b94	refactor & fix regularize claim and prices Diff	2020-09-29 13:28:02 +02:00
Carlos Jimenez Ruiz	40abd68734	fix byWarehouse and ticket.filter tests	2020-09-29 13:11:11 +02:00
Carlos Jimenez Ruiz	6afee4924c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2457-fix_regularizeClaim_unit_test	2020-09-29 08:44:33 +02:00
Joan Sanchez	a1349de32d	Merge branch 'dev' into 2381-mariaDB	2020-09-28 06:18:53 +00:00
Joan Sanchez	3e2f85dbd2	Merge branch 'dev' into 2458-ticket_index_pending	2020-09-28 06:13:39 +00:00
Joan Sanchez	0438171a47	Merge branch 'dev' into 2381-mariaDB	2020-09-28 06:09:48 +00:00
Bernat Exposito Domenech	790c9bfe6f	update models and fixtures	2020-09-25 14:50:04 +02:00
Javi Gallego	c909470f41	merge	2020-09-25 08:10:37 +02:00
Joan Sanchez	f1d36df558	#2458 - Removed states from pending tickets	2020-09-24 15:00:00 +02:00
Joan Sanchez	de3c7acb08	Merge branch 'dev' into 2381-mariaDB	2020-09-24 12:30:44 +00:00
Carlos Jimenez Ruiz	87e4765a1c	fixed ticket-weekly backend unit test	2020-09-22 16:53:47 +02:00
Joan Sanchez	89667a18c9	Handle ticket without old state	2020-09-22 07:50:30 +02:00
Juan Ferrer	6abd707a6d	Tests fixed	2020-09-21 19:16:51 +02:00
Juan Ferrer	3880e21ce3	Test fixes	2020-09-21 16:09:34 +02:00
Javi Gallego	8fb674819a	ticket service	2020-09-21 10:35:39 +02:00
Javi Gallego	1b13e58e10	item basic-data añadir isFragile	2020-09-17 09:58:00 +02:00
Carlos Jimenez Ruiz	bde6c4495d	e2e path updated + 2 new tasks for broken tests	2020-09-16 16:10:43 +02:00
Carlos Jimenez Ruiz	5b69ce983c	salesPersonUser replaces salesPerson relation	2020-09-15 19:43:07 +02:00
Carlos Jimenez Ruiz	13a5c4c4c9	test enhanced	2020-09-14 13:58:42 +02:00
Carlos Jimenez Ruiz	0b4c53a655	added invoiceOut descriptor	2020-09-14 13:11:53 +02:00
Bernat Exposito Domenech	0cf99a5a83	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production	2020-09-10 11:34:35 +02:00
Bernat Exposito Domenech	348412c5db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-09 15:50:06 +02:00
Bernat Exposito Domenech	d4b6d7cd96	cr changes	2020-09-09 15:49:59 +02:00
Bernat Exposito Domenech	9ff7232b50	export production and fix test	2020-09-09 12:54:10 +02:00
Bernat Exposito Domenech	5bb8aacfb0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-09 11:12:18 +02:00
Joan Sanchez	d0ac1b621c	Merge branch 'dev' into 2385-worker_descriptor_refactor	2020-09-09 09:06:11 +00:00
Bernat Exposito Domenech	f99fb69d48	front and back test	2020-09-09 08:20:27 +02:00
Joan Sanchez	db081501eb	2440 - Ticket filter hotfix	2020-09-09 08:14:17 +02:00
Bernat Exposito Domenech	d79cffb2c3	back test for getComponentsSum	2020-09-08 08:13:54 +02:00
Bernat Exposito Domenech	174cea7bc3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-08 07:17:23 +02:00
Bernat Exposito Domenech	92e14d5292	update getComponentSum	2020-09-08 07:17:16 +02:00
Joan Sanchez	b848fa52f2	2385 - Replaced worker nickname	2020-09-03 15:11:16 +02:00
Javi Gallego	b4952002a3	Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk	2020-09-01 06:49:09 +00:00
Joan Sanchez	6297d09de2	Updated syntax	2020-08-31 12:14:39 +02:00
Joan Sanchez	baf9ec6e70	2416 - Item request - Added state filter	2020-08-31 08:32:30 +02:00
Javi Gallego	8b26c41b7f	campo packageFk	2020-08-28 17:06:27 +02:00
Joan Sanchez	4d8a84e774	Fixed back unit tests	2020-08-20 08:45:03 +02:00
Joan Sanchez	f13c47ce6d	Ticket problems filter fix	2020-08-17 14:31:26 +02:00
Bernat Exposito Domenech	0d689a8c01	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-08-13 10:43:25 +02:00
Joan Sanchez	88c5b6f8a6	Changed ticket problems min date	2020-08-13 08:23:55 +02:00
Carlos Jimenez Ruiz	9402f368f6	ticket index and zone descriptor refactor	2020-07-30 12:51:19 +02:00
Bernat Exposito Domenech	b972353bb4	create method getComponentSum	2020-07-21 11:11:09 +02:00
Bernat Exposito Domenech	064b950773	export production	2020-07-16 12:10:18 +02:00
Bernat Exposito Domenech	f7100f11ee	first step add right menu in ticket components	2020-07-16 07:43:07 +02:00
Joan Sanchez	6aca80b075	Merge branch 'dev' into 2338-ticket_weekly	2020-07-07 12:34:04 +00:00
Joan Sanchez	53d672152b	Merge branch 'dev' into 2343-exportar_produccion	2020-07-07 06:19:12 +00:00
Carlos Jimenez Ruiz	c801d8a969	Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor	2020-07-01 14:45:53 +02:00
Carlos Jimenez Ruiz	354123dc86	e2e toolkit 2.0 + refactors	2020-07-01 14:45:48 +02:00
Joan Sanchez	b40e09a6cb	Methods refactor & updated back unit tests	2020-07-01 14:28:05 +02:00
Joan Sanchez	0a327087ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor	2020-07-01 11:57:16 +02:00
Javi Gallego	039eec7d26	test excepto fallo e2e	2020-06-30 10:16:22 +02:00
Javi Gallego	db06626675	refactor	2020-06-29 14:26:27 +02:00
Bernat Exposito Domenech	faee28cb01	fix bugs in ticket weekly	2020-06-29 09:35:18 +02:00
Bernat Exposito Domenech	ea1eb16060	export structure	2020-06-29 07:32:08 +02:00
Javi Gallego	962436b8bb	2344 ticket sale descuento usuario	2020-06-25 17:12:53 +02:00
Joan Sanchez	d4c78b46c1	1368 - First sale refactor	2020-06-23 13:40:49 +02:00
Carlos Jimenez Ruiz	e6a72d0f09	clean code refactor	2020-06-18 15:26:15 +02:00
Carlos Jimenez Ruiz	4d97357213	update estate without model.refresh()	2020-06-18 13:50:52 +02:00
Carlos Jimenez Ruiz	edea60dd94	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note	2020-06-17 15:38:49 +02:00
Carlos Jimenez Ruiz	2abd45f498	setDelivered and open delivery notes and tests	2020-06-17 15:38:37 +02:00
Joan Sanchez	fd97845979	Revert "Removed sms excluded tests" ... This reverts commit 30912bd5e9.	2020-06-17 14:00:04 +02:00
Joan Sanchez	30912bd5e9	Removed sms excluded tests	2020-06-16 15:11:24 +02:00
Joan Sanchez	dddfe2773a	2293 - getVolume() call to saleVolume	2020-06-12 11:26:32 +02:00
Carlos Jimenez Ruiz	538ae75b89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2283_e2e_delete_ticket_with_stowaway	2020-06-10 16:24:17 +02:00
Joan Sanchez	5edfc59d97	Updated unit test	2020-06-10 13:57:32 +02:00
Joan Sanchez	461fec7e64	Updated unit test	2020-06-10 13:57:08 +02:00
Carlos Jimenez Ruiz	4b1e79a433	2314 server side unit test fixed	2020-06-10 13:50:03 +02:00
Joan Sanchez	3cfb8b4730	2323 - Filter by myTeam fix	2020-06-10 12:13:07 +02:00
Joan Sanchez	1fed4c7913	Contextmenu fixes	2020-06-09 12:16:40 +02:00
Carlos Jimenez Ruiz	d8593ea3e0	Merge pull request '2176-contextmenu' (#302) from 2176-contextmenu into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-06-08 12:59:59 +00:00
Joan Sanchez	ba9a44dec1	Updated back unit test	2020-06-08 13:06:33 +02:00
Joan Sanchez	ab1e8fb622	2176 First working version	2020-06-08 12:14:27 +02:00
Joan Sanchez	181f2f0148	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu	2020-06-08 08:19:18 +02:00
Javi Gallego	faa053a3d2	Merge branch 'dev' into 2035-el-parametro-vShowExpiredZones	2020-06-05 10:01:52 +02:00
Javi Gallego	b40be5cca9	2035	2020-06-05 10:01:21 +02:00
Bernat Exposito Domenech	a81862baad	set deleteded skiped	2020-06-05 08:29:51 +02:00
Bernat Exposito Domenech	f340466daf	fix test 2296	2020-06-04 14:23:48 +02:00
Joan Sanchez	94dcf7679b	Merge pull request '2265-item_request_filters' (#289) from 2265-item_request_filters into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-06-03 10:54:41 +00:00
Joan Sanchez	613937dc8d	Fixed order	2020-06-03 12:21:03 +02:00
Joan Sanchez	18edd523d2	Excluded failing test	2020-06-03 11:40:18 +02:00
Joan Sanchez	b7ceeae65a	Excluded back unit tests. TLS error	2020-06-03 11:27:14 +02:00
Joan Sanchez	751f79373a	Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 09:28:14 +00:00
Bernat Exposito	fac64c45c0	Merge pull request 'zone delete' (#285) from 2244-zone_descriptor into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 09:18:24 +00:00
Bernat Exposito Domenech	aac47e52e9	update log	2020-06-02 11:15:07 +02:00
Joan Sanchez	a0767a6ea2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters	2020-06-02 10:56:40 +02:00
Joan Sanchez	1e4f36b775	Updated back unit test	2020-06-02 09:34:42 +02:00
Bernat Exposito Domenech	546272cc3f	zone delete	2020-06-02 08:59:04 +02:00
Joan Sanchez	052c51cee5	2282 - Change stowaway state to FIXING	2020-06-01 12:47:04 +02:00