922 Commits

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