12075 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	1e587be2ed	(fix): filter repaired	2022-03-28 11:57:19 +02:00
Alex Moreno	7cd33619e3	change db version	2022-03-28 11:47:20 +02:00
Alex Moreno	89d7d27061	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph	2022-03-28 11:47:09 +02:00
Carlos Jimenez Ruiz	29f8fd1fc6	Merge branch 'dev' into 3686-client_create	2022-03-28 09:33:24 +00:00
Carlos Jimenez Ruiz	81a3ea7646	Merge pull request '3615-feat(print_deliveryNote): add withoutPrices type' (#908) from 3615-print_deliveryNote into dev ... Reviewed-on: #908 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-28 09:26:11 +00:00
Carlos Jimenez Ruiz	b4dbbc53b2	Merge branch 'dev' into 3615-print_deliveryNote	2022-03-28 09:21:10 +00:00
Carlos Jimenez Ruiz	39694b31b8	Merge branch 'dev' into 3607-supplier_agencyTerm	2022-03-28 08:40:32 +00:00
Carlos Jimenez Ruiz	166593bbae	Merge pull request '3721-claim_basic-data' (#903) from 3721-claim_basic-data into dev ... Reviewed-on: #903 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-28 08:39:55 +00:00
Juan Ferrer	85de742630	Export data & structure	2022-03-28 09:44:29 +02:00
Vicent Llopis	ad7bcd7cc2	delete two filter fields	2022-03-28 09:28:01 +02:00
Alex Moreno	79c74d92b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph	2022-03-25 13:22:04 +01:00
Vicent Llopis	e02ab9dd2d	feat: add fixtures	2022-03-24 11:39:19 +01:00
Vicent Llopis	4bdc29e283	refactor: calculate holidays through db procedures	2022-03-24 10:59:23 +01:00
Vicent Llopis	67a90c356f	updated FK for production db	2022-03-24 10:58:04 +01:00
Alex Moreno	968ecab9b2	fix(item_diary): apply async scroll	2022-03-24 10:28:28 +01:00
Alex Moreno	ad4c89af5f	feat(department): add hasToMistake in model	2022-03-23 14:12:47 +01:00
Alex Moreno	254fee5036	feat(worker_calendar): repaint, fix front test and add fixtures	2022-03-23 14:02:48 +01:00
Alex Moreno	0963b66560	fix(worker_calendar): absence in holiday day	2022-03-23 13:06:17 +01:00
Vicent Llopis	fd7afc962f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-23 12:53:33 +01:00
Alex Moreno	79e0543c26	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3615-print_deliveryNote	2022-03-23 12:47:59 +01:00
Vicent Llopis	1056060957	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data	2022-03-23 12:37:34 +01:00
Alex Moreno	aeb1eed421	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3615-print_deliveryNote	2022-03-23 12:31:38 +01:00
Joan Sanchez	b8910e38ea	Merge pull request '3682-item_fixed-price' (#901) from 3682-item_fixed-price into dev ... Reviewed-on: #901	2022-03-23 11:29:44 +00:00
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
Alex Moreno	3b80f6dec9	renaming	2022-03-23 12:26:58 +01:00
Alex Moreno	193f97aa41	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price	2022-03-23 12:25:01 +01: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
Vicent Llopis	c8ae5bca82	check if email, phone or mobile already exists in another client	2022-03-23 12:19:49 +01:00
Alex Moreno	f6ff8ea081	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price	2022-03-23 12:17:14 +01: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
Alex Moreno	dc03a66c6b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price	2022-03-23 12:01:50 +01: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	ebfd0bdb29	use computed function	2022-03-23 09:46:44 +01:00
Alex Moreno	9a1c0a07fd	Merge branch 'dev' into 3680-claim_basic-data_packages	2022-03-23 08:42:52 +00:00
Alex Moreno	1051a9cafb	traductions	2022-03-23 09:42:00 +01:00
Alex Moreno	4a323d2cfb	report-footer use function	2022-03-23 09:27:10 +01:00
Alex Moreno	0dc1848870	feat(print_deliveryNote): add withoutPrices type	2022-03-22 15:13:34 +01:00
Alex Moreno	4112fe84c0	change footer	2022-03-22 14:59:57 +01:00
Joan Sanchez	21e3dad38d	Merge pull request '3776-fix(zone_delivery-days): agencyModeName and defaulter pagination' (#907) from 3776-zone_delivery-days into test ... Reviewed-on: #907 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-22 10:17:25 +00:00
Alex Moreno	7fc82cbfeb	feat(ticket_descriptor-menu): add show proforma	2022-03-22 10:32:26 +01:00
Alex Moreno	05be19de2d	fix(zone_delivery-days): agencyModeName and defaulter pagination	2022-03-22 10:03:56 +01:00
Alex Moreno	ca35c88be4	feat(print_deliveryNote): add proforma type	2022-03-22 07:38:14 +01:00
Vicent Llopis	31a5e19151	move db changes to correct folder	2022-03-21 13:19:19 +01:00
Vicent Llopis	29036cc39d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-21 13:17:52 +01:00