2055 Commits

Author	SHA1	Message	Date
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