4111 Commits

Author	SHA1	Message	Date
Alex Moreno	d5c0be5a9d	refactor(ticket_sale): logic and tests	2021-11-30 13:47:16 +01:00
Carlos Jimenez Ruiz	d760eba446	Merge branch 'dev' into 3275-worker_calendar	2021-11-30 11:40:54 +00:00
Vicent Llopis	21bd625b3b	add exceprion to half day absence	2021-11-30 12:31:02 +01:00
Alex Moreno	85721dcf45	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale	2021-11-30 09:51:30 +01:00
Carlos Jimenez Ruiz	1176b23bb9	Merge branch 'dev' into 2676-worker_time-control	2021-11-30 08:16:10 +00:00
Joan Sanchez	5c342ae463	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-30 09:11:40 +01:00
Vicent Llopis	4c064f8a80	feat(worker_calendar): add restrictions to add absence and to add hours recorded	2021-11-30 09:11:23 +01:00
Joan Sanchez	495510efed	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-11-30 09:08:19 +01:00
Alex Moreno	594f258232	modify js date format	2021-11-30 07:16:43 +01:00
Alex Moreno	85e3b47408	test(worker_time-control): tested url parameter timestamp	2021-11-29 15:22:16 +01:00
Alex Moreno	07e092f9bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2676-worker_time-control	2021-11-29 11:52:43 +01:00
Joan Sanchez	f93da5f60d	Merge branch 'dev' into 3387-route_ticket	2021-11-29 09:21:34 +00:00
Alex Moreno	49e9fcaa7c	remove unnecesary on-accept	2021-11-29 10:11:47 +01:00
Alex Moreno	8bd1db2e97	remove unnecesary on-accept	2021-11-29 10:10:53 +01:00
Alex Moreno	cff4c90651	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data	2021-11-29 10:10:04 +01:00
Alex Moreno	8ea3307230	feat(ticket_sale): allow multi-check for recalculatePrice	2021-11-29 08:30:36 +01:00
Joan Sanchez	e4d7d957eb	Rectified icons	2021-11-26 14:48:55 +01:00
Joan Sanchez	452d4557d1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-26 14:11:33 +01:00
Joan Sanchez	9d6b870940	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-11-26 14:08:50 +01:00
Joan Sanchez	b0cb7e1424	Updated fonts	2021-11-26 13:53:39 +01:00
Alex Moreno	65053f5f28	feat(worker_time-control): add timestamp url param	2021-11-26 13:26:48 +01:00
Joan Sanchez	bcca33bc33	Updated icons	2021-11-26 13:04:07 +01:00
Vicent Llopis	e13f2d4ae3	feat(route_ticket): add column province and change order other columns	2021-11-26 10:06:13 +01:00
Joan Sanchez	c986fe9557	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-11-26 09:59:21 +01:00
Joan Sanchez	eb101ffc76	refactor(fonts): updated fonts and changed invoiceOut icon	2021-11-26 09:59:05 +01:00
Joan Sanchez	25371ef97b	Translation fix	2021-11-26 09:06:58 +01:00
Alex Moreno	2ab5c9818a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data	2021-11-26 08:35:00 +01:00
Alex Moreno	eea9413628	fix(item_basic-data): controller, test e2e and model	2021-11-26 08:34:32 +01:00
Carlos Jimenez Ruiz	ba29df16c0	Merge branch 'dev' into 3377-modifyStyles	2021-11-25 15:02:47 +00:00
Vicent Llopis	74fbae6510	refactor(route_ticket): add style in a style.scss	2021-11-25 15:15:51 +01:00
Joan Sanchez	6b6a1b4329	refactor(fonts): updated fonts and changed invoiceOut icon	2021-11-25 14:14:01 +01:00
Vicent Llopis	6afc694f6c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3377-modifyStyles	2021-11-25 14:07:14 +01:00
Alex Moreno	9fce06dfe0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data	2021-11-25 11:53:26 +01:00
Carlos Jimenez Ruiz	cdbd1964a6	Merge branch 'dev' into 3368-export_database	2021-11-25 10:49:17 +00:00
Carlos Jimenez Ruiz	5914e8e1ac	fixed e2e by adding acls where needed	2021-11-25 11:30:55 +01:00
Alex Moreno	815826e891	refactor(ticket): modify transferSales.js for avoid unnecessary logs	2021-11-25 11:23:18 +01:00
Joan Sanchez	0838f34771	Show alias section for marketing	2021-11-25 08:14:48 +01:00
Joan Sanchez	ab3902ebd8	Restricted account creation	2021-11-25 08:08:47 +01:00
Joan Sanchez	4162f239cf	Allow basic-data access for hhrr	2021-11-25 07:50:01 +01:00
Joan Sanchez	0fc52cbf1d	Updated descriptor ACLs	2021-11-25 07:43:32 +01:00
Carlos Jimenez Ruiz	09c2b813b5	ACL update	2021-11-24 15:27:09 +01:00
Joan Sanchez	c3e311f076	Updated route acls	2021-11-24 15:01:44 +01:00
Carlos Jimenez Ruiz	c4bc89ee29	refactor(entry): back unit tests refactor to transactions	2021-11-24 14:29:15 +01:00
Carlos Jimenez Ruiz	c3da93bfd3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions	2021-11-24 11:22:16 +01:00
Joan Sanchez	f98b0c7bbe	Merge branch 'dev' into 3363-sale_update_price	2021-11-24 09:15:13 +00:00
Alex Moreno	00072a7dd1	landing searchable false	2021-11-24 10:02:52 +01:00
Alex Moreno	8d33041970	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3339-entry_latest-buys-search-panel	2021-11-24 09:59:10 +01:00
Joan Sanchez	8ede14ab40	fix(sales): update price on any change affecting the ticket total ... Refs: 3363	2021-11-24 09:25:24 +01:00
Alex Moreno	aaa49bdf78	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data	2021-11-24 09:22:24 +01:00
Alex Moreno	02d89e5774	feat(item): add field genericFk in basic-data	2021-11-24 08:51:07 +01:00
Alex Moreno	e319af6556	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3339-entry_latest-buys-search-panel	2021-11-24 07:30:10 +01:00
Carlos Jimenez Ruiz	c544cbfec7	Merge branch 'dev' into 3350-Smart_table_unit_tests	2021-11-23 15:55:45 +00:00
Carlos Jimenez Ruiz	320cc6c02c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests	2021-11-23 13:52:15 +01:00
Alex Moreno	abb33c8514	feat(client): consumption.decription sortable	2021-11-23 11:39:31 +01:00
Carlos Jimenez Ruiz	16df8fd2f3	Merge branch 'dev' into 3388-ticket_sale	2021-11-23 09:03:06 +00:00
Joan Sanchez	07dcdab1ef	fix(sale): disabled clear icons	2021-11-23 09:57:19 +01:00
Carlos Jimenez Ruiz	51a3673160	Merge branch 'dev' into 3369-filterValue_sqli	2021-11-23 08:54:50 +00:00
Alex Moreno	854ed9936d	deleted unnecessary comma	2021-11-23 09:05:42 +01:00
Alex Moreno	b460579834	feat(entry_latest-buys): add from and to in search-panel	2021-11-23 09:00:46 +01:00
Carlos Jimenez Ruiz	1f2417b55e	Merge branch 'dev' into 3290-entry_latest-buys	2021-11-22 15:34:55 +00:00
Carlos Jimenez Ruiz	cae3322c6b	Merge branch 'dev' into 3332-item_search-panel	2021-11-22 15:28:21 +00:00
Carlos Jimenez Ruiz	ec7cb47ad5	Merge branch 'dev' into 3375-client_descriptor	2021-11-22 14:55:56 +00:00
Joan Sanchez	4ebad6b372	filter order was not properly being applied	2021-11-22 15:54:01 +01:00
Joan Sanchez	3a2e4c54b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3369-filterValue_sqli	2021-11-22 15:49:43 +01:00
Joan Sanchez	90ab78d26d	Updated unit tests	2021-11-22 15:49:32 +01:00
Carlos Jimenez Ruiz	cbcfdd33ec	Merge branch 'dev' into 3379-payMethod_ibanRequired	2021-11-22 14:21:46 +00:00
Carlos Jimenez Ruiz	9fdfe64909	Merge branch 'dev' into 3381-item_diary-claim	2021-11-22 13:51:51 +00:00
Joan Sanchez	a940d14256	fix(filterValue): fixed sql injection vulnerability ... Refs: 3369	2021-11-22 14:40:03 +01:00
Carlos Jimenez Ruiz	ff0a3acd6e	Merge branch 'dev' into 3379-payMethod_ibanRequired	2021-11-22 13:32:18 +00:00
Carlos Jimenez Ruiz	dd19ac975d	Merge branch 'dev' into 3338-worker_calendar	2021-11-22 13:18:53 +00:00
Vicent Llopis	cb81ad3722	delete unnecessay space	2021-11-22 14:02:21 +01:00
Vicent Llopis	709a300388	fix: extracting logic gates to constants	2021-11-22 13:44:22 +01:00
Vicent Llopis	abf3c1c84b	Merge branch '3338-worker_calendar' of https://gitea.verdnatura.es/verdnatura/salix into 3338-worker_calendar	2021-11-22 13:34:44 +01:00
Vicent Llopis	cdf7c20b16	feat(worker_createAbsense): update backTest	2021-11-22 13:34:42 +01:00
Vicent Llopis	a5ba02e2ec	feat(route_tickets): update frontTest	2021-11-22 13:28:12 +01:00
Vicent Llopis	fb6e443f03	feat(routes_tickets): button up when add tickets	2021-11-22 12:52:02 +01:00
Alex Moreno	80f651f37d	add entries less than a year ago	2021-11-22 12:34:20 +01:00
Alex Moreno	fe46dbd343	feat(entry_last-buys): add filter isFloramondo	2021-11-22 11:49:30 +01:00
Alex Moreno	97a66754a7	feat(item and entry): add back test	2021-11-22 08:58:54 +01:00
Alex Moreno	1e6805a161	remove unnecessary tabulation	2021-11-22 08:30:28 +01:00
Alex Moreno	d2729e67e9	feat(item and latest-buys: add supplier filter	2021-11-22 08:27:14 +01:00
Carlos Jimenez Ruiz	ca0c3be843	Merge branch 'dev' into 3381-item_diary-claim	2021-11-19 12:55:11 +00:00
Carlos Jimenez Ruiz	fad44c0b74	Merge branch 'dev' into 3374-itemPackingType	2021-11-19 11:59:50 +00:00
Carlos Jimenez Ruiz	e5977be502	Merge branch 'dev' into 3374-itemPackingType	2021-11-19 11:47:37 +00:00
Alex Moreno	e64e06b9ab	feat(client): change phone for payMethod in descriptor	2021-11-19 12:10:53 +01:00
Vicent Llopis	8f2e29787b	fix(payMethod): alter colums name	2021-11-19 10:07:33 +01:00
Alex Moreno	ac9ed90f4a	feat(item): modify item_getBalance and do test	2021-11-19 10:02:40 +01:00
Joan Sanchez	46d7a6e765	Added unit tests	2021-11-19 09:24:49 +01:00
Joan Sanchez	8c5f0d3019	feat(createClaim): disallow claim creation for a ticket delivered more than seven days ago ... Refs: 3278	2021-11-19 09:24:31 +01:00
Vicent Llopis	98195bf7b0	fix(route_tickets): dialog show the name of clients	2021-11-19 08:44:56 +01:00
Vicent Llopis	9de3db1961	fix(client_summary): show 10 tickets at least	2021-11-19 08:43:30 +01:00
Carlos Jimenez Ruiz	92142c4f93	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests	2021-11-18 17:00:33 +01:00
Joan Sanchez	c101bbb6be	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-11-18 16:10:11 +01:00
Joan Sanchez	9c5939b661	Updated styles	2021-11-18 16:02:47 +01:00
Carlos Jimenez Ruiz	cdc0d4dbe5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests	2021-11-18 15:26:34 +01:00
Carlos Jimenez Ruiz	52cc927f85	Merge branch 'dev' into 3351-ticket_step-two-two	2021-11-18 14:10:23 +00:00
Carlos Jimenez Ruiz	c1adba3249	Merge branch 'dev' into 3338-worker_calendar	2021-11-18 14:01:25 +00:00
Carlos Jimenez Ruiz	334da3da9d	Merge branch 'dev' into 3370-client_create	2021-11-18 14:00:22 +00:00
Carlos Jimenez Ruiz	3eb7b4cf55	refactor(item.filter): buildFilter switch refactor	2021-11-18 14:49:05 +01:00
Alex Moreno	caf6320d53	feat(ticket): default ticketAction for salesAssistant	2021-11-18 14:27:05 +01:00