714 Commits

Author	SHA1	Message	Date
Joan Sanchez	dfe1a68d35	fix ticket basic data allow change company #1277	2019-04-01 09:01:11 +02:00
Joan Sanchez	6d51ef4187	fixed absence test	2019-04-01 08:56:18 +02:00
Gerard	164093af48	Merge branch 'test' into dev	2019-04-01 08:43:22 +02:00
Gerard	034bd77d52	Date is visible always	2019-04-01 08:42:19 +02:00
Carlos Jimenez Ruiz	a191ddebf0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-29 13:15:06 +01:00
Carlos Jimenez Ruiz	0fb95bc8d2	test repairs plus some traductions	2019-03-29 13:14:48 +01:00
Joan Sanchez	75cb05865b	filter by firstName & lastName	2019-03-29 13:07:06 +01:00
Carlos Jimenez Ruiz	d2331ccd68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-29 10:51:13 +01:00
Carlos Jimenez Ruiz	14bd970fbc	#1265 worker.pbx da error si no tiene extensión	2019-03-29 10:51:02 +01:00
Joan Sanchez	8db51fdf64	added shrink class to item index #1278	2019-03-29 08:01:15 +01:00
Gerard	8bf4190d12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-29 07:37:23 +01:00
Gerard	280efdae50	#732 Loggable now inserts the correct values for FK values	2019-03-29 07:36:26 +01:00
Joan Sanchez	8110325af8	send sms from ticket descriptor & ticket line #991	2019-03-29 07:29:09 +01:00
Carlos Jimenez Ruiz	2263da2e05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-28 11:55:31 +01:00
Carlos Jimenez Ruiz	a14ba28629	#1263 invoiceOut.summary	2019-03-28 11:55:23 +01:00
Gerard	3b3e4a96e9	Merge branch 'test' into dev	2019-03-27 10:03:53 +01:00
Gerard	59d99db6b4	#1272 ticket.index	2019-03-27 09:58:58 +01:00
Joan Sanchez	8433e15875	show client id on ticket summary header #1273	2019-03-27 09:06:21 +01:00
Gerard	8fc9581b8d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-27 08:56:39 +01:00
Gerard	650e5b8626	#1257 route.log	2019-03-27 08:56:25 +01:00
Joan Sanchez	56f352686c	added sms endpoint #1149	2019-03-27 08:48:13 +01:00
Bernat	4e27581045	cau 10269 fix test and update fixtures	2019-03-27 08:44:15 +01:00
Gerard	b24a6a6255	#1262 invoiceOut.descriptor	2019-03-26 14:27:08 +01:00
Gerard	eaec968aa4	Now you can change the shipped hour of a ticket	2019-03-26 12:25:06 +01:00
Joan Sanchez	2ca5def095	build english locale on dist directory #1268	2019-03-26 12:05:53 +01:00
Bernat	4e1e3bdeeb	cau 10270 refactor fixtures and fix test	2019-03-26 10:25:11 +01:00
Joan Sanchez	a16b43546d	fixed volume onLoad errors #1238	2019-03-26 09:33:54 +01:00
Joan Sanchez	500105675c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-26 07:29:57 +01:00
Joan Sanchez	3df5f4cae9	replaced numeric fields with input-number #1138	2019-03-26 07:29:45 +01:00
Gerard	40cbb60673	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-25 16:30:43 +01:00
Gerard	f31be20bd3	changed wrong descriptions	2019-03-25 16:30:40 +01:00
Carlos Jimenez Ruiz	de7c1f3d95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-25 16:26:06 +01:00
Carlos Jimenez Ruiz	1e150dbc8f	#1264 cambiar ruta invoice a invoiceOut	2019-03-25 16:25:59 +01:00
Gerard	2c7b9968eb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-25 15:49:10 +01:00
Gerard	aa0f04b47f	Changed wrong english label of two properties	2019-03-25 15:45:59 +01:00
Carlos Jimenez Ruiz	d322c941a4	#1226 Ticket.index advanced filter añadir factura	2019-03-25 15:16:56 +01:00
Gerard	462879a40b	#1241 summary refactor	2019-03-25 13:16:34 +01:00
Bernat	3340163315	refactor worker fixtures	2019-03-25 10:00:49 +01:00
Gerard	f4ddf3544d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-25 09:36:30 +01:00
Gerard	649b7f0e21	log added to ticket module models	2019-03-25 09:36:24 +01:00
Carlos Jimenez Ruiz	92738759a3	#1235 route.basic-data	2019-03-23 16:16:47 +01:00
Carlos Jimenez Ruiz	ce43bd63c9	#1234 route.create	2019-03-22 16:47:20 +01:00
Carlos Jimenez Ruiz	ae9ad7a6cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-22 16:04:59 +01:00
Joan Sanchez	4a4b997e1b	added subName to fetched-tags #1246	2019-03-22 15:05:15 +01:00
Carlos Jimenez Ruiz	80f59eeeb7	merge	2019-03-22 14:08:01 +01:00
Joan Sanchez	6c9f1cfdfa	fix claim regularize & message.send methods #1242	2019-03-22 13:45:17 +01:00
Joan Sanchez	c5e953f922	worker calendar front & back unit tests #1248	2019-03-22 12:51:44 +01:00
Gerard	37546e7a26	#1236 revision con pepe	2019-03-22 12:34:42 +01:00
Gerard	e23a184166	styles added	2019-03-22 11:56:21 +01:00
Gerard	f4476ca690	#1236 route.summary	2019-03-22 11:10:23 +01:00
Gerard	7ae011b3b6	#1240 route.descriptor	2019-03-22 11:07:44 +01:00
Joan Sanchez	6eaf317b5e	added worker calendar #1147	2019-03-22 08:28:57 +01:00
Carlos Jimenez Ruiz	40cabdd3bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-21 15:02:12 +01:00
Carlos Jimenez Ruiz	82683a09b5	corredted typo	2019-03-21 15:02:06 +01:00
Javi Gallego	0dd7e528dd	#1245 bug ticket line	2019-03-21 14:56:09 +01:00
Carlos Jimenez Ruiz	bbb00b98dc	#1233 route.index	2019-03-21 13:47:33 +01:00
Carlos Jimenez Ruiz	92347cd9c4	#1233 route.index	2019-03-21 13:46:14 +01:00
Bernat	504dc954d0	update model vehicle	2019-03-21 12:50:34 +01:00
Gerard	bb321995fa	deleted wrongly an unused relation alertLevel	2019-03-21 12:05:27 +01:00
Carlos Jimenez Ruiz	6b11f26296	test refactor to async await	2019-03-21 08:53:12 +01:00
Carlos Jimenez Ruiz	7a5124aca2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-20 12:27:36 +01:00
Carlos Jimenez Ruiz	30333a914e	#957 ticket.descriptor stowaway singlepage nav e2e	2019-03-20 12:23:38 +01:00
Carlos Jimenez Ruiz	d38ca72fd8	orden de resultados por defecto DESC de id y fecha	2019-03-20 11:49:11 +01:00
Bernat	41e1505b1a	#1233 new models and fixtures	2019-03-20 10:10:36 +01:00
Bernat	981800a0e2	import production structure db to local and fix test	2019-03-20 08:52:54 +01:00
Carlos Jimenez Ruiz	d7d8bff92b	#1196 worker.descriptor correo	2019-03-15 12:58:26 +01:00
Joan Sanchez	6b5d91f545	fixed translations	2019-03-15 08:12:36 +01:00
Joan Sanchez	274d744b69	added clone zone button #1159	2019-03-14 15:07:24 +01:00
Carlos Jimenez Ruiz	b165f0d06b	removed unexpected fdescribe	2019-03-14 08:29:35 +01:00
Carlos Jimenez Ruiz	53bbba49d7	removed key bind from invoices as requested.	2019-03-14 08:25:38 +01:00
Carlos Jimenez Ruiz	dcf22303ea	#1179 invoice.index crear el módulo	2019-03-14 08:10:14 +01:00
Gerard	f48e3260bd	Merge branch 'test' into dev	2019-03-13 16:15:18 +01:00
Gerard	5fcb9f61ab	Merge branch 'master' into test	2019-03-13 16:09:14 +01:00
Gerard	0a95f1b299	#1229 general search of worker searckpanel now searchs users	2019-03-13 16:08:04 +01:00
Joan Sanchez	12308de5d1	catalog filter by item id #1219	2019-03-13 15:09:10 +01:00
Carlos Jimenez Ruiz	98f73fc5d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-13 14:16:26 +01:00
Carlos Jimenez Ruiz	f4b74abe3b	#1179 invoice.index crear el módulo	2019-03-13 14:10:45 +01:00
Gerard	fd4fe288a5	has visible disabled temporally	2019-03-13 12:03:06 +01:00
Joan Sanchez	aa37a9f66a	Added zone.isVolumetric #1227	2019-03-13 11:27:45 +01:00
Joan Sanchez	5f5ce1a765	required if for checked data	2019-03-13 08:35:25 +01:00
Joan Sanchez	92170c34d5	worker department #1133	2019-03-12 15:04:09 +01:00
Gerard	fb75ff0eae	#1222 Activar log en el modulo ítem	2019-03-12 11:47:53 +01:00
Gerard	41a34421df	ship menu now open the stowaways in new tabs	2019-03-11 11:29:31 +01:00
Joan Sanchez	891c4b201a	Merge branch 'test' into dev	2019-03-11 11:10:28 +01:00
Joan Sanchez	91f8f337f5	removed clog	2019-03-11 11:09:59 +01:00
Gerard	926ee532ae	Merge branch 'test' into dev	2019-03-11 08:40:59 +01:00
Gerard	987fc1e4e3	tranlations added	2019-03-11 08:40:35 +01:00
Gerard	562403cd0a	Merge branch 'test' into dev	2019-03-11 08:15:00 +01:00
Gerard	63787a7beb	showing client tickets from client descriptor works again	2019-03-11 08:11:48 +01:00
Gerard	3afedbd89b	merge	2019-03-11 08:02:06 +01:00
Gerard	f6eb8315a3	#999 worker.index buscador	2019-03-11 08:00:49 +01:00
Carlos Jimenez Ruiz	7323ed03e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-08 14:46:14 +01:00
Carlos Jimenez Ruiz	78103137bb	Test #1221 e2e worker.pbx	2019-03-08 14:46:01 +01:00
Gerard	cd86b78596	Merge branch 'test' into dev	2019-03-08 13:46:59 +01:00
Gerard	d1ce85c81e	taxclass field temporally removed as it slows the query	2019-03-08 13:46:33 +01:00
Gerard	9d85094ccd	Merge branch 'test' into dev	2019-03-08 13:12:33 +01:00
Gerard	720803facb	#1220 item.index añadir campos a buscador avanzado	2019-03-08 13:12:13 +01:00
Carlos Jimenez Ruiz	aceecd9c7a	Tarea #1197 worker.centralita	2019-03-08 09:41:53 +01:00
Gerard	7f0d3279d1	#1189 ticket.index mostrar mas informacion	2019-03-08 08:14:22 +01:00
Gerard	759cca3989	Merge branch 'test' into dev	2019-03-08 08:04:20 +01:00
Gerard	7d8879a979	deleted default query on item index	2019-03-08 07:52:43 +01:00
Carlos Jimenez Ruiz	6bb4f04bd1	#1211 client.billingData	2019-03-07 12:11:06 +01:00
Carlos Jimenez Ruiz	75fba75688	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-07 11:00:48 +01:00
Carlos Jimenez Ruiz	8e28bb4312	#1211 client.billingData	2019-03-07 09:55:22 +01:00
Bernat	b709930db5	cau 10041 update fixtures for workers and fix test	2019-03-07 07:51:29 +01:00
Gerard	b04dc02c61	Merge branch 'test' into dev	2019-03-06 16:29:15 +01:00
Gerard	af960e5f5f	fonts updated to 1.26 version	2019-03-06 16:28:09 +01:00
Gerard	1cc196983e	Merge branch 'test' into dev	2019-03-06 14:13:58 +01:00
Gerard	f8d6d2fe98	Merge branch 'master' into test	2019-03-06 14:10:36 +01:00
Gerard	0e3d568743	#1218 ticket.new quitar restricciones al crear un ticket abono	2019-03-06 14:06:36 +01:00
Carlos Jimenez Ruiz	fdfddd260a	#1208 Cambiar componente de icono papelera vn-icon por vn-icon-button	2019-03-06 12:27:56 +01:00
Gerard	b2adde4ba3	#1176 ticket.sale actualizar descuento	2019-03-06 08:54:56 +01:00
Gerard	8923970e75	e2e fixed	2019-03-06 08:54:04 +01:00
Gerard	1c7d50fc25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-05 15:00:38 +01:00
Gerard	dd7ded018b	test fixed	2019-03-05 15:00:17 +01:00
Joan Sanchez	11603f8d90	Add services to deliver-note #1201. Renamed receipt	2019-03-05 14:59:18 +01:00
Gerard	fbc84f48a1	Merge branch 'test' into dev	2019-03-05 14:44:38 +01:00
Gerard	52c64e9c1d	tricks with hours deleted and changed order	2019-03-05 14:43:59 +01:00
Carlos Jimenez Ruiz	17654ef71e	#1183 Crear enlace a client summary en /order/descriptor	2019-03-05 12:37:43 +01:00
Carlos Jimenez Ruiz	d37d314304	#1202 refactor del cambio de estado de un ticket	2019-03-05 12:01:53 +01:00
Joan Sanchez	e7ca55fea3	Merge branch 'dev' into test	2019-03-05 11:12:44 +01:00
Joan Sanchez	8e45858cd0	Disable & create new mandate when sending a new core sample #1207	2019-03-05 10:10:43 +01:00
Carlos Jimenez Ruiz	f8a4ad0f28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-04 16:49:41 +01:00
Carlos Jimenez Ruiz	d1d11233ad	#1039 ticket.summary	2019-03-04 16:34:41 +01:00
Gerard	d6683918bb	#1165 Añadir al buscador avanzado de order la búsqueda por ticket	2019-03-04 16:06:41 +01:00
Gerard	96704cc4df	Merge branch 'test' into dev	2019-03-04 14:29:18 +01:00
Gerard	2f7c544c52	changed showfield of salesperson autocomplete	2019-03-05 12:25:37 +01:00
Gerard	025c0810be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-05 12:13:59 +01:00
Gerard	32893b49c1	#1174 item.index buscador avanzado mostrar comprador	2019-03-05 12:13:46 +01:00
Gerard	00f9754c1e	#1171 item.index mostrar campos medida y nicho	2019-03-05 12:03:34 +01:00
Gerard	7f10a509e0	#1188 item.index filtering doesnt work for some params	2019-03-05 11:34:05 +01:00
Gerard	9be6f1351a	updated steps	2019-03-05 08:42:05 +01:00
Joan Sanchez	3c6d27a285	order sales by concept #1166	2019-03-04 12:04:23 +01:00
Gerard	1b2f851525	#1191 item not available icon added	2019-03-04 20:00:12 +01:00
Bernat	11c6fd2da7	Cau 8402 fix test and update structure	2019-03-01 12:19:12 +01:00
Carlos Jimenez Ruiz	acbe9b8488	#1184 Propagar done en afterAll() de los test back	2019-03-01 11:50:26 +01:00
Carlos Jimenez Ruiz	daa65e967f	typo corrected	2019-03-01 11:09:20 +01:00
Carlos Jimenez Ruiz	443da0c44c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-01 10:51:12 +01:00
Javi Gallego	a5b60a9016	instalacion impresora revisado	2019-03-01 09:07:44 +01:00
Carlos Jimenez Ruiz	0762b734fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-01 07:33:31 +01:00
Joan Sanchez	dbc582a410	Merge branch 'test' into dev	2019-03-01 07:30:30 +01:00
Joan Sanchez	4fe4c7886b	fixed samples visible scope	2019-03-01 07:27:29 +01:00
Carlos Jimenez Ruiz	4026004ecf	#987 client.billing-data ALPHA	2019-02-28 14:30:29 +01:00
Gerard	9ef3eac480	#1136 item.buscador Avanzado añadir campo visible y isActive	2019-02-28 13:50:39 +01:00
Gerard	08650a177e	client index not being able to open summary popover fixed	2019-02-28 11:29:24 +01:00
Gerard	7dd08dc6e5	merge test	2019-02-28 10:19:31 +01:00
Joan Sanchez	d19d360ca6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-28 10:17:28 +01:00
Joan Sanchez	d336fd0eb1	fixed address	2019-02-28 10:17:09 +01:00
Gerard	624733dcfb	changed order of ticket index	2019-02-28 10:01:54 +01:00
Carlos Jimenez Ruiz	c2b95b093a	removed focus describe	2019-02-28 09:37:42 +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
Carlos Jimenez Ruiz	ac6851bf4a	eslint rules passed	2019-02-27 16:50:14 +01:00
Carlos Jimenez Ruiz	1e89b6977a	#1070 Renombrar columnas de la vista vn.worker	2019-02-27 13:10:26 +01:00
Carlos Jimenez Ruiz	048c5c2ad8	#1104 order.index mostar mas campos	2019-02-27 12:03:54 +01:00
Carlos Jimenez Ruiz	c227784877	typoe fixed	2019-02-27 10:05:49 +01:00
Gerard	a37fdd1e33	EQTAX restriction deleted CR Javi	2019-02-26 17:32:58 +01:00
Gerard	4de73fb2a8	#1152 refactor ticket.sale	2019-02-26 17:32:32 +01:00
Joan Sanchez	4d53564602	Merge branch 'test' into dev	2019-02-26 14:26:47 +01:00
Joan Sanchez	4853c8fd60	zone calendar date picker	2019-02-26 14:11:30 +01:00
Gerard	d404fc92c8	dates fixed, deleted tricks to change the hours	2019-02-26 12:51:01 +01:00
Gerard	43f26d1bc9	input number now has a option to hide the controls	2019-02-25 15:56:42 +01:00
Joan Sanchez	2862501475	Merge branch 'test' into dev	2019-02-25 15:08:42 +01:00
Carlos Jimenez Ruiz	4b37b0fc1e	#1155 item.index añadir grouping y packing	2019-02-25 14:55:06 +01:00
Gerard	8a137e7713	grouping and packing added	2019-02-25 13:40:53 +01:00
Joan Sanchez	23ed5e4ddf	added offset calendar remove selection	2019-02-25 12:22:04 +01:00
Joan Sanchez	ac1e619b06	fixed zone bugs	2019-02-25 10:03:50 +01:00
Juan Ferrer	c3f20dba3c	Small fix	2019-02-22 17:23:03 +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	ea9d194368	traduction added	2019-02-22 13:18:53 +01:00
Gerard	9370142731	styles fixed	2019-02-22 12:43:08 +01:00
Gerard	86b3407e35	item barcode to item created	2019-02-22 08:32:18 +01:00
Gerard	c590dc6270	traduction added	2019-02-21 14:08:32 +01:00
Gerard	1324d53e1b	claim action now shows ticket	2019-02-21 13:48:34 +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	506c857b70	Merge branch 'test' into dev	2019-02-21 10:17:54 +01:00
Gerard	03e168739b	updated icons	2019-02-21 10:17:13 +01:00
Juan Ferrer	02569aeea4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-21 10:10:48 +01:00
Juan Ferrer	e42da544cd	Styles fixed	2019-02-21 10:10:38 +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	42cc2bde0d	Merge branch 'test' into dev	2019-02-21 07:48:31 +01:00
Gerard	444d531162	summary action now shows ticket id	2019-02-21 07:46:27 +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	902b654f80	Merge branch 'test' into dev	2019-02-20 16:43:52 +01:00
Gerard	c95b2d71d4	tag not closed correctly fixed	2019-02-20 16:43:01 +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	8c401b6921	Style fixes	2019-02-20 14:38:41 +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
Joan Sanchez	90092a4f48	fixed treeview order	2019-02-20 12:31:08 +01:00
Gerard	23e08331fc	fetched tags not sowing title and displaying wrong fixed	2019-02-20 12:12:16 +01:00
Gerard	b97cb52abe	changed traduction of email	2019-02-20 11:52:36 +01:00
Gerard	5d6951a610	deleted deprecated component	2019-02-20 11:41:06 +01:00
Gerard	efff9d2184	deleted duplicated data	2019-02-20 11:36:55 +01:00
Gerard	0f5d1e55c0	item descriptor not sending the correct warehouse fixed	2019-02-20 11:30:55 +01:00
Joan Sanchez	20843a9068	updated module worker acl, removed fi from summary	2019-02-20 09:59:39 +01:00
Joan Sanchez	40d765adc1	removed fi from worker module	2019-02-20 09:16:19 +01:00
Carlos Jimenez Ruiz	250bb359e1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-19 18:00:07 +01:00
Carlos Jimenez Ruiz	7d2bc25c95	#1142 order.line total	2019-02-19 17:55:19 +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	a8a17b72bd	Merge remote-tracking branch 'origin/dev' into jgallego	2019-02-19 16:10:16 +01:00
Joan Sanchez	d11a51b3f1	added color filter #1041	2019-02-19 15:13:27 +01:00
Gerard	b7db5f969b	fixed worker descriptor not showing the correct worker	2019-02-19 15:09:50 +01:00
Gerard	5ef524559e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-19 12:59:58 +01:00
Gerard	abfbf791f3	added one time bindings	2019-02-19 12:50:24 +01:00
Carlos Jimenez Ruiz	ff415dc654	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-19 12:14:27 +01:00
Gerard Miguel	12337d6bcf	Merge branch 'test' of gerard/salix into dev	2019-02-19 10:42:40 +00:00
Gerard	280803f2ad	tests updated	2019-02-19 11:17:08 +01:00
Gerard	054cf21c1f	item index fixes	2019-02-19 10:15:39 +01:00
Javi Gallego	a0cf617cca	#498 e2e arreglado	2019-02-19 08:42:36 +01:00
Carlos Jimenez Ruiz	2d2ce304b5	merge	2019-02-19 08:16:36 +01:00
Joan Sanchez	75053618a2	zoneLocation order	2019-02-18 13:39:48 +01:00
Joan Sanchez	813d7368f3	fixed zoneLocation order	2019-02-18 13:37:36 +01:00
Javi Gallego	da4d961c8b	Merge branch 'dev' into jgallego	2019-02-18 13:35:33 +01:00
Javi Gallego	a3e69d604a	getAvailable aislado	2019-02-18 13:31:57 +01:00
Joan Sanchez	0ea161ff19	fixed zoneLocation search	2019-02-18 13:23:24 +01:00
Gerard	3adc035cab	#1121 worker.descriptor	2019-02-18 12:54:33 +01:00
Gerard	f5759f131b	#1145 item diary no va a la linea actual	2019-02-18 09:50:46 +01:00
Gerard	13473e7bec	#1145 item diary no va a la linea actual	2019-02-18 09:50:09 +01:00
Joan Sanchez	5eb4eb2e79	Merge branch 'dev' into test	2019-02-18 08:38:14 +01:00
Joan Sanchez	3b0d003322	treeview refactor & zone #1140	2019-02-18 08:37:26 +01:00
Javi Gallego	58706b8694	backPreparado	2019-02-18 07:57:15 +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
Gerard	cb9e2284eb	styles, imports of titles and traductions added	2019-02-15 17:30:22 +01:00
Javi Gallego	2b4f5984cc	principio 1146	2019-02-15 16:04:24 +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	32cc39ad00	order.json regularizados campos addressFk, agencyModeFk	2019-02-15 13:26:49 +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	4f851c9eed	#1111 poder buscar pedidos confirmados o sin confirmar	2019-02-15 11:05:14 +01:00