11422 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	a32ebc37da	add supplier autonomous	2022-03-09 23:54:23 +01:00
Carlos Jimenez Ruiz	20ee9727e9	Merge pull request '3626-client_basic-data' (#883) from 3626-client_basic-data into dev ... Reviewed-on: #883 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-08 08:57:21 +00:00
Carlos Jimenez Ruiz	4fc6da5ba9	Merge branch 'dev' into 3626-client_basic-data	2022-03-08 08:53:03 +00:00
Carlos Jimenez Ruiz	9826278829	Merge pull request '3644-feat(client_descriptor): add supplier quick-link' (#892) from 3644-client_descriptor into dev ... Reviewed-on: #892 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-08 08:50:22 +00:00
Vicent Llopis	527387aad5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3626-client_basic-data	2022-03-08 08:45:40 +01:00
Alex Moreno	4e3fe180ca	feat(client_descriptor): add supplier quick-link	2022-03-07 13:25:55 +01:00
Carlos Jimenez Ruiz	76b63c8c45	Merge pull request '3676-zone_delivery-days' (#891) from 3676-zone_delivery-days into dev ... Reviewed-on: #891 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-07 10:26:04 +00:00
Alex Moreno	0359e05def	description	2022-03-07 11:22:16 +01:00
Alex Moreno	56bdb85af5	translations	2022-03-07 10:28:55 +01:00
Alex Moreno	a136d8b03d	accept array in params	2022-03-07 10:10:45 +01:00
Alex Moreno	b421038bbe	typo	2022-03-07 08:11:21 +01:00
Alex Moreno	dedbccae19	description	2022-03-07 08:07:34 +01:00
Alex Moreno	2c853a7885	test(zone): getZoneClosing() front and back	2022-03-07 08:02:59 +01:00
Alex Moreno	a658969afa	feat(zone_delivery-days): get real closing hour	2022-03-04 12:24:01 +01:00
Alex Moreno	a434d9268b	fix(zone_upcoming-deliveries): fix backgroundcolor	2022-03-04 11:48:18 +01:00
Carlos Jimenez Ruiz	9203c38234	Merge pull request '3671-supplier_account' (#889) from 3671-supplier_account into dev ... Reviewed-on: #889 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-04 08:59:36 +00:00
Carlos Jimenez Ruiz	93ab24e853	Merge branch 'dev' into 3671-supplier_account	2022-03-04 08:39:52 +00:00
Joan Sanchez	0f869e922b	Merge pull request '3669-refactor(order_search-panel): change orderFk to ticketFk' (#888) from 3669-order_search-panel into dev ... Reviewed-on: #888 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-04 08:38:58 +00:00
Alex Moreno	6748426f67	correct loopback form	2022-03-03 13:48:18 +01:00
Alex Moreno	29d63d1e4d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3671-supplier_account	2022-03-03 13:05:08 +01:00
Alex Moreno	e082d18564	change description	2022-03-03 13:03:43 +01:00
Alex Moreno	f143619777	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3669-order_search-panel	2022-03-03 13:03:13 +01:00
Carlos Jimenez Ruiz	3f9debe9f8	Merge pull request '3649-feat(claim): log section' (#890) from 3649-claim_log into dev ... Reviewed-on: #890 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-03 12:02:08 +00:00
Carlos Jimenez Ruiz	63fc58b6ba	Merge branch 'dev' into 3649-claim_log	2022-03-03 12:00:02 +00:00
Vicent Llopis	5ea8c5b06c	delete vendedores_updatePortfolio.sql	2022-03-03 11:38:32 +01:00
Joan Sanchez	9b4d091692	Merge branch 'dev' into 3669-order_search-panel	2022-03-03 10:38:16 +00:00
Carlos Jimenez Ruiz	d923209c2d	Merge pull request '3620-feat(claim): implemented smart-table and change state in summary' (#887) from 3620-claim_change_state into dev ... Reviewed-on: #887 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-02 10:12:51 +00:00
Alex Moreno	619baf2896	refactor claim_main controller	2022-03-02 11:07:35 +01:00
Alex Moreno	7c3945a921	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state	2022-03-02 10:47:56 +01:00
Carlos Jimenez Ruiz	8550fdf48f	Merge pull request '3598-feat(worker): absences can return all absences of worker' (#886) from 3598-worker_calendar_absences into dev ... Reviewed-on: #886 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-02 09:46:39 +00:00
Alex Moreno	a05223681e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state	2022-03-02 10:43:06 +01:00
Alex Moreno	5efb678a53	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences	2022-03-02 10:32:18 +01:00
Alex Moreno	ccb5261ff6	Merge branch '3598-worker_calendar_absences' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences	2022-03-02 10:31:27 +01:00
Joan Sanchez	c8605eea2b	Merge pull request '3646-refactor(claim): move responsability, improve fixtures, remove importTicketSales' (#885) from 3646-claim-summary into dev ... Reviewed-on: #885 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-02 09:26:54 +00:00
Alex Moreno	26ed4b3c30	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences	2022-03-02 10:24:11 +01:00
Carlos Jimenez Ruiz	2b0f54c3aa	Merge branch 'dev' into 3646-claim-summary	2022-03-02 09:17:19 +00:00
Joan Sanchez	6a29f31bb5	Merge pull request '3622-feat(client_defaulter): implemented smart-table' (#881) from 3622-client_defaulter into dev ... Reviewed-on: #881 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-02 09:17:07 +00:00
Joan Sanchez	5c542cbbb2	Merge branch 'dev' into 3622-client_defaulter	2022-03-02 09:05:16 +00:00
Alex Moreno	64a94cd60d	delete e2e	2022-03-02 09:50:29 +01:00
Alex Moreno	44318903e7	feat(claim): add log section	2022-03-01 15:15:58 +01:00
Joan Sanchez	cb21a51065	Added SQL version 10430-ash	2022-03-01 12:12:40 +01:00
Alex Moreno	2026e909e9	disable search observation	2022-03-01 11:43:35 +01:00
Alex Moreno	5a906d075a	Merge branch '3622-client_defaulter' of https://gitea.verdnatura.es/verdnatura/salix into 3622-client_defaulter	2022-03-01 11:39:20 +01:00
Alex Moreno	772c85e5cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3622-client_defaulter	2022-03-01 11:39:09 +01:00
Joan Sanchez	eb9d349b17	Merge pull request '#3015 feat(unlink): tickets link to route can now be removed from the suggested tickets to route' (#884) from 3015-route_tickets_unlink into dev ... Reviewed-on: #884 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-01 10:18:21 +00:00
Joan Sanchez	10af48a739	Merge branch 'dev' into 3015-route_tickets_unlink	2022-03-01 10:13:41 +00:00
Carlos Jimenez Ruiz	4b0ad8ae36	Merge pull request '3634 - refactor(chat): check rocketchat status before sending message' (#882) from 3634-rocketchat_status into dev ... Reviewed-on: #882 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-01 10:13:29 +00:00
Joan Sanchez	3512e287ae	Updated endpoints description	2022-03-01 11:09:10 +01:00
Joan Sanchez	b71e7440b3	Merge branch 'dev' into 3634-rocketchat_status	2022-03-01 09:49:11 +00:00
Alex Moreno	a27a48f251	fix(supplier_account): fix setWireTransfer and add test	2022-03-01 10:44:46 +01:00