3736 Commits

Author	SHA1	Message	Date
Joan Sanchez	d4c78b46c1	1368 - First sale refactor	2020-06-23 13:40:49 +02:00
Carlos Jimenez Ruiz	ec6a3e00f7	removed unused argument in test	2020-06-23 13:26:21 +02:00
Carlos Jimenez Ruiz	bc9ab1a837	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2328-claim_detail	2020-06-23 13:10:12 +02:00
Bernat Exposito Domenech	2275541bb1	change on-response for on-accept	2020-06-23 12:46:24 +02:00
Carlos Jimenez Ruiz	7c72cd8f2d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2322-order_index	2020-06-23 12:33:16 +02:00
Carlos Jimenez Ruiz	1b683f5dc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 902-zone_unit_tests	2020-06-23 11:41:18 +02:00
Bernat Exposito Domenech	ee2a4771ff	delete coment code	2020-06-23 11:22:33 +02:00
Bernat Exposito Domenech	6a021b5767	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2061-ticket_descriptor	2020-06-23 10:00:50 +02:00
Bernat Exposito Domenech	e96df49622	refactor delete zone	2020-06-23 07:38:36 +02:00
Joan Sanchez	356c1a7b45	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-22 11:54:50 +02:00
Joan Sanchez	4ad3334de6	Allow change to discount 0%	2020-06-22 11:49:44 +02:00
Joan Sanchez	3cb783740f	Added unit tests	2020-06-22 10:01:55 +02:00
Joan Sanchez	8729d1c765	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-19 10:35:57 +02:00
Joan Sanchez	2930b60adc	Entitlement rate	2020-06-19 10:28:08 +02:00
Joan Sanchez	41eeaeef0b	Entitlement rate	2020-06-19 09:58:09 +02:00
Carlos Jimenez Ruiz	e6a72d0f09	clean code refactor	2020-06-18 15:26:15 +02:00
Carlos Jimenez Ruiz	3c2a392cb8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note	2020-06-18 13:51:00 +02:00
Carlos Jimenez Ruiz	4d97357213	update estate without model.refresh()	2020-06-18 13:50:52 +02:00
Joan Sanchez	322085ffd7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-18 13:15:45 +02:00
Joan Sanchez	7c45858764	Sms dialog fix	2020-06-18 12:59:37 +02:00
Joan Sanchez	fa73911452	Added tests	2020-06-18 12:43:33 +02:00
Bernat Exposito Domenech	9af33d1b96	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2322-order_index	2020-06-18 11:23:35 +02:00
Bernat Exposito Domenech	84bacfd379	add message before delete a line on a claim	2020-06-18 10:10:42 +02:00
Joan Sanchez	765d3c7553	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-18 07:19:57 +02:00
Joan Sanchez	43a48994e0	Image path fix	2020-06-17 16:33:58 +02:00
Carlos Jimenez Ruiz	edea60dd94	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note	2020-06-17 15:38:49 +02:00
Carlos Jimenez Ruiz	2abd45f498	setDelivered and open delivery notes and tests	2020-06-17 15:38:37 +02:00
Joan Sanchez	fd97845979	Revert "Removed sms excluded tests" ... This reverts commit 30912bd5e9.	2020-06-17 14:00:04 +02:00
Juan Ferrer	8e51104e1b	Merge branch 'test' into dev	2020-06-17 13:31:54 +02:00
Bernat Exposito Domenech	f1b26133cf	refactor order index	2020-06-17 13:25:12 +02:00
Joan Sanchez	63ed592312	902 - Added unit tests	2020-06-17 11:51:57 +02:00
Bernat Exposito Domenech	ebcbd5068f	add restrictions in ticket descriptor	2020-06-17 09:49:14 +02:00
Carlos Jimenez Ruiz	fb37e156d4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note	2020-06-17 09:22:09 +02:00
Joan Sanchez	686203db18	Merge pull request '2275-claim_detail' (#311) from 2275-claim_detail into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-17 05:44:17 +00:00
Bernat Exposito Domenech	930e167a8e	fix test	2020-06-17 07:25:05 +02:00
Joan Sanchez	30912bd5e9	Removed sms excluded tests	2020-06-16 15:11:24 +02:00
Carlos Jimenez Ruiz	98300b2fec	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note	2020-06-16 13:10:56 +02:00
Carlos Jimenez Ruiz	b44942c7d7	open delivery notes on ticket index	2020-06-16 12:36:34 +02:00
Bernat Exposito Domenech	d80d520fba	fix claim.beggining	2020-06-16 12:00:38 +02:00
Bernat Exposito Domenech	b6d50f7d8d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2275-claim_detail	2020-06-16 11:36:06 +02:00
Javi Gallego	9e62fd78a2	hasta precio	2020-06-16 10:57:18 +02:00
Javi Gallego	552828a1ba	hasta precio	2020-06-16 10:47:01 +02:00
Joan Sanchez	2f8fa59561	2332 - Fixed on load error	2020-06-16 09:04:13 +02:00
Joan Sanchez	7fd77bdaef	2332 - Fixed on load error	2020-06-16 08:50:59 +02:00
Bernat Exposito Domenech	b33f42d05e	add restrictions in claim detail	2020-06-16 07:47:46 +02:00
Bernat Exposito Domenech	9d80ec11af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2275-claim_detail	2020-06-15 09:54:46 +02:00
Joan Sanchez	279677bda9	Removed report from descriptor	2020-06-15 09:07:13 +02:00
Joan Sanchez	ed83fd5f73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2290-client_consumption	2020-06-15 09:00:24 +02:00
Bernat Exposito	e335775cdb	Merge pull request '2325 - Search address' (#308) from 2325-address_searchbar into dev ... Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-06-15 06:24:23 +00:00
Bernat Exposito	70d5c641ad	Merge pull request '2293 - getVolume() call to saleVolume' (#309) from 2293-getVolume into dev ... Reviewed-by: Bernat Exposito <bernat@verdnatura.es>	2020-06-15 06:16:55 +00:00
Joan Sanchez	25b1c6bd8f	2239 - Added services	2020-06-12 14:28:29 +02:00
Joan Sanchez	36ec930878	Updated test	2020-06-12 12:01:53 +02:00
Joan Sanchez	3d388ad226	Updated unit test	2020-06-12 11:39:33 +02:00
Joan Sanchez	dddfe2773a	2293 - getVolume() call to saleVolume	2020-06-12 11:26:32 +02:00
Joan Sanchez	48034b234f	2325 - Search address	2020-06-12 10:53:33 +02:00
Joan Sanchez	cba5fb01a6	Removed onused styles	2020-06-12 09:28:44 +02:00
Joan Sanchez	b3db5681fe	2290 - Added consumption section	2020-06-12 09:18:19 +02:00
Bernat Exposito Domenech	12468afa3c	refactor claim detail	2020-06-11 12:31:52 +02:00
Joan Sanchez	8688c2899b	Merge pull request '2321-log_web_access' (#306) from 2321-log_web_access into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-11 09:41:35 +00:00
Bernat Exposito Domenech	f9025bef98	delete test	2020-06-11 10:37:40 +02:00
Bernat Exposito Domenech	5d426c490c	fix traductions	2020-06-11 09:04:17 +02:00
Bernat Exposito Domenech	061dceb2b0	test client hook	2020-06-11 08:46:03 +02:00
Bernat Exposito Domenech	2c5f44f94a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2321-log_web_access	2020-06-11 08:45:16 +02:00
Carlos Jimenez Ruiz	538ae75b89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2283_e2e_delete_ticket_with_stowaway	2020-06-10 16:24:17 +02:00
Joan Sanchez	5edfc59d97	Updated unit test	2020-06-10 13:57:32 +02:00
Joan Sanchez	461fec7e64	Updated unit test	2020-06-10 13:57:08 +02:00
Carlos Jimenez Ruiz	4b1e79a433	2314 server side unit test fixed	2020-06-10 13:50:03 +02:00
Joan Sanchez	5fbcb5c439	2290 - Client consumption	2020-06-10 13:35:41 +02:00
Joan Sanchez	3cfb8b4730	2323 - Filter by myTeam fix	2020-06-10 12:13:07 +02:00
Bernat Exposito Domenech	d2aca11e16	log web access, create hook in client	2020-06-10 12:09:27 +02:00
Bernat Exposito Domenech	704e27a657	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2321-log_web_access	2020-06-10 12:08:54 +02:00
Bernat Exposito Domenech	ee58aebe16	first step, client hook	2020-06-10 09:26:51 +02:00
Joan Sanchez	4b262dc3cc	Disabled contextmenu option	2020-06-09 13:18:29 +02:00
Joan Sanchez	1abe0addcb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-06-09 12:43:40 +02:00
Joan Sanchez	1fed4c7913	Contextmenu fixes	2020-06-09 12:16:40 +02:00
Bernat Exposito Domenech	294021391d	fix travel descritor	2020-06-09 08:32:57 +02:00
Joan Sanchez	7d53f274de	Merge pull request '2303-fix_descriptor_show' (#300) from 2303-fix_descriptor_show into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-08 14:08:56 +00:00
Carlos Jimenez Ruiz	d8593ea3e0	Merge pull request '2176-contextmenu' (#302) from 2176-contextmenu into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-06-08 12:59:59 +00:00
Joan Sanchez	05b5c452a9	Removed attribute	2020-06-08 13:17:18 +02:00
Joan Sanchez	cda6e37620	Removed console.log	2020-06-08 13:07:34 +02:00
Joan Sanchez	ba9a44dec1	Updated back unit test	2020-06-08 13:06:33 +02:00
Bernat Exposito Domenech	cc569769b0	fix client balance	2020-06-08 12:48:23 +02:00
Joan Sanchez	ab1e8fb622	2176 First working version	2020-06-08 12:14:27 +02:00
Bernat Exposito Domenech	e24c5b00e9	fix descriptors	2020-06-08 11:05:17 +02:00
Joan Sanchez	181f2f0148	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu	2020-06-08 08:19:18 +02:00
Javi Gallego	762c39eb23	:: para watcher	2020-06-08 07:52:30 +02:00
Bernat Exposito Domenech	56c9b08101	fix show.descriptor	2020-06-08 07:52:23 +02:00
Bernat Exposito Domenech	90541a4c13	fix client descriptor in log section	2020-06-05 12:13:05 +02:00
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
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
Bernat	9fd0ab0bd3	#1775 travel.log crear sección historial	2019-10-25 13:28:12 +02:00
Bernat	5547193a31	#1776 travel.basicData	2019-10-25 13:26:38 +02:00
Juan Ferrer	5fdfda47b2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-25 00:53:57 +02:00
Juan Ferrer	c7384bb3ac	API path prefix, repeated code removed from tests	2019-10-25 00:53:53 +02:00
Bernat	eb384425f2	#1777 travel.descriptor	2019-10-24 14:43:11 +02:00
Bernat	afd7c5684a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1773-1774-travel_summary	2019-10-24 12:49:23 +02:00
Bernat	7bdb497976	#1773 travel.summary & #1774	2019-10-24 12:49:18 +02:00
Juan Ferrer	ee196df2ff	vnCompent with most common services as properties	2019-10-24 12:44:36 +02:00
Juan Ferrer	4685b4166b	Improved event handling	2019-10-24 10:17:32 +02:00
Juan Ferrer	53003246c3	Merge with upstream	2019-10-23 17:42:41 +02:00
Juan Ferrer	2436bf9488	Agency events - First stable version	2019-10-23 17:38:35 +02:00
Carlos Jimenez Ruiz	6cbfa895da	fixed a typo	2019-10-23 15:04:05 +02:00
Carlos Jimenez Ruiz	c84625b0d5	#1713 route.tickets boton mas bajo derecha	2019-10-23 09:25:28 +02:00
Joan Sanchez	d1e8f5fb1c	removed endpoints	2019-10-23 07:18:09 +02:00
Joan Sanchez	b6d666d223	removed IOS worker-time-controls endpoints	2019-10-23 07:14:12 +02:00
Joan Sanchez	137f701434	changed order	2019-10-22 14:20:50 +02:00
Joan Sanchez	2ed4cf3e4a	Item request refactor #1818	2019-10-22 13:44:36 +02:00
Joan Sanchez	58a763acf5	added quicklinks to worker descriptor	2019-10-21 14:21:52 +02:00
Joan Sanchez	8e1d594a13	was saving data on page load #1820	2019-10-21 13:43:17 +02:00
Joan Sanchez	188f4ae3bf	mark item diary line	2019-10-21 11:08:41 +02:00
Bernat	939c507fba	#1810 El método listPackaging filtrar por isPackagingReturnable	2019-10-21 09:16:52 +02:00
Bernat	6adeb689eb	Tarea #1814 refactor fixtures userPhone	2019-10-21 08:52:42 +02:00
Bernat	e9f65cd2a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-21 08:42:30 +02:00
Joan Sanchez	e2a7c09e4a	Uploadfile parameters are now required + fixed date filters	2019-10-21 08:31:14 +02:00
Bernat	6477a1458d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-21 07:24:56 +02:00
Joan Sanchez	55f3390f85	added validation for confirmed purcharse requests	2019-10-21 07:08:47 +02:00
Juan Ferrer	72017a64ac	Date timezone offset properly handled from backend DB connector	2019-10-19 01:18:25 +02:00
Juan Ferrer	de9a8443ca	Style fixes	2019-10-18 22:28:08 +02:00
Juan Ferrer	485bc43b13	Style fixes	2019-10-18 22:07:55 +02:00
Juan Ferrer	17a150370c	Style fixes	2019-10-18 21:54:13 +02:00
Juan Ferrer	43fd8fe75e	Merge	2019-10-18 21:37:28 +02:00
Juan Ferrer	457034daad	Tests fixed	2019-10-18 21:36:30 +02:00
Bernat	85bcb356d4	1778 Refactor worker.phone	2019-10-18 13:52:15 +02:00
Bernat	b78447bdd7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-18 13:51:24 +02:00
Joan Sanchez	18b0ae034c	#1815 - show summary correct photos on claim index	2019-10-18 09:53:30 +02:00
Bernat	1cedd6cbfd	merge	2019-10-18 08:38:25 +02:00
Bernat	7a89ab5335	#1778 Refactor worker.phone	2019-10-18 08:36:33 +02:00
Carlos Jimenez Ruiz	bdbadaf61a	#1819 fixtures	2019-10-17 14:30:52 +02:00
Joan Sanchez	f2a05ff915	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department	2019-10-17 14:08:29 +02:00
Bernat	7ee03d91f8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-17 14:01:58 +02:00
Joan Sanchez	e1cea99cc0	insert timeControl from procedure	2019-10-17 14:01:23 +02:00
Joan Sanchez	04785d3f72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department	2019-10-17 13:28:07 +02:00
Joan Sanchez	b2b76b05d8	css fixes + back unit tests	2019-10-17 13:27:50 +02:00
Carlos Jimenez Ruiz	8ce804a099	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-17 11:56:12 +02:00
Bernat	24861fe5b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-17 11:55:36 +02:00
Joan Sanchez	4ca001d98e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department	2019-10-17 11:09:03 +02:00
Joan Sanchez	79f9e616d2	added treeview unit tests	2019-10-17 11:08:40 +02:00
Carlos Jimenez Ruiz	e0d9f69aef	corrected a description	2019-10-16 10:59:42 +02:00
Joan Sanchez	6d159c50a0	css fixes	2019-10-16 09:52:46 +02:00
Joan Sanchez	dadfc92ebd	pull from dev	2019-10-16 09:52:32 +02:00
Joan Sanchez	7aaa8f4a5e	refactor drag & drop treeview	2019-10-16 08:56:13 +02:00
Juan Ferrer	e1e65e8b2e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-16 08:23:16 +02:00
Bernat	061e978a26	#1758 Añadir los alias como prefijos en los filtros	2019-10-16 08:08:10 +02:00
Carlos Jimenez Ruiz	a501cb8887	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-16 08:03:09 +02:00
Carlos Jimenez Ruiz	b37e308a4b	#1811 send.js unit test	2019-10-16 08:01:34 +02:00
Joan Sanchez	6ed5695063	Added zoneFk to routes. solved #1713	2019-10-16 07:18:05 +02:00
Juan Ferrer	a2881e5b1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-15 16:19:38 +02:00
Juan Ferrer	3bf44d08de	vnDatePicker refactor	2019-10-15 16:19:35 +02:00
Bernat	25bd28990a	Refactor #1812 refactor phone	2019-10-15 14:44:00 +02:00
Bernat	c6a078d82d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-15 14:35:58 +02:00
Carlos Jimenez Ruiz	3595524286	#1794 index de balance pierde la companyFk	2019-10-15 13:18:56 +02:00
Joan Sanchez	3853fc7404	descuadre de horas #1766 rollback	2019-10-15 08:50:11 +02:00
Bernat	fe5a77257f	#1758 Añadir los alias como prefijos en los filtros	2019-10-15 08:32:25 +02:00
Carlos Jimenez Ruiz	c46797d57e	removed third party endpoint test	2019-10-15 08:15:04 +02:00
Carlos Jimenez Ruiz	1086d3d362	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-15 07:43:51 +02:00
Bernat	793dd06e8d	merge	2019-10-15 07:30:23 +02:00
Bernat	ed1ed7f50b	#1738 exportar estructura y datos de produccion a la local	2019-10-15 07:23:34 +02:00
Carlos Jimenez Ruiz	c57583e64b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-14 15:20:10 +02:00
Carlos Jimenez Ruiz	5b47eb54b2	#1767 client.balance.index, campo referencia	2019-10-14 15:20:03 +02:00
Joan Sanchez	e79456374c	fixed item-popover width	2019-10-14 14:54:11 +02:00
Joan Sanchez	300ba61fd3	#1759 Forzar desenrutado al cambiar datos básicos de ticket	2019-10-14 14:43:10 +02:00
Joan Sanchez	ecda659a8c	Bug #1796 fixed edit discount dialog position	2019-10-14 14:17:18 +02:00
Joan Sanchez	1f8f5af301	fixed transaction params	2019-10-14 11:50:45 +02:00
Joan Sanchez	81097287fa	#1755 create claim only for non removed tickets	2019-10-14 11:44:54 +02:00
Carlos Jimenez Ruiz	4a6ff9ca20	removed useless FIXME comments as per #1782	2019-10-14 10:59:10 +02:00
Joan Sanchez	4a2d61ddcb	#1769 removed route report from ticket descriptor	2019-10-14 08:52:48 +02:00
Joan Sanchez	cd2b02b0c6	Bug/Test #1753 - Added dateTime filter	2019-10-14 08:52:48 +02:00
Bernat	e267bf93a4	merge	2019-10-14 07:01:29 +02:00
Bernat	d637ed2599	1717, route basic data	2019-10-14 06:58:02 +02:00
Juan Ferrer	7dfd1fe6f2	Merge	2019-10-11 17:43:29 +02:00
Juan Ferrer	a72c12e1c9	Tests passed	2019-10-11 17:38:04 +02:00
Joan Sanchez	8af7f13ac6	#1763 insert from procedure	2019-10-10 14:11:23 +02:00
Javi Gallego	3e71338d94	borra tabla temporal	2019-10-10 12:14:21 +02:00
Joan Sanchez	144f13c400	changed state to stowaway ticket	2019-10-10 10:00:38 +02:00
Joan Sanchez	9bfc87f1e2	changed state to stowaway ticket	2019-10-10 09:59:28 +02:00
Joan Sanchez	756acd41ef	added data-viewer	2019-10-10 09:26:44 +02:00
Joan Sanchez	21c32b0af2	dialog css fixes	2019-10-10 08:07:11 +02:00
Juan Ferrer	a9d5e87078	vnField alpha with ngModel	2019-10-10 00:47:29 +02:00
Juan Ferrer	fc09d76422	Merge	2019-10-08 23:57:54 +02:00
Juan Ferrer	757fc6fe23	vnField stable & applied to all field except vnTextfield	2019-10-08 23:57:02 +02:00
Carlos Jimenez Ruiz	7db4945a6d	#1702 Autocomplete data refresh and #1754 watcher	2019-10-08 17:27:27 +02:00
Joan Sanchez	6422d25ad6	stowaway changed to correct field name	2019-10-08 14:37:38 +02:00
Joan Sanchez	c0403873e7	stowaway changed to correct field name	2019-10-08 14:36:02 +02:00
Joan Sanchez	cc71f51f45	added invoiceOut alias	2019-10-08 13:52:50 +02:00
Joan Sanchez	1186654fba	added invoiceOut alias	2019-10-08 13:51:16 +02:00
Joan Sanchez	90ca883962	solved conflicts	2019-10-08 13:06:50 +02:00
Joan Sanchez	9358602471	#15 Updated changes width dev	2019-10-08 13:03:19 +02:00
Joan Sanchez	4025c624b3	#15 WIP fixed requested changes	2019-10-08 12:48:12 +02:00
Joan Sanchez	c7d2c33ffb	merge	2019-10-08 11:48:13 +02:00
Joan Sanchez	05aa9151eb	fixed stowaway list	2019-10-08 11:45:00 +02:00
Joan Sanchez	edecadc78e	#1756 stowaway no muestra resultados	2019-10-08 11:41:17 +02:00
Joan Sanchez	eb655215f4	merge pull changes	2019-10-08 09:23:29 +02:00
Joan Sanchez	b32cf4a386	last refactor	2019-10-08 07:22:38 +02:00
Carlos Jimenez Ruiz	7449f288b3	#1751 order.summary mostrar campo sourceapp	2019-10-07 10:35:34 +02:00
Juan Ferrer	4f92cafe30	CSS border style classes	2019-10-06 20:13:24 +02:00
Juan Ferrer	c2dcae5577	client.note.index style fixes	2019-10-05 00:44:25 +02:00
Juan Ferrer	eeef468964	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-05 00:17:10 +02:00
Juan Ferrer	b12a666653	CSS padding/margin refactor, glob styles in core	2019-10-05 00:16:57 +02:00
Carlos Jimenez Ruiz	4fa532abb8	#1744 ticket.index ocultar columnas expendables	2019-10-04 17:49:51 +02:00
Juan Ferrer	9b385f4b90	#1749 Fixed	2019-10-04 13:12:53 +02:00
Joan Sanchez	b4c23b86a2	fixed summary button	2019-10-04 11:39:24 +02:00
Joan Sanchez	9c3e7f50ec	disabled autoload on stowaway model #1747	2019-10-04 11:21:24 +02:00
Joan Sanchez	7b7d7664e1	disabled autoload on stowaway model #1747	2019-10-04 11:18:07 +02:00
Carlos Jimenez Ruiz	e158bd5811	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-04 10:07:59 +02:00
Carlos Jimenez Ruiz	da2c763573	#1705 item.index optimizar velocidad	2019-10-04 10:07:45 +02:00
Joan Sanchez	6b44686ff4	update zone and shipped on #1746	2019-10-04 09:45:30 +02:00
Joan Sanchez	69ef2c2e27	update zone and shipped on #1746	2019-10-04 09:28:09 +02:00
Joan Sanchez	9919f9a46e	add & remove childs	2019-10-04 07:41:24 +02:00
Juan Ferrer	c6e8498281	ModelProxy.status, Paging removed, locale fixes	2019-10-03 19:34:24 +02:00
Joan Sanchez	a8f2000f3f	Cambios mockup #1745	2019-10-03 11:37:44 +02:00
Juan Ferrer	ec9797a4b3	vnDataViewer applied to all module indexes	2019-10-02 21:02:49 +02:00
Juan Ferrer	87add6cd33	vnDataViewer	2019-10-02 19:24:42 +02:00
Joan Sanchez	2e22c79e18	fixed #1734 canHaveStowaway validation	2019-10-02 14:36:24 +02:00
Joan Sanchez	6a184496d6	treeview refactor 2	2019-10-02 14:12:17 +02:00
Joan Sanchez	9473636b5b	treeview refactor	2019-10-02 09:54:52 +02:00
Juan Ferrer	ac5d9b909b	Agency exclusions & style fixes	2019-10-01 16:48:01 +02:00
Juan Ferrer	0e88343649	Agency events bug fixed	2019-10-01 16:31:33 +02:00
Juan Ferrer	34e141e159	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-01 16:21:20 +02:00
Juan Ferrer	21992d3e69	Minimal style fixes	2019-10-01 16:21:08 +02:00
Juan Ferrer	76604744d1	Global & client style fixes	2019-10-01 16:17:57 +02:00
Joan Sanchez	199529b3b9	fiscal name ignore case	2019-10-01 15:12:58 +02:00
Joan Sanchez	1ec2362dbf	fiscal name ignore case	2019-10-01 15:12:02 +02:00
Joan Sanchez	183d770483	first changes	2019-10-01 15:09:55 +02:00
Juan Ferrer	a4892845e0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-01 13:46:16 +02:00
Juan Ferrer	4e4919c1e2	Agency fixes & exclusion with left calendar	2019-10-01 13:45:43 +02:00
Carlos Jimenez Ruiz	eb80721ec4	removed x from test + merge	2019-10-01 13:21:27 +02:00
Carlos Jimenez Ruiz	fb846baaa4	#1740 Intermitencia test de back	2019-10-01 13:19:22 +02:00
Juan Ferrer	daeb4bed09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-01 11:15:25 +02:00
Juan Ferrer	0bd852604a	Refactor: vnCheck, vnRadio, vnTreeview, vnNumber	2019-10-01 11:15:15 +02:00
Carlos Jimenez Ruiz	e8a9de6acd	ticket.index.total warning css range from 1 to 50	2019-10-01 11:06:20 +02:00
Carlos Jimenez Ruiz	cef28307d0	#1660 ticket.log si el usuario es un cliente falla	2019-10-01 10:47:06 +02:00
Joan Sanchez	26be791cf0	fixed styles	2019-10-01 10:35:27 +02:00
Carlos Jimenez Ruiz	d96f67254f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-01 08:15:04 +02:00
Joan Sanchez	fe95406594	Ticket list order by zone hour #1728	2019-10-01 08:14:08 +02:00
Carlos Jimenez Ruiz	6c438a9109	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-01 07:56:26 +02:00
Juan Ferrer	9319067697	Front tests & DMS imports fixed	2019-09-30 20:55:41 +02:00
Juan Ferrer	eba854f0e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-30 20:46:34 +02:00
Juan Ferrer	679c6af0df	#1297 Angular material removed from project	2019-09-30 20:46:22 +02:00
Carlos Jimenez Ruiz	4658c843cf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-30 15:24:25 +02:00
Joan Sanchez	6d54e7a89d	Claim dms upload file with drag & drop #1731	2019-09-30 14:57:54 +02:00
Carlos Jimenez Ruiz	303f18d359	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-30 14:49:22 +02:00
Carlos Jimenez Ruiz	5b38889a72	#1739 claim.detail dialog add cambiar campos	2019-09-30 14:49:04 +02:00
Carlos Jimenez Ruiz	ae4533c61e	#1726 client.index añadir icono de Listado tickets	2019-09-30 13:16:31 +02:00
Juan Ferrer	c72381f9c1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-30 13:02:21 +02:00
Juan Ferrer	a177ad8e26	Fixes	2019-09-30 13:02:11 +02:00
Juan Ferrer	84572dc398	Merge & fixes	2019-09-30 13:02:03 +02:00
Carlos Jimenez Ruiz	300dfc5772	#1726 client.index añadir icono de Listado tickets	2019-09-30 11:47:39 +02:00
Juan Ferrer	2bcdcaa133	#1285 fixed, vnInputTime fixes	2019-09-30 11:30:54 +02:00
Bernat	e380e4466c	#1717 route.basic-data añadir campo description	2019-09-30 08:26:51 +02:00
Carlos Jimenez Ruiz	cae2a0a148	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-27 16:55:49 +02:00
Carlos Jimenez Ruiz	6e50c1fad9	#1685 ticket.transferSale	2019-09-27 16:55:40 +02:00
Bernat	907b4a4991	#1729 client.webPayment mostrar hora	2019-09-27 11:04:27 +02:00
Carlos Jimenez Ruiz	f3d2313464	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-26 14:52:54 +02:00
Juan Ferrer	455d953e9a	Tests fixed	2019-09-26 14:51:45 +02:00
Carlos Jimenez Ruiz	38a58af3ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-26 14:23:31 +02:00
Carlos Jimenez Ruiz	d5d7b1ef96	Bug/Test #1736 back errors	2019-09-26 13:45:42 +02:00
Juan Ferrer	dbd70da866	Merge	2019-09-26 13:36:22 +02:00
Carlos Jimenez Ruiz	a8c6c57b7e	#1719 claim.detail final amends and tests	2019-09-26 12:07:40 +02:00
Carlos Jimenez Ruiz	e57210fdfc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-26 11:52:42 +02:00
Joan Sanchez	b64a6fd05c	Mostrar fotos de reclamaciones en el summary #1732	2019-09-26 11:41:56 +02:00
Carlos Jimenez Ruiz	52552ec502	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-26 11:07:38 +02:00
Carlos Jimenez Ruiz	2a2c5ae3c4	#1719 claim.detail cambiar descuento falla	2019-09-26 10:56:49 +02:00
Juan Ferrer	c0f39ba87f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-26 10:09:07 +02:00
Bernat	f28305de9b	Refactor #1698 claim.basic-data al llamar a updateClaim tener en cuenta el campo roleFk	2019-09-26 09:13:18 +02:00
Carlos Jimenez Ruiz	156c9ec3ab	#1716 ticket.summary añadir link a la Ruta	2019-09-26 09:05:54 +02:00
Carlos Jimenez Ruiz	65981099b6	#1719 claim.detail cambiar descuento falla	2019-09-26 09:05:18 +02:00
Juan Ferrer	91e4e62a1c	Merge branch 'test' into dev	2019-09-26 08:44:00 +02:00
Juan Ferrer	2a0cc1dc8b	Style/i18n fixes	2019-09-25 23:09:10 +02:00
Juan Ferrer	dba4ae14d5	Query delivery days by province	2019-09-25 22:35:21 +02:00
Juan Ferrer	54839782f3	Style fix	2019-09-25 20:14:43 +02:00
Juan Ferrer	91b5ad5a3e	Merge	2019-09-25 20:11:14 +02:00
Juan Ferrer	98cc3ce00e	Agency events, delivery days viewer	2019-09-25 20:06:42 +02:00
Carlos Jimenez Ruiz	1841e4edb0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-25 11:53:42 +02:00
Carlos Jimenez Ruiz	be65c5acad	#1719 claim.detail cambiar descuento falla	2019-09-25 11:53:12 +02:00
Joan Sanchez	73eca9905e	fixed #1734 canHaveStowaway validation	2019-09-25 11:26:12 +02:00
Carlos Jimenez Ruiz	92eef27f37	#1723 ticket.index si el total es menor de 50€	2019-09-24 16:38:57 +02:00
Carlos Jimenez Ruiz	0c27b90c5d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 14:39:22 +02:00
Carlos Jimenez Ruiz	b3bd40e2dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 14:25:56 +02:00
Carlos Jimenez Ruiz	99ef8a6010	#1719 claim.detail cambiar descuento falla	2019-09-24 14:23:21 +02:00
Bernat	de0034f145	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 14:22:46 +02:00
Joan Sanchez	d627a8ba25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 14:03:42 +02:00
Joan Sanchez	d0fc74cefd	updated e2e and unit tests	2019-09-24 14:03:30 +02:00
Bernat	2b80c4f7bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 13:56:31 +02:00
Bernat	bf5a9967cf	Refactor #1682 modificar modelos componentRate y componentTypeRate	2019-09-24 13:45:54 +02:00
Carlos Jimenez Ruiz	d56c7ff540	#1727 ticlet.line foco en cambiar hora	2019-09-24 13:25:18 +02:00
Bernat	faf355fab8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 12:38:26 +02:00
Bernat	7384fabec0	Tarea #1724 order/index buscar por alias	2019-09-24 12:10:03 +02:00
Joan Sanchez	3af26900e3	watcher preventing claim creation	2019-09-24 11:55:36 +02:00
Joan Sanchez	5851784e41	Create new order now opens on new window	2019-09-24 11:41:00 +02:00
Juan Ferrer	a319eed5f6	Zone.getLeaves() refactor	2019-09-24 10:41:25 +02:00
Juan Ferrer	4b58078798	Zone.getLeaves refactor & fixes	2019-09-24 10:38:07 +02:00
Juan Ferrer	52a6221b59	recover getLeaves	2019-09-24 10:38:05 +02:00
Joan Sanchez	15183df65f	transfer sales error fixed	2019-09-24 08:51:21 +02:00
Joan Sanchez	314b609060	fixed family translation	2019-09-24 08:34:14 +02:00
Joan Sanchez	a091674f08	allowed numbers on fiscal name	2019-09-24 07:47:06 +02:00
Carlos Jimenez Ruiz	6c1fdb444a	removed fdescribe	2019-09-24 07:03:22 +02:00
Joan Sanchez	e55b8b7b6b	precio por kilo #1690	2019-09-23 14:41:54 +02:00
Joan Sanchez	36d7e514ff	Allow spanish characters on socialName #1712	2019-09-23 09:27:58 +02:00
Carlos Jimenez Ruiz	0f04aed2fe	#1670 Crear icono isDeleted para ticket.descriptor	2019-09-20 17:20:54 +02:00
Carlos Jimenez Ruiz	7bcc908708	#1704 item.basicData	2019-09-20 16:39:20 +02:00
Juan Ferrer	6d50012fab	agency.location fixes	2019-09-19 18:00:40 +02:00
Juan Ferrer	40c555702d	Zone.getLeaves() refactor	2019-09-19 17:49:46 +02:00
Juan Ferrer	05fec10cf2	Zone.getLeaves refactor & fixes	2019-09-19 17:30:16 +02:00
Juan Ferrer	e0ffef70b1	Method ZoneGeo.getLeaves optimized	2019-09-19 15:51:39 +02:00
Juan Ferrer	afb06dd4a5	#1167 Fixed	2019-09-19 12:32:34 +02:00
Joan Sanchez	d6d825ebf1	fixed automerge	2019-09-19 10:52:23 +02:00
Joan Sanchez	f67006e526	changed fiscal name translation	2019-09-19 09:44:50 +02:00
Joan Sanchez	9ce18fbd0a	double start pick	2019-09-19 09:44:18 +02:00
Joan Sanchez	4d894365eb	Fixed production errors #1699	2019-09-19 09:42:41 +02:00
Joan Sanchez	8cb10759d3	updated transactions	2019-09-19 09:42:32 +02:00
Joan Sanchez	2edfb66423	changed fiscal name translation	2019-09-19 09:41:02 +02:00
Joan Sanchez	fa549630c4	Bug/Test #1700	2019-09-19 09:37:02 +02:00
Joan Sanchez	a85e653f34	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-19 09:24:27 +02:00
Joan Sanchez	5a4c6bf66f	updated back unit tests	2019-09-19 09:17:21 +02:00
Bernat	526e4e34fa	skip e2e #1702	2019-09-19 09:05:11 +02:00
Joan Sanchez	73b1f18759	Fixed production errors #1699	2019-09-19 08:58:42 +02:00
Bernat	c773ddc499	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-19 06:56:47 +02:00
Joan Sanchez	335f92173c	updated transactions	2019-09-18 15:11:09 +02:00
Bernat	86d793b9ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-18 11:11:53 +02:00
Bernat	7af4f3626d	#1691 item.basicData - Añadir campo hasKgPrice	2019-09-18 11:11:47 +02:00
Joan Sanchez	f56e4f4b7d	pick	2019-09-18 10:37:54 +02:00
Joan Sanchez	86ef44c90d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-18 10:35:49 +02:00
Joan Sanchez	031dbcb63a	Unlocked from autocomplete city and postcode fields #1703	2019-09-18 10:35:46 +02:00
Carlos Jimenez Ruiz	4c33f07e42	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-18 09:42:45 +02:00
Carlos Jimenez Ruiz	b12d0388c9	#1074 Undo changes button for forms	2019-09-18 09:41:25 +02:00
Bernat	cbbce91def	#1693 export structure, data and fix back test	2019-09-17 13:52:29 +02:00
Joan Sanchez	c7423f5580	pick2	2019-09-17 07:15:34 +02:00
Joan Sanchez	dd0c34d31b	allowed null parent	2019-09-17 07:13:37 +02:00
Joan Sanchez	043fe80254	cherry 1	2019-09-17 07:12:45 +02:00
Carlos Jimenez Ruiz	206dec59a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-13 16:09:27 +02:00
Carlos Jimenez Ruiz	2251fb65ad	#1615 migrar karma a jest	2019-09-13 16:09:14 +02:00
Joan Sanchez	a529efc783	getleaves fix	2019-09-13 13:26:50 +02:00
Joan Sanchez	a25652293d	changed initial leaves depth	2019-09-13 12:26:37 +02:00
Joan Sanchez	7f23e006fa	allowed null parent	2019-09-13 12:16:38 +02:00
Bernat	2e1b329584	#1681 delete comment	2019-09-13 11:27:32 +02:00
Bernat	c6507fc2bb	#1681 crear test para el endpoint getPossibleStowaways	2019-09-13 07:40:27 +02:00
Bernat	2172bdee4e	#1689	2019-09-12 12:27:19 +02:00
Joan Sanchez	8b8463e936	Updated dms colums size #1692	2019-09-12 12:12:39 +02:00
Joan Sanchez	f6bd915ae6	Ticket dms CSS fixes #1692	2019-09-12 11:47:56 +02:00
Joan Sanchez	e16d43b2fc	Allow disable log on model properties	2019-09-12 09:49:02 +02:00
Joan Sanchez	9bf54f34dd	Added fruit translation	2019-09-12 07:26:15 +02:00
Joan Sanchez	5d980f5129	Added fruit translation	2019-09-12 07:25:05 +02:00
Bernat	c344d8088b	merge	2019-09-11 14:18:21 +02:00
Joan Sanchez	ff626764d8	fixed back unit tests	2019-09-11 08:24:28 +02:00
Joan Sanchez	342886942f	fixed sale loggable transaction error #1686	2019-09-11 08:12:27 +02:00
Bernat	03c44d4ef9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-10 14:43:10 +02:00
Bernat	ac6d1ed829	#1663 update ticketLog	2019-09-10 14:43:00 +02:00
Joan Sanchez	b36846994d	Server error on change paymethod #1687	2019-09-10 14:13:45 +02:00
Joan Sanchez	0ed240df0b	Server error on change paymethod #1687	2019-09-10 14:12:03 +02:00
Bernat	8932aa4e5a	Tarea #1663 ticket-sale al hacer un slit de lineas debe dejar rastro en el log	2019-09-10 13:27:41 +02:00
Joan Sanchez	7ecb67052d	item.diary css chip fixed #1676	2019-09-10 08:47:46 +02:00
Joan Sanchez	197e89ae5a	Added fiscal data validate translation	2019-09-09 12:45:09 +02:00
Joan Sanchez	73f438c300	reset watcher on changes #1678	2019-09-09 12:35:59 +02:00
Joan Sanchez	1f5a75b285	fixed karma unit tests	2019-09-09 10:57:10 +02:00
Joan Sanchez	7a1ae9177b	Special characters not allowed on socialName #1635	2019-09-09 09:05:13 +02:00
Carlos Jimenez Ruiz	3c9fe334c9	#1655 e2e ticket.sale Añadir lineas	2019-09-06 14:56:56 +02:00
Carlos Jimenez Ruiz	56c291a160	merge	2019-09-06 11:45:55 +02:00
Carlos Jimenez Ruiz	ce9fb14b62	#1655 e2e ticket.sale Añadir lineas	2019-09-06 11:43:15 +02:00
Joan Sanchez	f31d544cd7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-06 11:06:57 +02:00
Joan Sanchez	7fad401624	Send delivery note to client #1332	2019-09-06 11:06:44 +02:00
Bernat	e8cb57e27a	#1674 ticket.descriptor stowaway sólo debe de aparecer la opcion en el menu en el almacen	2019-09-06 09:47:58 +02:00
Bernat	751c945575	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-06 09:35:27 +02:00
Bernat	ec2a457849	ticket.weekly add order	2019-09-06 08:00:19 +02:00
Joan Sanchez	176750046a	Scroll component #643	2019-09-05 13:06:40 +02:00
Bernat	9db989d191	ticket.sale ok state fixed	2019-09-05 11:12:33 +02:00
Joan Sanchez	59c6952025	Implement watcher on ticket sales #1678	2019-09-05 09:00:55 +02:00
Joan Sanchez	0d21519523	updated transfer css	2019-09-04 14:37:29 +02:00
Joan Sanchez	db1113ab0b	added scrollbar to transfer popover	2019-09-04 14:08:08 +02:00
Joan Sanchez	81072ce7e8	fixed claim refund	2019-09-04 13:49:16 +02:00
Joan Sanchez	6f508838c9	claim.action falla el boton import #1679	2019-09-04 13:39:01 +02:00
Javi Gallego	2b14a9050e	Bug/Test #1679 claim.action falla el boton import	2019-09-04 12:17:33 +02:00
Joan Sanchez	93286663ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-04 09:41:27 +02:00
Bernat	a2228fa15f	Tarea #1673 exportar estructura y datos de produccion a la local	2019-09-04 09:06:08 +02:00
Joan Sanchez	693c204e21	Calendar last day selection fixed #1465	2019-09-04 08:42:01 +02:00
Joan Sanchez	d3441fa1b3	Ticket step one refactor #1669	2019-09-04 08:04:31 +02:00
Bernat	f0447c18ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-03 14:54:29 +02:00
Carlos Jimenez Ruiz	c1cca30a26	bug fix icon add ticket.sales enables/disables	2019-09-03 14:42:52 +02:00
Bernat	fc872a2b21	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-03 14:38:40 +02:00
Carlos Jimenez Ruiz	219614b44f	#1656 ticket.regularizar eliminar ticket + tests	2019-09-03 13:27:02 +02:00
Bernat	36d9d320c0	Tarea #1672 route.ticket	2019-09-03 10:54:52 +02:00
Carlos Jimenez Ruiz	e1b5b449ce	#1656 ticket.regularizar eliminar ticket	2019-09-03 09:57:53 +02:00
Joan Sanchez	7b40fe2942	ticket.basicData Update zone on changes + fixes #1668	2019-09-02 14:37:30 +02:00
Joan Sanchez	d93974f481	ticket.basicData Update zone on changes + fixes #1668	2019-09-02 14:36:54 +02:00
Joan Sanchez	50c989a267	Add attendedBy and salesPerson filters #1661	2019-09-02 12:23:49 +02:00
Joan Sanchez	37b9c5c4ce	Added zone inflation field #1641	2019-09-02 11:25:31 +02:00
Bernat	b6edcde589	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-02 09:43:30 +02:00
Bernat	2a21e9d60e	#1654	2019-09-02 09:43:22 +02:00
Joan Sanchez	8726aa70c5	removed autocompletion on change postal code #1638	2019-09-02 09:35:03 +02:00
Bernat	82c569cfc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-02 09:25:25 +02:00
Bernat	fb62128a80	Refactor #1652 client.addres.index	2019-09-02 09:25:18 +02:00
Joan Sanchez	e2b972431a	removed autocompletion on change postal code #1638	2019-09-02 09:11:40 +02:00
Carlos Jimenez Ruiz	8dbcf917a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-08-29 13:16:53 +02:00
Carlos Jimenez Ruiz	b9234fc1a8	#1642 order.summary en el descriptor	2019-08-29 13:16:38 +02:00
Bernat	b656db3a84	#1645 refactor search panel	2019-08-29 08:32:46 +02:00
Bernat	6daabed202	#1645 first part, delete hasVisible	2019-08-28 12:17:06 +02:00
Carlos Jimenez Ruiz	5e69fc0aa5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-08-28 08:10:49 +02:00
Carlos Jimenez Ruiz	5e3b8fe1f0	#1648 claim.detail add cambiar campos	2019-08-28 08:08:30 +02:00
Bernat	15097313a2	#1651 worker.json	2019-08-27 11:12:17 +02:00
Carlos Jimenez Ruiz	11b99d9a5f	#1618 e2e ticket.basicData.stepOne	2019-08-20 14:18:32 +02:00
Bernat	7eea9d1d2c	Refactor #1630 state.js	2019-08-19 07:56:20 +02:00
Bernat	4032bde243	fix bug ticket.sale	2019-08-13 14:03:02 +02:00
Bernat	d9c63e3bc0	Tarea #1501 ticket / delete	2019-08-13 12:44:34 +02:00
Bernat	b749cb80df	Bug/Test #1634 cesta.catalogo	2019-08-13 07:45:29 +02:00
Bernat	f05f3a3df7	Bug/Test #1634 cesta.catalogo	2019-08-12 14:58:46 +02:00
Bernat	d08a43bc23	#1630 state.isEditable	2019-08-12 13:28:27 +02:00
Bernat	2e89af9795	#1630 state.isEditable	2019-08-12 13:26:44 +02:00
Bernat	b6cc769df3	Test #1636 refactor test de back isEditable y editableState	2019-08-12 12:31:31 +02:00
Joan Sanchez	0918f154e9	transfer partially sale #1251	2019-08-09 08:04:44 +02:00
Joan Sanchez	a5486ec694	Get allowed content-types from model #1598	2019-08-08 08:37:03 +02:00
Bernat	2f1472b9ee	Tarea #1574 ... ticket.sale editableState	2019-08-08 08:33:27 +02:00
Bernat	8f519fd15b	Bug #900 Ticket.picture lineas vacias cuando no tiene tags	2019-08-07 09:58:05 +02:00
Bernat	fa4fd15450	Tarea #1573 order.catalog No deben de mostrar familias vacias	2019-08-07 07:27:00 +02:00
Bernat	7e1eba53f1	Refactor #1627 worker.timeControl	2019-08-06 12:25:53 +02:00
Joan Sanchez	72a02112b5	fixed fiscal data postcode selection	2019-08-06 12:12:51 +02:00
Joan Sanchez	3d88d41bd0	fixed fiscal data postcode selection	2019-08-06 12:07:48 +02:00
Joan Sanchez	e011c120db	ticket.sale split show active tickets	2019-08-06 07:37:30 +02:00
Joan Sanchez	e52a0ac5da	ticket.sale split show active tickets	2019-08-06 07:36:26 +02:00
Bernat	4e329a4201	Bug/Test #1607 ticket.updateDiscount and fix test	2019-08-02 12:24:08 +02:00
Joan Sanchez	2ff374e7ba	postcode autocompletion fixes	2019-08-02 08:28:44 +02:00
Joan Sanchez	2c71a983e3	postcode autocompletion fixes	2019-08-02 08:27:55 +02:00
Joan Sanchez	e7511aefdc	back errors fixed	2019-08-01 11:53:33 +02:00
Joan Sanchez	efeba38fb4	back errors fixed	2019-08-01 11:52:53 +02:00
Joan Sanchez	e3c4536183	timeControl calendar fixed #1623	2019-08-01 10:29:26 +02:00
Joan Sanchez	31b5f689df	timeControl calendar fixed #1623	2019-08-01 09:58:59 +02:00
Bernat	098dd7b235	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-07-31 10:45:03 +02:00
Joan Sanchez	77d8ac82a5	contabilize worker.calenday holidays, updated styles	2019-07-31 09:51:08 +02:00
Joan Sanchez	eccf381e56	contabilize worker.calenday holidays, updated styles	2019-07-31 09:50:47 +02:00
Bernat	116a34d04a	fix test	2019-07-31 09:17:26 +02:00
Bernat	7571cd6e1b	Bug/Test #1607 ticket.updateDiscount and fix test	2019-07-31 07:46:24 +02:00
Joan Sanchez	5974f6e0c2	ticket basicData change zone on date update	2019-07-30 12:44:25 +02:00
Joan Sanchez	82d3ac27cf	ticket basicData change zone on date update	2019-07-30 12:43:21 +02:00
Joan Sanchez	fb4ce77c01	claim upload pictures #1593	2019-07-30 08:51:38 +02:00
Joan Sanchez	07af2271c2	ticket.weekly Add ticket #1612	2019-07-29 13:12:36 +02:00
Joan Sanchez	2c6ba0089b	merge	2019-07-29 08:35:58 +02:00
Joan Sanchez	f4a3b8e9b2	client.create not showing all postcodes, changed autocomplete #1619	2019-07-26 13:05:22 +02:00
Joan Sanchez	64a4e5f43d	ticket.basicData Select zone for productionBoss #1604	2019-07-26 11:48:01 +02:00
Carlos Jimenez Ruiz	c2573d6853	css amends for item-request	2019-07-25 11:25:01 +02:00
Carlos Jimenez Ruiz	e1cbf781e1	#1608 item.request	2019-07-25 09:55:09 +02:00
Joan Sanchez	6d5412227a	Changed invoiceOut pdf to hasPdf	2019-07-24 12:42:33 +02:00
Bernat	8089c32ec2	Tarea #1611 export db roduction to local	2019-07-23 14:56:57 +02:00
Bernat	97f2229090	Tarea #1603 ticket.index ticket.sales problems icon	2019-07-23 11:15:06 +02:00
Bernat	16257e9918	fix test front	2019-07-23 07:36:10 +02:00
Bernat	6a23a5429c	Tarea #1562 ticket.line isEditable	2019-07-22 13:14:00 +02:00
Joan Sanchez	85049c126b	catalogFilter show items without color	2019-07-19 09:25:59 +02:00
Joan Sanchez	970c8ab5ec	show dms order number #1601	2019-07-19 08:13:52 +02:00
Joan Sanchez	51734db404	ticket dms local warehouse and company	2019-07-17 15:01:38 +02:00
Joan Sanchez	f56423bac9	disabled hasFile checkbox for dms edit forms	2019-07-17 10:55:58 +02:00
Joan Sanchez	c51c4383ce	fixed unit tests	2019-07-17 07:39:08 +02:00
Joan Sanchez	e99bae89b4	fixed e2e tests	2019-07-17 07:33:46 +02:00
Joan Sanchez	145e596d16	fixed dms unit tests	2019-07-16 14:12:58 +02:00
Joan Sanchez	89a3c399c1	merge with dev	2019-07-16 13:41:34 +02:00
Joan Sanchez	4f73d1eb5a	dms fixes	2019-07-16 13:37:25 +02:00
Joan Sanchez	3c3f4bfeae	address.edit fixed location autocompletion	2019-07-16 08:26:57 +02:00
Joan Sanchez	72fcf807b0	7z mimetype	2019-07-16 07:22:29 +02:00
Joan Sanchez	b85aa6d3da	fixed icons column size	2019-07-15 13:20:50 +02:00
Joan Sanchez	aa19e54a16	removed download file conditional	2019-07-15 11:56:46 +02:00
Joan Sanchez	dae49f52b6	removed download file conditional	2019-07-15 11:56:17 +02:00
Joan Sanchez	fefb389872	dms update files	2019-07-15 11:48:03 +02:00
Joan Sanchez	588250b1c1	dms update files	2019-07-15 11:40:11 +02:00
Joan Sanchez	88b698f3eb	merge with dev	2019-07-15 09:04:11 +02:00
Joan Sanchez	23f5ff0c5c	merge	2019-07-12 14:02:38 +02:00
Joan Sanchez	c21532e5f7	ticket.index filters	2019-07-12 14:00:32 +02:00
Joan Sanchez	eefa4b9f5b	apply default filters	2019-07-12 12:56:00 +02:00
Joan Sanchez	6b9286d1b0	fixed ticket.index	2019-07-12 12:32:02 +02:00
Joan Sanchez	c4fcaeb908	ticket.index filter by date if no filters were entered	2019-07-12 12:20:55 +02:00
Joan Sanchez	29744c52f3	fixed ticket.index	2019-07-12 11:43:10 +02:00
Joan Sanchez	e135ae039a	changed closure field	2019-07-12 09:42:06 +02:00
Joan Sanchez	25014654b1	changed closure field	2019-07-12 09:39:59 +02:00
Joan Sanchez	659a441f47	ticket index show zone closure hour	2019-07-12 09:29:22 +02:00
Joan Sanchez	6634cdf059	ticket.index show zone hour & minute. Show only tickets from today	2019-07-12 09:29:16 +02:00
Joan Sanchez	14a69e47c9	ticket index show zone closure hour	2019-07-12 09:06:19 +02:00
Joan Sanchez	18ca64a7d9	ticket.index show zone hour & minute. Show only tickets from today	2019-07-12 08:50:51 +02:00
Joan Sanchez	2a6de77e17	ticket.index show zone hour & minute. Show only tickets from today	2019-07-12 08:49:44 +02:00
Joan Sanchez	1b8a407916	show expeditions fix	2019-07-11 11:21:12 +02:00
Joan Sanchez	62ef2dccd8	show expeditions fix	2019-07-11 11:20:41 +02:00
Joan Sanchez	8ecc88b516	hide download button for dms without a file attached #1590	2019-07-11 09:54:42 +02:00
Joan Sanchez	3ce59c0b73	hide download button for dms without a file attached #1590	2019-07-11 09:53:16 +02:00
Joan Sanchez	cb23fd28fa	updated unit tests	2019-07-11 07:18:07 +02:00
Joan Sanchez	8a5e0c5402	Notify password changes #1588	2019-07-11 07:06:53 +02:00
Javi Gallego	f79b638e49	#1564 client.summary defaulting cantidad	2019-07-09 09:31:08 +02:00
Joan Sanchez	6f3b023644	Create postcode form #1585	2019-07-08 14:07:09 +02:00
Bernat	b98b534eec	Tarea #1583 exportar produccio a la local	2019-07-05 14:16:33 +02:00
Joan Sanchez	8ec61bf31f	fixed unit test for weekends	2019-07-05 11:18:08 +02:00
Bernat	061f0cb39c	Refactor #1581 client.balance.create	2019-07-04 10:34:19 +02:00
Carlos Jimenez Ruiz	fc80848506	merge	2019-07-03 14:40:53 +02:00
Carlos Jimenez Ruiz	ea5cbf634b	#1392 order.catalog	2019-07-03 14:39:08 +02:00
Bernat	82a1d00b0c	Tarea #1516 order.index buscador avanzado añadir mi equipo	2019-07-03 14:06:27 +02:00
Carlos Jimenez Ruiz	a35533687f	removed unused spec files	2019-07-03 11:53:03 +02:00
Carlos Jimenez Ruiz	6b5acf5fe3	removed unused spec files	2019-07-03 11:51:42 +02:00
Carlos Jimenez Ruiz	553b8e681b	#1567 refactor logs - worker descriptor	2019-07-03 11:18:01 +02:00
Carlos Jimenez Ruiz	a2a9dfd7e5	#1567 refactor logs - worker descriptor	2019-07-03 11:08:44 +02:00
Bernat	65ec629221	Tarea #1518 route.tickets al eliminar un ticket de la ruta, tiene que logearse	2019-07-03 08:29:40 +02:00
Carlos Jimenez Ruiz	4b0a71644f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-07-02 14:44:39 +02:00
Carlos Jimenez Ruiz	4ac419b419	#1528 e2e claim/detail	2019-07-02 14:44:36 +02:00
Joan Sanchez	bddfbc4b34	add new item from ticket.sale #1414, checkedLines fixed	2019-07-02 12:12:15 +02:00
Bernat	dd38a21e8d	Refactor #1569 claim.delete, update fixtures and fix test	2019-07-01 11:56:16 +02:00
Carlos Jimenez Ruiz	bd76840cb3	#1446 e2e ticket.summary	2019-06-27 15:33:15 +02:00
Bernat	fb2545994c	Refactor #1563 fixtures item	2019-06-27 12:38:30 +02:00
Joan Sanchez	507bc8c2ce	updated fonts & calendar acls	2019-06-27 11:48:33 +02:00
Carlos Jimenez Ruiz	8c26a89516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-27 09:44:29 +02:00
Carlos Jimenez Ruiz	a7c5a9e598	#1566 ticket.sales state autocomplete	2019-06-27 09:44:19 +02:00
Bernat	e945967762	Refactor #1563 fixtures item,sale,saleComponent	2019-06-27 09:03:03 +02:00
Carlos Jimenez Ruiz	5270693bdd	#1387 e2e Ticket Edit sale path	2019-06-26 15:27:58 +02:00
Carlos Jimenez Ruiz	c352a12d49	merge	2019-06-26 15:02:22 +02:00
Carlos Jimenez Ruiz	d27402d4e6	#1558 ticket.sales mark/unmark as reserved	2019-06-26 13:56:40 +02:00
Joan Sanchez	8ff61a5d3a	added zone prices, radio-group and calendar refactor #1320	2019-06-26 13:35:38 +02:00
Javi Gallego	b0c34f8e29	#1564 client.summary defaulting cantidad	2019-06-26 12:18:47 +02:00
Bernat	682a75ac76	#1533 update fixtures and fix test	2019-06-25 14:00:55 +02:00
Carlos Jimenez Ruiz	2ce442a022	#1555 ticket.lines transer to a new ticket	2019-06-25 11:17:58 +02:00
Bernat	1227f7ac83	Test #1549 Arreglar test de back	2019-06-21 13:19:51 +02:00
Bernat	5c152f8813	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-21 11:50:36 +02:00
Joan Sanchez	5d63a14b15	transactions refactor #1546	2019-06-21 10:00:00 +02:00
Joan Sanchez	340e7b8495	round worker calendar holidays #1547	2019-06-21 09:56:39 +02:00
Joan Sanchez	7c23f92957	round worker calendar holidays #1547	2019-06-21 09:54:42 +02:00
Joan Sanchez	dae43bb9b0	transactions refactor #1546	2019-06-21 08:26:59 +02:00
Bernat	7f2b61b39c	Test #1549 fix back test	2019-06-21 07:50:56 +02:00
Javi Gallego	289f588923	#1550 ticket.descriptor polizon cambia estado	2019-06-21 07:41:03 +02:00
Carlos Jimenez Ruiz	7d0c42c077	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-20 14:41:58 +02:00
Carlos Jimenez Ruiz	594268183b	#1517 ticket.index	2019-06-20 14:35:47 +02:00
Joan Sanchez	7fd6c850d7	lock controls #1533	2019-06-20 13:50:58 +02:00
Carlos Jimenez Ruiz	9162ef9c1e	#1517 ticket.index hot fix	2019-06-20 11:31:03 +02:00
Joan Sanchez	e45d95ac10	upload dms files into new folder structure #1548	2019-06-20 07:47:03 +02:00
Joan Sanchez	19dc0c80b8	upload dms files into new folder structure #1548	2019-06-20 07:46:30 +02:00
Carlos Jimenez Ruiz	6e029a3623	merged test fix	2019-06-19 15:30:04 +02:00
Carlos Jimenez Ruiz	73ccf9a107	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-19 14:42:59 +02:00
Carlos Jimenez Ruiz	560cce7c8c	#1537 refactor fixtures	2019-06-19 14:40:47 +02:00
Carlos Jimenez Ruiz	63febf8bd0	#1537 refactor fixtures + e2e fixes	2019-06-19 09:03:45 +02:00
Bernat	1336bf092d	Test #1540 Reparar test back db	2019-06-19 07:20:02 +02:00
Bernat	c3f5b2c4dd	Bug/Test #1543 ticket.request.create precio con decimales	2019-06-18 12:09:43 +02:00
Bernat	82ab9e5ac5	Tarea #1534 Paginar consignatarios	2019-06-18 09:34:32 +02:00
Bernat	c02d576bb9	erese a fdescribe	2019-06-18 07:57:41 +02:00
Bernat	53f6db7a4a	Refactor #1527 claim/detail, ticket/sale updateDiscount y updatePrice	2019-06-17 12:13:05 +02:00
Juan Ferrer	edfa112874	Merge with master	2019-06-17 11:33:34 +02:00
Juan Ferrer	da01d52756	Secret removed from worker/pbx	2019-06-17 11:14:45 +02:00
Joan Sanchez	3bd12492b0	updated karma unit test	2019-06-17 08:16:25 +02:00
Joan Sanchez	471da18a6c	optional bank entity code #1416	2019-06-17 08:14:48 +02:00
Carlos Jimenez Ruiz	fcc0ad6098	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-14 12:27:54 +02:00
Carlos Jimenez Ruiz	b8a4861f01	#1526 refactor fixtures	2019-06-14 12:27:41 +02:00
Bernat	5203c33483	Bug #1463 Las reclamaciones no se eliminan por completo	2019-06-14 09:29:23 +02:00
Juan Ferrer	ced4578f75	Merge branch 'test' into dev	2019-06-14 08:33:44 +02:00
Joan Sanchez	a9aaa3329a	fixed worker calendar	2019-06-14 08:17:12 +02:00
Joan Sanchez	9a18d0bd8c	fixed worker calendar	2019-06-14 08:15:14 +02:00
Carlos Jimenez Ruiz	a0f0230e76	#1437 unitarios back guessPriority	2019-06-13 14:31:55 +02:00
Joan Sanchez	32df2373f7	Order zone by hour	2019-06-13 13:49:07 +02:00
Joan Sanchez	9c00e7e67c	Autocomplete geolocation from postcode #1519 and #1531	2019-06-13 13:08:11 +02:00
Juan Ferrer	91174d1c8e	fdescribe removed, SQL refactor	2019-06-13 11:47:32 +02:00
Juan Ferrer	03205e01ae	NPM fix, fdescribe removed	2019-06-13 09:49:36 +02:00
Juan Ferrer	89a563eaf9	Merge	2019-06-13 09:21:36 +02:00
Juan Ferrer	58cc90929f	TX fixes, debug disabled, glob transaction timeout	2019-06-12 17:31:45 +02:00
Carlos Jimenez Ruiz	921af523f8	#1526 refactor fixtures	2019-06-12 11:38:31 +02:00
Bernat	a6951bc0a1	Tarea #1419 claim.detail permitir modificar descuento	2019-06-12 08:19:02 +02:00
Bernat	4729a7e9a9	Bug #1514 route.volume No actualiza el volumen	2019-06-11 12:25:17 +02:00
Bernat	5ce33fbefd	Bug/Test #1515 Dump structure de production a dev	2019-06-11 12:25:02 +02:00
Bernat	2504d06bab	Bug/Test #1515 Dump structure de production a dev	2019-06-11 12:23:55 +02:00
Carlos Jimenez Ruiz	a8b9e2c374	#1435 unitarios back hasActiveRecovery	2019-06-11 08:54:03 +02:00
Carlos Jimenez Ruiz	0c9b4bbe87	#1436 unitarios back invoiceOut/download	2019-06-11 07:06:49 +02:00
Joan Sanchez	43e87a1cb1	mege from test to dev - no structure	2019-06-07 13:07:23 +02:00
Joan Sanchez	4545d1f649	merge from test to dev - no structure	2019-06-07 13:06:54 +02:00
Joan Sanchez	372ad15f26	zone add buttons show only for deliveryBoss #1480	2019-06-07 09:09:29 +02:00
Bernat	ea38ff221d	#1467 ticket filter with hours	2019-06-07 07:45:12 +02:00
Joan Sanchez	c28734ff61	added dms tasks #1499, #1469, #1468, #1484	2019-06-06 13:59:11 +02:00
Bernat	217b08cd0a	Tarea #1509 route/ticket/delete ticket	2019-06-06 13:50:12 +02:00
Carlos Jimenez Ruiz	7a44a5aab8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-06 09:48:46 +02:00
Carlos Jimenez Ruiz	cd6b60015f	#1486 back test updateDiscount	2019-06-06 09:48:08 +02:00
Bernat	f3558a2d26	#1462 updateVolume backTest	2019-06-06 09:34:45 +02:00
Carlos Jimenez Ruiz	3082ce2556	#1486 back test updateDiscount	2019-06-06 09:34:36 +02:00
Carlos Jimenez Ruiz	55ea445f02	#1486 back test updateDiscount	2019-06-05 15:20:56 +02:00
Carlos Jimenez Ruiz	7bcd4b53e5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-05 15:09:00 +02:00
Bernat	082c292ed7	fix updatePrice	2019-06-05 15:05:07 +02:00
Bernat	3a338739d1	Tarea #1462 Route.descriptior Añadir menú - actualizar m3	2019-06-05 13:51:34 +02:00
Carlos Jimenez Ruiz	605dabbe19	#1486 back test updateDiscount	2019-06-05 13:39:15 +02:00
Joan Sanchez	073c457abb	Merge branch 'test'	2019-06-05 08:56:56 +02:00
Carlos Jimenez Ruiz	05fc1f08a8	renamed vars according to convention	2019-06-05 07:41:20 +02:00
Joan Sanchez	d169a66e19	clone zone with calenday days (#1482) & fixed clone hour #1458	2019-06-05 07:19:22 +02:00
Javi Gallego	0f5ebf42ec	Tarea #1506 worker.pbx quitar campo password	2019-06-04 12:54:41 +02:00
Bernat	62f4abf6ed	Refactor #1418 claim.action Mover casilla mana	2019-06-04 11:00:05 +02:00
Bernat	c49f72b36c	#1493 Refactorizar el método back /Tickets/deleted	2019-06-03 14:54:03 +02:00
Carlos Jimenez Ruiz	6e2c71eca9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-03 13:36:41 +02:00
Bernat	798d4063ea	fix karma test	2019-06-03 12:41:57 +02:00
Carlos Jimenez Ruiz	d06d5cd9c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-03 12:00:58 +02:00
Carlos Jimenez Ruiz	9671307688	#1486 back test updateDiscount	2019-06-03 12:00:48 +02:00
Bernat	fa7b79b1c8	Bug/Test #1491, #1500 refactor new.js	2019-06-03 10:05:22 +02:00
quique	a6a6ea5b06	WorkerTimerControl App	2019-06-03 09:41:54 +02:00
quique	b034333cdb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-03 09:20:35 +02:00
quique	8005b0a892	WorkerTimeControl App	2019-06-03 09:20:20 +02:00
Bernat	62fe9d760c	#1488 #1489 ticket sale updatePrice and backTest	2019-06-03 08:01:24 +02:00
Joan Sanchez	a138465071	moveNext() movePrevious() moves now to day 1 to prevent a month jump	2019-05-31 13:54:15 +02:00
Carlos Jimenez Ruiz	a009329bdd	removed console logs from spec file	2019-05-31 13:54:05 +02:00
Joan Sanchez	5abb82faab	moveNext() movePrevious() moves now to day 1 to prevent a month jump	2019-05-31 13:33:37 +02:00
Joan Sanchez	68f67f12d7	moveNext() movePrevious() moves now to day 1 to prevent a month jump	2019-05-31 13:28:28 +02:00
Bernat	97459bd7e6	1497	2019-05-31 11:33:28 +02:00
Bernat	d4a3a1a72e	export production structure and fixtures updated	2019-05-30 13:45:13 +02:00
Carlos Jimenez Ruiz	ed3024e144	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-30 08:57:38 +02:00
Carlos Jimenez Ruiz	80d5c923cc	#1486 back test updateDiscount	2019-05-30 08:57:25 +02:00
Javi Gallego	e01765e34e	test back-front fixed	2019-05-30 08:41:08 +02:00
Bernat	24c3b35605	Test #1489 updatePrice backTest skipped	2019-05-30 08:06:52 +02:00
Bernat	d742eef7c3	Tarea #1478 item.basicData	2019-05-30 08:04:46 +02:00
Bernat	726d0ab359	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-30 07:53:23 +02:00
Bernat	4f20716fa3	#1489 updatePrice backTest	2019-05-29 14:59:26 +02:00
Carlos Jimenez Ruiz	cfcadc4f28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-29 13:07:23 +02:00
Carlos Jimenez Ruiz	40654f94c4	#1475 no borrar servicios de tickets no editables	2019-05-29 13:06:42 +02:00
Bernat	7a7ea03bff	1485 refactor updatePrice	2019-05-29 12:41:26 +02:00
Bernat	85761043cd	delete console.log	2019-05-29 11:15:08 +02:00
Bernat	84a4b049f0	1453 ticket UpdateDiscount refactor	2019-05-29 11:11:54 +02:00
Joan Sanchez	749c6f1167	clone zone with calenday days (#1482) & fixed clone hour #1458	2019-05-28 12:56:40 +02:00
Joan Sanchez	12e0268870	clone zone with calenday days (#1482) & fixed clone hour #1458	2019-05-28 12:55:50 +02:00
Bernat	69434caa52	#1470 update fixtures, client.dms gestdoc	2019-05-28 11:26:54 +02:00
Carlos Jimenez Ruiz	027602e18a	#1476 ticket.Sale check all checkbox	2019-05-27 15:10:57 +02:00
Bernat	230516b9d4	#1438 fix test back makeInvoice	2019-05-27 10:01:35 +02:00
Bernat	59069749a2	1461 fix test back	2019-05-27 09:19:23 +02:00
Carlos Jimenez Ruiz	16c8d2fd2a	removed service name from end points	2019-05-27 08:46:11 +02:00
Carlos Jimenez Ruiz	f2752d9098	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-24 15:31:03 +02:00
Carlos Jimenez Ruiz	a3311f6093	#1250 ticket.line al mover todas las lineas delete	2019-05-24 15:30:50 +02:00
Javi Gallego	f871879ee5	merge fixtures dinamicas para zoneCalendar	2019-05-23 13:33:06 +02:00
Javi Gallego	c5743ce37a	fallos de tablas	2019-05-23 13:25:26 +02:00
Javi Gallego	c311b0ae65	dump y procedimientos volcados	2019-05-23 13:18:15 +02:00
Javi Gallego	94cc7af8b2	merge paso 2	2019-05-23 13:07:59 +02:00
Javi Gallego	3776e0588c	merge paso 1	2019-05-23 13:05:02 +02:00
Joan Sanchez	e9c2ae073a	Clone item without size	2019-05-23 11:42:14 +02:00
Joan Sanchez	e60ebb283b	sms accessType	2019-05-23 11:42:12 +02:00
Joan Sanchez	34542ce12f	message send ACL fix #1464	2019-05-23 11:39:14 +02:00
Joan Sanchez	f7aeaa707f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-23 11:35:36 +02:00
Bernat	ae2fa8d0af	1459 export production to local	2019-05-23 09:31:37 +02:00
Bernat	443feef673	#1456 fixtores for dms and model	2019-05-23 09:30:29 +02:00
Joan Sanchez	318c014fab	Clone item without size	2019-05-23 08:03:31 +02:00
Joan Sanchez	cc72432a37	accessType refactor #1460	2019-05-22 12:38:51 +02:00
Joan Sanchez	f73b42b0be	accessType refactor #1460	2019-05-22 12:35:24 +02:00
Carlos Jimenez Ruiz	4c8aa7ff6e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-22 11:59:14 +02:00
Bernat	1769b03846	1457 client.sample.index	2019-05-22 07:50:08 +02:00
Carlos Jimenez Ruiz	bb1c85459e	removed unused code	2019-05-21 13:09:30 +02:00
Carlos Jimenez Ruiz	fef62d59a5	removed extraneous code	2019-05-21 13:08:25 +02:00
Joan Sanchez	52e26eb99d	mark manual lines #1449	2019-05-21 12:56:29 +02:00
Bernat	bb5c81a3e9	#1409 ticket.weekly add finder	2019-05-21 09:03:57 +02:00
Carlos Jimenez Ruiz	32555c47d0	#1434 agency.index explota por zoneFk al cargar	2019-05-20 15:04:33 +02:00
Joan Sanchez	183bf137f6	added workerTimeControl #1360	2019-05-17 13:27:51 +02:00
Bernat	b86cf1d98a	1354 refactor item-descriptor-popover	2019-05-17 07:34:25 +02:00
Carlos Jimenez Ruiz	8df885b19b	removed f from describe	2019-05-16 14:19:14 +02:00
Carlos Jimenez Ruiz	c7ad52f7b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-16 14:07:42 +02:00
Carlos Jimenez Ruiz	43bf6b45cf	#1260 ticket.service textfield por autocomplete	2019-05-16 14:07:16 +02:00
Joan Sanchez	2ac654fa53	parse scopeDays integer on ticket.index #1439	2019-05-16 12:53:49 +02:00
Joan Sanchez	858916e528	remove description properties from item clone	2019-05-16 12:53:40 +02:00
Joan Sanchez	a0ffde8ed1	remove description properties from item clone	2019-05-16 12:51:16 +02:00
Joan Sanchez	599084a8be	parse scopeDays integer on ticket.index #1439	2019-05-16 12:33:41 +02:00
Joan Sanchez	5c9d06b5d2	edit claim basic data for salesPerson #1433	2019-05-16 10:49:27 +02:00
Joan Sanchez	ecc335d781	client greuge order by shipped and amount #1431	2019-05-16 10:49:17 +02:00
Joan Sanchez	b70316551b	edit claim basic data for salesPerson #1433	2019-05-16 09:33:56 +02:00
Joan Sanchez	1ae2512169	client greuge order by shipped and amount #1431	2019-05-16 09:24:13 +02:00
Carlos Jimenez Ruiz	fa191af14c	#1430 client.balance bug fix and e2e fix	2019-05-16 07:07:10 +02:00
Carlos Jimenez Ruiz	417dc511f5	#1430 client.balance bug fix and e2e fix	2019-05-15 15:26:13 +02:00
Carlos Jimenez Ruiz	41c20d977c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-15 13:07:44 +02:00
Carlos Jimenez Ruiz	2358c94aae	#1402 route.ticket	2019-05-15 13:07:32 +02:00
Joan Sanchez	307cffcb58	fixed item clone #1429	2019-05-15 13:05:49 +02:00
Joan Sanchez	11ae1dbe7c	fixed item clone #1429	2019-05-15 12:57:46 +02:00
Carlos Jimenez Ruiz	d358f940a6	#1428 disabled test for the time being	2019-05-15 12:21:46 +02:00
Carlos Jimenez Ruiz	ed14f94fd6	small amends	2019-05-15 08:33:27 +02:00
Joan Sanchez	5cc78ce5ac	ticket & order index fixes #1422 & #1423	2019-05-14 08:14:37 +02:00
Joan Sanchez	790577acaf	ticket & order index fixes #1422 & #1423	2019-05-14 08:13:04 +02:00
Carlos Jimenez Ruiz	18d0aa9282	#1398 Test unitarios de filtros	2019-05-13 14:34:37 +02:00
Joan Sanchez	eae6a6f43c	show spinner on load for table & catalog components #1424	2019-05-10 14:42:46 +02:00
Carlos Jimenez Ruiz	da04d409a3	#1415 implementar color legend en worker.calendar	2019-05-10 13:16:37 +02:00
Bernat	e6d6e63255	1413 ticket.summary refactor checkbox triple state	2019-05-09 14:40:59 +02:00
Javi Gallego	0d0f354902	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-09 11:25:51 +02:00
Javi Gallego	ac5b17be31	ticket View	2019-05-09 11:25:46 +02:00
Bernat	1f128797c3	export production to local, fix test and add fixtures	2019-05-09 09:32:04 +02:00
Carlos Jimenez Ruiz	c9521d1024	#1407 email core francia LCR	2019-05-08 10:42:26 +02:00
Bernat	e43b7be526	1397 client.descriptor change icon to icon-basketadd	2019-05-07 11:55:47 +02:00
Bernat	83898c9ba7	1354 refactor item-descriptor-popover	2019-05-07 11:32:35 +02:00
Bernat	86e0d66f55	#926 update fixtures and model claimState	2019-05-07 08:18:14 +02:00
Joan Sanchez	8161ef2d7c	create zone with zero bonus, price, travelingDays	2019-05-06 07:41:28 +02:00
Joan Sanchez	4aff31a165	fixed update discount	2019-05-06 07:40:59 +02:00
Carlos Jimenez Ruiz	8771098045	#1350 route.index	2019-05-03 18:23:44 +02:00
Carlos Jimenez Ruiz	b60ee825ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-03 17:38:47 +02:00
Bernat	91e8b1f81b	update fixtures, #1388 ticket descript change shiiped hour	2019-05-03 12:23:57 +02:00
Carlos Jimenez Ruiz	28a69c8d2b	#1350 route.index	2019-05-02 13:25:41 +02:00
Carlos Jimenez Ruiz	46756dfdcb	#1351 e2e order.catalog	2019-05-02 11:41:24 +02:00
Joan Sanchez	0dbed4e102	fixed translation	2019-05-02 10:40:46 +02:00
Joan Sanchez	a2fd8ddc8a	buy requests translation & default order	2019-05-02 10:04:02 +02:00
Joan Sanchez	2b7287dabb	added ticket.dms #1373	2019-05-01 18:49:39 +02:00
Joan Sanchez	3615fe36a8	removed template strings	2019-04-30 14:25:07 +02:00
Bernat	c68015fb88	1341 invoiceOut.descriptor asentar factura	2019-04-30 11:47:39 +02:00
Joan Sanchez	c8bf9d0d7b	fixed worker calendar error for local holidays	2019-04-30 11:43:26 +02:00
Joan Sanchez	1a524e33b1	regenerate invoiceOut ACL	2019-04-30 11:29:57 +02:00
Bernat	a81e705251	#1341 invoiceOut.descriptor book invoiceOut	2019-04-30 11:03:48 +02:00
Joan Sanchez	a572130b6c	propagate check value to multicheck component for intermediate value #1305	2019-04-30 08:00:27 +02:00
Joan Sanchez	69403223d8	fixed treeview #1374	2019-04-29 11:49:43 +02:00
Bernat	a8a5193a86	1389 update fixtures for invoiceOut and fix test	2019-04-29 11:40:54 +02:00
Carlos Jimenez Ruiz	85dc6e51af	#1258 ticket.index sumatorio removed unused code	2019-04-29 10:35:46 +02:00
Carlos Jimenez Ruiz	774d8524cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-29 10:21:54 +02:00
Carlos Jimenez Ruiz	10669f01f3	#1258 ticket.index sumatorio unit test fixed	2019-04-29 10:21:36 +02:00
Bernat	5bc6f5107e	#1370 ticket.descriptor change shipped hour	2019-04-29 07:48:59 +02:00
Carlos Jimenez Ruiz	2ca85394f3	#1385 excluded tests	2019-04-26 16:10:51 +02:00
Bernat	ed8705a50c	#1340 invoiceOut.descriptor delete invoiceOut	2019-04-26 12:05:49 +02:00
Joan Sanchez	16bf0b3448	regenerate invoice #1342	2019-04-26 08:52:43 +02:00
Javi Gallego	24fedff62f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-25 18:30:17 +02:00
Javi Gallego	a920bc1d8f	tablas dms	2019-04-25 18:30:11 +02:00
Bernat	fabe4f396f	#1371 claim descriptor hour	2019-04-25 14:51:22 +02:00
Carlos Jimenez Ruiz	3cb7319efa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-25 14:24:08 +02:00
Carlos Jimenez Ruiz	511e33b835	#1350 route.index worker descriptor + filters	2019-04-25 14:24:02 +02:00
Joan Sanchez	4465f48afe	fix search by string barcode #1381	2019-04-25 13:51:34 +02:00
Joan Sanchez	aec46bb855	fix send notification to salesPerson #1382	2019-04-25 13:32:14 +02:00
Carlos Jimenez Ruiz	8384a6cb2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-25 09:26:52 +02:00
Javi Gallego	59e8990db9	bug solved	2019-04-25 09:26:42 +02:00
Carlos Jimenez Ruiz	da925eb9b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-25 08:28:33 +02:00
Carlos Jimenez Ruiz	e11d33eb27	worker descriptor refactor	2019-04-25 08:28:23 +02:00
Carlos Jimenez Ruiz	4e5c6ff882	#1356 advanced search refactor	2019-04-25 08:28:08 +02:00
Javi Gallego	47e55580ad	#1258 ticket.index sumatorio	2019-04-25 07:57:26 +02:00
Bernat	0eabd9876d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-24 11:36:43 +02:00
Bernat	4ac36e6bf2	#1362 ticket.packaging negative quantity	2019-04-24 11:36:13 +02:00
Joan Sanchez	d88e2e81ca	update ticket line discount until invoiced #1365	2019-04-24 11:23:24 +02:00
Bernat	37293ad695	#1364 bug create ticket	2019-04-24 11:02:31 +02:00
Joan Sanchez	6747a80943	fixed available/visible icon on ticket sales #1363	2019-04-24 09:54:25 +02:00
Joan Sanchez	00c11a95c6	fixed catalog filter bugs #1352	2019-04-24 09:21:24 +02:00
Bernat	b2f88872fa	#1366 bug in claim-index	2019-04-24 09:10:56 +02:00
Bernat	94480a8189	#1329 fix test and fixtures, update ticket-service	2019-04-24 07:43:11 +02:00
Carlos Jimenez Ruiz	a6fa9f98fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-23 13:30:43 +02:00
Carlos Jimenez Ruiz	8d5cc93ddb	#1359 refactor absences	2019-04-23 13:29:52 +02:00
Bernat	75c9d1122c	#1329 ticket.services validation	2019-04-23 11:25:49 +02:00
Carlos Jimenez Ruiz	5501ff8f4f	test repairs	2019-04-23 09:08:28 +02:00
Carlos Jimenez Ruiz	c2badeacd0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-23 09:04:30 +02:00
Carlos Jimenez Ruiz	2b04eebe84	#1334 E2E ticket.descriptor - Make invoice	2019-04-23 08:58:49 +02:00
Joan Sanchez	76269a8a16	added drag & drop directives on worker department #1319	2019-04-23 08:29:23 +02:00
Carlos Jimenez Ruiz	0176fbc2d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-18 11:47:41 +02:00
Carlos Jimenez Ruiz	fb30a01fde	#1348 invoiceOut.summary	2019-04-18 11:47:31 +02:00
Carlos Jimenez Ruiz	2107b57764	small typo	2019-04-18 11:12:48 +02:00
Bernat	bc005b2310	#1346 fix confirm.js and update item request	2019-04-18 11:02:28 +02:00
Carlos Jimenez Ruiz	2876f19101	#1348 invoiceOut.summary	2019-04-17 11:44:00 +02:00
Carlos Jimenez Ruiz	e34cb8ce84	#1351 e2e order.catalog	2019-04-17 09:37:55 +02:00
Carlos Jimenez Ruiz	bafbd92802	Bug/Test #1331 cambio de rol	2019-04-17 08:21:58 +02:00
Carlos Jimenez Ruiz	1f5fe891e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-17 07:16:13 +02:00
Carlos Jimenez Ruiz	d52f5077b0	#1306 Renombrar controladores, rutas y carpeta	2019-04-16 15:00:21 +02:00
Carlos Jimenez Ruiz	9baa37b833	#1306 Renombrar controladores, rutas y carpetas	2019-04-16 14:30:01 +02:00
Carlos Jimenez Ruiz	85851e7a33	#1306 Renombrar controladores, rutas y carpetas	2019-04-16 13:40:26 +02:00
Bernat	9a86929e3a	#1344 create test for worker filter	2019-04-16 13:10:06 +02:00
Carlos Jimenez Ruiz	5770bed5af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-16 12:44:12 +02:00
Bernat	54f65a9227	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-16 12:21:58 +02:00
Joan Sanchez	842101e239	fixed catalog price popover	2019-04-16 12:11:06 +02:00
Carlos Jimenez Ruiz	a326fd2a65	#1306 Renombrar controladores, rutas y carpetas	2019-04-16 11:32:45 +02:00
Carlos Jimenez Ruiz	02c63b0d5f	refactor tests	2019-04-16 08:46:59 +02:00
Bernat	c2b3ff8d81	#1335 worker/filter renamed columns acordantly	2019-04-16 08:42:44 +02:00
Bernat	97f3761e0c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-16 08:36:16 +02:00
Joan Sanchez	6573e61a7c	fixed karma tests	2019-04-16 08:21:20 +02:00
Javi Gallego	ce2615e2d0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-16 08:09:20 +02:00
Javi Gallego	28bbc024b2	#1195 claim.action regularize	2019-04-16 08:09:16 +02:00
Bernat	0d680bdaed	#1343 update worker filter	2019-04-16 07:59:29 +02:00
Joan Sanchez	f814584f6b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-16 07:59:15 +02:00
Joan Sanchez	90bbe1bd02	Log sent sms #1324	2019-04-16 07:59:12 +02:00
Carlos Jimenez Ruiz	9c596b06c8	merge	2019-04-15 14:37:12 +02:00
Carlos Jimenez Ruiz	82ed0078d2	#1339 Print - Hoja de rutas	2019-04-15 14:34:33 +02:00
Bernat	a68174c456	#1337 refactor checkbox in ticketRequest	2019-04-15 14:21:52 +02:00
Bernat	6a68003d84	#1212 refactor claim filter	2019-04-15 11:06:42 +02:00
Joan Sanchez	79f9dfb515	error when sending to a salesPerson pay-method changes #1338	2019-04-15 08:46:20 +02:00
Joan Sanchez	b5fe7a6fae	restore fixtures makeInvoice	2019-04-12 14:53:17 +02:00
Bernat	dbe56b2496	#1330 add info in the search panel	2019-04-12 14:33:08 +02:00
Joan Sanchez	ac8a27d2f4	Added ticket invoice #1310	2019-04-12 13:54:31 +02:00
Javi Gallego	6eef192929	añade opcion mana con permisos	2019-04-11 12:44:43 +02:00
Joan Sanchez	2f38f6e88f	Merge branch 'test' into dev	2019-04-11 11:34:25 +02:00
Joan Sanchez	84151d6527	Merge branch 'master' into test	2019-04-11 11:24:46 +02:00
Joan Sanchez	bed6721643	changed credit min value to zero	2019-04-11 11:24:10 +02:00
Joan Sanchez	353167734e	send message to salesPerson #1315	2019-04-11 09:38:53 +02:00
Joan Sanchez	7c3052d17b	fixed input time & input number	2019-04-11 07:42:27 +02:00
Joan Sanchez	da473c921d	input time refactor #1292	2019-04-11 07:32:58 +02:00
Joan Sanchez	3d71165682	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-11 07:29:43 +02:00
Joan Sanchez	1e06a19884	input time refactor #1292	2019-04-11 07:29:41 +02:00
Javi Gallego	50d70f0f6f	Tarea #1259 crear modelo ticketServiceType	2019-04-10 14:44:41 +02:00
Joan Sanchez	49ef341eb6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-10 12:04:22 +02:00
Joan Sanchez	6f98d81db1	fixed input time	2019-04-10 12:04:11 +02:00
Carlos Jimenez Ruiz	e9102249be	#1328 module home refactor	2019-04-10 11:49:39 +02:00
Carlos Jimenez Ruiz	9db389329d	renamed the it statement	2019-04-10 10:53:00 +02:00
Carlos Jimenez Ruiz	a248f722a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-10 10:43:19 +02:00
Carlos Jimenez Ruiz	98e704adf8	#1326 enlazar en ticket.descriptor tres puntos	2019-04-10 10:43:11 +02:00
Bernat	2be3481138	#1309 add icon in routes module	2019-04-10 10:02:28 +02:00
Joan Sanchez	20ba05a655	item filter by id or barcode	2019-04-10 09:32:29 +02:00
Joan Sanchez	b3c00e5a29	updated td-editable styles #1313	2019-04-09 13:47:13 +02:00
Joan Sanchez	9ce1e93da7	changed worker holidays length	2019-04-09 13:38:02 +02:00
Joan Sanchez	4f1a1ae004	Merge branch 'master' into dev	2019-04-09 13:19:34 +02:00
Joan Sanchez	a6308c7f1e	input-number refactor #1311	2019-04-09 13:18:55 +02:00
Carlos Jimenez Ruiz	26ba8b2463	#1312 InvoiceOut.descriptor	2019-04-08 16:53:37 +02:00
Joan Sanchez	33e6467c44	fixed zone descriptor	2019-04-08 10:57:01 +02:00
Joan Sanchez	d0dc192fc4	navigate to next claim section for salesAssistant #1119	2019-04-08 09:01:10 +02:00
Gerard	633ab28c41	#1315 item.ticketRequest	2019-04-05 15:20:12 +02:00
Carlos Jimenez Ruiz	c9cd1b19dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-05 13:59:22 +02:00
Joan Sanchez	c312374c3e	added sms back unit test	2019-04-05 13:58:50 +02:00
Carlos Jimenez Ruiz	2ba91a6cc2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-05 13:20:47 +02:00
Carlos Jimenez Ruiz	837a7b08cc	#1300-1301 client.risk	2019-04-05 13:20:34 +02:00
Gerard	ebe269f41e	#1249 ticket.invoice	2019-04-05 12:24:39 +02:00
Gerard	d7c063f389	removed unused binding	2019-04-05 09:27:43 +02:00
Gerard	00b7442b89	#1247 reparar tests excluidos	2019-04-05 07:52:08 +02:00
Gerard	cfdeb387a1	#1241 routes.tickets	2019-04-04 13:06:41 +02:00
Gerard	93bca3b3f0	merge master	2019-04-04 12:47:02 +02:00
Gerard	4861b789f7	Loggable now inserts the correct values for FK values	2019-04-04 12:38:54 +02:00
Gerard	d1a179c1c3	Merge branch 'test' into dev	2019-04-04 12:09:57 +02:00
Gerard	9abaa8ce51	bug sending messages to buyers fixed	2019-04-04 12:05:01 +02:00
Joan Sanchez	c4c5c67b18	Merge branch 'master' into dev	2019-04-04 11:54:25 +02:00
Joan Sanchez	bb039386f2	fixed input focus #1302	2019-04-04 11:53:13 +02:00
Carlos Jimenez Ruiz	11c6939ad4	traduccion de invoice out	2019-04-03 15:32:21 +02:00
Carlos Jimenez Ruiz	09288c2c12	merge	2019-04-03 15:19:05 +02:00
Carlos Jimenez Ruiz	971a2ab891	#1270 ... ticket.index advanced search mostrar dias en el futuro	2019-04-03 15:16:32 +02:00
Joan Sanchez	afafbdda95	fixed back unit test	2019-04-03 14:04:25 +02:00
Joan Sanchez	4ecc1f445a	added filter from-to on routes index #1296	2019-04-03 13:51:14 +02:00
Joan Sanchez	ccb2505896	Merge branch 'master' into dev	2019-04-03 12:58:59 +02:00
Joan Sanchez	eea4f53151	removed field acl for buyer on item tags	2019-04-03 12:58:30 +02:00
Joan Sanchez	0a0aa3853a	Merge branch 'master' into dev	2019-04-03 12:48:21 +02:00
Joan Sanchez	1e99a890e2	allow item tags for accessory role	2019-04-03 12:47:51 +02:00
Joan Sanchez	f8035c9777	fixed calendar front unit tests	2019-04-03 12:39:24 +02:00
Joan Sanchez	d407fc7803	fixed calendar month name display	2019-04-03 12:29:23 +02:00
Joan Sanchez	e433828f7c	Merge branch 'master' into dev	2019-04-03 11:55:18 +02:00
Joan Sanchez	892e267a16	fixed worker calendar total holidays #1299	2019-04-03 11:36:10 +02:00
Joan Sanchez	f337799e39	tests & refactor calendar component #811	2019-04-03 11:34:58 +02:00
Gerard	a23c636c16	#1279 loggable rawSql	2019-04-02 14:36:49 +02:00
Carlos Jimenez Ruiz	b86c1afa79	re-activated preview on invoiceout index	2019-04-02 12:32:15 +02:00
Carlos Jimenez Ruiz	ef53d60c94	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-02 11:05:16 +02:00
Carlos Jimenez Ruiz	570e2b5732	#1243 ticket.log columna worker	2019-04-02 11:04:53 +02:00
Joan Sanchez	eb67dffd35	Merge branch 'test' into dev	2019-04-02 10:57:30 +02:00
Joan Sanchez	a0a6c49349	order filter sort by created desc	2019-04-02 10:56:24 +02:00
Joan Sanchez	0f2d9ade57	Merge branch 'test' into dev	2019-04-02 10:06:16 +02:00
Joan Sanchez	a44bb2a13c	route index order by created desc	2019-04-02 10:05:56 +02:00
Joan Sanchez	a36c50b324	merge	2019-04-02 09:51:05 +02:00
Joan Sanchez	8bd4d25e2e	route index order by date desc	2019-04-02 09:44:03 +02:00
Joan Sanchez	c0e52c475f	hide invoiceOut preview	2019-04-02 09:15:47 +02:00
Javi Gallego	0b977d3b0b	#1293 ticket.components solo muestra base	2019-04-02 08:00:16 +02:00
Carlos Jimenez Ruiz	056c07b17c	#1181 No modificar ticket.basicData en reparto	2019-04-01 15:04:09 +02:00
Carlos Jimenez Ruiz	62acb534e1	#1181 No modificar ticket.basicData en reparto	2019-04-01 14:49:12 +02:00
Joan Sanchez	3f1889daa3	fix open client card from ticket descriptor #1291	2019-04-01 09:48:22 +02:00
Joan Sanchez	48cd9e2919	price fixes	2019-04-01 09:13:24 +02:00
Gerard	03d8e96deb	Merge branch 'test' into dev	2019-04-01 09:03:33 +02:00
Gerard	66d94dde3a	claim detail now adds a sale with its total quantity	2019-04-01 09:03:05 +02:00
Joan Sanchez	5898d07822	Merge branch 'test' into dev	2019-04-01 09:02:13 +02:00
Joan Sanchez	dfe1a68d35	fix ticket basic data allow change company #1277	2019-04-01 09:01:11 +02:00
Joan Sanchez	6d51ef4187	fixed absence test	2019-04-01 08:56:18 +02:00
Gerard	164093af48	Merge branch 'test' into dev	2019-04-01 08:43:22 +02:00
Gerard	034bd77d52	Date is visible always	2019-04-01 08:42:19 +02:00
Carlos Jimenez Ruiz	a191ddebf0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-29 13:15:06 +01:00
Carlos Jimenez Ruiz	0fb95bc8d2	test repairs plus some traductions	2019-03-29 13:14:48 +01:00
Joan Sanchez	75cb05865b	filter by firstName & lastName	2019-03-29 13:07:06 +01:00
Carlos Jimenez Ruiz	d2331ccd68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-29 10:51:13 +01:00
Carlos Jimenez Ruiz	14bd970fbc	#1265 worker.pbx da error si no tiene extensión	2019-03-29 10:51:02 +01:00
Joan Sanchez	8db51fdf64	added shrink class to item index #1278	2019-03-29 08:01:15 +01:00
Gerard	8bf4190d12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-29 07:37:23 +01:00
Gerard	280efdae50	#732 Loggable now inserts the correct values for FK values	2019-03-29 07:36:26 +01:00
Joan Sanchez	8110325af8	send sms from ticket descriptor & ticket line #991	2019-03-29 07:29:09 +01:00
Carlos Jimenez Ruiz	2263da2e05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-28 11:55:31 +01:00
Carlos Jimenez Ruiz	a14ba28629	#1263 invoiceOut.summary	2019-03-28 11:55:23 +01:00
Gerard	3b3e4a96e9	Merge branch 'test' into dev	2019-03-27 10:03:53 +01:00
Gerard	59d99db6b4	#1272 ticket.index	2019-03-27 09:58:58 +01:00
Joan Sanchez	8433e15875	show client id on ticket summary header #1273	2019-03-27 09:06:21 +01:00
Gerard	8fc9581b8d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-27 08:56:39 +01:00
Gerard	650e5b8626	#1257 route.log	2019-03-27 08:56:25 +01:00
Joan Sanchez	56f352686c	added sms endpoint #1149	2019-03-27 08:48:13 +01:00
Bernat	4e27581045	cau 10269 fix test and update fixtures	2019-03-27 08:44:15 +01:00
Gerard	b24a6a6255	#1262 invoiceOut.descriptor	2019-03-26 14:27:08 +01:00
Gerard	eaec968aa4	Now you can change the shipped hour of a ticket	2019-03-26 12:25:06 +01:00
Joan Sanchez	2ca5def095	build english locale on dist directory #1268	2019-03-26 12:05:53 +01:00
Bernat	4e1e3bdeeb	cau 10270 refactor fixtures and fix test	2019-03-26 10:25:11 +01:00
Joan Sanchez	a16b43546d	fixed volume onLoad errors #1238	2019-03-26 09:33:54 +01:00
Joan Sanchez	500105675c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-26 07:29:57 +01:00
Joan Sanchez	3df5f4cae9	replaced numeric fields with input-number #1138	2019-03-26 07:29:45 +01:00
Gerard	40cbb60673	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-25 16:30:43 +01:00
Gerard	f31be20bd3	changed wrong descriptions	2019-03-25 16:30:40 +01:00
Carlos Jimenez Ruiz	de7c1f3d95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-25 16:26:06 +01:00
Carlos Jimenez Ruiz	1e150dbc8f	#1264 cambiar ruta invoice a invoiceOut	2019-03-25 16:25:59 +01:00
Gerard	2c7b9968eb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-25 15:49:10 +01:00
Gerard	aa0f04b47f	Changed wrong english label of two properties	2019-03-25 15:45:59 +01:00
Carlos Jimenez Ruiz	d322c941a4	#1226 Ticket.index advanced filter añadir factura	2019-03-25 15:16:56 +01:00
Gerard	462879a40b	#1241 summary refactor	2019-03-25 13:16:34 +01:00
Bernat	3340163315	refactor worker fixtures	2019-03-25 10:00:49 +01:00
Gerard	f4ddf3544d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-25 09:36:30 +01:00
Gerard	649b7f0e21	log added to ticket module models	2019-03-25 09:36:24 +01:00
Carlos Jimenez Ruiz	92738759a3	#1235 route.basic-data	2019-03-23 16:16:47 +01:00
Carlos Jimenez Ruiz	ce43bd63c9	#1234 route.create	2019-03-22 16:47:20 +01:00
Carlos Jimenez Ruiz	ae9ad7a6cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-22 16:04:59 +01:00
Joan Sanchez	4a4b997e1b	added subName to fetched-tags #1246	2019-03-22 15:05:15 +01:00
Carlos Jimenez Ruiz	80f59eeeb7	merge	2019-03-22 14:08:01 +01:00
Joan Sanchez	6c9f1cfdfa	fix claim regularize & message.send methods #1242	2019-03-22 13:45:17 +01:00
Joan Sanchez	c5e953f922	worker calendar front & back unit tests #1248	2019-03-22 12:51:44 +01:00
Gerard	37546e7a26	#1236 revision con pepe	2019-03-22 12:34:42 +01:00
Gerard	e23a184166	styles added	2019-03-22 11:56:21 +01:00
Gerard	f4476ca690	#1236 route.summary	2019-03-22 11:10:23 +01:00
Gerard	7ae011b3b6	#1240 route.descriptor	2019-03-22 11:07:44 +01:00
Joan Sanchez	6eaf317b5e	added worker calendar #1147	2019-03-22 08:28:57 +01:00
Carlos Jimenez Ruiz	40cabdd3bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-21 15:02:12 +01:00
Carlos Jimenez Ruiz	82683a09b5	corredted typo	2019-03-21 15:02:06 +01:00
Javi Gallego	0dd7e528dd	#1245 bug ticket line	2019-03-21 14:56:09 +01:00
Carlos Jimenez Ruiz	bbb00b98dc	#1233 route.index	2019-03-21 13:47:33 +01:00
Carlos Jimenez Ruiz	92347cd9c4	#1233 route.index	2019-03-21 13:46:14 +01:00
Bernat	504dc954d0	update model vehicle	2019-03-21 12:50:34 +01:00
Gerard	bb321995fa	deleted wrongly an unused relation alertLevel	2019-03-21 12:05:27 +01:00
Carlos Jimenez Ruiz	6b11f26296	test refactor to async await	2019-03-21 08:53:12 +01:00
Carlos Jimenez Ruiz	7a5124aca2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-20 12:27:36 +01:00
Carlos Jimenez Ruiz	30333a914e	#957 ticket.descriptor stowaway singlepage nav e2e	2019-03-20 12:23:38 +01:00
Carlos Jimenez Ruiz	d38ca72fd8	orden de resultados por defecto DESC de id y fecha	2019-03-20 11:49:11 +01:00
Bernat	41e1505b1a	#1233 new models and fixtures	2019-03-20 10:10:36 +01:00
Bernat	981800a0e2	import production structure db to local and fix test	2019-03-20 08:52:54 +01:00
Carlos Jimenez Ruiz	d7d8bff92b	#1196 worker.descriptor correo	2019-03-15 12:58:26 +01:00
Joan Sanchez	6b5d91f545	fixed translations	2019-03-15 08:12:36 +01:00
Joan Sanchez	274d744b69	added clone zone button #1159	2019-03-14 15:07:24 +01:00
Carlos Jimenez Ruiz	b165f0d06b	removed unexpected fdescribe	2019-03-14 08:29:35 +01:00
Carlos Jimenez Ruiz	53bbba49d7	removed key bind from invoices as requested.	2019-03-14 08:25:38 +01:00
Carlos Jimenez Ruiz	dcf22303ea	#1179 invoice.index crear el módulo	2019-03-14 08:10:14 +01:00
Gerard	f48e3260bd	Merge branch 'test' into dev	2019-03-13 16:15:18 +01:00
Gerard	5fcb9f61ab	Merge branch 'master' into test	2019-03-13 16:09:14 +01:00
Gerard	0a95f1b299	#1229 general search of worker searckpanel now searchs users	2019-03-13 16:08:04 +01:00
Joan Sanchez	12308de5d1	catalog filter by item id #1219	2019-03-13 15:09:10 +01:00
Carlos Jimenez Ruiz	98f73fc5d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-13 14:16:26 +01:00
Carlos Jimenez Ruiz	f4b74abe3b	#1179 invoice.index crear el módulo	2019-03-13 14:10:45 +01:00
Gerard	fd4fe288a5	has visible disabled temporally	2019-03-13 12:03:06 +01:00
Joan Sanchez	aa37a9f66a	Added zone.isVolumetric #1227	2019-03-13 11:27:45 +01:00
Joan Sanchez	5f5ce1a765	required if for checked data	2019-03-13 08:35:25 +01:00
Joan Sanchez	92170c34d5	worker department #1133	2019-03-12 15:04:09 +01:00
Gerard	fb75ff0eae	#1222 Activar log en el modulo ítem	2019-03-12 11:47:53 +01:00
Gerard	41a34421df	ship menu now open the stowaways in new tabs	2019-03-11 11:29:31 +01:00
Joan Sanchez	891c4b201a	Merge branch 'test' into dev	2019-03-11 11:10:28 +01:00
Joan Sanchez	91f8f337f5	removed clog	2019-03-11 11:09:59 +01:00
Gerard	926ee532ae	Merge branch 'test' into dev	2019-03-11 08:40:59 +01:00
Gerard	987fc1e4e3	tranlations added	2019-03-11 08:40:35 +01:00
Gerard	562403cd0a	Merge branch 'test' into dev	2019-03-11 08:15:00 +01:00
Gerard	63787a7beb	showing client tickets from client descriptor works again	2019-03-11 08:11:48 +01:00
Gerard	3afedbd89b	merge	2019-03-11 08:02:06 +01:00
Gerard	f6eb8315a3	#999 worker.index buscador	2019-03-11 08:00:49 +01:00
Carlos Jimenez Ruiz	7323ed03e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-08 14:46:14 +01:00
Carlos Jimenez Ruiz	78103137bb	Test #1221 e2e worker.pbx	2019-03-08 14:46:01 +01:00
Gerard	cd86b78596	Merge branch 'test' into dev	2019-03-08 13:46:59 +01:00
Gerard	d1ce85c81e	taxclass field temporally removed as it slows the query	2019-03-08 13:46:33 +01:00
Gerard	9d85094ccd	Merge branch 'test' into dev	2019-03-08 13:12:33 +01:00
Gerard	720803facb	#1220 item.index añadir campos a buscador avanzado	2019-03-08 13:12:13 +01:00
Carlos Jimenez Ruiz	aceecd9c7a	Tarea #1197 worker.centralita	2019-03-08 09:41:53 +01:00
Gerard	7f0d3279d1	#1189 ticket.index mostrar mas informacion	2019-03-08 08:14:22 +01:00
Gerard	759cca3989	Merge branch 'test' into dev	2019-03-08 08:04:20 +01:00
Gerard	7d8879a979	deleted default query on item index	2019-03-08 07:52:43 +01:00
Carlos Jimenez Ruiz	6bb4f04bd1	#1211 client.billingData	2019-03-07 12:11:06 +01:00
Carlos Jimenez Ruiz	75fba75688	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-07 11:00:48 +01:00
Carlos Jimenez Ruiz	8e28bb4312	#1211 client.billingData	2019-03-07 09:55:22 +01:00
Bernat	b709930db5	cau 10041 update fixtures for workers and fix test	2019-03-07 07:51:29 +01:00
Gerard	b04dc02c61	Merge branch 'test' into dev	2019-03-06 16:29:15 +01:00
Gerard	af960e5f5f	fonts updated to 1.26 version	2019-03-06 16:28:09 +01:00
Gerard	1cc196983e	Merge branch 'test' into dev	2019-03-06 14:13:58 +01:00
Gerard	f8d6d2fe98	Merge branch 'master' into test	2019-03-06 14:10:36 +01:00
Gerard	0e3d568743	#1218 ticket.new quitar restricciones al crear un ticket abono	2019-03-06 14:06:36 +01:00
Carlos Jimenez Ruiz	fdfddd260a	#1208 Cambiar componente de icono papelera vn-icon por vn-icon-button	2019-03-06 12:27:56 +01:00
Gerard	b2adde4ba3	#1176 ticket.sale actualizar descuento	2019-03-06 08:54:56 +01:00
Gerard	8923970e75	e2e fixed	2019-03-06 08:54:04 +01:00
Gerard	1c7d50fc25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-05 15:00:38 +01:00
Gerard	dd7ded018b	test fixed	2019-03-05 15:00:17 +01:00
Joan Sanchez	11603f8d90	Add services to deliver-note #1201. Renamed receipt	2019-03-05 14:59:18 +01:00
Gerard	fbc84f48a1	Merge branch 'test' into dev	2019-03-05 14:44:38 +01:00
Gerard	52c64e9c1d	tricks with hours deleted and changed order	2019-03-05 14:43:59 +01:00
Carlos Jimenez Ruiz	17654ef71e	#1183 Crear enlace a client summary en /order/descriptor	2019-03-05 12:37:43 +01:00
Carlos Jimenez Ruiz	d37d314304	#1202 refactor del cambio de estado de un ticket	2019-03-05 12:01:53 +01:00
Joan Sanchez	e7ca55fea3	Merge branch 'dev' into test	2019-03-05 11:12:44 +01:00
Joan Sanchez	8e45858cd0	Disable & create new mandate when sending a new core sample #1207	2019-03-05 10:10:43 +01:00
Carlos Jimenez Ruiz	f8a4ad0f28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-04 16:49:41 +01:00
Carlos Jimenez Ruiz	d1d11233ad	#1039 ticket.summary	2019-03-04 16:34:41 +01:00
Gerard	d6683918bb	#1165 Añadir al buscador avanzado de order la búsqueda por ticket	2019-03-04 16:06:41 +01:00
Gerard	96704cc4df	Merge branch 'test' into dev	2019-03-04 14:29:18 +01:00
Gerard	2f7c544c52	changed showfield of salesperson autocomplete	2019-03-05 12:25:37 +01:00
Gerard	025c0810be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-05 12:13:59 +01:00