9779 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Carlos Jimenez Ruiz	c12a2ceec9	instructions added to sepa core report	2021-05-04 11:53:47 +02:00
Joan Sanchez	deeb306b1a	Merge pull request '2469-e2e_account_module' (#616) from 2469-e2e_n_refactor_account_module into dev ... Reviewed-on: #616 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-05-03 12:15:56 +00:00
Carlos Jimenez Ruiz	b483d09a2f	Merge branch 'dev' into 2469-e2e_n_refactor_account_module	2021-05-03 12:11:00 +00:00
Carlos Jimenez Ruiz	7c47b85567	Merge pull request '2727 - Send consumption report to an email address' (#615) from 2727-supplier_consumption into dev ... Reviewed-on: #615 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-05-03 12:10:00 +00:00
Joan Sanchez	1efe8cb683	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2727-supplier_consumption	2021-05-03 14:03:41 +02:00
Carlos Jimenez Ruiz	e9636b837b	Merge pull request '2770 - Added supplier addresses section' (#614) from 2770-supplier_address into dev ... Reviewed-on: #614 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-05-03 12:01:12 +00:00
Carlos Jimenez Ruiz	47e36913a1	Merge branch 'dev' into 2770-supplier_address	2021-05-03 11:55:55 +00:00
Carlos Jimenez Ruiz	d16a39b180	e2e path for supplier address	2021-05-03 13:31:43 +02:00
Joan Sanchez	8f3d2d892d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-05-03 12:13:20 +02:00
Joan Sanchez	03e77685a1	SMS hotfix	2021-05-03 12:09:12 +02:00
Carlos Jimenez Ruiz	02c2588e78	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2469-e2e_n_refactor_account_module	2021-05-03 08:01:37 +02:00
Carlos Jimenez Ruiz	8a8c2fa39f	e2e partially working for account module	2021-05-03 08:01:29 +02:00
Joan Sanchez	3ed6e65f33	Style fixes to osticket report	2021-05-03 07:31:06 +02:00
Joan Sanchez	4d90006aa6	Updated unit test	2021-04-30 14:27:50 +02:00
Joan Sanchez	07dbeaf515	2727 - Send consumption report to an email address	2021-04-30 13:50:41 +02:00
Joan Sanchez	fcc8ab4236	Added model ACL	2021-04-30 10:08:40 +02:00
Joan Sanchez	dbe22844a6	Removed unused method	2021-04-30 09:53:20 +02:00
Joan Sanchez	29b5cac351	Fixtures for supplier 442	2021-04-30 09:48:28 +02:00
Joan Sanchez	d77e06a5a0	Changed city name	2021-04-30 08:30:21 +02:00
Joan Sanchez	5445764043	Added supplier address fixtures	2021-04-30 08:26:05 +02:00