11509 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	d5c2fb9857	Merge pull request '3685-fix(invoiceIn_descriptor): add necessary relations to filter' (#909) from 3685-invoiceIn_descriptor into dev ... Reviewed-on: #909 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 11:27:57 +00:00
Joan Sanchez	f74c80cf21	Merge pull request '3683-feat(monito_clients): smart-table and filter by date' (#904) from 3683-monitor_clients into dev ... Reviewed-on: #904 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 11:24:51 +00:00
Joan Sanchez	6e9db8b1cd	Merge pull request '3597-feat(print_deliveryNote): add proforma type' (#906) from 3597-ticket_descriptor_proforma into dev ... Reviewed-on: #906 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 11:22:57 +00:00
Joan Sanchez	d1d48f8beb	Merge branch 'dev' into 3683-monitor_clients	2022-03-23 11:15:51 +00:00
Joan Sanchez	0099b48865	Merge pull request '3704-feat(print_claim-pickup-order): add claimConfig' (#902) from 3704-print_claim-pickup-order into dev ... Reviewed-on: #902 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 11:09:18 +00:00
Joan Sanchez	e85c0c53c6	Merge pull request '3684-agencyTerm_search-panel' (#900) from 3684-agencyTerm_search-panel into dev ... Reviewed-on: #900 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 10:50:50 +00:00
Joan Sanchez	52b61d16ac	Merge pull request '3638-export_database' (#899) from 3638-export_database into dev ... Reviewed-on: #899 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 10:43:14 +00:00
Joan Sanchez	698c5daef8	Merge pull request '3680-feat(claim): add packages, and next button' (#898) from 3680-claim_basic-data_packages into dev ... Reviewed-on: #898 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 10:32:19 +00:00
Alex Moreno	7a17fe2cba	fix(invoiceIn_descriptor): add necessary relations to filter	2022-03-23 10:36:00 +01:00
Alex Moreno	2d9163ea1b	use computed function	2022-03-23 09:48:09 +01:00
Alex Moreno	9a1c0a07fd	Merge branch 'dev' into 3680-claim_basic-data_packages	2022-03-23 08:42:52 +00:00
Alex Moreno	4a323d2cfb	report-footer use function	2022-03-23 09:27:10 +01:00
Alex Moreno	4112fe84c0	change footer	2022-03-22 14:59:57 +01:00
Alex Moreno	7fc82cbfeb	feat(ticket_descriptor-menu): add show proforma	2022-03-22 10:32:26 +01:00
Alex Moreno	ca35c88be4	feat(print_deliveryNote): add proforma type	2022-03-22 07:38:14 +01:00
Carlos Jimenez Ruiz	19df1fe382	Merge pull request '3625-feat(ticket_log): add routeFk log' (#897) from 3625-ticket_log_routeFk into dev ... Reviewed-on: #897 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-21 12:04:43 +00:00
Carlos Jimenez Ruiz	728a5de311	Merge branch 'dev' into 3625-ticket_log_routeFk	2022-03-21 11:56:44 +00:00
Alex Moreno	8eebe1abbb	feat(monito_clients): smart-table and filter by date	2022-03-21 11:32:26 +01:00
Alex Moreno	a2b06e7248	feat(print_claim-pickup-order): add claimConfig	2022-03-18 13:22:39 +01:00
Joan Sanchez	00c53a7709	3668 - Deprecated field "isOfficial"	2022-03-18 11:06:16 +01:00
Vicent Llopis	470616d041	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3684-agencyTerm_search-panel	2022-03-17 09:54:35 +01:00
Vicent Llopis	21198820fc	refactor translate	2022-03-17 09:54:19 +01:00
Vicent Llopis	c3fe2dc52b	update filter test	2022-03-17 09:54:08 +01:00
Vicent Llopis	14eacec0ff	included test	2022-03-17 09:53:50 +01:00
Vicent Llopis	afa7345d22	delete old db changes	2022-03-17 09:00:13 +01:00
Vicent Llopis	7e8c15e413	modify test updatePortfolio	2022-03-17 09:00:01 +01:00
Vicent Llopis	a9b6dcacfe	included sms test	2022-03-17 08:13:18 +01:00
Vicent Llopis	16be66286e	excluded test	2022-03-17 08:13:08 +01:00
Vicent Llopis	a3dbec82bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-17 07:59:07 +01:00
Vicent Llopis	1094bbe92b	correction panel-search	2022-03-16 14:42:19 +01:00
Joan Sanchez	9439757158	Added again	2022-03-16 14:27:16 +01:00
Joan Sanchez	1e275eb4e3	Invoice folder	2022-03-16 14:26:56 +01:00
Joan Sanchez	e5bbff80d4	Added storage on gitignore	2022-03-16 14:24:51 +01:00
Joan Sanchez	dc21408b72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-03-16 14:24:20 +01:00
Joan Sanchez	22002c2ee9	Added storage pdf folder	2022-03-16 14:24:18 +01:00
Vicent Llopis	26f77ca07e	add panel-search	2022-03-16 13:02:48 +01:00
Carlos Jimenez Ruiz	2d4f182fe6	Merge pull request '3690-fix(worker): fix calendar e2e' (#896) from 3690-worker_calendar_fixe2e into dev ... Reviewed-on: #896 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-15 14:34:27 +00:00
Carlos Jimenez Ruiz	969ddb3e37	Merge branch 'dev' into 3690-worker_calendar_fixe2e	2022-03-15 14:22:12 +00:00
Carlos Jimenez Ruiz	17c95a654e	Merge pull request '3604-route_agencyTerm' (#893) from 3604-route_agencyTerm into dev ... Reviewed-on: #893 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-15 14:18:24 +00:00
Carlos Jimenez Ruiz	3098fc36fb	Merge branch 'dev' into 3604-route_agencyTerm	2022-03-15 14:14:16 +00:00
Alex Moreno	499cfb2797	Merge branch '3690-worker_calendar_fixe2e' of https://gitea.verdnatura.es/verdnatura/salix into 3690-worker_calendar_fixe2e	2022-03-15 15:12:01 +01:00
Alex Moreno	39b3e35725	change description	2022-03-15 15:11:58 +01:00
Vicent Llopis	2f53733151	refactor translates	2022-03-15 15:05:09 +01:00
Alex Moreno	c7d8ebebff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3690-worker_calendar_fixe2e	2022-03-15 14:49:22 +01:00
Carlos Jimenez Ruiz	9ea3c1832e	Merge branch 'dev' into 3690-worker_calendar_fixe2e	2022-03-15 13:31:43 +00:00
Carlos Jimenez Ruiz	a9f4386ad6	Merge pull request '3689-refactor(ticket): change role productionBoss to deliveryBoss' (#894) from 3689-deliveryBoss into dev ... Reviewed-on: #894 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-15 13:31:16 +00:00
Alex Moreno	f337f82b35	feat(claim): add packages, and next button	2022-03-15 12:51:33 +01:00
Vicent Llopis	656efa2be9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-15 12:23:28 +01:00
Alex Moreno	4dea046c97	feat(ticket_log): add routeFk log	2022-03-15 10:07:39 +01:00
Alex Moreno	f774b1f784	typo	2022-03-15 09:13:35 +01:00