3439 Commits

Author	SHA1	Message	Date
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
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
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
Gerard	90a4e5a7d1	#1144 fixed bugs with $destroy	2019-02-15 11:03:27 +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
Gerard	16f92ce646	changed Type traduction	2019-02-14 12:05:46 +01:00
Gerard	f7968ff15b	tests fixed	2019-02-14 11:41:06 +01:00
Gerard	9c439e9a92	added category to item search panel	2019-02-14 11:24:04 +01:00
Gerard	2a48e183e9	information added to the table	2019-02-14 09:59:54 +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
Gerard	b93e2f5359	#1114 item.regularize	2019-02-13 09:49:41 +01:00
Gerard	5063bd8137	#1128 item.index	2019-02-13 09:27:11 +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
Joan Sanchez	7f96eae312	$applyAsync() with relocate() on catalog. Replaced $$postDigest() #1072	2019-02-13 07:57:08 +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	8ef6db9017	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-12 13:33:21 +01:00
Joan Sanchez	108d9d4044	calculate swift on load #1132	2019-02-12 13:26:52 +01:00
Carlos Jimenez Ruiz	b0e22febd3	#1127 mover ticket.descriptor al modulo ticket	2019-02-12 09:03:56 +01:00
Joan Sanchez	604f75c84b	Show/send claim pickup order #1106	2019-02-12 07:42:19 +01:00
Carlos Jimenez Ruiz	82d59b544d	removed unused fdescribe	2019-02-11 15:01:12 +01:00
Joan Sanchez	58c95fac19	Merge branch 'test' into dev	2019-02-11 13:59:39 +01:00
Gerard	93aa94c5a0	fixed typo	2019-02-11 13:14:02 +01:00
Joan Sanchez	0a5860e59c	fixed agency descriptor & summary	2019-02-11 12:59:54 +01:00
Bernat	d994bd8e9d	#9783 update model and fixtures	2019-02-11 10:39:53 +01:00
Joan Sanchez	7365a1e001	updated delivery-note, fixed fallback locale	2019-02-11 10:06:26 +01:00
Gerard	5187a7e15b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-11 09:02:26 +01:00
Gerard	b38aa57894	order line not redirecting correctly to ticket index fixed	2019-02-11 09:02:09 +01:00
Juan Ferrer	c0dd1624f6	Table style	2019-02-10 22:52:35 +01:00
Juan Ferrer	20382b2b14	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-08 17:49:53 +01:00
Juan Ferrer	f52d306db4	Color style unified	2019-02-08 17:49:51 +01:00
Gerard	0aefe73379	#1032 order.index buscador avanzado no se puede buscar a carlos lopez	2019-02-08 15:07:18 +01:00
Javi Gallego	394a987a05	defaulter no muestra negativos	2019-02-08 09:37:11 +01:00
Gerard	8bef242a54	fixed lines icon not preventing event default	2019-02-07 09:33:54 +01:00
Gerard	b7f8a642be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-06 16:38:14 +01:00
Gerard	171716806a	#1096 back validaciones crear ticket	2019-02-06 16:37:59 +01:00
Javi Gallego	6e421d8442	Tarea #808 order.basic-data cr juan	2019-02-06 14:56:36 +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
Joan Sanchez	35bd82c9cb	item summary fix & css report fixes	2019-02-06 10:53:12 +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	a605b8f9b7	#1065 item.last-entries	2019-02-05 16:53:55 +01:00
Gerard	f59d022da8	#1078 risk.create	2019-02-05 16:46:02 +01:00
Gerard	48bb876bea	Revert "#1012 claim.action" ... This reverts commit 44893b57e7.	2019-02-05 16:42:28 +01:00
Gerard	44893b57e7	#1012 claim.action	2019-02-05 16:41:36 +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	2e1b47b0c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-05 11:44:12 +01:00
Gerard	8d714e655f	bug fixed	2019-02-05 11:44:08 +01:00
Joan Sanchez	391a092754	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-05 11:32:37 +01:00
Joan Sanchez	fa47c15d7a	catalog item type dropdown show limit #1041	2019-02-05 11:31:30 +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
Joan Sanchez	353dc38e48	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-05 11:08:04 +01:00
Juan Ferrer	1355fb80e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-05 09:47:45 +01:00
Gerard	8f575fbc45	strings added to the locale	2019-02-05 09:37:01 +01:00
Gerard	6c2fe1d4a3	#1036 order.line	2019-02-05 09:27:01 +01:00
Joan Sanchez	d87e2dbbf0	fixed order item category filter #1079	2019-02-05 09:21:29 +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
Joan Sanchez	bce67487c1	catalog filter requery fix #1034	2019-02-04 15:21:10 +01:00
Gerard	de654f270f	Merge branch 'test' into dev	2019-02-04 12:55:27 +01:00
Gerard	a19745a3e3	Merge branch 'master' into test	2019-02-04 12:52:58 +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
Joan Sanchez	af6a9d8022	fixed zone treeview bugs	2019-02-04 12:14:07 +01:00
Joan Sanchez	7986405a72	added sepa-core & letter-debtor	2019-02-04 10:10:57 +01:00
Juan Ferrer	84c0002cb1	Hot bugs fixed	2019-02-01 17:11:14 +01:00
Gerard	d648db504c	added card.reload and fixed remove stowaway not showing	2019-02-01 12:11:56 +01:00
Gerard	48aa29c4a3	updated stowaway icon	2019-02-01 11:42:31 +01:00
Juan Ferrer	3f08ab1b22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-02-01 11:06:39 +01:00
Carlos Jimenez Ruiz	2ac6342838	test fixed for fixtures dates	2019-02-01 09:43:30 +01:00
Juan Ferrer	e63e4319cd	Worker module fixes	2019-02-01 09:31:01 +01:00
Carlos Jimenez Ruiz	fd4205f9ab	#1069	2019-01-31 17:01:33 +01:00
Carlos Jimenez Ruiz	a288f9efd9	removed unused file	2019-01-31 15:06:12 +01:00
Carlos Jimenez Ruiz	8e6d38ab31	#1069 mostrar el nickname en los sitios donde aparezca nombre solo	2019-01-31 14:58:14 +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
Gerard	aac96f4b87	#1080 fallos de estilos en order prices-popover	2019-01-31 11:26:03 +01:00
Joan Sanchez	e74b7e3118	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-31 09:48:11 +01:00
Joan Sanchez	a49d937fd9	ita-tag validation error + home shortcuts	2019-01-31 09:47:52 +01:00
Bernat	0ca4881fdd	fix test	2019-01-31 09:12:45 +01:00
Bernat	19cfa1ab75	upadte structure db and models	2019-01-31 09:12:29 +01:00
Bernat	cd89550678	#9670 export acl fix test	2019-01-31 09:10:40 +01:00
Joan Sanchez	9cb97662d7	removed developer role from agency module	2019-01-31 07:20:36 +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	f27ca4ce3b	#1069 descriptor de claim	2019-01-30 16:03:29 +01:00
Carlos Jimenez Ruiz	f4e202dc62	#1069 index now show nicknames	2019-01-30 15:10:52 +01:00
Carlos Jimenez Ruiz	a48fa07cad	#1069 activeWrokersWithRole now returns the nickname	2019-01-30 14:27:35 +01:00
Juan Ferrer	259079b051	Translations fixed	2019-01-30 14:13:47 +01:00
Juan Ferrer	84737a0bb9	#997 worker.summary, bugs fixed	2019-01-30 13:32:25 +01:00
Gerard	21e30bcaef	#1064 quitar comprobación isTaxDataChecked	2019-01-30 08:46:05 +01:00
Gerard	b791195b89	#1068 claim.descriptor	2019-01-30 08:44:15 +01:00
Gerard	8aad79886c	fdescribe deleted	2019-01-30 08:28:09 +01:00
Joan Sanchez	c20a08e99b	updated clientSample with new reports uri #1001	2019-01-30 08:09:21 +01:00
Joan Sanchez	8d2f56a547	updated clientBillingData email test #1001	2019-01-30 07:18:33 +01:00
Juan Ferrer	7893c784aa	#997 worker summary	2019-01-29 21:45:43 +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
Joan Sanchez	c76bbb5a27	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-29 15:04:57 +01:00
Joan Sanchez	7537d35446	uncheck zones,removed treeview model #1066	2019-01-29 15:04:38 +01:00
Carlos Jimenez Ruiz	6f335a0753	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-29 14:46:30 +01:00
Carlos Jimenez Ruiz	8f7fd03d6e	#1035 ticket al borrar falta traduccion	2019-01-29 14:46:21 +01:00
Gerard	5db2783385	Merge branch 'test' into dev	2019-01-29 14:44:25 +01:00
Gerard	ef3930fdd7	Merge branch 'master' into test	2019-01-29 14:43:57 +01:00
Gerard	94f19c2cb5	#1073 item.tags no busca tags cuando se añade una linea nueva	2019-01-29 14:38:31 +01:00
Carlos Jimenez Ruiz	69a176a661	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-29 13:24:30 +01:00
Gerard	d4c6d28fec	Merge branch 'test' into dev	2019-01-29 11:23:42 +01:00
Gerard	036a75617a	Merge branch 'master' into test	2019-01-29 11:22:48 +01:00
Gerard	f6f1dba1d9	#1071 modificar update.claim para que no utilice updateAll	2019-01-29 11:14:01 +01:00
Carlos Jimenez Ruiz	fc450168c9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-29 08:53:56 +01:00
Carlos Jimenez Ruiz	c04071366f	#1063 client.summary añadir explicaciones	2019-01-29 08:53:29 +01:00
Juan Ferrer	9209424bca	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-28 16:24:56 +01:00
Juan Ferrer	3e40c651af	#998 worker.index	2019-01-28 16:24:45 +01:00
Joan Sanchez	0fcbc65ecc	plantilla claim-pickup #1044	2019-01-28 12:28:22 +01:00
Juan Ferrer	3bb42b1d7b	Project configuration fixed	2019-01-28 12:14:22 +01:00
Joan Sanchez	6495698308	treeview fixes #1015	2019-01-28 12:07:46 +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
Joan Sanchez	8f07ac1751	print fixes & claim pickup order	2019-01-25 15:08:11 +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
Gerard	f4839cb642	#1022 ticket.create	2019-01-25 08:50:13 +01:00
Carlos Jimenez Ruiz	d6255bc997	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-24 16:05:37 +01:00
Juan Ferrer	e600a4b5b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-24 16:04:51 +01:00
Juan Ferrer	bfb2f7f533	#981 vnLeftMenu fixes	2019-01-24 16:04:38 +01:00
Carlos Jimenez Ruiz	18d7d07f56	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-24 15:41:56 +01:00
Carlos Jimenez Ruiz	7096273800	#1045 ticket.datos basicos	2019-01-24 15:41:48 +01:00
Bernat	31dc2bd5e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-24 14:15:16 +01:00
Carlos Jimenez Ruiz	6bfa39e0eb	#1030 ticket.index orden siempre por fecha ascencente	2019-01-24 13:50:57 +01:00
Bernat	b7aa8e97a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-24 12:37:43 +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
Bernat	9ad703f625	update structure cau 9511 and fix test	2019-01-24 07:39:23 +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	23d26dec07	updated issue number	2019-01-23 16:32:17 +01:00
Gerard	649c09c551	#1025 item.create al crear articulo nuevo no busca tipo ni color	2019-01-23 15:06:11 +01:00
Gerard	cd28d559c4	#1026 ticket.line	2019-01-23 14:12:05 +01:00
Juan Ferrer	e080802445	#981 Login unified without passing tests	2019-01-23 13:11:44 +01:00
Gerard	61bd8740ce	modal-form class renamed	2019-01-23 12:46:45 +01:00
Gerard	05933781dc	#1031 order.create que se puedan crear tickets para clientes con riesgo	2019-01-23 12:34:42 +01:00
Gerard	aeb0f65fec	#1037 order.descriptor	2019-01-23 12:30:32 +01:00
Gerard	e6213fb83f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-23 11:17:35 +01:00
Gerard	05ed72661e	test fixed	2019-01-23 11:17:18 +01:00
Joan Sanchez	5bf430400d	show results count #992	2019-01-23 11:08:27 +01:00
Gerard	9ebd7a2922	unwanted property deleted	2019-01-23 08:37:52 +01:00
Gerard	abea582014	#1017 ticket.index	2019-01-22 16:18:26 +01:00
Carlos Jimenez Ruiz	8f23b0b127	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-22 14:08:35 +01:00
Carlos Jimenez Ruiz	5f850e76e2	#884 e2e claim.detail + bug fixes en autocompleteSearch extension	2019-01-22 13:18:20 +01:00
Gerard	972f71552a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-22 12:24:31 +01:00
Gerard	b24f0a9442	#1023 claim.detail cantidad total parecer ser erronea	2019-01-22 12:24:19 +01:00
Joan Sanchez	166546564d	updated payment-update path Method	2019-01-22 11:30:25 +01:00
Gerard	471374f32d	excluded test due changes in mailer #79	2019-01-22 10:31:36 +01:00
Gerard	b0a60fc94a	#1023 claim.detail cantidad total parecer ser erronea	2019-01-22 10:31:12 +01:00
Gerard	457e68cd3c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-22 10:04:53 +01:00
Gerard	87a0a0bccc	#972 ticket.tracking	2019-01-22 10:04:42 +01:00
Joan Sanchez	4e83172dae	added print service part 1 #1001	2019-01-22 09:55:35 +01:00
Juan Ferrer	0f55512918	Style fixes	2019-01-21 16:08:25 +01:00
Juan Ferrer	d856a3ae97	Merge	2019-01-21 15:22:20 +01:00
Juan Ferrer	09811d322a	Descriptor style fixes	2019-01-21 15:21:24 +01:00
Bernat	643dcc3856	update model sip	2019-01-21 14:53:23 +01:00
Bernat	79a7447030	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-21 13:47:21 +01:00
Joan Sanchez	5a53195574	agency module	2019-01-21 11:45:53 +01:00
Bernat	c87fd81a62	new model sip and fixtures #9474	2019-01-21 11:35:37 +01:00
Joan Sanchez	1989232949	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-21 09:12:33 +01:00
Gerard	2a339185fc	stowaway fixes	2019-01-21 08:45:02 +01:00
Gerard	ea0504db21	stowaway fixes	2019-01-21 08:44:21 +01:00
Joan Sanchez	b73c02c595	client summary red color on negative balance #1007	2019-01-21 08:16:43 +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	cb650bbdbc	added missing locale	2019-01-18 13:38:18 +01:00
Gerard	32743cb1d2	updated description	2019-01-18 13:37:48 +01:00
Gerard	97b2c23179	#952 Ticket.descriptor eliminar polizon	2019-01-18 13:37:26 +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
Joan Sanchez	fc7b4e4eda	changed item diary colors #990	2019-01-18 10:59:33 +01:00
Gerard	0c0a465784	descriptor not showing correctly fixed	2019-01-17 11:11:45 +01:00
Gerard	2b2fe69d0d	alert level not available fixed	2019-01-17 11:04:00 +01:00
Juan Ferrer	114c9ded7f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-16 15:48:26 +01:00
Javi Gallego	f7cf8cd656	Bug #976	2019-01-16 15:38:50 +01:00
Juan Ferrer	d02dc68c3e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-16 15:29:13 +01:00
Juan Ferrer	47b7596381	#938 Searchbar fixes	2019-01-16 15:29:01 +01:00
Gerard	175926d7fb	#965 claim.index colores	2019-01-16 15:05:35 +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	f586a30a1b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-16 08:53:05 +01:00
Carlos Jimenez	8ea3278a10	#875 e2e ticket create	2019-01-16 08:52:56 +01:00
Gerard	601295a170	#936 item.create	2019-01-16 08:46:40 +01:00
Gerard	13d9a57635	autocomplete not pointing to the correct endpoint fixed	2019-01-16 08:17:22 +01:00
Gerard	c0170628f4	autopcomplete not pointing to the right endpoint fixed	2019-01-16 08:11:28 +01:00
Gerard	3b5ea47848	bug not opening search panel solved	2019-01-15 14:53:38 +01:00
Javi Gallego	b60deafff1	actualiza fuentes a 1.19	2019-01-15 13:22:31 +01:00
Bernat	b4b630118a	merge	2019-01-15 12:38:07 +01:00
Bernat	bb8a9e2035	fix test and update fixtures #9153	2019-01-15 12:28:13 +01:00
Juan Ferrer	f402bb5afb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-15 12:17:47 +01:00
Juan Ferrer	9767ca7b71	#255 Download PDFs improvements	2019-01-15 12:17:33 +01:00
Gerard	7db288a8c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-15 12:06:35 +01:00
Gerard	08a9233e8d	#964 claim bugs solved	2019-01-15 12:06:19 +01:00
Juan Ferrer	1c6fee22d2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2019-01-15 12:04:45 +01:00
Juan Ferrer	48f11f942e	#255 Download invoice PDF bug fixed	2019-01-15 12:04:34 +01:00
Gerard	90d308afd6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-15 11:26:08 +01:00
Gerard	7383a377aa	ticket services hidden	2019-01-15 11:26:05 +01:00
Juan Ferrer	be5a8803ec	#255 Download icon fixes	2019-01-15 11:15:30 +01:00
Gerard	f5d44bbbd1	ids removed due duplicities	2019-01-15 08:56:20 +01:00
Juan Ferrer	67ebc6c7fe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-14 17:40:15 +01:00
Juan Ferrer	d539a345b0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2019-01-14 17:27:11 +01:00
Juan Ferrer	40b485da41	#255 Download invoices	2019-01-14 17:26:59 +01:00
Gerard	60c368baa2	fixed typo	2019-01-14 15:04:30 +01:00
Gerard	a32b1ba71e	temporally excluded test	2019-01-14 15:03:51 +01:00
Gerard	80fbd14c78	test temporally excluded	2019-01-14 15:01:35 +01:00
Gerard	8633f76017	fdescribe deleted	2019-01-14 14:59:50 +01:00
Gerard	8d0366e7bf	test fixed	2019-01-14 14:59:14 +01:00
Gerard	35e237fb4f	fixed bug showing null instead id	2019-01-14 13:40:39 +01:00
Gerard	24837b231f	added missing autoload property	2019-01-14 11:47:34 +01:00
Gerard	1d5cd1c86d	#960 order.line bugs solved	2019-01-14 11:35:48 +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
Gerard	81ef984597	added missing method getAgenciesWithWarehouse	2019-01-11 07:36:38 +01:00
Bernat	85b4f46479	structuredb step 2	2019-01-10 07:26:10 +01:00
Gerard	7f745de314	#927 order.basic-data	2019-01-07 16:53:34 +01:00
Gerard	360ef4837f	#931 ticket.create	2019-01-07 16:47:26 +01:00
Gerard	007516b0cb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-07 16:28:24 +01:00
Gerard	650becf455	#945 en salix no se pueden modificar los consignatarios antiguos	2019-01-07 16:28:18 +01:00
Joan	2b2b0ab103	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-01-07 15:08:08 +01:00
Joan	6cffc0f633	fixed order catalog item category	2019-01-07 15:08:05 +01:00
Gerard	db95eea71d	#932 client.descriptor	2019-01-07 08:49:01 +01:00
Juan Ferrer	2ead6f145d	Merge	2018-12-27 12:55:54 +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