11184 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	38100eeda4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-27 15:15:08 +01:00
Carlos Jimenez Ruiz	2748dd649a	Merge pull request '3553-fix(travel_summary): vn-check change value to ng-model' (#862) from 3553-travel_summary into dev ... Reviewed-on: #862 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-27 09:45:58 +00:00
Carlos Jimenez Ruiz	abd758721e	Merge branch 'dev' into 3553-travel_summary	2022-01-27 09:36:22 +00:00
Carlos Jimenez Ruiz	09a14fba41	Merge pull request '3549-feat(travel_search-panel): add continent filter' (#860) from 3549-travel_search-panel into dev ... Reviewed-on: #860 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-27 09:35:38 +00:00
Carlos Jimenez Ruiz	d4d761150e	Merge branch 'dev' into 3549-travel_search-panel	2022-01-27 08:26:28 +00:00
Alex Moreno	74916c182a	Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-27 07:22:39 +01:00
Alex Moreno	d0c4099255	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-27 07:20:39 +01:00
Joan Sanchez	879183a4e2	Merge pull request '3536-DbUserSync' (#857) from 3536-DbUserSync into dev ... Reviewed-on: #857 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-01-26 13:52:44 +00:00
Joan Sanchez	b991fe73b2	Merge branch 'dev' into 3536-DbUserSync	2022-01-26 13:45:50 +00:00
Alex Moreno	65c32c9ed3	fix(travel_summary): vn-check change value to ng-model	2022-01-26 11:40:44 +01:00
Alex Moreno	0a8153d44c	feat(travel_search-panel): add continent filter	2022-01-26 10:09:47 +01:00
Alex Moreno	f8a0094321	word movible	2022-01-26 08:54:48 +01:00
Alex Moreno	57e4b400c9	Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-26 07:12:57 +01:00
Alex Moreno	442d58f59b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-26 07:11:22 +01:00
Carlos Jimenez Ruiz	16fe26a2ab	Merge pull request '3542-feat(ticket_sale): role restriction to create payBack' (#855) from 3542-ticket_sale_payback into dev ... Reviewed-on: #855 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-25 15:30:01 +00:00
Alex Moreno	f67a4355db	refactor(ticket_sale): split e2e, change name backTest	2022-01-25 15:09:29 +01:00
Alex Moreno	8794f8639f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3542-ticket_sale_payback	2022-01-25 15:04:52 +01:00
Juan Ferrer	022c2cde3c	Merge branch 'dev' into 3536-DbUserSync	2022-01-25 11:18:50 +01:00
Carlos Jimenez Ruiz	52990c0d03	Merge pull request '2883-invoiceIn-Booking' (#786) from 2883-invoiceIn-Booking into dev ... Reviewed-on: #786 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-24 15:29:56 +00:00
Javi Gallego	5fbbae7ac6	Merge branch 'dev' into 2883-invoiceIn-Booking	2022-01-24 15:40:37 +01:00
Javi Gallego	dad4119300	getTotal remove ()	2022-01-24 15:35:32 +01:00
Joan Sanchez	6de82caf0c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-01-21 16:17:53 +01:00
Joan Sanchez	ddf62d2496	Updated back unit test	2022-01-21 16:16:39 +01:00
Carlos Jimenez Ruiz	41fe44f170	Merge pull request 'refactor(invoice): hide report logo for non group companies #3519' (#856) from 3519-hide_logo into dev ... Reviewed-on: #856 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-21 13:49:42 +00:00
Joan Sanchez	f657299229	Merge branch 'dev' into 3519-hide_logo	2022-01-21 12:45:10 +00:00
Alex Moreno	6d9afd5f4c	feat(ticket_sale): role restriction to create payBack	2022-01-21 11:40:48 +01:00
Joan Sanchez	f5217c3ebc	Removed package-lock files	2022-01-21 10:43:47 +01:00
Joan Sanchez	5ff950d078	refactor(invoice): hide report logo for non group companies #3519	2022-01-21 10:33:40 +01:00
Juan Ferrer	997b7990d4	Docker connectTimeout && MySQL/MariaDB user sync	2022-01-20 15:33:53 +01:00
Joan Sanchez	4237cd56df	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-01-20 14:12:21 +01:00
Joan Sanchez	263bc302e0	Background color for unchecked input	2022-01-20 14:07:25 +01:00
Joan Sanchez	2c05ed7c37	Disabled auto load	2022-01-20 13:17:08 +01:00
Joan Sanchez	b7494afbe2	Eliminado orden predeterminado	2022-01-20 12:57:36 +01:00
Joan Sanchez	dfd746f84d	Sort by clientFk	2022-01-20 12:48:12 +01:00
Joan Sanchez	b88f2c71c1	Ammends	2022-01-20 12:29:28 +01:00
Joan Sanchez	3fceff2975	Updated unit tests	2022-01-20 12:29:22 +01:00
Joan Sanchez	cf2ad0d61e	feat(smartTag): added sort priority between multiple sorting ... Refs: 3528	2022-01-20 12:29:12 +01:00
Joan Sanchez	02256201da	Merge pull request '3521-Monitors_ticket_summary' (#854) from 3521-Monitors_ticket_summary into dev ... Reviewed-on: #854 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-01-20 11:28:08 +00:00
Joan Sanchez	a9e8c5b374	Merge branch 'dev' into 3521-Monitors_ticket_summary	2022-01-20 11:03:33 +00:00
Carlos Jimenez Ruiz	3284d1651e	Merge pull request 'refactor(print): print service refactor with better router handler' (#840) from 3245-print_refactor into dev ... Reviewed-on: #840 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-20 11:03:23 +00:00
Joan Sanchez	cb8b0e9657	Removed comments	2022-01-20 11:56:04 +01:00
Carlos Jimenez Ruiz	3741417fd6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3521-Monitors_ticket_summary	2022-01-20 11:06:23 +01:00
Carlos Jimenez Ruiz	4ac071d55c	#3521 refactor(descriptor): navigation to index after deletion	2022-01-20 11:06:15 +01:00
Joan Sanchez	e3795ea072	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3245-print_refactor	2022-01-20 11:05:25 +01:00
Joan Sanchez	e46643711c	Merge pull request '3456-feat(entry_basic-data): add new filter in travels' (#852) from 3456-entry_basic-data into dev ... Reviewed-on: #852 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-01-20 10:04:38 +00:00
Joan Sanchez	464bc6d767	Merge branch 'dev' into 3456-entry_basic-data	2022-01-20 09:48:08 +00:00
Carlos Jimenez Ruiz	1e658cf62f	Merge pull request 'feat(smartTag): added sort priority between multiple sorting' (#853) from 3528-smartTable_sort_priority into dev ... Reviewed-on: #853 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-01-20 09:47:29 +00:00
Joan Sanchez	7a5e7b4c20	Ammends	2022-01-20 10:43:03 +01:00
Javi Gallego	6d66ab7bea	getTotals without transaction	2022-01-20 10:05:24 +01:00
Joan Sanchez	52d7b4f600	Updated unit tests	2022-01-20 09:53:40 +01:00