12113 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Vicent Llopis	4811254ccb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-02 15:07:38 +01:00
Vicent Llopis	ade34c1e0a	add section Autonomous	2022-03-02 14:59:30 +01: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
Alex Moreno	2137a34b36	feat(supplier-account): isPayMethodChecked false when change model	2022-03-01 10:44:04 +01:00
Joan Sanchez	b7dd4952df	Merge branch 'dev' into 3622-client_defaulter	2022-03-01 09:33:38 +00:00
Joan Sanchez	73d853cb53	Merge pull request '3352-docuware' (#880) from 3352-docuware into dev ... Reviewed-on: #880 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-02-28 13:44:46 +00:00
Joan Sanchez	1a95489568	Merge pull request '3623-reportInvoice_intrastat' (#878) from 3623-reportInvoice_intrastat into dev ... Reviewed-on: #878 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-02-28 13:41:59 +00:00
Alex Moreno	3f483d36f2	refactor(order_search-panel): change orderFk to ticketFk	2022-02-28 14:28:16 +01:00
Alex Moreno	4046617eab	short form	2022-02-28 13:37:44 +01:00
Alex Moreno	cf9851c8dc	typo	2022-02-28 13:27:03 +01:00
Alex Moreno	ab6b5aa803	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware	2022-02-28 13:14:34 +01:00
Alex Moreno	c9188658ca	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state	2022-02-28 12:40:52 +01:00
Alex Moreno	60e908d82a	feat(claim_summary): parentReload(), and test	2022-02-28 12:40:44 +01:00
Carlos Jimenez Ruiz	d2871ff3a6	Merge branch 'dev' into 3623-reportInvoice_intrastat	2022-02-28 10:12:36 +00:00
Carlos Jimenez Ruiz	8f1f9c3f9b	Merge pull request '3595-item-waste-folding' (#877) from 3595-item-waste-folding into dev ... Reviewed-on: #877 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-02-28 10:12:10 +00:00
Carlos Jimenez Ruiz	2647b4e423	Merge branch 'dev' into 3595-item-waste-folding	2022-02-28 10:05:07 +00:00
Carlos Jimenez Ruiz	00088d9781	Merge pull request '3609-ticket_basic-data' (#875) from 3609-ticket_basic-data into dev ... Reviewed-on: #875 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-02-28 10:04:40 +00:00
Carlos Jimenez Ruiz	d1c884deb2	Merge branch 'dev' into 3609-ticket_basic-data	2022-02-28 09:58:27 +00:00
Carlos Jimenez Ruiz	4b963804c6	added transalation to item waste	2022-02-28 10:54:32 +01:00
Carlos Jimenez Ruiz	bf0734ca67	excluded 3 test suites until db export	2022-02-28 10:46:14 +01:00
Carlos Jimenez Ruiz	a2d2e79738	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3595-item-waste-folding	2022-02-28 10:21:21 +01:00
Alex Moreno	5434dd3baf	feat(claim_index): implemented smart-table and change state in summary	2022-02-28 07:57:46 +01:00
Alex Moreno	62286c2f9a	refactor(defaulter): simple route	2022-02-25 10:34:17 +01:00