10911 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	4cb346c2a8	fix(monitor): changed order to prevent row duplication ... Refs: 3458	2021-12-17 12:40:23 +01:00
Joan Sanchez	2fb1c72887	fix(styles): style changes for better readability	2021-12-15 09:03:44 +01:00
Joan Sanchez	b4b30f5243	Merge pull request '3415-export database' (#813) from export_production into dev ... Reviewed-on: #813 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-12-14 09:30:31 +00:00
Joan Sanchez	b45263af30	Merge branch 'dev' into export_production	2021-12-14 09:23:15 +00:00
Joan Sanchez	7a54484e97	Merge pull request 'fix: deleted repeated tickets' (#820) from 3428-item_diary into dev ... Reviewed-on: #820 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-12-14 09:22:47 +00:00
Vicent Llopis	97b7ebd717	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3428-item_diary	2021-12-14 10:01:25 +01:00
Vicent Llopis	9de1d59d98	fix: deleted repeated tickets	2021-12-14 09:56:38 +01:00
Carlos Jimenez Ruiz	30e1be3167	Merge pull request 'fix(ticketIndex): excluded collectionFk property from date ranges' (#819) from 3431-ticket_collection into dev ... Reviewed-on: #819 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-12-14 08:50:30 +00:00
Joan Sanchez	f2a8992410	fix(ticketIndex): excluded collectionFk property from date ranges ... Refs: 3431	2021-12-14 09:17:00 +01:00
Joan Sanchez	f63426304f	Removed font color	2021-12-02 09:20:45 +01:00
Javi Gallego	b565d35a8b	Merge pull request '3386-route_ticket_buscaman' (#816) from 3386-route_ticket_buscaman into dev ... Reviewed-on: #816 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2021-12-01 15:02:32 +00:00
Carlos Jimenez Ruiz	2ebe6b5342	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3386-route_ticket_buscaman	2021-12-01 15:26:09 +01:00
Carlos Jimenez Ruiz	8285a8a8e9	refactor(route.tickets): updated error description	2021-12-01 15:26:01 +01:00
Carlos Jimenez Ruiz	bc2b2f37e8	Merge pull request '3372-ticket_sale multi-check for recalculatePrice' (#811) from 3372-ticket_sale into dev ... Reviewed-on: #811 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-12-01 12:55:52 +00:00
Alex Moreno	75e32feb16	refactor ticket_sale	2021-12-01 11:39:48 +01:00
Alex Moreno	77191b6182	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale	2021-12-01 11:29:10 +01:00
Carlos Jimenez Ruiz	23e55a1a82	Merge pull request 'Duplicated bank entity creation button on supplier account' (#814) from supplier_account into dev ... Reviewed-on: #814 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-12-01 08:43:36 +00:00
Joan Sanchez	7acf7c5bea	Changed duplicated button...	2021-12-01 08:29:05 +01:00
Vicent Llopis	b9893220cd	export database	2021-12-01 08:19:28 +01:00
Alex Moreno	c7e5c25a28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale	2021-11-30 15:13:38 +01:00
Alex Moreno	decd4b5a95	separate sql procedures	2021-11-30 15:13:20 +01:00
Carlos Jimenez Ruiz	cfdef6d090	Merge pull request 'feat(worker_calendar): add restrictions to add absence and to add hours recorded' (#812) from 3275-worker_calendar into dev ... Reviewed-on: #812 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-30 13:14:20 +00:00
Vicent Llopis	238577ec8f	refactor: change ids by codes and add fixtures	2021-11-30 13:57:17 +01:00
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	68a3a4d1e0	Merge pull request '2676-worker_time-control add timestamp url param' (#809) from 2676-worker_time-control into dev ... Reviewed-on: #809 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-30 08:20:20 +00: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
Carlos Jimenez Ruiz	df337360de	Merge pull request 'update column notificationEmail' (#810) from 3325-notify_absence into dev ... Reviewed-on: #810 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-29 09:57:08 +00:00
Carlos Jimenez Ruiz	51a608cb5a	Merge branch 'dev' into 3325-notify_absence	2021-11-29 09:49:58 +00:00
Carlos Jimenez Ruiz	a82053854a	Merge pull request 'feat(route_ticket): add column province and change order other columns' (#808) from 3387-route_ticket into dev ... Reviewed-on: #808 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-29 09:49:42 +00:00
Joan Sanchez	f93da5f60d	Merge branch 'dev' into 3387-route_ticket	2021-11-29 09:21:34 +00:00
Joan Sanchez	a19ce34aae	Merge pull request '3384-item_basic-data add field genericFk' (#807) from 3384-item_basic-data into dev ... Reviewed-on: #807 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-29 09:21:12 +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
Vicent Llopis	2f7295020c	update column notificationEmail	2021-11-26 13:30:40 +01:00
Vicent Llopis	442bf1940e	delete last commit, uploaed by error	2021-11-26 13:28:12 +01:00