841 Commits

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	8384a6cb2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-25 09:26:52 +02:00
Javi Gallego	59e8990db9	bug solved	2019-04-25 09:26:42 +02:00
Carlos Jimenez Ruiz	da925eb9b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-25 08:28:33 +02:00
Carlos Jimenez Ruiz	e11d33eb27	worker descriptor refactor	2019-04-25 08:28:23 +02:00
Carlos Jimenez Ruiz	4e5c6ff882	#1356 advanced search refactor	2019-04-25 08:28:08 +02:00
Javi Gallego	47e55580ad	#1258 ticket.index sumatorio	2019-04-25 07:57:26 +02:00
Bernat	0eabd9876d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-24 11:36:43 +02:00
Bernat	4ac36e6bf2	#1362 ticket.packaging negative quantity	2019-04-24 11:36:13 +02:00
Joan Sanchez	d88e2e81ca	update ticket line discount until invoiced #1365	2019-04-24 11:23:24 +02:00
Bernat	37293ad695	#1364 bug create ticket	2019-04-24 11:02:31 +02:00
Joan Sanchez	6747a80943	fixed available/visible icon on ticket sales #1363	2019-04-24 09:54:25 +02:00
Joan Sanchez	00c11a95c6	fixed catalog filter bugs #1352	2019-04-24 09:21:24 +02:00
Bernat	b2f88872fa	#1366 bug in claim-index	2019-04-24 09:10:56 +02:00
Bernat	94480a8189	#1329 fix test and fixtures, update ticket-service	2019-04-24 07:43:11 +02:00
Carlos Jimenez Ruiz	a6fa9f98fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-23 13:30:43 +02:00
Carlos Jimenez Ruiz	8d5cc93ddb	#1359 refactor absences	2019-04-23 13:29:52 +02:00
Bernat	75c9d1122c	#1329 ticket.services validation	2019-04-23 11:25:49 +02:00
Carlos Jimenez Ruiz	5501ff8f4f	test repairs	2019-04-23 09:08:28 +02:00
Carlos Jimenez Ruiz	c2badeacd0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-23 09:04:30 +02:00
Carlos Jimenez Ruiz	2b04eebe84	#1334 E2E ticket.descriptor - Make invoice	2019-04-23 08:58:49 +02:00
Joan Sanchez	76269a8a16	added drag & drop directives on worker department #1319	2019-04-23 08:29:23 +02:00
Carlos Jimenez Ruiz	0176fbc2d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-18 11:47:41 +02:00
Carlos Jimenez Ruiz	fb30a01fde	#1348 invoiceOut.summary	2019-04-18 11:47:31 +02:00
Carlos Jimenez Ruiz	2107b57764	small typo	2019-04-18 11:12:48 +02:00
Bernat	bc005b2310	#1346 fix confirm.js and update item request	2019-04-18 11:02:28 +02:00
Carlos Jimenez Ruiz	2876f19101	#1348 invoiceOut.summary	2019-04-17 11:44:00 +02:00
Carlos Jimenez Ruiz	e34cb8ce84	#1351 e2e order.catalog	2019-04-17 09:37:55 +02:00
Carlos Jimenez Ruiz	bafbd92802	Bug/Test #1331 cambio de rol	2019-04-17 08:21:58 +02:00
Carlos Jimenez Ruiz	1f5fe891e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-17 07:16:13 +02:00
Carlos Jimenez Ruiz	d52f5077b0	#1306 Renombrar controladores, rutas y carpeta	2019-04-16 15:00:21 +02:00
Carlos Jimenez Ruiz	9baa37b833	#1306 Renombrar controladores, rutas y carpetas	2019-04-16 14:30:01 +02:00
Carlos Jimenez Ruiz	85851e7a33	#1306 Renombrar controladores, rutas y carpetas	2019-04-16 13:40:26 +02:00
Bernat	9a86929e3a	#1344 create test for worker filter	2019-04-16 13:10:06 +02:00
Carlos Jimenez Ruiz	5770bed5af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-16 12:44:12 +02:00
Bernat	54f65a9227	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-16 12:21:58 +02:00
Joan Sanchez	842101e239	fixed catalog price popover	2019-04-16 12:11:06 +02:00
Carlos Jimenez Ruiz	a326fd2a65	#1306 Renombrar controladores, rutas y carpetas	2019-04-16 11:32:45 +02:00
Carlos Jimenez Ruiz	02c63b0d5f	refactor tests	2019-04-16 08:46:59 +02:00
Bernat	c2b3ff8d81	#1335 worker/filter renamed columns acordantly	2019-04-16 08:42:44 +02:00
Bernat	97f3761e0c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-16 08:36:16 +02:00
Joan Sanchez	6573e61a7c	fixed karma tests	2019-04-16 08:21:20 +02:00
Javi Gallego	ce2615e2d0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-16 08:09:20 +02:00
Javi Gallego	28bbc024b2	#1195 claim.action regularize	2019-04-16 08:09:16 +02:00
Bernat	0d680bdaed	#1343 update worker filter	2019-04-16 07:59:29 +02:00
Joan Sanchez	f814584f6b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-16 07:59:15 +02:00
Joan Sanchez	90bbe1bd02	Log sent sms #1324	2019-04-16 07:59:12 +02:00
Carlos Jimenez Ruiz	9c596b06c8	merge	2019-04-15 14:37:12 +02:00
Carlos Jimenez Ruiz	82ed0078d2	#1339 Print - Hoja de rutas	2019-04-15 14:34:33 +02:00
Bernat	a68174c456	#1337 refactor checkbox in ticketRequest	2019-04-15 14:21:52 +02:00
Bernat	6a68003d84	#1212 refactor claim filter	2019-04-15 11:06:42 +02:00
Joan Sanchez	79f9dfb515	error when sending to a salesPerson pay-method changes #1338	2019-04-15 08:46:20 +02:00
Joan Sanchez	b5fe7a6fae	restore fixtures makeInvoice	2019-04-12 14:53:17 +02:00
Bernat	dbe56b2496	#1330 add info in the search panel	2019-04-12 14:33:08 +02:00
Joan Sanchez	ac8a27d2f4	Added ticket invoice #1310	2019-04-12 13:54:31 +02:00
Javi Gallego	6eef192929	añade opcion mana con permisos	2019-04-11 12:44:43 +02:00
Joan Sanchez	2f38f6e88f	Merge branch 'test' into dev	2019-04-11 11:34:25 +02:00
Joan Sanchez	84151d6527	Merge branch 'master' into test	2019-04-11 11:24:46 +02:00
Joan Sanchez	bed6721643	changed credit min value to zero	2019-04-11 11:24:10 +02:00
Joan Sanchez	353167734e	send message to salesPerson #1315	2019-04-11 09:38:53 +02:00
Joan Sanchez	7c3052d17b	fixed input time & input number	2019-04-11 07:42:27 +02:00
Joan Sanchez	da473c921d	input time refactor #1292	2019-04-11 07:32:58 +02:00
Joan Sanchez	3d71165682	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-11 07:29:43 +02:00
Joan Sanchez	1e06a19884	input time refactor #1292	2019-04-11 07:29:41 +02:00
Javi Gallego	50d70f0f6f	Tarea #1259 crear modelo ticketServiceType	2019-04-10 14:44:41 +02:00
Joan Sanchez	49ef341eb6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-10 12:04:22 +02:00
Joan Sanchez	6f98d81db1	fixed input time	2019-04-10 12:04:11 +02:00
Carlos Jimenez Ruiz	e9102249be	#1328 module home refactor	2019-04-10 11:49:39 +02:00
Carlos Jimenez Ruiz	9db389329d	renamed the it statement	2019-04-10 10:53:00 +02:00
Carlos Jimenez Ruiz	a248f722a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-10 10:43:19 +02:00
Carlos Jimenez Ruiz	98e704adf8	#1326 enlazar en ticket.descriptor tres puntos	2019-04-10 10:43:11 +02:00
Bernat	2be3481138	#1309 add icon in routes module	2019-04-10 10:02:28 +02:00
Joan Sanchez	20ba05a655	item filter by id or barcode	2019-04-10 09:32:29 +02:00
Joan Sanchez	b3c00e5a29	updated td-editable styles #1313	2019-04-09 13:47:13 +02:00
Joan Sanchez	9ce1e93da7	changed worker holidays length	2019-04-09 13:38:02 +02:00
Joan Sanchez	4f1a1ae004	Merge branch 'master' into dev	2019-04-09 13:19:34 +02:00
Joan Sanchez	a6308c7f1e	input-number refactor #1311	2019-04-09 13:18:55 +02:00
Carlos Jimenez Ruiz	26ba8b2463	#1312 InvoiceOut.descriptor	2019-04-08 16:53:37 +02:00
Joan Sanchez	33e6467c44	fixed zone descriptor	2019-04-08 10:57:01 +02:00
Joan Sanchez	d0dc192fc4	navigate to next claim section for salesAssistant #1119	2019-04-08 09:01:10 +02:00
Gerard	633ab28c41	#1315 item.ticketRequest	2019-04-05 15:20:12 +02:00
Carlos Jimenez Ruiz	c9cd1b19dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-05 13:59:22 +02:00
Joan Sanchez	c312374c3e	added sms back unit test	2019-04-05 13:58:50 +02:00
Carlos Jimenez Ruiz	2ba91a6cc2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-05 13:20:47 +02:00
Carlos Jimenez Ruiz	837a7b08cc	#1300-1301 client.risk	2019-04-05 13:20:34 +02:00
Gerard	ebe269f41e	#1249 ticket.invoice	2019-04-05 12:24:39 +02:00
Gerard	d7c063f389	removed unused binding	2019-04-05 09:27:43 +02:00
Gerard	00b7442b89	#1247 reparar tests excluidos	2019-04-05 07:52:08 +02:00
Gerard	cfdeb387a1	#1241 routes.tickets	2019-04-04 13:06:41 +02:00
Gerard	93bca3b3f0	merge master	2019-04-04 12:47:02 +02:00
Gerard	4861b789f7	Loggable now inserts the correct values for FK values	2019-04-04 12:38:54 +02:00
Gerard	d1a179c1c3	Merge branch 'test' into dev	2019-04-04 12:09:57 +02:00
Gerard	9abaa8ce51	bug sending messages to buyers fixed	2019-04-04 12:05:01 +02:00
Joan Sanchez	c4c5c67b18	Merge branch 'master' into dev	2019-04-04 11:54:25 +02:00
Joan Sanchez	bb039386f2	fixed input focus #1302	2019-04-04 11:53:13 +02:00
Carlos Jimenez Ruiz	11c6939ad4	traduccion de invoice out	2019-04-03 15:32:21 +02:00
Carlos Jimenez Ruiz	09288c2c12	merge	2019-04-03 15:19:05 +02:00
Carlos Jimenez Ruiz	971a2ab891	#1270 ... ticket.index advanced search mostrar dias en el futuro	2019-04-03 15:16:32 +02:00
Joan Sanchez	afafbdda95	fixed back unit test	2019-04-03 14:04:25 +02:00
Joan Sanchez	4ecc1f445a	added filter from-to on routes index #1296	2019-04-03 13:51:14 +02:00
Joan Sanchez	ccb2505896	Merge branch 'master' into dev	2019-04-03 12:58:59 +02:00
Joan Sanchez	eea4f53151	removed field acl for buyer on item tags	2019-04-03 12:58:30 +02:00
Joan Sanchez	0a0aa3853a	Merge branch 'master' into dev	2019-04-03 12:48:21 +02:00
Joan Sanchez	1e99a890e2	allow item tags for accessory role	2019-04-03 12:47:51 +02:00
Joan Sanchez	f8035c9777	fixed calendar front unit tests	2019-04-03 12:39:24 +02:00
Joan Sanchez	d407fc7803	fixed calendar month name display	2019-04-03 12:29:23 +02:00
Joan Sanchez	e433828f7c	Merge branch 'master' into dev	2019-04-03 11:55:18 +02:00
Joan Sanchez	892e267a16	fixed worker calendar total holidays #1299	2019-04-03 11:36:10 +02:00
Joan Sanchez	f337799e39	tests & refactor calendar component #811	2019-04-03 11:34:58 +02:00
Gerard	a23c636c16	#1279 loggable rawSql	2019-04-02 14:36:49 +02:00
Carlos Jimenez Ruiz	b86c1afa79	re-activated preview on invoiceout index	2019-04-02 12:32:15 +02:00
Carlos Jimenez Ruiz	ef53d60c94	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-02 11:05:16 +02:00
Carlos Jimenez Ruiz	570e2b5732	#1243 ticket.log columna worker	2019-04-02 11:04:53 +02:00
Joan Sanchez	eb67dffd35	Merge branch 'test' into dev	2019-04-02 10:57:30 +02:00
Joan Sanchez	a0a6c49349	order filter sort by created desc	2019-04-02 10:56:24 +02:00
Joan Sanchez	0f2d9ade57	Merge branch 'test' into dev	2019-04-02 10:06:16 +02:00
Joan Sanchez	a44bb2a13c	route index order by created desc	2019-04-02 10:05:56 +02:00
Joan Sanchez	a36c50b324	merge	2019-04-02 09:51:05 +02:00
Joan Sanchez	8bd4d25e2e	route index order by date desc	2019-04-02 09:44:03 +02:00
Joan Sanchez	c0e52c475f	hide invoiceOut preview	2019-04-02 09:15:47 +02:00
Javi Gallego	0b977d3b0b	#1293 ticket.components solo muestra base	2019-04-02 08:00:16 +02:00
Carlos Jimenez Ruiz	056c07b17c	#1181 No modificar ticket.basicData en reparto	2019-04-01 15:04:09 +02:00
Carlos Jimenez Ruiz	62acb534e1	#1181 No modificar ticket.basicData en reparto	2019-04-01 14:49:12 +02:00
Joan Sanchez	3f1889daa3	fix open client card from ticket descriptor #1291	2019-04-01 09:48:22 +02:00
Joan Sanchez	48cd9e2919	price fixes	2019-04-01 09:13:24 +02:00
Gerard	03d8e96deb	Merge branch 'test' into dev	2019-04-01 09:03:33 +02:00
Gerard	66d94dde3a	claim detail now adds a sale with its total quantity	2019-04-01 09:03:05 +02:00
Joan Sanchez	5898d07822	Merge branch 'test' into dev	2019-04-01 09:02:13 +02:00
Joan Sanchez	dfe1a68d35	fix ticket basic data allow change company #1277	2019-04-01 09:01:11 +02:00
Joan Sanchez	6d51ef4187	fixed absence test	2019-04-01 08:56:18 +02:00
Gerard	164093af48	Merge branch 'test' into dev	2019-04-01 08:43:22 +02:00
Gerard	034bd77d52	Date is visible always	2019-04-01 08:42:19 +02:00
Carlos Jimenez Ruiz	a191ddebf0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-29 13:15:06 +01:00
Carlos Jimenez Ruiz	0fb95bc8d2	test repairs plus some traductions	2019-03-29 13:14:48 +01:00
Joan Sanchez	75cb05865b	filter by firstName & lastName	2019-03-29 13:07:06 +01:00
Carlos Jimenez Ruiz	d2331ccd68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-29 10:51:13 +01:00
Carlos Jimenez Ruiz	14bd970fbc	#1265 worker.pbx da error si no tiene extensión	2019-03-29 10:51:02 +01:00
Joan Sanchez	8db51fdf64	added shrink class to item index #1278	2019-03-29 08:01:15 +01:00
Gerard	8bf4190d12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-29 07:37:23 +01:00
Gerard	280efdae50	#732 Loggable now inserts the correct values for FK values	2019-03-29 07:36:26 +01:00
Joan Sanchez	8110325af8	send sms from ticket descriptor & ticket line #991	2019-03-29 07:29:09 +01:00
Carlos Jimenez Ruiz	2263da2e05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-28 11:55:31 +01:00
Carlos Jimenez Ruiz	a14ba28629	#1263 invoiceOut.summary	2019-03-28 11:55:23 +01:00
Gerard	3b3e4a96e9	Merge branch 'test' into dev	2019-03-27 10:03:53 +01:00
Gerard	59d99db6b4	#1272 ticket.index	2019-03-27 09:58:58 +01:00
Joan Sanchez	8433e15875	show client id on ticket summary header #1273	2019-03-27 09:06:21 +01:00
Gerard	8fc9581b8d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-27 08:56:39 +01:00
Gerard	650e5b8626	#1257 route.log	2019-03-27 08:56:25 +01:00
Joan Sanchez	56f352686c	added sms endpoint #1149	2019-03-27 08:48:13 +01:00
Bernat	4e27581045	cau 10269 fix test and update fixtures	2019-03-27 08:44:15 +01:00
Gerard	b24a6a6255	#1262 invoiceOut.descriptor	2019-03-26 14:27:08 +01:00
Gerard	eaec968aa4	Now you can change the shipped hour of a ticket	2019-03-26 12:25:06 +01:00
Joan Sanchez	2ca5def095	build english locale on dist directory #1268	2019-03-26 12:05:53 +01:00
Bernat	4e1e3bdeeb	cau 10270 refactor fixtures and fix test	2019-03-26 10:25:11 +01:00
Joan Sanchez	a16b43546d	fixed volume onLoad errors #1238	2019-03-26 09:33:54 +01:00
Joan Sanchez	500105675c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-26 07:29:57 +01:00
Joan Sanchez	3df5f4cae9	replaced numeric fields with input-number #1138	2019-03-26 07:29:45 +01:00
Gerard	40cbb60673	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-25 16:30:43 +01:00
Gerard	f31be20bd3	changed wrong descriptions	2019-03-25 16:30:40 +01:00
Carlos Jimenez Ruiz	de7c1f3d95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-25 16:26:06 +01:00
Carlos Jimenez Ruiz	1e150dbc8f	#1264 cambiar ruta invoice a invoiceOut	2019-03-25 16:25:59 +01:00
Gerard	2c7b9968eb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-25 15:49:10 +01:00
Gerard	aa0f04b47f	Changed wrong english label of two properties	2019-03-25 15:45:59 +01:00
Carlos Jimenez Ruiz	d322c941a4	#1226 Ticket.index advanced filter añadir factura	2019-03-25 15:16:56 +01:00
Gerard	462879a40b	#1241 summary refactor	2019-03-25 13:16:34 +01:00
Bernat	3340163315	refactor worker fixtures	2019-03-25 10:00:49 +01:00
Gerard	f4ddf3544d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-25 09:36:30 +01:00
Gerard	649b7f0e21	log added to ticket module models	2019-03-25 09:36:24 +01:00
Carlos Jimenez Ruiz	92738759a3	#1235 route.basic-data	2019-03-23 16:16:47 +01:00
Carlos Jimenez Ruiz	ce43bd63c9	#1234 route.create	2019-03-22 16:47:20 +01:00
Carlos Jimenez Ruiz	ae9ad7a6cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-22 16:04:59 +01:00
Joan Sanchez	4a4b997e1b	added subName to fetched-tags #1246	2019-03-22 15:05:15 +01:00
Carlos Jimenez Ruiz	80f59eeeb7	merge	2019-03-22 14:08:01 +01:00
Joan Sanchez	6c9f1cfdfa	fix claim regularize & message.send methods #1242	2019-03-22 13:45:17 +01:00
Joan Sanchez	c5e953f922	worker calendar front & back unit tests #1248	2019-03-22 12:51:44 +01:00
Gerard	37546e7a26	#1236 revision con pepe	2019-03-22 12:34:42 +01:00
Gerard	e23a184166	styles added	2019-03-22 11:56:21 +01:00
Gerard	f4476ca690	#1236 route.summary	2019-03-22 11:10:23 +01:00
Gerard	7ae011b3b6	#1240 route.descriptor	2019-03-22 11:07:44 +01:00
Joan Sanchez	6eaf317b5e	added worker calendar #1147	2019-03-22 08:28:57 +01:00
Carlos Jimenez Ruiz	40cabdd3bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-21 15:02:12 +01:00
Carlos Jimenez Ruiz	82683a09b5	corredted typo	2019-03-21 15:02:06 +01:00
Javi Gallego	0dd7e528dd	#1245 bug ticket line	2019-03-21 14:56:09 +01:00
Carlos Jimenez Ruiz	bbb00b98dc	#1233 route.index	2019-03-21 13:47:33 +01:00
Carlos Jimenez Ruiz	92347cd9c4	#1233 route.index	2019-03-21 13:46:14 +01:00
Bernat	504dc954d0	update model vehicle	2019-03-21 12:50:34 +01:00
Gerard	bb321995fa	deleted wrongly an unused relation alertLevel	2019-03-21 12:05:27 +01:00
Carlos Jimenez Ruiz	6b11f26296	test refactor to async await	2019-03-21 08:53:12 +01:00
Carlos Jimenez Ruiz	7a5124aca2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-20 12:27:36 +01:00
Carlos Jimenez Ruiz	30333a914e	#957 ticket.descriptor stowaway singlepage nav e2e	2019-03-20 12:23:38 +01:00
Carlos Jimenez Ruiz	d38ca72fd8	orden de resultados por defecto DESC de id y fecha	2019-03-20 11:49:11 +01:00
Bernat	41e1505b1a	#1233 new models and fixtures	2019-03-20 10:10:36 +01:00
Bernat	981800a0e2	import production structure db to local and fix test	2019-03-20 08:52:54 +01:00
Carlos Jimenez Ruiz	d7d8bff92b	#1196 worker.descriptor correo	2019-03-15 12:58:26 +01:00
Joan Sanchez	6b5d91f545	fixed translations	2019-03-15 08:12:36 +01:00
Joan Sanchez	274d744b69	added clone zone button #1159	2019-03-14 15:07:24 +01:00
Carlos Jimenez Ruiz	b165f0d06b	removed unexpected fdescribe	2019-03-14 08:29:35 +01:00
Carlos Jimenez Ruiz	53bbba49d7	removed key bind from invoices as requested.	2019-03-14 08:25:38 +01:00
Carlos Jimenez Ruiz	dcf22303ea	#1179 invoice.index crear el módulo	2019-03-14 08:10:14 +01:00
Gerard	f48e3260bd	Merge branch 'test' into dev	2019-03-13 16:15:18 +01:00
Gerard	5fcb9f61ab	Merge branch 'master' into test	2019-03-13 16:09:14 +01:00
Gerard	0a95f1b299	#1229 general search of worker searckpanel now searchs users	2019-03-13 16:08:04 +01:00
Joan Sanchez	12308de5d1	catalog filter by item id #1219	2019-03-13 15:09:10 +01:00
Carlos Jimenez Ruiz	98f73fc5d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-13 14:16:26 +01:00
Carlos Jimenez Ruiz	f4b74abe3b	#1179 invoice.index crear el módulo	2019-03-13 14:10:45 +01:00
Gerard	fd4fe288a5	has visible disabled temporally	2019-03-13 12:03:06 +01:00
Joan Sanchez	aa37a9f66a	Added zone.isVolumetric #1227	2019-03-13 11:27:45 +01:00
Joan Sanchez	5f5ce1a765	required if for checked data	2019-03-13 08:35:25 +01:00
Joan Sanchez	92170c34d5	worker department #1133	2019-03-12 15:04:09 +01:00
Gerard	fb75ff0eae	#1222 Activar log en el modulo ítem	2019-03-12 11:47:53 +01:00
Gerard	41a34421df	ship menu now open the stowaways in new tabs	2019-03-11 11:29:31 +01:00
Joan Sanchez	891c4b201a	Merge branch 'test' into dev	2019-03-11 11:10:28 +01:00
Joan Sanchez	91f8f337f5	removed clog	2019-03-11 11:09:59 +01:00
Gerard	926ee532ae	Merge branch 'test' into dev	2019-03-11 08:40:59 +01:00
Gerard	987fc1e4e3	tranlations added	2019-03-11 08:40:35 +01:00
Gerard	562403cd0a	Merge branch 'test' into dev	2019-03-11 08:15:00 +01:00
Gerard	63787a7beb	showing client tickets from client descriptor works again	2019-03-11 08:11:48 +01:00
Gerard	3afedbd89b	merge	2019-03-11 08:02:06 +01:00
Gerard	f6eb8315a3	#999 worker.index buscador	2019-03-11 08:00:49 +01:00
Carlos Jimenez Ruiz	7323ed03e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-08 14:46:14 +01:00
Carlos Jimenez Ruiz	78103137bb	Test #1221 e2e worker.pbx	2019-03-08 14:46:01 +01:00
Gerard	cd86b78596	Merge branch 'test' into dev	2019-03-08 13:46:59 +01:00
Gerard	d1ce85c81e	taxclass field temporally removed as it slows the query	2019-03-08 13:46:33 +01:00
Gerard	9d85094ccd	Merge branch 'test' into dev	2019-03-08 13:12:33 +01:00
Gerard	720803facb	#1220 item.index añadir campos a buscador avanzado	2019-03-08 13:12:13 +01:00
Carlos Jimenez Ruiz	aceecd9c7a	Tarea #1197 worker.centralita	2019-03-08 09:41:53 +01:00
Gerard	7f0d3279d1	#1189 ticket.index mostrar mas informacion	2019-03-08 08:14:22 +01:00
Gerard	759cca3989	Merge branch 'test' into dev	2019-03-08 08:04:20 +01:00
Gerard	7d8879a979	deleted default query on item index	2019-03-08 07:52:43 +01:00
Carlos Jimenez Ruiz	6bb4f04bd1	#1211 client.billingData	2019-03-07 12:11:06 +01:00
Carlos Jimenez Ruiz	75fba75688	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-07 11:00:48 +01:00
Carlos Jimenez Ruiz	8e28bb4312	#1211 client.billingData	2019-03-07 09:55:22 +01:00
Bernat	b709930db5	cau 10041 update fixtures for workers and fix test	2019-03-07 07:51:29 +01:00
Gerard	b04dc02c61	Merge branch 'test' into dev	2019-03-06 16:29:15 +01:00
Gerard	af960e5f5f	fonts updated to 1.26 version	2019-03-06 16:28:09 +01:00
Gerard	1cc196983e	Merge branch 'test' into dev	2019-03-06 14:13:58 +01:00
Gerard	f8d6d2fe98	Merge branch 'master' into test	2019-03-06 14:10:36 +01:00
Gerard	0e3d568743	#1218 ticket.new quitar restricciones al crear un ticket abono	2019-03-06 14:06:36 +01:00
Carlos Jimenez Ruiz	fdfddd260a	#1208 Cambiar componente de icono papelera vn-icon por vn-icon-button	2019-03-06 12:27:56 +01:00
Gerard	b2adde4ba3	#1176 ticket.sale actualizar descuento	2019-03-06 08:54:56 +01:00
Gerard	8923970e75	e2e fixed	2019-03-06 08:54:04 +01:00
Gerard	1c7d50fc25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-05 15:00:38 +01:00
Gerard	dd7ded018b	test fixed	2019-03-05 15:00:17 +01:00
Joan Sanchez	11603f8d90	Add services to deliver-note #1201. Renamed receipt	2019-03-05 14:59:18 +01:00
Gerard	fbc84f48a1	Merge branch 'test' into dev	2019-03-05 14:44:38 +01:00
Gerard	52c64e9c1d	tricks with hours deleted and changed order	2019-03-05 14:43:59 +01:00
Carlos Jimenez Ruiz	17654ef71e	#1183 Crear enlace a client summary en /order/descriptor	2019-03-05 12:37:43 +01:00
Carlos Jimenez Ruiz	d37d314304	#1202 refactor del cambio de estado de un ticket	2019-03-05 12:01:53 +01:00
Joan Sanchez	e7ca55fea3	Merge branch 'dev' into test	2019-03-05 11:12:44 +01:00
Joan Sanchez	8e45858cd0	Disable & create new mandate when sending a new core sample #1207	2019-03-05 10:10:43 +01:00
Carlos Jimenez Ruiz	f8a4ad0f28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-04 16:49:41 +01:00