12689 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alex Moreno	65053f5f28	feat(worker_time-control): add timestamp url param	2021-11-26 13:26:48 +01:00
Vicent Llopis	d1add9ef84	sql changes	2021-11-26 13:16:44 +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	771100ccab	remove unnecessary intro and comment	2021-11-26 08:40:20 +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	9f8d2c7350	Merge pull request '3377-modifyStyles' (#798) from 3377-modifyStyles into dev ... Reviewed-on: #798 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-25 15:21:12 +00: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	ec939674b9	Merge pull request '3368-export_database' (#806) from 3368-export_database into dev ... Reviewed-on: #806 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-25 10:53:20 +00:00
Carlos Jimenez Ruiz	cdbd1964a6	Merge branch 'dev' into 3368-export_database	2021-11-25 10:49:17 +00:00
Carlos Jimenez Ruiz	b7b6f62343	Merge pull request '3301-refactor(ticket): modify transferSales.js for avoid unnecessary logs' (#805) from 3301-ticket_transferSales into dev ... Reviewed-on: #805 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-25 10:47:07 +00:00
Alex Moreno	f96f22c231	misspelled word	2021-11-25 11:44:27 +01: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	469f944e47	Merge branch '3368-export_database' of https://gitea.verdnatura.es/verdnatura/salix into 3368-export_database	2021-11-24 15:01:47 +01:00
Joan Sanchez	c3e311f076	Updated route acls	2021-11-24 15:01:44 +01:00
Alex Moreno	c03fe359b1	add acl	2021-11-24 14:36:12 +01:00
Carlos Jimenez Ruiz	c4bc89ee29	refactor(entry): back unit tests refactor to transactions	2021-11-24 14:29:15 +01:00
Alex Moreno	fc2e81826d	export database	2021-11-24 13:02:58 +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
Carlos Jimenez Ruiz	537c1bb664	Merge pull request 'fix(sales): update price on any change affecting the ticket total' (#804) from 3363-sale_update_price into dev ... Reviewed-on: #804 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-11-24 09:57:44 +00:00
Joan Sanchez	f98b0c7bbe	Merge branch 'dev' into 3363-sale_update_price	2021-11-24 09:15:13 +00:00