2248 Commits

Author	SHA1	Message	Date
Javi Gallego	faa053a3d2	Merge branch 'dev' into 2035-el-parametro-vShowExpiredZones	2020-06-05 10:01:52 +02:00
Javi Gallego	b40be5cca9	2035	2020-06-05 10:01:21 +02:00
Bernat Exposito	49d4f881ad	Merge pull request '2296-fix_back_test' (#295) from 2296-fix_back_test into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-05 07:15:10 +00:00
Bernat Exposito Domenech	a81862baad	set deleteded skiped	2020-06-05 08:29:51 +02:00
Bernat Exposito Domenech	81757fb9b5	fix test 2302	2020-06-04 14:24:12 +02:00
Bernat Exposito Domenech	f340466daf	fix test 2296	2020-06-04 14:23:48 +02:00
Bernat Exposito Domenech	3a6efebfd9	skipp back test and create task 2304	2020-06-04 14:22:56 +02:00
Joan Sanchez	e2391e5595	Changes made	2020-06-04 10:12:54 +02:00
Joan Sanchez	30c721b0e2	Added ACL	2020-06-04 08:21:08 +02:00
Joan Sanchez	0695ec01bc	Updated unit test	2020-06-04 07:53:06 +02:00
Joan Sanchez	f39719cc46	2281 - Added claim pickup checkbox	2020-06-03 14:46:58 +02:00
Joan Sanchez	696de03ad1	Changed translation	2020-06-03 13:42:36 +02:00
Joan Sanchez	ca19581a5d	Merge pull request 'item diary, fix ticket descriptor' (#290) from 2288-item_diary into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-03 11:09:19 +00:00
Joan Sanchez	94dcf7679b	Merge pull request '2265-item_request_filters' (#289) from 2265-item_request_filters into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-06-03 10:54:41 +00:00
Bernat Exposito Domenech	1cd9c75468	fix item diary descriptor	2020-06-03 12:37:01 +02:00
Bernat Exposito Domenech	34b6641e5c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2288-item_diary	2020-06-03 12:32:27 +02:00
Joan Sanchez	613937dc8d	Fixed order	2020-06-03 12:21:03 +02:00
Joan Sanchez	f71a2a3665	Removed isOk param	2020-06-03 11:58:53 +02:00
Joan Sanchez	18edd523d2	Excluded failing test	2020-06-03 11:40:18 +02:00
Joan Sanchez	b7ceeae65a	Excluded back unit tests. TLS error	2020-06-03 11:27:14 +02:00
Bernat Exposito Domenech	0b3608433c	item diary, fix ticket descriptor	2020-06-03 10:37:17 +02:00
Joan Sanchez	16d7186829	Fixed initial filters	2020-06-02 14:42:58 +02:00
Joan Sanchez	751f79373a	Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 09:28:14 +00:00
Bernat Exposito	fac64c45c0	Merge pull request 'zone delete' (#285) from 2244-zone_descriptor into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 09:18:24 +00:00
Bernat Exposito Domenech	aac47e52e9	update log	2020-06-02 11:15:07 +02:00
Joan Sanchez	a0767a6ea2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters	2020-06-02 10:56:40 +02:00
Bernat Exposito	0fe2212f64	Merge pull request '2282-setDeleted_stowaway' (#287) from 2282-setDeleted_stowaway into dev ... Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-06-02 08:24:59 +00:00
Bernat Exposito Domenech	3bfee6d0fd	fix zone descriptor	2020-06-02 10:17:46 +02:00
Joan Sanchez	21bb4a778c	Merge pull request '2278-ticket_summary_invoiceOut' (#286) from 2278-ticket_summary_invoiceOut into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 08:11:44 +00:00
Joan Sanchez	1926f90f4b	Merge pull request 'add column in ticket split' (#279) from 2236-ticket_sale_split into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 07:47:50 +00:00
Joan Sanchez	1e4f36b775	Updated back unit test	2020-06-02 09:34:42 +02:00
Bernat Exposito Domenech	0251ff9bc9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2278-ticket_summary_invoiceOut	2020-06-02 09:04:09 +02:00
Bernat Exposito Domenech	546272cc3f	zone delete	2020-06-02 08:59:04 +02:00
Juan Ferrer	3e5bab41d3	Merge branch 'test' into dev	2020-06-01 13:47:33 +02:00
Juan Ferrer	3fcb76246d	Merge branch 'master' into test	2020-06-01 13:38:59 +02:00
Joan Sanchez	3d8bc3b7b4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-01 13:32:35 +02:00
Joan Sanchez	c188da88e8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-06-01 13:31:08 +02:00
Joan Sanchez	052c51cee5	2282 - Change stowaway state to FIXING	2020-06-01 12:47:04 +02:00
Bernat Exposito Domenech	c4be76977d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2278-ticket_summary_invoiceOut	2020-06-01 08:24:27 +02:00
Joan Sanchez	3f1109aee3	Test changes	2020-05-29 12:10:04 +02:00
Joan Sanchez	90ae1562dd	Added filters	2020-05-29 11:10:58 +02:00
Carlos Jimenez Ruiz	9deb518064	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2057_e2e_address_create_custom_agent	2020-05-28 09:55:05 +02:00
Carlos Jimenez Ruiz	9bf509cd5d	customs agent e2e path + small fixes	2020-05-28 09:54:31 +02:00
Joan Sanchez	a3e7771295	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2205-loggable_relations_fix	2020-05-28 08:08:00 +02:00
Joan Sanchez	0fe78a2b8f	2176 - Added contextmenu	2020-05-28 08:07:26 +02:00
Carlos Jimenez Ruiz	a858e51aee	removed unused code	2020-05-27 14:54:54 +02:00
Carlos Jimenez Ruiz	296967ab4b	fixed a front unit test with jest.fn() as spy	2020-05-27 14:54:29 +02:00
Carlos Jimenez Ruiz	dfa74221dd	added crud model to preload autocompletes on demand + e2e path done	2020-05-27 14:34:34 +02:00
Carlos Jimenez Ruiz	2345a922c8	now we can create thermographs for travelThermograph	2020-05-27 13:11:41 +02:00
Bernat Exposito Domenech	f28f88a100	ticket summary invoiceOut popover	2020-05-27 12:29:01 +02:00
Carlos Jimenez Ruiz	98157fc45a	Merge pull request '2141-print_reply_to' (#272) from 2141-print_reply_to into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-27 07:10:27 +00:00
Bernat Exposito Domenech	8be929c1da	log tiquet request	2020-05-27 08:07:14 +02:00
Joan Sanchez	6d94894b73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2234-getVisibleAvailable	2020-05-27 07:24:33 +02:00
Joan Sanchez	d24f04912e	2205 - Prevent relations to being logged in	2020-05-26 14:37:34 +02:00
Bernat Exposito Domenech	60d50afb2e	fix traduction	2020-05-26 12:20:06 +02:00
Joan Sanchez	14251e5a0c	Merge pull request '2262-catalog_remove_tag' (#276) from 2262-catalog_remove_tag into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-05-26 09:39:47 +00:00
Javi Gallego	5188f80da5	Merge branch 'dev' into 2234-getVisibleAvailable	2020-05-26 10:47:48 +02:00
Bernat Exposito Domenech	e7fc70a4b4	add column in ticket split	2020-05-26 10:43:53 +02:00
Javi Gallego	d8871c0bce	cr	2020-05-26 10:37:52 +02:00
Bernat Exposito	17ef761ba4	Merge pull request '2226-item_last_entries' (#271) from 2226-item_last_entries into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-05-26 07:59:17 +00:00
Joan Sanchez	44160d2f3c	Changed order	2020-05-26 08:11:36 +02:00
Joan Sanchez	4d2d57d646	2265 Changes to filter	2020-05-26 08:08:09 +02:00
Carlos Jimenez Ruiz	d02655d4d3	Merge pull request '2273 - Fixed transfer sales' (#273) from 2273-transfer_sales_fix into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-25 12:58:08 +00:00
Joan Sanchez	73a6148a77	2273 - Fixed transfer sales	2020-05-25 14:45:26 +02:00
Joan Sanchez	d60f8721f1	1490 - Don't update with empty value	2020-05-25 13:49:24 +02:00
Joan Sanchez	2af39d4b67	Updated unit tests	2020-05-25 07:43:24 +02:00
Joan Sanchez	4878c0dc46	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to	2020-05-25 07:25:21 +02:00
Joan Sanchez	e9e7ae08f2	Locale refactor	2020-05-22 15:20:55 +02:00
Javi Gallego	0f718ad065	Merge branch 'dev' into 2242-test	2020-05-22 07:56:00 +02:00
Bernat Exposito Domenech	8c2f57e380	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2226-item_last_entries	2020-05-21 15:26:04 +02:00
Bernat Exposito Domenech	52241e6f2c	update itemLastENtries	2020-05-21 15:26:00 +02:00
Joan Sanchez	ce43c1f2d9	Merge pull request '2264-travel_summary' (#265) from 2264-travel_summary into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-21 12:27:14 +00:00
Joan Sanchez	9a43dff1fd	Removed console.log()	2020-05-21 14:22:22 +02:00
Joan Sanchez	9a0c9d3da2	2262 Remove filter by id from searchbar	2020-05-21 14:18:24 +02:00
Joan Sanchez	aa95a9f984	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-05-21 12:33:01 +02:00
Joan Sanchez	d082f5d6c2	2225 Prevent location override	2020-05-21 11:14:34 +02:00
Carlos Jimenez Ruiz	245827e8d5	corrected a typo	2020-05-21 09:28:50 +02:00
Joan Sanchez	f6efa7160e	2141 ReplyTo param	2020-05-20 16:23:53 +02:00
Bernat Exposito Domenech	8ca12d9fdd	fix bugs in travel summary	2020-05-20 13:19:02 +02:00
Carlos Jimenez Ruiz	55c4ccdb29	Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech	a0f5f073a5	fix order traduction	2020-05-20 10:26:29 +02:00
Bernat Exposito Domenech	4133021e5c	fix translate on plural	2020-05-20 08:52:20 +02:00
Javi Gallego	670c5936ce	test2	2020-05-19 13:11:22 +02:00
Javi Gallego	529bd5673c	test	2020-05-19 13:06:59 +02:00
Juan Ferrer	ad1c677280	Test focus removed & fixes	2020-05-19 12:50:43 +02:00
Juan Ferrer	c998097ba1	Merge branch 'dev' into 1882-descriptorRefactor	2020-05-19 12:30:00 +02:00
Javi Gallego	3774d1dd1f	Merge branch 'dev' into 2242-test	2020-05-19 12:22:47 +02:00
Javi Gallego	692af6078c	Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev ... Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2020-05-19 10:21:33 +00:00
Javi Gallego	ff03133277	test	2020-05-19 12:21:02 +02:00
Juan Ferrer	e7cf060e12	Merge fixes	2020-05-19 10:51:50 +02:00
Bernat Exposito Domenech	d289c17530	searchbar translates	2020-05-19 10:27:22 +02:00
Juan Ferrer	d7f2e686b1	Merge branch 'dev' into 1882-descriptorRefactor	2020-05-19 09:28:50 +02:00
Javi Gallego	a7e6e3d4b7	cr juan	2020-05-19 08:46:42 +02:00
Bernat Exposito	5f8a2a24f5	Merge pull request '2246-claim_sorted_states' (#258) from 2246-claim_sorted_states into dev ... Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-05-19 06:42:07 +00:00
Joan Sanchez	6c49fc9b1c	Merge pull request 'client descriptor add risk' (#257) from 2250-client_descriptor into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-19 06:26:17 +00:00
Joan Sanchez	af0d0f1fbe	Merge pull request '2238-ticket_summary_invoiceOut' (#255) from 2238-ticket_summary_invoiceOut into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-19 06:18:23 +00:00
Bernat Exposito Domenech	f9bc1406e2	delete css	2020-05-19 08:14:44 +02:00
Bernat Exposito Domenech	2681060878	update mehod ticket summary	2020-05-18 14:59:58 +02:00
Bernat Exposito Domenech	369d8d59d8	fix error	2020-05-18 14:58:06 +02:00
Joan Sanchez	309b4dafe9	Requested changes	2020-05-18 14:03:15 +02:00
Joan Sanchez	4aea769797	2246 Added claim state priority field	2020-05-18 13:46:45 +02:00
Bernat Exposito Domenech	b953fa8773	client descriptor add risk	2020-05-18 11:50:55 +02:00
Joan Sanchez	53b55468fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1833-claim_action_refactor	2020-05-18 11:45:43 +02:00
Joan Sanchez	a3203fa81f	2216 Show active client icon on client index	2020-05-18 10:39:40 +02:00
Bernat Exposito Domenech	c205c173f8	invoiceOut descriptor popover in ticket summary	2020-05-18 10:28:33 +02:00
Joan Sanchez	42bec3a944	1833 Claim action refactor	2020-05-15 14:47:19 +02:00
Javi Gallego	3815edfbea	falta CR	2020-05-15 12:17:34 +02:00
Joan Sanchez	9b085d13e1	Updated back unit test	2020-05-14 17:32:52 +02:00
Joan Sanchez	2bb17f4a00	Requested changes	2020-05-14 17:15:54 +02:00
Joan Sanchez	e51341102b	Updated e2e	2020-05-14 14:30:43 +02:00
Joan Sanchez	62d27e45e2	Updated unit tests	2020-05-14 14:01:34 +02:00
Juan Ferrer	b94c97d322	Hotfix: Clone option added to vnItemDescriptor	2020-05-13 17:51:27 +02:00
Joan Sanchez	94a219760c	2223 Added pickup checkbox	2020-05-13 15:04:57 +02:00
Juan Ferrer	07cbac7fcd	Merge fixes	2020-05-08 19:56:39 +02:00
Juan Ferrer	7a1bb7e68d	Merge branch 'dev' into 1882-descriptorRefactor	2020-05-08 14:01:49 +02:00
Juan Ferrer	b14d2f9455	Small fixes in vnOrderCatalog and vnZoneEvents	2020-05-08 13:23:06 +02:00
Javi Gallego	8453d25852	#2224item.diary provar directiva $anchorScroll	2020-05-06 18:42:50 +02:00
Juan Ferrer	6c14743017	Last fixes & tests passed	2020-05-06 14:38:09 +02:00
Juan Ferrer	6a8e1bf6b5	#1882 Boileplate code removed, declarative quicklinks	2020-04-30 12:48:52 +02:00
Juan Ferrer	b536c8291a	#1882 Popover::show() boilerplate code removed	2020-04-28 14:26:02 +02:00
Juan Ferrer	5826099601	#1882 First step, front tests passed	2020-04-25 11:50:04 +02:00
Javi Gallego	6dacf20bd9	ticket.index modificar orden de las secciones	2020-04-23 17:59:46 +02:00
Javi Gallego	dbb2257430	test de zone_getLanded y zone_getFromGeo	2020-04-20 13:49:33 +02:00
Juan Ferrer	e3b7f81c69	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2026-itemDescriptorPopoverRelocate	2020-04-09 16:24:19 +02:00
Javi Gallego	ab9e640b44	Merge branch 'dev' into #2174-ticket.weekly-añadir-campo-agencyModeFk	2020-04-08 13:15:17 +02:00
Javi Gallego	397872ee19	mejoradas las descripciones de los test	2020-04-08 13:15:07 +02:00
Javi Gallego	09e425c33c	2174 ticket.weekly con campo agencyModeFk con E2E	2020-04-08 12:33:36 +02:00
Juan Ferrer	4336a303c0	Merge branch 'dev' into 2026-itemDescriptorPopoverRelocate	2020-04-07 13:03:57 +02:00
Javi Gallego	dad77cfa08	Merge branch 'dev' into #2219-Añadir-menu-wikipedia	2020-04-06 12:41:07 +02:00
Javi Gallego	d835dd60ed	2219 Añadir menu wikipedia	2020-04-06 12:40:21 +02:00
Javi Gallego	ea1cc68d29	test passed	2020-04-03 17:52:47 +02:00
Javi Gallego	b6aedd2e6d	Merge branch '2215-windowsE2EFixes' into worker---Añadir-sección-con-enlace-a-Wikipedia	2020-04-03 12:26:27 +02:00
Javi Gallego	0b966cbb76	Merge branch 'dev' into worker---Añadir-sección-con-enlace-a-Wikipedia	2020-04-03 08:28:49 +02:00
Juan Ferrer	2249f68d6e	SCSS px to em: rem for font-size	2020-04-02 15:11:42 +02:00
Juan Ferrer	559cc5eb8c	SCSS em to px: Second step	2020-04-02 14:52:02 +02:00
Juan Ferrer	734c86c5f5	SCSS px to em - First step	2020-04-02 14:20:57 +02:00
Juan Ferrer	bf68d15264	E2E expeditions fixes, scss px/em fixes	2020-04-02 11:39:39 +02:00
Juan Ferrer	eb586c510e	E2E focus fixes	2020-04-01 16:05:43 +02:00
Juan Ferrer	5d1e0ee682	E2E fixes: client billing data, invoiceOut descriptor	2020-03-31 15:15:16 +02:00
Juan Ferrer	d6fda676f6	E2E fixes: Client balance	2020-03-31 10:19:01 +02:00
Juan Ferrer	dfb9d32c2a	Client & ticket E2E fixes	2020-03-30 17:30:03 +02:00
Javi Gallego	324261dc74	Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia	2020-03-30 12:22:09 +02:00
Javi Gallego	729daf8b34	Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia	2020-03-27 12:16:47 +01:00
Javi Gallego	0f977a632f	test front arreglados por el cambio de hora	2020-03-27 12:01:09 +01:00
Joan Sanchez	59fadf410e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2208-ticket_summary	2020-03-27 11:45:10 +01:00
Joan Sanchez	d640b66ef5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway	2020-03-27 11:22:00 +01:00
Bernat Exposito Domenech	74b27778ab	add phones in ticket summary	2020-03-27 11:10:20 +01:00
Joan Sanchez	598ebe96d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2203-ticket_sale	2020-03-27 11:06:35 +01:00
Joan Sanchez	ef960f6e0f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2206-zone_delivery_days	2020-03-27 10:55:10 +01:00
Joan Sanchez	6a66f47cc1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2178_ticket_index_payout	2020-03-27 10:19:47 +01:00
Joan Sanchez	64718b5977	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2139-oder_catalog_searchbar	2020-03-27 10:01:03 +01:00
Joan Sanchez	d4ca58edad	Updated back unit test	2020-03-27 09:10:30 +01:00
Javi Gallego	0a8272a730	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita	2020-03-26 17:52:41 +01:00
Javi Gallego	d53cedd5d4	preparado para PR	2020-03-26 17:41:40 +01:00
Joan Sanchez	835c415ba7	1934 - Moved procedure logic to method	2020-03-26 14:45:38 +01:00
Bernat Exposito Domenech	6928092594	fix ticket.sale state autocomplete	2020-03-26 12:00:07 +01:00
Joan Sanchez	92ffccc9a2	2206 - Refactor popover table	2020-03-26 09:07:17 +01:00
Juan Ferrer	0bd09492d1	#2026 Implemented & tests passed	2020-03-25 20:44:59 +01:00
Joan Sanchez	f231fabef1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2195-setDeleted_itemShelving	2020-03-25 16:14:13 +01:00
Joan Sanchez	e71ace6da7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section	2020-03-25 15:59:41 +01:00
Carlos Jimenez Ruiz	f06c7d3d47	front test	2020-03-25 15:17:43 +01:00
Carlos Jimenez Ruiz	9b4546edad	minor refactor plus path fix after merge	2020-03-25 14:18:51 +01:00
Joan Sanchez	2b7ff6fec0	Removed state vars	2020-03-25 14:08:45 +01:00
Joan Sanchez	90b437c7ad	Updated unit tests	2020-03-25 14:06:13 +01:00
Joan Sanchez	c8b6c3f7f3	Fixed conflicts	2020-03-25 13:44:51 +01:00
Joan Sanchez	5b5d7787ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2139-oder_catalog_searchbar	2020-03-25 09:25:26 +01:00
Joan Sanchez	61c85cfb9e	Updated tests	2020-03-25 09:20:26 +01:00
Bernat Exposito	77e8bbc2ce	Merge branch '2182_worker_log' of verdnatura/salix into dev	2020-03-25 07:53:23 +00:00
Bernat Exposito Domenech	dcdae825d2	fixex pull request	2020-03-25 08:43:49 +01:00
Javi Gallego	0561f19313	version 1	2020-03-24 17:34:23 +01:00
Javi Gallego	a30a4bf961	quitado el campo provincia	2020-03-24 17:32:30 +01:00
Juan Ferrer	2ec1a5d450	Merge branch 'e2eFixes' of https://gitea.verdnatura.es/verdnatura/salix into e2eFixes	2020-03-24 17:27:55 +01:00
Juan Ferrer	8eb6590285	E2E fixes	2020-03-24 17:27:21 +01:00
Carlos Jimenez Ruiz	12c2b577e6	minor refactor	2020-03-24 17:01:11 +01:00
Joan Sanchez	2ed9cbd402	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2139-oder_catalog_searchbar	2020-03-24 16:02:58 +01:00
Bernat Exposito Domenech	423f59dfb0	worker log	2020-03-24 12:20:53 +01:00
Joan Sanchez	9bae89a672	Updated unit test	2020-03-23 16:03:27 +01:00
Joan Sanchez	27b1376799	changes	2020-03-23 11:21:25 +01:00
Joan Sanchez	9b933e7d88	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section	2020-03-20 12:00:53 +01:00
Joan Sanchez	b998ed200c	Fixes	2020-03-20 09:01:14 +01:00
Joan Sanchez	40df1018e4	Fixes	2020-03-18 15:47:38 +01:00
Joan Sanchez	74b78fee84	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section	2020-03-18 14:13:10 +01:00
Joan Sanchez	3d23583e0b	Fixes	2020-03-18 14:08:04 +01:00
Joan Sanchez	a9c622377e	Refactor	2020-03-18 12:55:22 +01:00
Joan Sanchez	934e057a67	Fixed watcher changes	2020-03-18 09:41:23 +01:00
Joan Sanchez	f25c8bb644	Ticket refactor	2020-03-18 08:35:59 +01:00
Joan Sanchez	3cb98eaf5f	Route refactor	2020-03-17 15:24:55 +01:00
Joan Sanchez	526a92fd32	Order refactor	2020-03-17 15:18:02 +01:00
Joan Sanchez	88fe9a006e	Item refactor	2020-03-17 14:43:46 +01:00
Juan Ferrer	b4a5a88943	E2E fixed	2020-03-17 14:01:25 +01:00
Joan Sanchez	381f2a08ef	Client refactor	2020-03-17 11:17:50 +01:00
Juan Ferrer	176e38c144	Merge fixes	2020-03-16 18:54:22 +01:00
Juan Ferrer	27eaa328e5	Merge	2020-03-16 18:33:49 +01:00
Juan Ferrer	56a21edeca	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1992-goWhenOneResult	2020-03-16 18:33:39 +01:00
Juan Ferrer	8629bc25cd	Back & Front tests passed	2020-03-16 18:08:44 +01:00
Bernat Exposito Domenech	285d930b8e	showReport fix	2020-03-16 12:32:26 +01:00
Joan Sanchez	a601a615e2	Claim refactor	2020-03-16 11:58:14 +01:00
Bernat Exposito Domenech	f6ca9eee01	ticketlog in componentUpdate	2020-03-16 09:13:44 +01:00
Bernat Exposito Domenech	6fabada18c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos	2020-03-16 08:54:54 +01:00
Juan Ferrer	9d1bc8eb54	First functional version (No tests)	2020-03-13 20:33:12 +01:00
Joan Sanchez	16cdc419ea	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-03-13 17:23:48 +01:00
Joan Sanchez	7987603d7b	Updated filter	2020-03-13 17:22:59 +01:00
Joan Sanchez	dbe7dcd0f2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-03-13 15:08:59 +01:00
Joan Sanchez	36ad778a59	Removed default filter	2020-03-13 15:02:51 +01:00
Joan Sanchez	2d24417078	Added translation	2020-03-13 14:40:00 +01:00
Joan Sanchez	55ff624394	2191 - Added showEmpty filter	2020-03-13 14:39:51 +01:00
Joan Sanchez	920d2c66b0	Added translation	2020-03-13 14:25:34 +01:00
Joan Sanchez	227760d712	2191 - Added showEmpty filter	2020-03-13 14:09:22 +01:00
Bernat Exposito Domenech	f9abaa409a	fix calendar-holiday model	2020-03-13 13:10:04 +01:00
Bernat Exposito Domenech	fdd1c73485	refactor componentUpdate	2020-03-13 12:26:15 +01:00
Bernat Exposito Domenech	dae89489ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos	2020-03-13 12:23:06 +01:00
Joan Sanchez	d234647112	Updated unit test	2020-03-13 11:03:34 +01:00
Joan Sanchez	db89e3f5d4	Updated unit test	2020-03-13 11:03:24 +01:00
Joan Sanchez	d9176728b0	Add line on change item	2020-03-13 11:03:16 +01:00
Joan Sanchez	269bd8e69a	2181 - Ticket sale fix item search	2020-03-13 11:03:05 +01:00
Bernat Exposito	1877a2ff1f	Merge branch '2181-ticket_sale_fixes' of verdnatura/salix into dev	2020-03-13 08:23:36 +00:00
Joan Sanchez	2d755c9094	Updated unit test	2020-03-13 08:47:41 +01:00
Joan Sanchez	f8c69306f4	Updated unit test	2020-03-13 08:44:01 +01:00
Joan Sanchez	d51356f11b	Add line on change item	2020-03-13 08:20:30 +01:00
Bernat Exposito Domenech	3ab80e1479	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos	2020-03-12 12:04:35 +01:00
Bernat Exposito Domenech	6798f9709c	update view holiday	2020-03-12 10:59:41 +01:00
Joan Sanchez	b9a482fc37	2181 - Ticket sale fix item search	2020-03-11 15:56:02 +01:00
Joan Sanchez	aba24292cf	Module translations	2020-03-11 13:36:56 +01:00
Bernat Exposito Domenech	67151f8427	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2165-travel_index_buttonClon	2020-03-11 13:23:34 +01:00
Bernat Exposito	b3cb2f7c25	Merge branch '2165-travel_index_buttonClon' of verdnatura/salix into dev	2020-03-11 12:22:14 +00:00
Joan Sanchez	1c8541376b	Fixed removed letter	2020-03-11 12:54:28 +01:00
Bernat Exposito Domenech	d0b0c9d060	pull request changes	2020-03-11 12:03:55 +01:00
Joan Sanchez	8fe6c651e3	Updated translations	2020-03-11 12:02:12 +01:00
Bernat Exposito Domenech	e92030ec6e	test	2020-03-11 09:17:14 +01:00
Joan Sanchez	668c337fb1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2175-ticket_send_sms	2020-03-11 08:46:22 +01:00
Joan Sanchez	581e2fcd1f	Updated unit test	2020-03-11 08:45:54 +01:00
Bernat Exposito Domenech	d35634551b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2165-travel_index_buttonClon	2020-03-11 08:45:11 +01:00
Joan Sanchez	2c39d8d390	Changed icon	2020-03-11 08:05:38 +01:00
Joan Sanchez	7496bc923e	Updated fonts & changed icons	2020-03-11 08:02:58 +01:00
Joan Sanchez	3736dcf792	Added ticket sms options	2020-03-10 15:01:33 +01:00
Joan Sanchez	0cd4e2ad9e	Added autocomplete property	2020-03-10 14:28:50 +01:00
Bernat Exposito Domenech	4a5d97996e	travel.index clonar	2020-03-10 14:09:26 +01:00
Joan Sanchez	6d437d0e2e	Allow empty agency on ticket creation	2020-03-10 11:46:58 +01:00
Joan Sanchez	d616b8a535	Merge branch '1969_e2e_diferentes_resoluciones' of verdnatura/salix into dev	2020-03-10 07:01:30 +00:00
Carlos Jimenez Ruiz	8688ecc810	eliminado el campo id en advanced search	2020-03-10 07:38:21 +01:00
Carlos Jimenez Ruiz	ebc0889011	Merge branch '2171-show_payment_button' of verdnatura/salix into dev	2020-03-09 15:51:39 +00:00
Carlos Jimenez Ruiz	e111b9a2b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1969_e2e_diferentes_resoluciones	2020-03-09 15:01:36 +01:00
Joan Sanchez	209251bf8b	2173 - descriptor_quicklink	2020-03-09 14:11:43 +01:00
Joan Sanchez	d173ab6a2b	2171 - Mostrar botón "Pago a cuenta" en índice de tickets	2020-03-09 11:50:23 +01:00
Carlos Jimenez Ruiz	2a0e437e1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1969_e2e_diferentes_resoluciones	2020-03-09 09:19:22 +01:00
Joan Sanchez	64f74b4f33	Merge branch '2111-route_drag_drop' of verdnatura/salix into dev	2020-03-08 12:45:44 +00:00
Juan Ferrer	c6b2db9a79	Savepoint	2020-03-07 13:52:02 +01:00
Joan Sanchez	3c41c4656b	2111 - Drop tickets to route ticket list	2020-03-06 13:06:01 +01:00
Joan Sanchez	fd91c3061a	Merge branch '2149-dbTest_workerTimeControl_check' of verdnatura/salix into dev	2020-03-06 11:19:26 +00:00
Bernat Exposito Domenech	da6b3bc5c8	fix test	2020-03-06 12:01:42 +01:00
Joan Sanchez	97671fd4a1	Merge branch '1878-print_with_auth' of verdnatura/salix into dev	2020-03-06 10:34:38 +00:00
Joan Sanchez	c329a4380c	Merge branch '2037_getWorkedHours_db_test' of verdnatura/salix into dev	2020-03-06 10:34:06 +00:00
Carlos Jimenez Ruiz	5f0ace8f29	removed unused code	2020-03-06 10:21:42 +01:00
Carlos Jimenez Ruiz	0dce5c733b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2082_entry_buy	2020-03-06 09:57:17 +01:00
Carlos Jimenez Ruiz	11bd861224	section bases	2020-03-06 09:57:05 +01:00
Bernat Exposito Domenech	1951e8bcf9	fix setter client	2020-03-06 08:50:55 +01:00
Bernat Exposito Domenech	666ccbf370	ticket.basicData address	2020-03-06 08:38:03 +01:00
Joan Sanchez	fddc8e7ed1	Updated unit test	2020-03-05 14:49:41 +01:00
Joan Sanchez	1f714718bb	1878 - Implementar autenticación en servicio print	2020-03-05 13:56:45 +01:00
Carlos Jimenez Ruiz	0f3ceea653	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2037_getWorkedHours_db_test	2020-03-04 15:13:03 +01:00
Joan Sanchez	f168734b8c	Updated E2E	2020-03-04 13:54:17 +01:00
Joan Sanchez	516b112354	Merge branch '2034-postcode_autocomplete' of verdnatura/salix into dev	2020-03-04 12:15:41 +00:00
Joan Sanchez	5da1c41476	Added ACL	2020-03-04 12:51:29 +01:00
Joan Sanchez	24becf7872	Updated var names	2020-03-04 11:17:35 +01:00
Joan Sanchez	df3fbf291b	Changed format	2020-03-04 09:32:18 +01:00
Joan Sanchez	d6278e0df9	2164 - Show confirmation only when data is not empty	2020-03-04 09:26:12 +01:00
Bernat Exposito Domenech	e40575cc1f	fix model entry log	2020-03-04 08:58:57 +01:00
Bernat Exposito Domenech	ced8c6e963	traductions	2020-03-04 07:49:21 +01:00
Bernat Exposito Domenech	6b44715bf6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2148-entry_log	2020-03-04 07:41:28 +01:00
Carlos Jimenez Ruiz	0f7ed5bbfa	get worked hours unit test	2020-03-03 15:14:28 +01:00
Joan Sanchez	15bedc5f12	Updated unit tests	2020-03-03 15:03:54 +01:00
Joan Sanchez	f16553ecba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete	2020-03-03 13:59:33 +01:00
Bernat Exposito Domenech	686382a0e6	entryLog section	2020-03-02 11:57:09 +01:00
Joan Sanchez	7e694c3e80	2073 - Filter by pending tickets	2020-03-02 11:35:43 +01:00
Bernat Exposito Domenech	72b7300bf5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2148-entry_log	2020-03-02 10:41:32 +01:00
Bernat Exposito Domenech	1d98c44c3e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor	2020-03-02 09:51:05 +01:00
Bernat Exposito Domenech	42b151c849	fix isEditable spec	2020-03-02 09:43:22 +01:00
Joan Sanchez	04917f980f	Updated E2E	2020-03-02 09:30:54 +01:00
Bernat Exposito Domenech	bd46f6a302	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor	2020-03-02 09:28:43 +01:00
Bernat Exposito Domenech	0d23a3894f	entry log	2020-03-02 09:28:08 +01:00
Bernat Exposito Domenech	2accd8fa3b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2148-entry_log	2020-03-02 08:51:00 +01:00
Bernat Exposito Domenech	63cd436d3c	fix request changes	2020-03-02 08:30:33 +01:00
Joan Sanchez	5ccc79df8c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete	2020-03-02 08:07:14 +01:00
Joan Sanchez	03e952c83e	Updated unit test	2020-03-02 07:57:33 +01:00
Joan Sanchez	28553a1c0d	Worker dms changes	2020-03-02 07:50:07 +01:00
Joan Sanchez	28b7f5d3a2	2151 - Added thermograph edit section	2020-02-28 14:18:55 +01:00
Joan Sanchez	a2001636d2	Some changes	2020-02-28 09:21:00 +01:00
Joan Sanchez	dfacb02cdc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2151-edit_thermograph	2020-02-28 09:08:01 +01:00
Joan Sanchez	25a1c0d2de	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-02-28 08:34:42 +01:00
Joan Sanchez	a8eea3d8f6	Changed primary key	2020-02-28 08:19:37 +01:00
Joan Sanchez	5169273ccc	Added edit section	2020-02-28 08:19:20 +01:00
Joan Sanchez	220f36d795	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-02-28 07:34:26 +01:00
Joan Sanchez	442541d0f8	Renamed rgb column	2020-02-28 07:24:36 +01:00
Joan Sanchez	12aa5da355	Changed fields order	2020-02-28 07:17:19 +01:00
Bernat Exposito	9d513878a1	Merge branch '2150-travel_filter_by_ref' of verdnatura/salix into dev	2020-02-27 12:57:44 +00:00
Joan Sanchez	94ebb7fbd2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-02-27 13:48:09 +01:00
Joan Sanchez	6dcfc34056	Fix - Find duplicated client	2020-02-27 13:33:40 +01:00
Joan Sanchez	ccd28114ca	Updated unit tests	2020-02-27 12:39:58 +01:00
Bernat Exposito Domenech	4561b6eeef	refactor ticket.isEditable	2020-02-27 12:31:38 +01:00
Joan Sanchez	c920f0bc91	Requested changes	2020-02-27 11:21:11 +01:00