1996 Commits

Author	SHA1	Message	Date
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
Bernat	69434caa52	#1470 update fixtures, client.dms gestdoc	2019-05-28 11:26:54 +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	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	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	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
Carlos Jimenez Ruiz	bb1c85459e	removed unused code	2019-05-21 13:09:30 +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
Bernat	b86cf1d98a	1354 refactor item-descriptor-popover	2019-05-17 07:34:25 +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	599084a8be	parse scopeDays integer on ticket.index #1439	2019-05-16 12:33:41 +02:00
Carlos Jimenez Ruiz	2358c94aae	#1402 route.ticket	2019-05-15 13:07:32 +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
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
Bernat	83898c9ba7	1354 refactor item-descriptor-popover	2019-05-07 11:32:35 +02:00
Joan Sanchez	4aff31a165	fixed update discount	2019-05-06 07:40:59 +02:00
Bernat	91e8b1f81b	update fixtures, #1388 ticket descript change shiiped hour	2019-05-03 12:23:57 +02:00
Joan Sanchez	2b7287dabb	added ticket.dms #1373	2019-05-01 18:49:39 +02:00
Joan Sanchez	a572130b6c	propagate check value to multicheck component for intermediate value #1305	2019-04-30 08:00:27 +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
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
Carlos Jimenez Ruiz	511e33b835	#1350 route.index worker descriptor + filters	2019-04-25 14:24:02 +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
Bernat	94480a8189	#1329 fix test and fixtures, update ticket-service	2019-04-24 07:43:11 +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	2b04eebe84	#1334 E2E ticket.descriptor - Make invoice	2019-04-23 08:58:49 +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	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	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
Bernat	c2b3ff8d81	#1335 worker/filter renamed columns acordantly	2019-04-16 08:42:44 +02:00
Joan Sanchez	6573e61a7c	fixed karma tests	2019-04-16 08:21:20 +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
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
Joan Sanchez	353167734e	send message to salesPerson #1315	2019-04-11 09:38:53 +02:00
Javi Gallego	50d70f0f6f	Tarea #1259 crear modelo ticketServiceType	2019-04-10 14:44:41 +02:00
Carlos Jimenez Ruiz	98e704adf8	#1326 enlazar en ticket.descriptor tres puntos	2019-04-10 10:43:11 +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
Joan Sanchez	33e6467c44	fixed zone descriptor	2019-04-08 10:57:01 +02:00
Gerard	633ab28c41	#1315 item.ticketRequest	2019-04-05 15:20:12 +02:00
Gerard	ebe269f41e	#1249 ticket.invoice	2019-04-05 12:24:39 +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
Carlos Jimenez Ruiz	971a2ab891	#1270 ... ticket.index advanced search mostrar dias en el futuro	2019-04-03 15:16:32 +02:00
Gerard	a23c636c16	#1279 loggable rawSql	2019-04-02 14:36:49 +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	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	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
Bernat	4e27581045	cau 10269 fix test and update fixtures	2019-03-27 08:44:15 +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
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
Carlos Jimenez Ruiz	d322c941a4	#1226 Ticket.index advanced filter añadir factura	2019-03-25 15:16:56 +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
Joan Sanchez	4a4b997e1b	added subName to fetched-tags #1246	2019-03-22 15:05:15 +01:00
Gerard	37546e7a26	#1236 revision con pepe	2019-03-22 12:34:42 +01:00
Joan Sanchez	6eaf317b5e	added worker calendar #1147	2019-03-22 08:28:57 +01:00
Javi Gallego	0dd7e528dd	#1245 bug ticket line	2019-03-21 14:56:09 +01:00
Gerard	bb321995fa	deleted wrongly an unused relation alertLevel	2019-03-21 12:05:27 +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	981800a0e2	import production structure db to local and fix test	2019-03-20 08:52:54 +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	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	7f0d3279d1	#1189 ticket.index mostrar mas informacion	2019-03-08 08:14:22 +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	d37d314304	#1202 refactor del cambio de estado de un ticket	2019-03-05 12:01:53 +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
Joan Sanchez	3c6d27a285	order sales by concept #1166	2019-03-04 12:04:23 +01:00
Carlos Jimenez Ruiz	acbe9b8488	#1184 Propagar done en afterAll() de los test back	2019-03-01 11:50:26 +01:00
Javi Gallego	a5b60a9016	instalacion impresora revisado	2019-03-01 09:07:44 +01:00
Gerard	7dd08dc6e5	merge test	2019-02-28 10:19:31 +01:00
Gerard	624733dcfb	changed order of ticket index	2019-02-28 10:01:54 +01:00
Joan Sanchez	4729dda5f6	isDefaultAddress to defaultAddressFk migration #1108	2019-02-28 08:55:34 +01:00
Gerard	9a7bd834df	date offset fixed	2019-02-27 17:04:32 +01:00
Gerard	87e8be0ede	time filter changed by dateTime	2019-02-27 17:04:00 +01:00
Gerard	4de73fb2a8	#1152 refactor ticket.sale	2019-02-26 17:32:32 +01:00
Gerard	d404fc92c8	dates fixed, deleted tricks to change the hours	2019-02-26 12:51:01 +01:00
Juan Ferrer	26419e75c9	Style fixes	2019-02-22 16:15:54 +01:00
Juan Ferrer	961eb6edaf	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2019-02-22 14:38:45 +01:00
Juan Ferrer	9fc6a2c4c2	Style fixes	2019-02-22 14:34:11 +01:00
Gerard	9370142731	styles fixed	2019-02-22 12:43:08 +01:00
Gerard	1e199e9d5a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-21 12:58:05 +01:00
Gerard	6fb936a08a	ticket log disabled temporally	2019-02-21 12:57:19 +01:00
Carlos Jimenez Ruiz	413d2f2855	merge	2019-02-21 11:53:19 +01:00
Carlos Jimenez Ruiz	050c5c1126	#1131 Refactor vn-icon a vn-icon-button en las templates.	2019-02-21 11:40:27 +01:00
Gerard	ab6606a624	Merge branch 'test' into dev	2019-02-21 10:07:27 +01:00
Gerard	8d6fdc4b2f	added envialia and solved problems with worker popover	2019-02-21 10:06:38 +01:00
Joan Sanchez	c9746521dc	removed unused getSubTotal() method	2019-02-21 08:44:03 +01:00
Joan Sanchez	06be535115	ticket subtotal should check service prices #1151	2019-02-21 08:43:04 +01:00
Gerard	a651142fff	Merge branch 'test' into dev	2019-02-20 18:50:08 +01:00
Gerard	4b54b82a9d	#1150 descriptor popover intentar abrir con id movimiento	2019-02-20 18:46:30 +01:00
Gerard	a3dab9013c	Merge branch 'test' into dev	2019-02-20 17:53:10 +01:00
Gerard	0cca3bb9ce	#1137 ticket.summary, ticket.sale	2019-02-20 17:52:36 +01:00
Gerard	79cf4afb3e	#1116 loggable now works with transaction and log enabled on ticket module	2019-02-20 16:30:46 +01:00
Juan Ferrer	752a703cdb	Merge	2019-02-20 14:34:56 +01:00
Juan Ferrer	8f1e41e744	Style fixes	2019-02-20 14:34:16 +01:00
Joan Sanchez	646e6c7b46	Disabled delivery-note preview	2019-02-20 13:26:31 +01:00
Gerard	23e08331fc	fetched tags not sowing title and displaying wrong fixed	2019-02-20 12:12:16 +01:00
Gerard	927957aed8	Merge remote-tracking branch 'upstream/dev' into jgallego	2019-02-19 16:12:01 +01:00
Gerard	e041cef586	vn-empty-rows deleted as its not longer needed	2019-02-19 16:11:57 +01:00
Gerard	b7db5f969b	fixed worker descriptor not showing the correct worker	2019-02-19 15:09:50 +01:00
Carlos Jimenez Ruiz	2d2ce304b5	merge	2019-02-19 08:16:36 +01:00
Joan Sanchez	5eb4eb2e79	Merge branch 'dev' into test	2019-02-18 08:38:14 +01:00
Carlos Jimenez Ruiz	4186fbacb3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-16 17:15:03 +01:00
Joan Sanchez	42e3fede23	fixed ng-repeat transition	2019-02-15 17:33:03 +01:00
Carlos Jimenez Ruiz	b034a8fab7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-15 15:33:11 +01:00
Gerard	8bed065f62	My team checkbox now has three states	2019-02-15 13:59:44 +01:00
Gerard	b01f401286	Merge branch 'dev' into jgallego	2019-02-15 13:33:24 +01:00
Javi Gallego	7f7f47d861	bug no results duplicado	2019-02-15 13:25:23 +01:00
Carlos Jimenez Ruiz	d6a8cd68d4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-15 13:19:21 +01:00
Javi Gallego	8bea3afbfb	karma reparado	2019-02-15 13:13:23 +01:00
Carlos Jimenez Ruiz	3ab0b2eb19	merge	2019-02-15 12:43:18 +01:00
Carlos Jimenez Ruiz	92a645f395	#1122 + worker descriptor popover + small refactors for worker.nickname	2019-02-15 12:39:21 +01:00
Gerard	db6a5cfc3e	changed hide for on-hide binding	2019-02-14 20:18:10 +01:00
Gerard	1144a197a5	#1112 ticket.sale	2019-02-14 12:06:14 +01:00
Juan Ferrer	f3e3c1bbae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-13 14:01:38 +01:00
Juan Ferrer	1f759b6b8c	Style fixes	2019-02-13 14:01:37 +01:00
Bernat	df452ff345	merge	2019-02-13 13:28:02 +01:00
Bernat	bbd4188695	#9848 fix test and update fixtures	2019-02-13 13:19:15 +01:00
Carlos Jimenez Ruiz	fb4a4cd3de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-13 08:19:44 +01:00
Juan Ferrer	d65a6fd59e	Ticket summary fix: lines with no claim	2019-02-12 15:39:37 +01:00
Carlos Jimenez Ruiz	3a5b5096da	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-12 14:40:22 +01:00
Carlos Jimenez Ruiz	9c0613e8e7	#1127	2019-02-12 14:40:13 +01:00
Gerard	5b50bbd5d0	Merge branch 'test' into dev	2019-02-12 14:36:24 +01:00
Gerard	208936f979	Merge branch 'master' into test	2019-02-12 14:29:45 +01:00
Gerard	41d950eaef	hotfix errors creting tickets	2019-02-12 14:23:04 +01:00
Carlos Jimenez Ruiz	b0e22febd3	#1127 mover ticket.descriptor al modulo ticket	2019-02-12 09:03:56 +01:00
Gerard	93aa94c5a0	fixed typo	2019-02-11 13:14:02 +01:00
Bernat	d994bd8e9d	#9783 update model and fixtures	2019-02-11 10:39:53 +01:00
Juan Ferrer	c0dd1624f6	Table style	2019-02-10 22:52:35 +01:00
Juan Ferrer	f52d306db4	Color style unified	2019-02-08 17:49:51 +01:00
Gerard	8bef242a54	fixed lines icon not preventing event default	2019-02-07 09:33:54 +01:00
Gerard	171716806a	#1096 back validaciones crear ticket	2019-02-06 16:37:59 +01:00
Gerard	d714c34f59	#1049 ticket.sale	2019-02-06 11:42:22 +01:00
Gerard	9573c875e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-06 11:40:43 +01:00
Gerard	87b3032a4f	#1067 error en boton "Importar Reclamacion"	2019-02-06 11:39:22 +01:00
Juan Ferrer	91d83bc132	Merge	2019-02-06 11:25:36 +01:00
Juan Ferrer	2bf9244770	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-06 11:24:31 +01:00
Juan Ferrer	03406a7d9b	Style fixes	2019-02-06 11:24:29 +01:00
Gerard	6d54c860cd	#1029 ir a lineas pedido en ticket.index	2019-02-06 09:55:17 +01:00
Gerard	3b4126ee79	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-06 09:25:40 +01:00
Javi Gallego	f9982047aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-06 07:58:43 +01:00
Javi Gallego	60c5d3062f	expedition.json new externalId field	2019-02-06 07:56:10 +01:00
Gerard	391c5e42c0	#1101 ticket.index	2019-02-05 17:01:01 +01:00
Gerard	69edf3fc43	Merge branch 'master' into test	2019-02-05 12:24:34 +01:00
Gerard	d51ed26025	tracking edit not showing hotfix	2019-02-05 12:20:03 +01:00
Gerard	8d714e655f	bug fixed	2019-02-05 11:44:08 +01:00
Gerard	edd433561b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-05 11:25:50 +01:00
Gerard	a32ea66a15	#913 ticket-basic data step one	2019-02-05 11:25:47 +01:00
Juan Ferrer	8f72fbad23	Merge	2019-02-05 09:14:22 +01:00
Juan Ferrer	1dbb75a1b8	vnSideMenu, vnBackground, style fixes	2019-02-05 09:13:15 +01:00
Gerard	3869742fd7	#1088 ticket.descriptor añadir polizon interval server error	2019-02-04 12:41:38 +01:00
Gerard	879c9b8877	#1093 ticket.descriptor ha dejado de funcionar en el modulo item	2019-02-04 12:24:47 +01:00
Juan Ferrer	84c0002cb1	Hot bugs fixed	2019-02-01 17:11:14 +01:00
Carlos Jimenez Ruiz	fd4205f9ab	#1069	2019-01-31 17:01:33 +01:00
Carlos Jimenez Ruiz	d109e480a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-31 14:14:52 +01:00
Carlos Jimenez Ruiz	00ccf9a4a0	#1069 mostrar el nickname en los sitios donde aparezca nombre solo	2019-01-31 14:14:39 +01:00
Joan Sanchez	1bcaf27563	changed currency filter, fixed tag value errors	2019-01-31 11:44:03 +01:00
Juan Ferrer	f643261a85	Styles fixed, change language moved to user config popover	2019-01-31 00:33:43 +01:00
Juan Ferrer	1dc8cafc73	Style & translation fixes	2019-01-30 23:47:06 +01:00
Carlos Jimenez Ruiz	f4e202dc62	#1069 index now show nicknames	2019-01-30 15:10:52 +01:00
Gerard	21e30bcaef	#1064 quitar comprobación isTaxDataChecked	2019-01-30 08:46:05 +01:00
Juan Ferrer	e553d63492	#996 worker.descriptor	2019-01-29 21:00:27 +01:00
Juan Ferrer	d46575a072	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-29 16:38:11 +01:00
Juan Ferrer	f47fe9c1cc	#998 worker.index, back tests fixed	2019-01-29 16:37:59 +01:00
Carlos Jimenez Ruiz	8f7fd03d6e	#1035 ticket al borrar falta traduccion	2019-01-29 14:46:21 +01:00
Juan Ferrer	3e40c651af	#998 worker.index	2019-01-28 16:24:45 +01:00
Juan Ferrer	ce99ab64bd	#1058 Fixed	2019-01-28 10:04:08 +01:00
Juan Ferrer	18c7851fb7	Merge	2019-01-28 00:32:28 +01:00
Juan Ferrer	317102b612	Section titile in topbar, responsive	2019-01-28 00:26:01 +01:00
Carlos Jimenez Ruiz	7333cb4114	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-27 20:49:21 +01:00
Carlos Jimenez Ruiz	20bea9679c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-26 13:04:20 +01:00
Juan Ferrer	af5ab770ec	More cleaning, deps in routes.json, module autodetection	2019-01-26 02:30:46 +01:00
Carlos Jimenez Ruiz	5b252fbc47	#1040 ticket.step2	2019-01-25 12:52:12 +01:00
Gerard	6e6b646978	#1022 ticket.create	2019-01-25 11:58:50 +01:00
Carlos Jimenez Ruiz	7096273800	#1045 ticket.datos basicos	2019-01-24 15:41:48 +01:00
Carlos Jimenez Ruiz	6bfa39e0eb	#1030 ticket.index orden siempre por fecha ascencente	2019-01-24 13:50:57 +01:00
Juan Ferrer	637c61063b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-24 10:57:45 +01:00
Gerard	91b0484c74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-24 10:04:20 +01:00
Gerard	8b17524432	changed salesperson definition	2019-01-24 10:04:18 +01:00
Juan Ferrer	1ccffd63a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-24 09:25:57 +01:00
Juan Ferrer	498ae5d4fe	Keybindings bugs fixed	2019-01-24 09:25:51 +01:00
Carlos Jimenez Ruiz	79ee9bb0da	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-24 09:08:38 +01:00
Carlos Jimenez Ruiz	8cbde4c137	removed global variable serviceRoot	2019-01-24 09:08:28 +01:00
Gerard	e6ee15fc8d	console log removed	2019-01-24 08:25:48 +01:00
Gerard	bbb7fafed1	fixed default search on ticket index	2019-01-24 08:21:00 +01:00
Juan Ferrer	30749f0f4d	#981 Back & front tests passed, keybinds on it's own module routes.json	2019-01-23 17:49:28 +01:00
Gerard	288300db41	#1048 ticket.index quitar columnas	2019-01-23 16:51:39 +01:00
Gerard	cd28d559c4	#1026 ticket.line	2019-01-23 14:12:05 +01:00
Gerard	aeb0f65fec	#1037 order.descriptor	2019-01-23 12:30:32 +01:00
Gerard	05ed72661e	test fixed	2019-01-23 11:17:18 +01:00
Gerard	abea582014	#1017 ticket.index	2019-01-22 16:18:26 +01:00
Carlos Jimenez Ruiz	5f850e76e2	#884 e2e claim.detail + bug fixes en autocompleteSearch extension	2019-01-22 13:18:20 +01:00
Gerard	87a0a0bccc	#972 ticket.tracking	2019-01-22 10:04:42 +01:00
Gerard	ea0504db21	stowaway fixes	2019-01-21 08:44:21 +01:00
Juan Ferrer	6e43b11e16	Left menu fixed	2019-01-20 18:48:03 +01:00
Juan Ferrer	2df9579f2c	Summary style fixes	2019-01-20 16:47:04 +01:00
Joan Sanchez	9cb298fb08	modules summary were not updating view data #978	2019-01-18 14:04:12 +01:00
Gerard	345acc1353	#951 ticket.descriptor añadir polizon	2019-01-18 13:36:13 +01:00
Gerard	e9bc3f00a1	#954 ticket.descriptor añadir link a polizon	2019-01-18 13:34:50 +01:00
Gerard	2b2fe69d0d	alert level not available fixed	2019-01-17 11:04:00 +01:00
Javi Gallego	f7cf8cd656	Bug #976	2019-01-16 15:38:50 +01:00
Gerard	542dd9f280	#973 order.action	2019-01-16 12:55:38 +01:00
Gerard	0fd1149c55	#975 ticket.summary	2019-01-16 12:43:18 +01:00
Gerard	ef7660162c	#966 loggable	2019-01-16 12:09:43 +01:00
Gerard	140e7b4f92	#968 ticket/servicios	2019-01-16 10:49:49 +01:00
Carlos Jimenez	8ea3278a10	#875 e2e ticket create	2019-01-16 08:52:56 +01:00
Gerard	c0170628f4	autopcomplete not pointing to the right endpoint fixed	2019-01-16 08:11:28 +01:00
Javi Gallego	b60deafff1	actualiza fuentes a 1.19	2019-01-15 13:22:31 +01:00
Gerard	7383a377aa	ticket services hidden	2019-01-15 11:26:05 +01:00
Gerard	35e237fb4f	fixed bug showing null instead id	2019-01-14 13:40:39 +01:00
Bernat	3faf03cf9f	fix test and update fixtures	2019-01-11 15:06:18 +01:00
Bernat	f7244cc22b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-11 12:26:06 +01:00
Bernat	f678bfea37	exportDB step 3	2019-01-11 12:25:53 +01:00
Gerard	aa03c686e5	added log of ticket packaging	2019-01-11 08:30:44 +01:00
Gerard	100871edf6	clients autocompletes now order by id	2019-01-11 08:03:36 +01:00
Bernat	85b4f46479	structuredb step 2	2019-01-10 07:26:10 +01:00
Gerard	360ef4837f	#931 ticket.create	2019-01-07 16:47:26 +01:00
Gerard	650becf455	#945 en salix no se pueden modificar los consignatarios antiguos	2019-01-07 16:28:18 +01:00
Juan Ferrer	9cdfe0c5d9	#814 First stable version	2018-12-27 12:54:16 +01:00
Juan Ferrer	f2fc5b6b2b	#841 Client modules mixed with service modules	2018-12-22 11:59:26 +01:00
Juan Ferrer	97e0b33d0d	#814 Service modules moved to project root, models reclassified	2018-12-21 20:22:13 +01:00