7900 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Carlos Jimenez Ruiz	5e15321749	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2194_e2e_order_index_empty_filter	2020-05-19 11:49:25 +02:00
Carlos Jimenez Ruiz	321aa827c2	created order.index showEmpty filter path	2020-05-19 11:49:09 +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
Joan Sanchez	73035c5d65	Merge pull request 'fixed list sales e2e path' (#259) from 1865_fix_e2e_sales_list into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-18 15:04:36 +00:00
Carlos Jimenez Ruiz	8cfa6df99c	fixed list sales e2e path	2020-05-18 16:53:48 +02:00
Joan Sanchez	959417e681	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to	2020-05-18 16:27:39 +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
Carlos Jimenez Ruiz	d960295efa	Merge pull request '1833 Claim action refactor' (#253) from 1833-claim_action_refactor into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-18 10:05:59 +00:00
Bernat Exposito Domenech	b953fa8773	client descriptor add risk	2020-05-18 11:50:55 +02:00
Carlos Jimenez Ruiz	79a0466850	Merge pull request '2216-show_client_icons' (#256) from 2216-show_client_icons into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-18 09:46:56 +00: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	4ee61906a5	Merge pull request '2211-fix_tooltip_unit_test' (#254) from 2211-fix_tooltip_unit_test into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-18 09:29:16 +00:00
Joan Sanchez	341eaab472	Removed css changes	2020-05-18 10:42:26 +02:00
Joan Sanchez	a3203fa81f	2216 Show active client icon on client index	2020-05-18 10:39:40 +02:00
Bernat Exposito Domenech	37d5cf5975	delete old db changes	2020-05-18 10:29:57 +02:00
Bernat Exposito Domenech	c205c173f8	invoiceOut descriptor popover in ticket summary	2020-05-18 10:28:33 +02:00
Carlos Jimenez Ruiz	b7b02566d1	fixed tooltip unit test for Jest	2020-05-18 10:05:54 +02:00
Carlos Jimenez Ruiz	e3374e5eea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2211-fix_tooltip_unit_test	2020-05-18 10:03:47 +02:00
Joan Sanchez	1f2dee9c12	Merge pull request 'update structure and fix test' (#252) from 2241-production_export into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-05-18 06:23:09 +00:00
Joan Sanchez	67fc332b46	1833 Currency filter error	2020-05-15 17:00:55 +02:00
Carlos Jimenez Ruiz	c296c454d4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2211-fix_tooltip_unit_test	2020-05-15 16:10:38 +02:00
Joan Sanchez	42bec3a944	1833 Claim action refactor	2020-05-15 14:47:19 +02:00
Bernat Exposito Domenech	5ceb26c6da	update structure and fix test	2020-05-15 13:11:23 +02:00
Javi Gallego	3815edfbea	falta CR	2020-05-15 12:17:34 +02:00
Joan Sanchez	6692ac2e02	Merge pull request '2223 Added pickup checkbox' (#251) from 2223-claim_action_pickup into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-05-14 15:41:30 +00: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
Carlos Jimenez Ruiz	3946155e24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2211-fix_tooltip_unit_test	2020-05-13 09:21:09 +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
Juan Ferrer	58be5ef78e	Merge branch '#2224-item.diary-directiva-$anchorScroll' of verdnatura/salix into dev	2020-05-08 10:16:31 +00:00
Javi Gallego	9f339c6a11	Merge branch 'refactor-test-front-filters' of verdnatura/salix into dev	2020-05-07 09:28:11 +00:00
Javi Gallego	8453d25852	#2224item.diary provar directiva $anchorScroll	2020-05-06 18:42:50 +02:00