4518 Commits

Author	SHA1	Message	Date
Vicent Llopis	64ae7ee8ea	feat: modify filter	2022-03-28 13:24:26 +02:00
Vicent Llopis	a5b3bdfa8d	feat: add backTest	2022-03-28 13:24:11 +02:00
Carlos Jimenez Ruiz	23c473de89	Merge branch 'dev' into 3408-worker_calendar	2022-03-28 10:26:13 +00:00
Carlos Jimenez Ruiz	49ae4d0e74	Merge branch 'dev' into 3734-item_diary_scroll	2022-03-28 10:14:34 +00:00
Carlos Jimenez Ruiz	fd3ade4a29	Merge branch 'dev' into 3637-departments_hasToMistake	2022-03-28 10:14:15 +00:00
Carlos Jimenez Ruiz	8d70bac5c6	Merge branch 'dev' into 3621-worker_calendar	2022-03-28 10:13:21 +00:00
Vicent Llopis	1e587be2ed	(fix): filter repaired	2022-03-28 11:57:19 +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	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
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	4bdc29e283	refactor: calculate holidays through db procedures	2022-03-24 10:59:23 +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
Joan Sanchez	d1d48f8beb	Merge branch 'dev' into 3683-monitor_clients	2022-03-23 11:15:51 +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
Alex Moreno	7a17fe2cba	fix(invoiceIn_descriptor): add necessary relations to filter	2022-03-23 10:36:00 +01:00
Alex Moreno	9a1c0a07fd	Merge branch 'dev' into 3680-claim_basic-data_packages	2022-03-23 08:42:52 +00:00
Alex Moreno	0dc1848870	feat(print_deliveryNote): add withoutPrices type	2022-03-22 15:13:34 +01: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	29036cc39d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-21 13:17:52 +01:00
Vicent Llopis	fae267f539	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data	2022-03-21 13:15:46 +01:00
Carlos Jimenez Ruiz	728a5de311	Merge branch 'dev' into 3625-ticket_log_routeFk	2022-03-21 11:56:44 +00:00
Vicent Llopis	920bff30c8	modify filter sql	2022-03-21 12:02:17 +01:00
Vicent Llopis	aba7136f56	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-21 11:47:33 +01:00
Alex Moreno	8eebe1abbb	feat(monito_clients): smart-table and filter by date	2022-03-21 11:32:26 +01:00
Vicent Llopis	e4eed95724	notify rocket when claimState change to canceled	2022-03-21 10:02:56 +01:00
Joan Sanchez	00c53a7709	3668 - Deprecated field "isOfficial"	2022-03-18 11:06:16 +01:00
Alex Moreno	b56e1810c3	test(item_fixedPrice): fix back test & e2e	2022-03-18 10:30:30 +01:00
Vicent Llopis	894f95cb1f	update consulte sql	2022-03-17 15:05:13 +01:00
Vicent Llopis	bc65beaa76	add frontTest	2022-03-17 14:51:49 +01:00
Vicent Llopis	a32f7b5ef1	add new row	2022-03-17 14:27:55 +01:00
Vicent Llopis	644c24fa3b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-17 11:55:07 +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
Alex Moreno	e8b4896e98	feat(item_fixed-price): add search, and defaultSerach	2022-03-17 09:13:09 +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	a3dbec82bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-17 07:59:07 +01:00
Alex Moreno	b4e5631cc7	feat(item_fixed-price): implement smart-table	2022-03-16 14:58:07 +01:00
Vicent Llopis	1094bbe92b	correction panel-search	2022-03-16 14:42:19 +01:00
Vicent Llopis	26f77ca07e	add panel-search	2022-03-16 13:02:48 +01:00
Alex Moreno	7a45b6014a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price	2022-03-16 07:45:09 +01:00
Alex Moreno	e0924ea373	refactor(item_fixed-price): add checkbox hasMinPrice, tooltips, more witdh	2022-03-15 15:18:27 +01:00
Carlos Jimenez Ruiz	3098fc36fb	Merge branch 'dev' into 3604-route_agencyTerm	2022-03-15 14:14:16 +00:00
Vicent Llopis	2f53733151	refactor translates	2022-03-15 15:05:09 +01:00
Vicent Llopis	1ecc76067a	code to correct insert in model	2022-03-15 14:50:09 +01: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
Vicent Llopis	ec41123772	button for insert rows	2022-03-15 09:36:48 +01:00
Alex Moreno	f774b1f784	typo	2022-03-15 09:13:35 +01:00
Alex Moreno	bacfa3f1f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3689-deliveryBoss	2022-03-14 10:27:00 +01:00
Vicent Llopis	97f856afcc	corrected comment	2022-03-11 12:24:53 +01:00
Vicent Llopis	6a91fe6c11	solved backTest	2022-03-10 14:43:07 +01:00
Vicent Llopis	7f5b30aa87	delete frontTest	2022-03-10 10:40:52 +01:00
Vicent Llopis	ba31d96cdf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-10 10:36:02 +01:00
Vicent Llopis	16208a5e11	especify PK	2022-03-10 10:35:35 +01:00
Vicent Llopis	189fe2ed41	update acl	2022-03-10 08:14:50 +01:00
Vicent Llopis	a32ebc37da	add supplier autonomous	2022-03-09 23:54:23 +01:00
Juan Ferrer	d49d1b437c	User.login() error fixed	2022-03-09 15:34:26 +01:00
Vicent Llopis	91a23088c3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-09 08:40:55 +01:00
Alex Moreno	9c4d58fc1a	refactor(ticket-popup): extends from dialog	2022-03-09 08:08:13 +01:00
Alex Moreno	b11a6a7c5c	feat(route): add ticket-popup and tests	2022-03-08 15:17:18 +01:00
Alex Moreno	c8a512db4e	unnecessary	2022-03-08 15:16:36 +01:00
Vicent Llopis	97f2341ae0	pull request changes	2022-03-08 13:42:44 +01:00
Carlos Jimenez Ruiz	4fc6da5ba9	Merge branch 'dev' into 3626-client_basic-data	2022-03-08 08:53:03 +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	e8d7ce7cc7	refactor(ticket): change role productionBoss to deliveryBoss	2022-03-07 14:50:51 +01:00
Vicent Llopis	6b51b7ddd7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm	2022-03-07 13:54:33 +01:00
Vicent Llopis	03c8ceffb2	refactor code	2022-03-07 13:54:18 +01:00
Alex Moreno	4e3fe180ca	feat(client_descriptor): add supplier quick-link	2022-03-07 13:25:55 +01:00
Vicent Llopis	f88f60ef27	refactor code and icons	2022-03-07 12:43:05 +01: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	efa32a3dc7	export structure	2022-03-04 13:04:28 +01:00