9699 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	e39758ee16	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-05-14 12:46:54 +02:00
Joan Sanchez	a70b29f9bf	#2916 - HOTFIX: Grouping selection limit	2021-05-14 12:44:23 +02:00
Joan Sanchez	54dd545525	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-14 11:42:13 +02:00
Carlos Jimenez Ruiz	2b83abeefd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor	2021-05-14 10:13:02 +02:00
Joan Sanchez	c4357ea577	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-05-13 12:27:01 +02:00
Joan Sanchez	e6f7ef41b0	Hotfix: Catalog items without ink	2021-05-13 12:21:12 +02:00
Joan Sanchez	ac02f8b309	Ticket request hotfix	2021-05-13 12:18:21 +02:00
Joan Sanchez	24981912e4	2907 - Proper claim rate percentage	2021-05-13 12:13:15 +02:00
Carlos Jimenez Ruiz	c8174fd132	Merge pull request '2905- Restore ticket with shipped and landed' (#621) from 2905-restore_ticket_date into dev ... Reviewed-on: #621 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-05-13 08:29:14 +00:00
Joan Sanchez	6fdb91fdc8	Removed line	2021-05-13 10:20:22 +02:00
Carlos Jimenez Ruiz	95666ccc1d	Merge branch 'dev' into 2905-restore_ticket_date	2021-05-13 07:44:01 +00:00
Carlos Jimenez Ruiz	e9ac0c1a74	Merge pull request '2907 - Proper claim rate percentage' (#622) from 2907-claim_rate_percentage into dev ... Reviewed-on: #622 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-05-13 07:43:34 +00:00
Joan Sanchez	4a1d286a95	2907 - Proper claim rate percentage	2021-05-13 09:17:49 +02:00
Joan Sanchez	af49a66911	Unit test fix	2021-05-13 08:57:49 +02:00
Joan Sanchez	e6e91ced99	2905 - Restore ticket shipped and landed	2021-05-13 08:56:26 +02:00
Joan Sanchez	fc00e759c2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-12 15:11:18 +02:00
Joan Sanchez	8af66a7ca5	HOTFIX: Sort by column	2021-05-12 15:11:07 +02:00
Joan Sanchez	c4537b0562	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-12 14:47:16 +02:00
Joan Sanchez	7e4b540af1	Updated company address	2021-05-12 14:47:00 +02:00
Joan Sanchez	d9a57cf9da	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-12 14:22:47 +02:00
Joan Sanchez	b3cbf9374c	Hotfix: Catalog items without ink	2021-05-12 14:22:29 +02:00
Joan Sanchez	6a3cb7f724	Added new version	2021-05-12 14:17:28 +02:00
Joan Sanchez	16bcbad26c	Merge pull request '2863 - Added monitor module' (#618) from 2863-monitor_module into dev ... Reviewed-on: #618 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-05-12 12:09:31 +00:00
Joan Sanchez	9363726d67	Updated unit test	2021-05-12 13:37:01 +02:00
Joan Sanchez	873fc54dff	More ammends	2021-05-12 13:18:58 +02:00
Joan Sanchez	65f0cb4612	More ammends	2021-05-12 13:14:41 +02:00
Joan Sanchez	6f5df10413	Removed controller	2021-05-12 13:06:36 +02:00
Joan Sanchez	eecba426ee	Removed unused class	2021-05-12 13:00:54 +02:00
Joan Sanchez	b828609d33	Ammends	2021-05-12 12:39:45 +02:00
Joan Sanchez	2e7d56cc26	Test fixes	2021-05-12 12:11:27 +02:00
Carlos Jimenez Ruiz	83d6581349	indentation correction	2021-05-12 09:52:04 +02:00
Carlos Jimenez Ruiz	457d23dc16	reoute tickets order columns + endpoint refactor	2021-05-12 09:51:32 +02:00
Joan Sanchez	e22da9b0d5	Merge branch 'dev' into 2863-monitor_module	2021-05-12 07:14:08 +00:00
Joan Sanchez	88616862cb	Updated unit tests	2021-05-12 09:12:46 +02:00
Carlos Jimenez Ruiz	d4eedc69e1	indentation on route filter	2021-05-11 12:53:08 +02:00
Joan Sanchez	ee596b07f1	Merge pull request 'cambio landed por created' (#620) from 2902-error-getSuggestedTickets into dev ... Reviewed-on: #620 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-05-11 09:57:39 +00:00
Joan Sanchez	6ae8b72268	Merge branch 'dev' into 2902-error-getSuggestedTickets	2021-05-11 09:52:42 +00:00
Joan Sanchez	d2169000f4	Merge branch 'dev' into 2863-monitor_module	2021-05-11 07:46:18 +00:00
Joan Sanchez	dc44af148d	2863 - Added sales monitor	2021-05-11 09:43:15 +02:00
Javi Gallego	e384dd4a7a	Merge pull request 'routes without vehicle or vehicles without drop off now throw' (#619) from 2896-route_tickets_refactor into dev ... Reviewed-on: #619 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2021-05-10 08:49:17 +00:00
Carlos Jimenez Ruiz	ac917b6115	mino changes on translations	2021-05-10 10:46:17 +02:00
Carlos Jimenez Ruiz	58447c8168	transaltion changes	2021-05-10 10:39:51 +02:00
Carlos Jimenez Ruiz	657896bce0	increased section width	2021-05-10 10:32:00 +02:00
Carlos Jimenez Ruiz	9883270dff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor	2021-05-10 09:09:53 +02:00
Javi Gallego	84cd89d7f7	modifica la descripcion de la compensacion	2021-05-07 08:45:20 +02:00
Javi Gallego	19b35f5f6c	landed en lugar de shipped	2021-05-07 07:52:03 +02:00
Javi Gallego	f1c30ca6d1	cambio landed por created	2021-05-06 08:13:17 +02:00
Joan Sanchez	e37b3d8277	Merge pull request 'instructions added to sepa core report' (#617) from 2884-add_instructions_sepa_core into dev ... Reviewed-on: #617 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-05-05 11:42:32 +00:00
Carlos Jimenez Ruiz	245243aa14	routes without vehicle or vehicles without drop off now throw	2021-05-05 13:36:54 +02:00
Joan Sanchez	db148c8177	2863 - Added monitor module	2021-05-04 12:44:21 +02:00