2601 Commits

Author	SHA1	Message	Date
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
Joan Sanchez	893b634d33	Get phone from address and client	2020-02-27 11:18:59 +01:00
Joan Sanchez	70210e87c9	Advanced filter by ref	2020-02-27 09:03:36 +01:00
Joan Sanchez	a86c7c9b8a	updated unit tests	2020-02-27 08:08:31 +01:00
Joan Sanchez	21ace6ef4e	Merge branch '2131_jest_spyOn' of verdnatura/salix into dev	2020-02-27 06:56:43 +00:00
Joan Sanchez	21be73b734	2127 - Disable preview on sepa core sample	2020-02-27 07:40:43 +01:00
Carlos Jimenez Ruiz	c9f37d5fcd	Merge branch '2127-sample_disable_preview' of verdnatura/salix into dev	2020-02-27 06:27:12 +00:00
Carlos Jimenez Ruiz	6c668131a4	replaced returnValur for returnThis	2020-02-27 07:19:42 +01:00
Carlos Jimenez Ruiz	0fd012930e	#2131 jest.spyOn	2020-02-26 15:02:47 +01:00
Joan Sanchez	1d326a52c8	updated unit tests	2020-02-26 14:45:47 +01:00
Joan Sanchez	d66c53dbf2	2127 - Disable preview on sepa core sample	2020-02-26 14:30:30 +01:00
Carlos Jimenez Ruiz	aedd551371	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2131_jest_spyOn	2020-02-26 13:24:41 +01:00
Carlos Jimenez Ruiz	794b20fc83	#2131 jest.spyOn	2020-02-26 13:22:52 +01:00
Joan Sanchez	37ff99d838	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-02-26 13:19:32 +01:00
Joan Sanchez	e15ef3386e	Translation changes	2020-02-26 13:18:29 +01:00
Joan Sanchez	d401fa8d13	Changed variable name	2020-02-26 13:06:35 +01:00
Joan Sanchez	ce84d26fae	Some changes	2020-02-26 12:24:48 +01:00
Joan Sanchez	e09325b3fa	Changed test description	2020-02-26 11:43:41 +01:00
Joan Sanchez	442c3ba87c	unit tests	2020-02-26 11:05:29 +01:00
Joan Sanchez	4add07898f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2138-zone_event_m3	2020-02-26 11:00:40 +01:00
Bernat Exposito Domenech	9cad13f166	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1970-test_crud_model	2020-02-26 08:24:21 +01:00
Joan Sanchez	9849c60651	Added popover	2020-02-26 07:02:03 +01:00
Bernat Exposito Domenech	85db094f1d	componentUpdate	2020-02-25 12:36:33 +01:00
Carlos Jimenez Ruiz	0bf0ed78ee	Merge branch '2056-entry_descriptor' of verdnatura/salix into dev	2020-02-25 10:49:40 +00:00
Bernat Exposito Domenech	bbba294b79	fix test	2020-02-25 11:44:46 +01:00
Bernat Exposito Domenech	2fdd275085	log in ticketUpdate	2020-02-25 11:43:50 +01:00
Bernat Exposito Domenech	b37e8da410	fix test	2020-02-25 10:39:21 +01:00
Joan Sanchez	447cdc686e	2138 - Added field m3Max to zoneEvent	2020-02-25 08:08:13 +01:00
Bernat Exposito Domenech	e7cdc58fad	translates	2020-02-25 07:51:16 +01:00
Bernat Exposito	7c1a13cca8	Merge branch '2134-item_request_load_error' of verdnatura/salix into dev	2020-02-24 13:38:17 +00:00
Joan Sanchez	ad1e08ec70	2134 - Irem request load error	2020-02-24 14:29:48 +01:00
Joan Sanchez	415316d7d0	2081 - Fix ticket search by order id	2020-02-24 13:28:59 +01:00
Bernat Exposito Domenech	832089de79	entry descriptor, add more options to view entry report	2020-02-24 12:20:53 +01:00
Joan Sanchez	d0c2f88a77	2126 - Search by client name	2020-02-24 12:08:53 +01:00
Joan Sanchez	3643709a80	Added datalist auto completion	2020-02-24 11:27:36 +01:00
Bernat Exposito Domenech	0a4adedcdb	client descriptor translates	2020-02-24 09:47:26 +01:00
Joan Sanchez	75d7125426	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete	2020-02-24 09:41:23 +01:00
Bernat Exposito Domenech	79fca8b70b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor	2020-02-24 09:25:39 +01:00
Bernat Exposito Domenech	005adc252d	worker dms index	2020-02-24 08:05:26 +01:00
Bernat Exposito Domenech	50a8da2064	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor	2020-02-21 12:48:37 +01:00
Bernat Exposito Domenech	9779c6d2ba	entry summary and descriptor	2020-02-21 12:48:34 +01:00
Joan Sanchez	7b57d79f50	Create client geo auto fill	2020-02-21 12:39:41 +01:00
Bernat Exposito Domenech	773963e7ab	update entry filter	2020-02-21 10:03:08 +01:00
Bernat Exposito	97716e0ede	Merge branch '2130-ticket_sms' of verdnatura/salix into dev	2020-02-21 08:50:33 +00:00
Joan Sanchez	2dbde24a99	Requested changes	2020-02-21 09:00:13 +01:00
Javi Gallego	4d389176fe	Merge branch 'test' into dev	2020-02-21 08:50:50 +01:00
Joan Sanchez	bf4e0d09c5	Get phone from address and client	2020-02-21 08:37:37 +01:00
Javi Gallego	a8137c8a6b	zoneClosure 3	2020-02-20 15:15:50 +01:00
Joan Sanchez	2f089681df	Don't throw error if no salesPerson is assigned	2020-02-20 12:52:05 +01:00
Joan Sanchez	54bc1bc281	Merge branch '1835-e2e-item-request' of verdnatura/salix into dev	2020-02-20 10:10:18 +00:00
Bernat Exposito Domenech	cec1f7b90f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor	2020-02-20 09:48:12 +01:00
Carlos Jimenez Ruiz	587653fb40	#2119 e2e item.request	2020-02-20 09:31:44 +01:00
Joan Sanchez	9e435e9553	Some changes	2020-02-19 12:34:33 +01:00
Joan Sanchez	c9fd48b0cd	2112 - Catalog improvements	2020-02-19 11:57:39 +01:00
Carlos Jimenez Ruiz	081c742dcb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1835-e2e-item-request	2020-02-19 11:48:01 +01:00
Joan Sanchez	346d20b066	Merge branch '2124-route_basic_data' of verdnatura/salix into dev	2020-02-18 12:07:29 +00:00
Bernat Exposito Domenech	bfb8c5e138	route.basicData validations	2020-02-18 12:51:29 +01:00
Joan Sanchez	ba06a59ac8	Merge branch '2110-client_sample_validation' of verdnatura/salix into dev	2020-02-18 10:53:44 +00:00
Joan Sanchez	af51c2632e	Merge branch '2122-entry_index' of verdnatura/salix into dev	2020-02-18 10:20:19 +00:00
Joan Sanchez	2460725d98	Refactor + updated tests	2020-02-18 11:14:02 +01:00
Bernat Exposito Domenech	6540ef9598	change Fk to Id	2020-02-18 11:07:55 +01:00
Bernat Exposito Domenech	3f978bd32b	entry index refactor	2020-02-18 10:33:17 +01:00
Joan Sanchez	7e38100d05	Merge branch '845-order_catalog_datalist' of verdnatura/salix into dev	2020-02-18 06:58:54 +00:00
Joan Sanchez	30e3880299	Removed comments	2020-02-18 07:50:18 +01:00
Joan Sanchez	61b3ce184c	Merge branch '2113-item_data_add_instrastat' of verdnatura/salix into dev	2020-02-18 06:32:17 +00:00
Joan Sanchez	fe8a0b4583	Added translation. taxClassCode.sql removed	2020-02-18 07:21:35 +01:00
Joan Sanchez	a9b8fab51d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-02-17 14:55:26 +01:00
Joan Sanchez	1ca3753908	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-02-17 14:48:11 +01:00
Joan Sanchez	a148daa368	2125 - ticket create invalid type fix	2020-02-17 14:47:43 +01:00
Bernat Exposito Domenech	f900b7ef62	crud model test	2020-02-17 13:50:54 +01:00
Joan Sanchez	7d8e88e884	Updated unit test	2020-02-17 13:32:12 +01:00
Joan Sanchez	844b27acb9	2118 - Create new intrastat	2020-02-17 12:47:03 +01:00
Joan Sanchez	578556b1d5	2121 - Client balance fix balance on pagination	2020-02-17 08:38:19 +01:00
Joan Sanchez	d9ed7cda38	Added form dialog	2020-02-17 07:22:55 +01:00
Carlos Jimenez Ruiz	4e2ab537ee	unstable with the rest of tests	2020-02-14 14:52:47 +01:00
Joan Sanchez	84bf95db13	2106 - Sms max length fix	2020-02-14 12:01:17 +01:00
Joan Sanchez	fd45c41210	removed focus	2020-02-13 15:01:24 +01:00
Joan Sanchez	5360c407d5	updated unit test	2020-02-13 14:46:18 +01:00
Joan Sanchez	be07e33e5f	updated unit test	2020-02-13 14:39:33 +01:00
Joan Sanchez	39470e837b	2094 Regularize claim send chat even if doesn't have destination	2020-02-13 13:20:31 +01:00
Joan Sanchez	c5840f322f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 845-order_catalog_datalist	2020-02-13 11:38:18 +01:00
Bernat Exposito Domenech	1887cc8c60	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2105-export_structure_db	2020-02-13 08:44:25 +01:00
Bernat Exposito Domenech	4b48a89eaa	ticket descriptor update acl	2020-02-13 08:31:29 +01:00
Bernat Exposito Domenech	4abf87552d	db production exported	2020-02-12 14:38:51 +01:00
Carlos Jimenez Ruiz	2a7f826cf6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2006-e2e-route-summary	2020-02-12 14:36:14 +01:00
Carlos Jimenez Ruiz	e8a178d5f4	#2006 e2e route.summary plus refactors	2020-02-12 14:36:05 +01:00
Bernat Exposito Domenech	e0f7b917d7	db test ticket_recalcComponent	2020-02-12 10:39:46 +01:00
Joan Sanchez	c78c154ab0	Added datalist	2020-02-11 14:41:59 +01:00
Bernat Exposito Domenech	5375952778	translate	2020-02-11 13:52:05 +01:00
Bernat Exposito Domenech	1d73d9f89d	refactor campaing report	2020-02-11 13:25:41 +01:00
Carlos Jimenez Ruiz	420f059211	Merge branch '1684-ticket_transfer_salesLog' of verdnatura/salix into dev	2020-02-11 08:30:08 +00:00
Joan Sanchez	91210c3a0d	1684 - Log old quantity value	2020-02-11 08:19:03 +01:00
Joan Sanchez	f2fdce11cd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-02-10 14:54:59 +01:00
Joan Sanchez	8ad2344735	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2020-02-10 14:54:21 +01:00
Bernat Exposito Domenech	d26597c395	fix ticket.sale sms	2020-02-10 14:34:53 +01:00
Bernat Exposito Domenech	d1c8c8ad58	ticket/client.sms validations	2020-02-10 14:33:38 +01:00
Joan Sanchez	e1942875af	1684 - Log transfer old values	2020-02-10 14:32:52 +01:00
Bernat Exposito Domenech	f6674448f8	ticket/client.sms validations	2020-02-10 13:22:43 +01:00
Joan Sanchez	cdef356e8f	Merge branch '2091-ticket_sms' of verdnatura/salix into dev	2020-02-10 08:52:34 +00:00
Joan Sanchez	829f9a67bc	Merge branch '2007-e2e-invoiceout-summary' of verdnatura/salix into dev	2020-02-10 08:47:49 +00:00
Bernat Exposito Domenech	bafec3ce90	fix ticket.sale sms	2020-02-10 09:36:40 +01:00
Bernat Exposito Domenech	7a643eff34	fix index step-two	2020-02-10 07:03:09 +01:00
Carlos Jimenez Ruiz	0a554afdb2	2007 e2e invoiceOut summary	2020-02-07 15:42:11 +01:00
Bernat Exposito Domenech	dd368a8c3f	refactor ticket.basicData steps	2020-02-07 13:38:32 +01:00
Carlos Jimenez Ruiz	f28a80b855	#2078 ticket. step-one	2020-02-07 11:25:56 +01:00
Carlos Jimenez Ruiz	ca94f03c58	Merge branch '2036-claim_action_show_snackbar' of verdnatura/salix into dev	2020-02-07 08:27:36 +00:00
Joan Sanchez	b192cb15c0	Show data save snackbar on auto-save	2020-02-07 07:47:11 +01:00
Bernat Exposito Domenech	2f81727594	reload_card_volume	2020-02-07 07:43:22 +01:00
Joan Sanchez	4deda8588b	Merge branch '2029-fix_item_request_filters' of verdnatura/salix into dev	2020-02-07 06:09:02 +00:00
Joan Sanchez	b623646f25	removed console	2020-02-07 07:02:27 +01:00
Javi Gallego	5d0f72af4e	zoneDoCalc	2020-02-06 16:04:23 +01:00
Bernat Exposito Domenech	5cd3bde306	ticketRequest front test	2020-02-06 14:59:00 +01:00
Joan Sanchez	3e0fd10b41	2029 - Item request fixes & searchbar filters working	2020-02-06 14:33:28 +01:00
Carlos Jimenez Ruiz	a3a7b4cbaa	Merge branch '2084-order_catalog_keep_category' of verdnatura/salix into dev ... n1ce	2020-02-06 12:52:00 +00:00
Carlos Jimenez Ruiz	652e0e6071	Merge branch '2076-item_tags_refactor' of verdnatura/salix into dev	2020-02-06 12:50:40 +00:00
Joan Sanchez	b647379443	removed line	2020-02-06 13:42:28 +01:00
Carlos Jimenez Ruiz	b6a2344e14	Merge branch '2059-zone_index_searchPanel' of verdnatura/salix into dev	2020-02-06 12:14:31 +00:00
Bernat Exposito Domenech	73c4e310f0	2059 zone.index buscador avanzado	2020-02-06 13:07:01 +01:00
Joan Sanchez	20f9f7af24	2084 - Keep categoryId selected on item confirmation	2020-02-06 12:46:44 +01:00
Bernat Exposito Domenech	bb09fc9746	update ticket.isEditable	2020-02-06 11:50:32 +01:00
Joan Sanchez	462cf46753	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2076-item_tags_refactor	2020-02-06 11:26:22 +01:00
Bernat Exposito Domenech	7bb5b19398	refactor table holidayType and holidayDetail	2020-02-06 09:33:36 +01:00
Carlos Jimenez Ruiz	1e8059c9f5	Merge branch '2023-ticket_index_advanced_search' of verdnatura/salix into dev	2020-02-06 07:26:39 +00:00
Joan Sanchez	4d723a721e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2076-item_tags_refactor	2020-02-06 08:02:59 +01:00
Joan Sanchez	e3b1a4b58a	2076 - Item tags refactor	2020-02-06 07:41:51 +01:00
Carlos Jimenez Ruiz	610c21f23d	corrected a typo	2020-02-06 07:39:00 +01:00
Bernat Exposito Domenech	8193b0ffc0	update ticket.filter	2020-02-06 07:37:41 +01:00
Carlos Jimenez Ruiz	06c3580bc4	#1944 ticket.summary	2020-02-05 13:37:36 +01:00
Carlos Jimenez Ruiz	76fc5a3311	#1944 ticket.summary	2020-02-05 12:44:14 +01:00
Joan Sanchez	218ed38b54	changed comment	2020-02-05 08:24:29 +01:00
Joan Sanchez	bee814f6a6	#2069 bug-fix ticket scope days	2020-02-05 08:23:23 +01:00
Joan Sanchez	f86d3a0052	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1959-client_fiscal_data_check_phone	2020-02-04 13:23:02 +01:00
Joan Sanchez	041c4966d6	changed line	2020-02-04 12:29:04 +01:00
Joan Sanchez	494b14bab4	added translation	2020-02-04 12:28:01 +01:00
Joan Sanchez	5b0bb5dc73	updated e2e	2020-02-04 11:25:15 +01:00
Bernat Exposito Domenech	89dc8e27e0	update models	2020-02-04 11:20:05 +01:00
Bernat Exposito Domenech	fac93bd74c	summary	2020-02-04 09:34:31 +01:00
Bernat Exposito Domenech	eab2593306	update ticket.dms.create	2020-02-03 14:36:04 +01:00
Bernat Exposito Domenech	759ac5b5c7	add icon in worker.index	2020-02-03 14:03:09 +01:00
Bernat Exposito Domenech	0681f5efc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2071-ticket_sale_split	2020-02-03 11:12:09 +01:00
Bernat Exposito Domenech	668f20c433	update lastActiveTickets	2020-02-03 11:12:04 +01:00
Bernat Exposito Domenech	6265796260	add icon in ticket.basicData	2020-02-03 09:24:49 +01:00
Joan Sanchez	b743938fee	merge	2020-01-31 08:18:54 +01:00
Joan Sanchez	43693c35ad	removed fdescribe	2020-01-30 14:35:21 +01:00
Joan Sanchez	8f851d5c15	refactor	2020-01-30 13:53:14 +01:00
Joan Sanchez	31349b2ebf	Merge branch 'test' into dev	2020-01-30 11:54:51 +01:00
Bernat Exposito Domenech	c07d5f337a	fix getWorkerdHours	2020-01-30 11:20:41 +01:00
Joan Sanchez	1be640a59d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members	2020-01-29 14:51:37 +01:00
Joan Sanchez	499bd082fc	changed messages	2020-01-29 14:13:25 +01:00
Joan Sanchez	5ebe800c5f	html fix	2020-01-29 13:41:55 +01:00
Joan Sanchez	a078898627	Merge branch '2049-hotfix_percentage' of verdnatura/salix into master	2020-01-29 10:29:35 +00:00
Joan Sanchez	b27d514918	percentage hotfix	2020-01-29 11:09:42 +01:00
Joan Sanchez	b0ec7ce15b	updated e2e	2020-01-28 11:56:26 +01:00
Bernat Exposito Domenech	35b9820e73	update ticket request	2020-01-28 09:05:01 +01:00
Joan Sanchez	35e443a112	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members	2020-01-28 09:03:33 +01:00
Joan Sanchez	0044bd2efa	updated tests	2020-01-28 09:03:20 +01:00
Carlos Jimenez Ruiz	87ad594f8a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2020-01-27 14:31:33 +01:00
Bernat Exposito Domenech	849faad6ea	add m3Max in agency.basicData	2020-01-27 09:45:13 +01:00
Carlos Jimenez Ruiz	a1fd5a01a7	#1976 Implementar Puppeteer	2020-01-27 00:48:00 +01:00
Carlos Jimenez Ruiz	7fef6dc2b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2020-01-26 21:59:46 +01:00
Bernat Exposito Domenech	9f73c68210	udate client.log styles	2020-01-24 14:22:11 +01:00
Joan Sanchez	921af4dcc2	Merge branch '2014-remove_bi_from_db' of verdnatura/salix into dev	2020-01-24 12:52:30 +00:00
Bernat Exposito Domenech	b244df4807	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db	2020-01-24 12:56:01 +01:00
Javi Gallego	08fda3ed1b	#workedHours	2020-01-24 12:38:08 +01:00
Carlos Jimenez Ruiz	f74792dbe9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2020-01-24 10:17:08 +01:00
Joan Sanchez	2eeab485e3	Merge dev	2020-01-24 09:48:59 +01:00
Joan Sanchez	25ffa839a2	added incoterms & customs agent to address forms	2020-01-24 09:47:24 +01:00
Joan Sanchez	deada69ca4	Added models	2020-01-23 14:59:37 +01:00
Bernat Exposito	f6ad5696b4	Merge branch '2018-deprecate_message_send' of verdnatura/salix into dev	2020-01-23 13:14:21 +00:00
Bernat Exposito Domenech	439f9009ff	fix model componentType	2020-01-23 13:47:00 +01:00
Joan Sanchez	57acca2f5e	refactor & updated tests	2020-01-23 13:31:07 +01:00
Bernat Exposito Domenech	6700daf0e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db	2020-01-23 12:58:47 +01:00
Bernat Exposito Domenech	64bd721287	update structure db	2020-01-23 12:58:38 +01:00
Bernat Exposito	6c0cc3d204	Merge branch '1982-travel_add_thermograph' of verdnatura/salix into dev	2020-01-23 10:00:58 +00:00
Juan Ferrer	23f066b3f4	vnZoneWarehouses: remove bug fixed	2020-01-22 16:32:01 +01:00
Javi Gallego	5bd31eb082	zoneClosure	2020-01-22 10:41:09 +01:00
Bernat Exposito Domenech	960b3c3f75	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-01-22 09:51:35 +01:00
Bernat Exposito Domenech	0b848adf03	fix back test	2020-01-22 09:43:10 +01:00
Joan Sanchez	c36e62a97b	added front unit tests	2020-01-22 09:04:26 +01:00
Joan Sanchez	2339d347f7	Added back unit tests	2020-01-22 08:26:54 +01:00
Joan Sanchez	77f6333aba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph	2020-01-21 12:23:10 +01:00
Joan Sanchez	f0b4c26aea	added travel thermograph create & remove methods	2020-01-21 12:21:53 +01:00
Joan Sanchez	1d6edabb10	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-01-21 09:23:58 +01:00
Joan Sanchez	e93e9d2947	getWasteDetail() now calls weekWaste_getDetail()	2020-01-21 09:17:55 +01:00
Joan Sanchez	5e4ab8b128	Loggable errors	2020-01-21 09:00:42 +01:00
Joan Sanchez	41e69a2e9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph	2020-01-20 13:05:06 +01:00
Joan Sanchez	3ff1fb7d2d	Added back unit tests	2020-01-20 11:59:15 +01:00
Bernat Exposito Domenech	8ae5a8705e	fix test	2020-01-20 11:17:04 +01:00
Bernat Exposito Domenech	0fe0596b3e	worker phone refactor	2020-01-20 11:03:40 +01:00
Joan Sanchez	826dfe8092	changes to percentage filter	2020-01-17 11:46:45 +01:00
Joan Sanchez	3a4c379033	Added waste section	2020-01-17 11:44:05 +01:00
Joan Sanchez	65a227db9e	uploadFile args	2020-01-17 09:23:32 +01:00
Joan Sanchez	4002b51565	added section	2020-01-17 08:43:10 +01:00
Joan Sanchez	1704f5e93b	Merge branch '2011-client_phone' of verdnatura/salix into dev	2020-01-17 06:48:57 +00:00
Bernat Exposito Domenech	74b688dc4b	client phone refactor	2020-01-17 07:24:57 +01:00
Bernat Exposito	e1aefc795b	Merge branch '2008-item_buyer_waste_detail' of verdnatura/salix into dev	2020-01-16 13:42:12 +00:00
Joan Sanchez	2b2e6532f6	changes to percentage filter	2020-01-16 13:39:32 +01:00
Bernat Exposito Domenech	ba2300288f	sendSms test	2020-01-16 12:40:28 +01:00
Bernat Exposito Domenech	b42b2ec8c3	refactor sms send	2020-01-15 13:27:14 +01:00
Joan Sanchez	708789502d	Added waste section	2020-01-15 13:07:33 +01:00
Joan Sanchez	8f449566bb	Merge branch '2000-client.sms' of verdnatura/salix into dev	2020-01-15 08:20:40 +00:00
Bernat Exposito Domenech	1f60aac446	export structure db	2020-01-15 08:19:22 +01:00
Bernat Exposito Domenech	cbda081608	refactor sms component	2020-01-14 09:10:54 +01:00
Bernat Exposito Domenech	f4e3649d9e	new section thermograph	2020-01-13 11:53:10 +01:00
Joan Sanchez	048fcb733d	added zone name to ticket summary	2020-01-13 07:42:41 +01:00
Joan Sanchez	de05cadef4	Merge branch '1975-delivery_note_tags' of verdnatura/salix into dev	2020-01-10 11:09:29 +00:00
Bernat Exposito Domenech	6c4e25bfe3	create entry.index	2020-01-10 11:52:35 +01:00
Joan Sanchez	e235bf94a6	removed syntax error	2020-01-10 11:31:12 +01:00
Joan Sanchez	16a9a1f5f8	updated styles	2020-01-10 11:29:11 +01:00
Joan Sanchez	5cf8328476	added more rows to sms textarea	2020-01-09 13:58:50 +01:00
Carlos Jimenez Ruiz	cb2f94cdaf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2020-01-09 13:10:27 +01:00
Bernat Exposito Domenech	5511ef2537	client address index	2020-01-09 12:39:03 +01:00
Carlos Jimenez Ruiz	83d2ec40d4	Merge branch '1985-apply_item_type_filter' of verdnatura/salix into dev	2020-01-09 10:50:26 +00:00
Bernat Exposito Domenech	78fab48840	update models	2020-01-09 11:27:53 +01:00
Joan Sanchez	6f3359c76e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1985-apply_item_type_filter	2020-01-09 11:24:01 +01:00
Joan Sanchez	7df41fc63c	solved bug ordering by tag	2020-01-09 11:21:54 +01:00
Bernat Exposito Domenech	d432c32577	export production and create new models	2020-01-09 10:49:09 +01:00
Bernat Exposito Domenech	99f5fbec3c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1980-models_Thermograph	2020-01-09 10:17:23 +01:00
Joan Sanchez	c830bc6e8a	fixed order by tag	2020-01-09 09:23:59 +01:00
Carlos Jimenez Ruiz	ff7c6bea6a	Merge branch '1986-claim_draggable_pictures' of verdnatura/salix into dev	2020-01-09 08:00:35 +00:00
Joan Sanchez	436673986c	removed focus	2020-01-09 08:43:33 +01:00
Joan Sanchez	a2e6719e1e	updated unit tests	2020-01-09 08:42:58 +01:00
Joan Sanchez	e637f32aaa	removed opacity effects	2020-01-09 08:18:13 +01:00
Joan Sanchez	92b72328b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1984-travel_summary_total	2020-01-09 08:01:07 +01:00
Bernat Exposito Domenech	90b9692fba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1980-models_Thermograph	2020-01-09 07:46:57 +01:00
Joan Sanchez	df7493ff14	Updated styles	2020-01-08 17:03:08 +01:00
Joan Sanchez	0a9eaa406d	changed translations	2020-01-08 13:55:26 +01:00
Juan Ferrer	a979a17482	Merge branch 'test' into dev	2020-01-08 13:53:10 +01:00
Joan Sanchez	f362963dbb	Added total by column	2020-01-08 13:52:04 +01:00
Juan Ferrer	5d69f50ac0	vnZoneDeliveryDays hotfixes	2020-01-08 13:27:43 +01:00
Joan Sanchez	5a7bd4e18f	filters refactor	2020-01-08 12:27:18 +01:00
Juan Ferrer	0b7aa7e65e	Zone.getEvents hotfix: wrong parameter name	2020-01-08 12:14:09 +01:00
Bernat Exposito Domenech	36108038df	refactor sintaxis	2020-01-08 11:00:50 +01:00
Bernat Exposito Domenech	0ef2d92df7	claim.details	2020-01-08 10:08:27 +01:00
Bernat Exposito Domenech	8b0fd79f15	claim.details isEditable	2020-01-07 13:03:45 +01:00
Bernat Exposito Domenech	27a469c786	route.basic finder	2020-01-07 08:40:23 +01:00
Bernat Exposito Domenech	730b8e160f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1947-route_basic_data	2020-01-07 08:30:55 +01:00
Carlos Jimenez Ruiz	f0fd018c56	Merge branch '1924-worker_calendar_dynamic_holidays' of verdnatura/salix into dev	2020-01-07 06:31:05 +00:00
Bernat Exposito Domenech	d8e27a4a5c	routebasic	2020-01-03 14:42:50 +01:00
Bernat Exposito Domenech	904602637d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1947-route_basic_data	2020-01-03 14:31:21 +01:00
Bernat Exposito Domenech	814c96434e	routebasic	2020-01-03 14:31:02 +01:00
Bernat Exposito Domenech	8d01cd38c2	refactor client.balance	2020-01-03 12:48:06 +01:00
Bernat Exposito Domenech	b6353f1b5c	test client.balance	2020-01-03 12:29:13 +01:00
Joan Sanchez	8a36e0913f	changed fixtures for dynamic holidays	2020-01-03 08:43:03 +01:00
Bernat Exposito Domenech	b1c23dfca4	delete console.log	2020-01-02 15:07:25 +01:00
Bernat Exposito Domenech	68f437071f	refactor client.balance	2020-01-02 14:44:51 +01:00
Joan Sanchez	7fb3f75808	changed comparator	2020-01-02 11:21:11 +01:00
Joan Sanchez	a5eb8e5315	extended worker contract ranges & fixed invoice	2020-01-02 11:10:26 +01:00
Carlos Jimenez Ruiz	3ce5d95010	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2019-12-31 16:25:01 +01:00
Joan Sanchez	8f92abe49c	fixed procedure bug	2019-12-31 14:01:05 +01:00
Carlos Jimenez Ruiz	e922a05e50	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2019-12-31 11:40:15 +01:00
Joan Sanchez	b471f51482	refactor	2019-12-31 10:38:19 +01:00
Juan Ferrer	98cf5a4a18	Hotfix: restart interval, vnAgencyEvents	2019-12-30 12:36:19 +01:00
Bernat Exposito Domenech	e9d3b14da7	refactor models component and componentType	2019-12-27 08:01:53 +01:00
Joan Sanchez	195163c4f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1945-item_type_category	2019-12-26 13:30:57 +01:00
Joan Sanchez	b74de37c82	updated selectors	2019-12-26 13:29:50 +01:00
Joan Sanchez	f2e9dbd597	added category name to item type autocompletes	2019-12-26 11:27:44 +01:00
Joan Sanchez	fd594841d5	Merge branch '1955-client_index' of verdnatura/salix into dev	2019-12-26 08:16:08 +00:00
Carlos Jimenez Ruiz	c992cbc5c6	Merge branch '1935-ticket_create_auto_fill' of verdnatura/salix into dev	2019-12-26 08:14:22 +00:00
Joan Sanchez	fd8eeb626d	removed console.log	2019-12-26 08:45:55 +01:00
Joan Sanchez	d2c5ab7297	trigger unit tests	2019-12-26 08:43:34 +01:00
Joan Sanchez	c95c7192da	Added template to specie autocomplete	2019-12-26 08:21:08 +01:00
Bernat Exposito Domenech	0a37f3a1b2	update index filter	2019-12-26 08:20:16 +01:00
Joan Sanchez	5273e90a30	Added params to ticket method & updated unit tests	2019-12-26 07:12:34 +01:00
Juan Ferrer	6c57220703	InvoiceOut PDF download fix	2019-12-24 10:17:41 +01:00
Bernat Exposito Domenech	0827b998a1	update structure sql	2019-12-23 15:15:58 +01:00
Joan Sanchez	0799e58558	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-12-23 08:15:25 +01:00
Joan Sanchez	3d4fc9c18e	#1963 Entry & zone style changes	2019-12-23 08:05:58 +01:00
Bernat Exposito Domenech	e9d416671d	update fixtures and structure db	2019-12-20 13:51:04 +01:00
Joan Sanchez	472352e24c	Merge branch '1915-claim_regularize_fk' of verdnatura/salix into dev	2019-12-20 10:05:38 +00:00
Joan Sanchez	b9415c0335	updated sql	2019-12-20 10:40:12 +01:00
Joan Sanchez	61408bdfd5	updated tests	2019-12-20 09:30:35 +01:00
Joan Sanchez	2330e9fb39	Merge branch '1897travel.index' of verdnatura/salix into dev	2019-12-20 07:52:28 +00:00
Bernat Exposito Domenech	81bb9cfc88	refactor travel filter	2019-12-20 08:39:34 +01:00
Bernat Exposito Domenech	9a6c8db140	focus on the dialog	2019-12-20 08:32:02 +01:00
Bernat Exposito Domenech	3d21539fb0	travel index filter	2019-12-20 07:55:00 +01:00
Joan Sanchez	42239815e0	removed fdescribe	2019-12-19 15:01:33 +01:00
Joan Sanchez	61b9646f5b	Merge branch 'test' into dev	2019-12-19 14:55:09 +01:00
Joan Sanchez	aa809eea8a	trigger build	2019-12-19 14:21:18 +01:00
Joan Sanchez	8a54da6fd3	fixed dms links	2019-12-19 14:13:24 +01:00
Juan Ferrer	9947021736	#1953 Temporal fix	2019-12-19 12:17:53 +01:00
Joan Sanchez	a1c6c0ab39	claim regularize refactor	2019-12-19 11:37:53 +01:00
Bernat Exposito Domenech	03af680968	fix backtest	2019-12-18 07:30:24 +01:00
Joan Sanchez	f42f46dc42	Merge branch '1913-stowaway_unboarding' of verdnatura/salix into master	2019-12-17 12:53:06 +00:00
Joan Sanchez	3d83a08eca	Merge branch 'test' of verdnatura/salix into dev	2019-12-17 12:34:51 +00:00
Joan Sanchez	9d487f3cee	updated translation	2019-12-17 13:25:30 +01:00
Juan Ferrer	39a41f9a64	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2019-12-17 12:23:46 +01:00
Juan Ferrer	4da83ef963	Hotfixes: vnTicketSale menu, vnItemDiary width	2019-12-17 12:23:31 +01:00
Joan Sanchez	8ddcd5a654	ACL fixes	2019-12-17 12:18:17 +01:00
Juan Ferrer	d1341c2758	Hotfixes	2019-12-17 09:23:11 +01:00
Bernat Exposito Domenech	aab970e667	client.phone section	2019-12-17 09:11:28 +01:00
Joan Sanchez	ef95244d07	stowaway refactor	2019-12-17 08:38:36 +01:00
Carlos Jimenez Ruiz	70ca4df29a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2019-12-16 13:23:53 +01:00
Bernat Exposito Domenech	d66519a39f	set autoincrement db to one	2019-12-16 08:48:12 +01:00
Carlos Jimenez Ruiz	e6130e78fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2019-12-13 15:12:55 +01:00
Joan Sanchez	4a69a7f9b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1919-ticket_service_type	2019-12-13 12:31:51 +01:00
Joan Sanchez	da361a8ffb	Merge branch '1921-claim_detail_discount' of verdnatura/salix into dev	2019-12-13 11:19:46 +00:00
Joan Sanchez	8808e49a10	updated unit test	2019-12-13 12:07:36 +01:00
Joan Sanchez	780f1e4773	renamed expence to expense and added field	2019-12-13 11:59:25 +01:00
Bernat Exposito Domenech	2e68ad0d01	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1858testworkerPhone	2019-12-13 10:54:52 +01:00
Bernat Exposito Domenech	ff117c1811	merge conflicts structure.sql	2019-12-13 09:06:39 +01:00
Joan Sanchez	2325127390	pull from dev	2019-12-13 08:40:59 +01:00
Joan Sanchez	7bbb9fa321	Pull from dev	2019-12-13 08:26:27 +01:00
Javi Gallego	44304e993a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1912	2019-12-13 08:19:22 +01:00
Joan Sanchez	676b5198a8	changed discount popover width + refresh discount	2019-12-13 08:01:13 +01:00
Juan Ferrer	d61b08ed10	Merge branch '1922-mysql8' of verdnatura/salix into dev	2019-12-12 13:49:05 +00:00
Javi Gallego	ec081e6a3a	campo claimDestinationFk ya no esta como required	2019-12-12 13:53:54 +01:00
Bernat Exposito Domenech	a87ce44f08	test front worker.phone	2019-12-12 12:23:31 +01:00
Carlos Jimenez Ruiz	2e905d6858	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2019-12-12 11:08:41 +01:00
Carlos Jimenez Ruiz	8a2eda7c08	Merge branch '1923-ticket-summary-discount' of verdnatura/salix into dev	2019-12-12 10:06:47 +00:00
Joan Sanchez	62aae9ce14	removed password from fixtures	2019-12-12 09:46:29 +01:00
Bernat Exposito Domenech	e573a2cff0	fix error	2019-12-12 09:13:24 +01:00
Bernat Exposito Domenech	126a02c1b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1707route.ticket	2019-12-12 09:11:45 +01:00
Carlos Jimenez Ruiz	77f9cd8e00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2019-12-12 08:29:23 +01:00
Carlos Jimenez Ruiz	4d493c3572	Merge branch 'E2E-fix-for-windows' of verdnatura/salix into dev	2019-12-12 07:25:22 +00:00
Joan Sanchez	af47ab6cac	fixed styles & discounts	2019-12-12 08:22:04 +01:00
Carlos Jimenez Ruiz	bd0130514c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2019-12-12 08:14:25 +01:00
Juan Ferrer	3428dfa6e0	Migration complete & test	2019-12-11 15:01:01 +01:00
Carlos Jimenez Ruiz	036093a31f	Merge branch 'puppeteer' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer	2019-12-11 14:16:23 +01:00
Bernat Exposito Domenech	eb2cfc5535	updated selectors	2019-12-11 14:14:44 +01:00
Bernat Exposito Domenech	d0a2f4627b	1707 route.ticket sistema tablas que soporte dirección salida para warehouses	2019-12-10 12:42:14 +01:00
Bernat Exposito Domenech	17acfc2631	update translations	2019-12-10 08:18:53 +01:00
Bernat Exposito Domenech	2cc9c5e951	create section travel create	2019-12-09 12:15:19 +01:00
Bernat Exposito Domenech	f6eabc81da	add models and update structure db	2019-12-05 14:20:11 +01:00
Bernat	da2503d4b8	fix test	2019-12-04 11:18:26 +01:00
Bernat	f38210ddd2	udate structure db	2019-12-04 11:09:36 +01:00
Javi Gallego	3c36526f12	E2E fix for windows plus refactors	2019-11-28 12:54:34 +01:00
Bernat Exposito	a4a48e76a4	Merge branch '1762-worker_dms' of verdnatura/salix into dev	2019-11-25 08:33:04 +00:00
Joan Sanchez	f9dba9489f	updated tests	2019-11-25 09:17:24 +01:00
Joan Sanchez	8fc76b49c9	summary unit tests #1905	2019-11-25 08:35:34 +01:00
Joan Sanchez	974bf67e8d	removed focus	2019-11-25 07:46:00 +01:00
Joan Sanchez	a077dd5165	test unitario	2019-11-22 14:34:20 +01:00
Joan Sanchez	3c144ea0cd	transaction changes	2019-11-22 13:46:38 +01:00
Juan Ferrer	f50f99b962	Minor bug & style fixes	2019-11-22 13:23:43 +01:00
Joan Sanchez	5aae48c7dc	added gestdoc	2019-11-22 10:42:05 +01:00
Joan Sanchez	a67f6ec1ae	removed zeroFill	2019-11-22 07:41:06 +01:00
Bernat Exposito	9f345fe244	Merge branch '1875-send-sms-dialog' of verdnatura/salix into dev	2019-11-21 13:13:05 +00:00
Joan Sanchez	27cab0e722	added sms option to client descriptor	2019-11-21 14:00:27 +01:00
Joan Sanchez	423240ac7d	open dialog	2019-11-21 13:02:46 +01:00
Carlos Jimenez Ruiz	f4a62dfa86	Merge branch '1770-calculate_components' of verdnatura/salix into dev	2019-11-21 11:30:00 +00:00
Joan Sanchez	fd72f206bc	Recalculate ticket components #1770	2019-11-21 12:00:56 +01:00
Carlos Jimenez Ruiz	6a0783d22f	#1891 tests for worker time control function	2019-11-21 11:16:10 +01:00
Joan Sanchez	fee0d674a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1770-calculate_components	2019-11-21 11:06:31 +01:00
Carlos Jimenez Ruiz	c04640bd62	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests	2019-11-21 09:19:15 +01:00
Carlos Jimenez Ruiz	52a8d5e0c2	#1891 tests for worker time control function	2019-11-21 09:19:03 +01:00
Bernat	d1dfa126c0	#1711 Eliminar referencias al esquema vn2008	2019-11-21 09:08:43 +01:00
Carlos Jimenez Ruiz	6929e3d497	#1889 absences() unit test fixed + refactor	2019-11-20 14:22:44 +01:00
Joan Sanchez	5bb7f7f14a	deprecated getItemVisibleAvailable() #1887	2019-11-20 11:14:11 +01:00
Joan Sanchez	c6d1536500	recalculate ticket components	2019-11-20 06:53:37 +01:00
Juan Ferrer	59fddb5c55	vnAgencyEvents: console.log removed	2019-11-19 15:44:33 +01:00
Juan Ferrer	c47f3137c1	Delivery days fixes	2019-11-19 13:49:10 +01:00
Bernat	9743b61f63	delete endpoint getWorkerInfo	2019-11-19 11:51:47 +01:00
Bernat	12825f0503	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-19 11:43:00 +01:00
Joan Sanchez	cba578d42e	fixed zoom photo url #1884	2019-11-19 09:24:53 +01:00
Carlos Jimenez Ruiz	f998a04808	#1852 worker.time-control	2019-11-18 16:37:33 +01:00
Carlos Jimenez Ruiz	eeead2cc86	corrected a typo	2019-11-18 16:37:03 +01:00
Carlos Jimenez Ruiz	04b4f60c48	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-18 16:35:21 +01:00
Juan Ferrer	4d4e4f31f4	vnZoneEvents refactor	2019-11-18 16:31:37 +01:00
Javi Gallego	f12b1b8595	test fron arreglados	2019-11-18 16:03:10 +01:00
Carlos Jimenez Ruiz	3c2ad2df48	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-18 12:35:30 +01:00
Javi Gallego	c736e4de29	#1850 descomentar test back	2019-11-18 12:32:50 +01:00
Carlos Jimenez Ruiz	7c199b5d74	#1852 worker.time-control	2019-11-18 11:00:09 +01:00
Javi Gallego	4b51d607f7	error getLanded con drop temporary table	2019-11-15 15:42:00 +01:00
Joan Sanchez	c83a97d7ec	holidays fix #1853	2019-11-15 10:44:11 +01:00
Carlos Jimenez Ruiz	d1b114de59	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-15 10:37:42 +01:00
Joan Sanchez	ddb19cb198	added event	2019-11-15 10:03:46 +01:00
Joan Sanchez	6e5f460fab	#1867 show warehouses on summary	2019-11-15 07:35:51 +01:00
Juan Ferrer	4f5c1404d7	E2E fixes	2019-11-14 15:24:08 +01:00
Juan Ferrer	09a187ecfe	Merge	2019-11-14 15:05:49 +01:00
Juan Ferrer	2621da8dce	Hour formating fix	2019-11-14 14:40:19 +01:00
Juan Ferrer	64124376f0	Final fixes	2019-11-14 14:37:18 +01:00
Carlos Jimenez Ruiz	8629b72d55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-14 14:22:22 +01:00
Carlos Jimenez Ruiz	34bd35ce4e	#1852 worker.time-control	2019-11-14 14:20:05 +01:00
Joan Sanchez	c028233012	ticket.sale recalculate sale price #1768	2019-11-14 14:19:39 +01:00
Juan Ferrer	4436acec10	Merge	2019-11-14 14:07:48 +01:00
Joan Sanchez	5561ff169e	deprecated worker.sendMessage()	2019-11-14 11:21:08 +01:00
Joan Sanchez	236dcbf207	changed isRaid to isVirtual, atenderFk to attenderFk	2019-11-13 13:22:39 +01:00
Carlos Jimenez Ruiz	d12f815c80	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-13 12:31:13 +01:00
Joan Sanchez	c166067888	updated tests & email compatibility with phone	2019-11-13 12:18:30 +01:00
Bernat	dfd29ced70	1711 delete references	2019-11-13 11:04:52 +01:00
Carlos Jimenez Ruiz	b4669270c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-13 08:54:27 +01:00
Joan Sanchez	308c4dfb88	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor	2019-11-13 08:09:54 +01:00
Joan Sanchez	603bb034a1	Excluded specs with calls to setDeleted #1874	2019-11-13 07:56:09 +01:00
Carlos Jimenez Ruiz	65b84d752c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-13 07:51:06 +01:00
Joan Sanchez	7f2af116bc	updated translation	2019-11-13 07:04:47 +01:00
Carlos Jimenez Ruiz	0730aa1d0e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-12 15:18:41 +01:00
Joan Sanchez	c3962c3d78	updated test	2019-11-12 15:07:37 +01:00
Joan Sanchez	b320d64462	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-12 14:54:13 +01:00
Joan Sanchez	1b70721b0e	#1864 added restrictions, send rocketchat message	2019-11-12 14:53:58 +01:00
Joan Sanchez	05c4c9e96a	ticket.weekly removed create section already on ticket descriptor #1841	2019-11-12 14:48:03 +01:00
Juan Ferrer	1c035ca045	All tests fixed	2019-11-12 14:18:46 +01:00
Carlos Jimenez Ruiz	266de44f2f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-12 13:19:34 +01:00
Bernat	7cbbc4c18e	#1870 exportar produccion a la local	2019-11-12 11:13:20 +01:00
Juan Ferrer	a4f6c64e59	Merge	2019-11-12 09:24:08 +01:00
Juan Ferrer	f6050a6c65	Merge	2019-11-12 09:24:01 +01:00
Carlos Jimenez Ruiz	d284e36ee6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-12 08:52:07 +01:00
Bernat	74a2c58954	Bug #1862 fix e2e and front test	2019-11-12 08:51:50 +01:00
Juan Ferrer	95d943e515	E2E fixes	2019-11-11 16:32:03 +01:00
Juan Ferrer	efa6ddc0f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor	2019-11-11 16:25:00 +01:00
Joan Sanchez	6cedfceddd	Show ticket state #1836	2019-11-11 13:51:30 +01:00
Joan Sanchez	42524c7f1d	increased width to expand class #1845	2019-11-11 13:22:25 +01:00
Joan Sanchez	5b2e407870	dialog styles	2019-11-11 12:26:22 +01:00
Joan Sanchez	6f7962935d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor	2019-11-11 11:24:26 +01:00
Joan Sanchez	115156f89d	updated unit tests	2019-11-11 11:23:39 +01:00
Joan Sanchez	0838540789	template mso compatibility	2019-11-11 11:04:49 +01:00
Juan Ferrer	cf6961f5c5	E2E fixes	2019-11-10 14:13:55 +01:00
Juan Ferrer	976782738e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor	2019-11-10 13:27:31 +01:00
Juan Ferrer	bee50a6b03	Front tests passed	2019-11-10 13:10:52 +01:00
Juan Ferrer	515234187a	First working version	2019-11-10 11:08:44 +01:00
Carlos Jimenez Ruiz	f2de7ddab4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-07 12:17:33 +01:00
Joan Sanchez	5705c37f92	show attachments on email templates attachment component	2019-11-07 11:19:05 +01:00
Bernat	84ccfe0422	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-07 07:51:21 +01:00
Javi Gallego	eaa2ef4570	zone warehouse error	2019-11-07 07:49:37 +01:00
Carlos Jimenez Ruiz	9442a198b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-06 15:13:14 +01:00
Bernat	4220c995a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-06 14:02:26 +01:00
Javi Gallego	729f6cb767	changes to zone	2019-11-06 13:44:58 +01:00
Joan Sanchez	3cd92211a1	test fixed & export sample table	2019-11-06 10:55:04 +01:00
Joan Sanchez	3d701f534a	updated tests	2019-11-06 09:32:54 +01:00
Joan Sanchez	23f6c8843d	#1860 refactorizar llamadas al servicio print	2019-11-06 08:20:45 +01:00
Carlos Jimenez Ruiz	76f3dc48e5	#1852 worker.time-control	2019-11-05 11:57:05 +01:00
Joan Sanchez	cac8cb6a6a	dev pull request	2019-11-05 09:16:16 +01:00
Carlos Jimenez Ruiz	b9be0188d8	manual merge	2019-11-05 09:05:00 +01:00
Carlos Jimenez Ruiz	03ab88bcd9	#1852 worker.time-control	2019-11-05 08:59:48 +01:00
Bernat	1be61b16d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-05 08:56:59 +01:00
Joan Sanchez	5d83849e2b	unknown provider	2019-11-05 07:19:16 +01:00
Joan Sanchez	14cb32d1c8	updated reports	2019-11-04 13:55:20 +01:00
Joan Sanchez	fc2abdc0ab	change log columns size	2019-11-04 08:05:00 +01:00
Juan Ferrer	026c608f42	Faster module loading & vnAgencyCalendar bug fixes	2019-11-01 13:02:47 +01:00
Juan Ferrer	4fcaa2e507	Jest fixes	2019-10-31 15:38:20 +01:00
Juan Ferrer	f759c1e11a	vnDialog bug fixes & front tests, workerTimeControl date fixes	2019-10-31 15:24:28 +01:00
Juan Ferrer	38b4483edf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-31 13:43:15 +01:00
Javi Gallego	03a4da307d	Tarea #1848 test back arreglados/comentados	2019-10-31 12:54:16 +01:00
Juan Ferrer	5a15e65fd6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-30 16:57:26 +01:00
Juan Ferrer	c41fb1d0f4	#1847 vnDialog refactor	2019-10-30 16:57:14 +01:00
Bernat	9353d54b16	add alias on weekly filter	2019-10-29 14:55:05 +01:00
Javi Gallego	7dfdfc45c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-29 12:58:39 +01:00
Javi Gallego	700c092b90	merge	2019-10-29 12:58:26 +01:00
quique	49b06e3472	send rocket chat message	2019-10-29 12:39:25 +01:00
Javi Gallego	1a56f0af96	zoneRefactor	2019-10-29 12:29:38 +01:00
Joan Sanchez	443aa56fed	refactor	2019-10-29 07:46:44 +01:00
Juan Ferrer	0a4a22ec87	vnInputFile fixed	2019-10-28 21:40:24 +01:00
Juan Ferrer	1b2c383502	vnDialog opens in body, nightmare extensions with detailed errors	2019-10-28 17:31:33 +01:00
Juan Ferrer	47998aaa97	vnDialog opens in body	2019-10-27 01:30:01 +02:00
Juan Ferrer	dc18c4ba2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-26 12:05:00 +02:00
Juan Ferrer	5ae558e965	Watchers performance fixes	2019-10-26 12:04:48 +02:00
Bernat	35966afad0	refactor travel	2019-10-25 14:06:32 +02:00
Bernat	4eca2e9453	merge	2019-10-25 13:31:01 +02:00
Bernat	d02c79d2e8	#1774 travel.index test and refactor	2019-10-25 13:29:05 +02:00