389 Commits

Author	SHA1	Message	Date
Joan Sanchez	5851784e41	Create new order now opens on new window	2019-09-24 11:41:00 +02:00
Juan Ferrer	52a6221b59	recover getLeaves	2019-09-24 10:38:05 +02:00
Carlos Jimenez Ruiz	0f04aed2fe	#1670 Crear icono isDeleted para ticket.descriptor	2019-09-20 17:20:54 +02:00
Carlos Jimenez Ruiz	206dec59a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-13 16:09:27 +02:00
Carlos Jimenez Ruiz	2251fb65ad	#1615 migrar karma a jest	2019-09-13 16:09:14 +02:00
Joan Sanchez	8b8463e936	Updated dms colums size #1692	2019-09-12 12:12:39 +02:00
Joan Sanchez	f6bd915ae6	Ticket dms CSS fixes #1692	2019-09-12 11:47:56 +02:00
Joan Sanchez	73f438c300	reset watcher on changes #1678	2019-09-09 12:35:59 +02:00
Joan Sanchez	1f5a75b285	fixed karma unit tests	2019-09-09 10:57:10 +02:00
Carlos Jimenez Ruiz	3c9fe334c9	#1655 e2e ticket.sale Añadir lineas	2019-09-06 14:56:56 +02:00
Carlos Jimenez Ruiz	56c291a160	merge	2019-09-06 11:45:55 +02:00
Carlos Jimenez Ruiz	ce9fb14b62	#1655 e2e ticket.sale Añadir lineas	2019-09-06 11:43:15 +02:00
Joan Sanchez	f31d544cd7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-06 11:06:57 +02:00
Joan Sanchez	7fad401624	Send delivery note to client #1332	2019-09-06 11:06:44 +02:00
Bernat	e8cb57e27a	#1674 ticket.descriptor stowaway sólo debe de aparecer la opcion en el menu en el almacen	2019-09-06 09:47:58 +02:00
Bernat	751c945575	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-06 09:35:27 +02:00
Bernat	ec2a457849	ticket.weekly add order	2019-09-06 08:00:19 +02:00
Joan Sanchez	176750046a	Scroll component #643	2019-09-05 13:06:40 +02:00
Joan Sanchez	59c6952025	Implement watcher on ticket sales #1678	2019-09-05 09:00:55 +02:00
Joan Sanchez	0d21519523	updated transfer css	2019-09-04 14:37:29 +02:00
Joan Sanchez	db1113ab0b	added scrollbar to transfer popover	2019-09-04 14:08:08 +02:00
Joan Sanchez	d3441fa1b3	Ticket step one refactor #1669	2019-09-04 08:04:31 +02:00
Carlos Jimenez Ruiz	c1cca30a26	bug fix icon add ticket.sales enables/disables	2019-09-03 14:42:52 +02:00
Carlos Jimenez Ruiz	219614b44f	#1656 ticket.regularizar eliminar ticket + tests	2019-09-03 13:27:02 +02:00
Carlos Jimenez Ruiz	e1b5b449ce	#1656 ticket.regularizar eliminar ticket	2019-09-03 09:57:53 +02:00
Joan Sanchez	d93974f481	ticket.basicData Update zone on changes + fixes #1668	2019-09-02 14:36:54 +02:00
Joan Sanchez	37b9c5c4ce	Added zone inflation field #1641	2019-09-02 11:25:31 +02:00
Carlos Jimenez Ruiz	11b99d9a5f	#1618 e2e ticket.basicData.stepOne	2019-08-20 14:18:32 +02:00
Bernat	7eea9d1d2c	Refactor #1630 state.js	2019-08-19 07:56:20 +02:00
Bernat	4032bde243	fix bug ticket.sale	2019-08-13 14:03:02 +02:00
Joan Sanchez	0918f154e9	transfer partially sale #1251	2019-08-09 08:04:44 +02:00
Joan Sanchez	a5486ec694	Get allowed content-types from model #1598	2019-08-08 08:37:03 +02:00
Bernat	2f1472b9ee	Tarea #1574 ... ticket.sale editableState	2019-08-08 08:33:27 +02:00
Bernat	8f519fd15b	Bug #900 Ticket.picture lineas vacias cuando no tiene tags	2019-08-07 09:58:05 +02:00
Bernat	7571cd6e1b	Bug/Test #1607 ticket.updateDiscount and fix test	2019-07-31 07:46:24 +02:00
Joan Sanchez	82d3ac27cf	ticket basicData change zone on date update	2019-07-30 12:43:21 +02:00
Joan Sanchez	fb4ce77c01	claim upload pictures #1593	2019-07-30 08:51:38 +02:00
Joan Sanchez	07af2271c2	ticket.weekly Add ticket #1612	2019-07-29 13:12:36 +02:00
Joan Sanchez	64a4e5f43d	ticket.basicData Select zone for productionBoss #1604	2019-07-26 11:48:01 +02:00
Bernat	97f2229090	Tarea #1603 ticket.index ticket.sales problems icon	2019-07-23 11:15:06 +02:00
Bernat	16257e9918	fix test front	2019-07-23 07:36:10 +02:00
Bernat	6a23a5429c	Tarea #1562 ticket.line isEditable	2019-07-22 13:14:00 +02:00
Joan Sanchez	970c8ab5ec	show dms order number #1601	2019-07-19 08:13:52 +02:00
Joan Sanchez	51734db404	ticket dms local warehouse and company	2019-07-17 15:01:38 +02:00
Joan Sanchez	f56423bac9	disabled hasFile checkbox for dms edit forms	2019-07-17 10:55:58 +02:00
Joan Sanchez	145e596d16	fixed dms unit tests	2019-07-16 14:12:58 +02:00
Joan Sanchez	4f73d1eb5a	dms fixes	2019-07-16 13:37:25 +02:00
Joan Sanchez	72fcf807b0	7z mimetype	2019-07-16 07:22:29 +02:00
Joan Sanchez	b85aa6d3da	fixed icons column size	2019-07-15 13:20:50 +02:00
Joan Sanchez	dae49f52b6	removed download file conditional	2019-07-15 11:56:17 +02:00
Joan Sanchez	588250b1c1	dms update files	2019-07-15 11:40:11 +02:00
Joan Sanchez	23f5ff0c5c	merge	2019-07-12 14:02:38 +02:00
Joan Sanchez	c21532e5f7	ticket.index filters	2019-07-12 14:00:32 +02:00
Joan Sanchez	eefa4b9f5b	apply default filters	2019-07-12 12:56:00 +02:00
Joan Sanchez	6b9286d1b0	fixed ticket.index	2019-07-12 12:32:02 +02:00
Joan Sanchez	c4fcaeb908	ticket.index filter by date if no filters were entered	2019-07-12 12:20:55 +02:00
Joan Sanchez	29744c52f3	fixed ticket.index	2019-07-12 11:43:10 +02:00
Joan Sanchez	e135ae039a	changed closure field	2019-07-12 09:42:06 +02:00
Joan Sanchez	25014654b1	changed closure field	2019-07-12 09:39:59 +02:00
Joan Sanchez	659a441f47	ticket index show zone closure hour	2019-07-12 09:29:22 +02:00
Joan Sanchez	6634cdf059	ticket.index show zone hour & minute. Show only tickets from today	2019-07-12 09:29:16 +02:00
Joan Sanchez	14a69e47c9	ticket index show zone closure hour	2019-07-12 09:06:19 +02:00
Joan Sanchez	2a6de77e17	ticket.index show zone hour & minute. Show only tickets from today	2019-07-12 08:49:44 +02:00
Joan Sanchez	8ecc88b516	hide download button for dms without a file attached #1590	2019-07-11 09:54:42 +02:00
Joan Sanchez	3ce59c0b73	hide download button for dms without a file attached #1590	2019-07-11 09:53:16 +02:00
Carlos Jimenez Ruiz	a35533687f	removed unused spec files	2019-07-03 11:53:03 +02:00
Carlos Jimenez Ruiz	a2a9dfd7e5	#1567 refactor logs - worker descriptor	2019-07-03 11:08:44 +02:00
Joan Sanchez	bddfbc4b34	add new item from ticket.sale #1414, checkedLines fixed	2019-07-02 12:12:15 +02:00
Carlos Jimenez Ruiz	bd76840cb3	#1446 e2e ticket.summary	2019-06-27 15:33:15 +02:00
Carlos Jimenez Ruiz	a7c5a9e598	#1566 ticket.sales state autocomplete	2019-06-27 09:44:19 +02:00
Carlos Jimenez Ruiz	d27402d4e6	#1558 ticket.sales mark/unmark as reserved	2019-06-26 13:56:40 +02:00
Bernat	1227f7ac83	Test #1549 Arreglar test de back	2019-06-21 13:19:51 +02:00
Javi Gallego	289f588923	#1550 ticket.descriptor polizon cambia estado	2019-06-21 07:41:03 +02:00
Carlos Jimenez Ruiz	7d0c42c077	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-20 14:41:58 +02:00
Carlos Jimenez Ruiz	594268183b	#1517 ticket.index	2019-06-20 14:35:47 +02:00
Joan Sanchez	7fd6c850d7	lock controls #1533	2019-06-20 13:50:58 +02:00
Carlos Jimenez Ruiz	9162ef9c1e	#1517 ticket.index hot fix	2019-06-20 11:31:03 +02:00
Carlos Jimenez Ruiz	73ccf9a107	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-19 14:42:59 +02:00
Carlos Jimenez Ruiz	63febf8bd0	#1537 refactor fixtures + e2e fixes	2019-06-19 09:03:45 +02:00
Bernat	c3f5b2c4dd	Bug/Test #1543 ticket.request.create precio con decimales	2019-06-18 12:09:43 +02:00
Bernat	53f6db7a4a	Refactor #1527 claim/detail, ticket/sale updateDiscount y updatePrice	2019-06-17 12:13:05 +02:00
Bernat	2504d06bab	Bug/Test #1515 Dump structure de production a dev	2019-06-11 12:23:55 +02:00
Joan Sanchez	4545d1f649	merge from test to dev - no structure	2019-06-07 13:06:54 +02:00
Joan Sanchez	c28734ff61	added dms tasks #1499, #1469, #1468, #1484	2019-06-06 13:59:11 +02:00
Carlos Jimenez Ruiz	cd6b60015f	#1486 back test updateDiscount	2019-06-06 09:48:08 +02:00
Carlos Jimenez Ruiz	3082ce2556	#1486 back test updateDiscount	2019-06-06 09:34:36 +02:00
Carlos Jimenez Ruiz	605dabbe19	#1486 back test updateDiscount	2019-06-05 13:39:15 +02:00
Bernat	c49f72b36c	#1493 Refactorizar el método back /Tickets/deleted	2019-06-03 14:54:03 +02:00
Bernat	62fe9d760c	#1488 #1489 ticket sale updatePrice and backTest	2019-06-03 08:01:24 +02:00
Javi Gallego	e01765e34e	test back-front fixed	2019-05-30 08:41:08 +02:00
Carlos Jimenez Ruiz	cfcadc4f28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-29 13:07:23 +02:00
Carlos Jimenez Ruiz	40654f94c4	#1475 no borrar servicios de tickets no editables	2019-05-29 13:06:42 +02:00
Bernat	7a7ea03bff	1485 refactor updatePrice	2019-05-29 12:41:26 +02:00
Bernat	84a4b049f0	1453 ticket UpdateDiscount refactor	2019-05-29 11:11:54 +02:00
Carlos Jimenez Ruiz	16c8d2fd2a	removed service name from end points	2019-05-27 08:46:11 +02:00
Carlos Jimenez Ruiz	a3311f6093	#1250 ticket.line al mover todas las lineas delete	2019-05-24 15:30:50 +02:00
Javi Gallego	c311b0ae65	dump y procedimientos volcados	2019-05-23 13:18:15 +02:00
Javi Gallego	94cc7af8b2	merge paso 2	2019-05-23 13:07:59 +02:00
Carlos Jimenez Ruiz	4c8aa7ff6e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-22 11:59:14 +02:00
Carlos Jimenez Ruiz	bb1c85459e	removed unused code	2019-05-21 13:09:30 +02:00
Joan Sanchez	52e26eb99d	mark manual lines #1449	2019-05-21 12:56:29 +02:00
Bernat	bb5c81a3e9	#1409 ticket.weekly add finder	2019-05-21 09:03:57 +02:00
Carlos Jimenez Ruiz	c7ad52f7b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-16 14:07:42 +02:00
Carlos Jimenez Ruiz	43bf6b45cf	#1260 ticket.service textfield por autocomplete	2019-05-16 14:07:16 +02:00
Joan Sanchez	599084a8be	parse scopeDays integer on ticket.index #1439	2019-05-16 12:33:41 +02:00
Carlos Jimenez Ruiz	2358c94aae	#1402 route.ticket	2019-05-15 13:07:32 +02:00
Joan Sanchez	5cc78ce5ac	ticket & order index fixes #1422 & #1423	2019-05-14 08:14:37 +02:00
Joan Sanchez	790577acaf	ticket & order index fixes #1422 & #1423	2019-05-14 08:13:04 +02:00
Bernat	e6d6e63255	1413 ticket.summary refactor checkbox triple state	2019-05-09 14:40:59 +02:00
Bernat	1f128797c3	export production to local, fix test and add fixtures	2019-05-09 09:32:04 +02:00
Bernat	83898c9ba7	1354 refactor item-descriptor-popover	2019-05-07 11:32:35 +02:00
Joan Sanchez	4aff31a165	fixed update discount	2019-05-06 07:40:59 +02:00
Bernat	91e8b1f81b	update fixtures, #1388 ticket descript change shiiped hour	2019-05-03 12:23:57 +02:00
Joan Sanchez	2b7287dabb	added ticket.dms #1373	2019-05-01 18:49:39 +02:00
Joan Sanchez	a572130b6c	propagate check value to multicheck component for intermediate value #1305	2019-04-30 08:00:27 +02:00
Carlos Jimenez Ruiz	85dc6e51af	#1258 ticket.index sumatorio removed unused code	2019-04-29 10:35:46 +02:00
Carlos Jimenez Ruiz	774d8524cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-29 10:21:54 +02:00
Carlos Jimenez Ruiz	10669f01f3	#1258 ticket.index sumatorio unit test fixed	2019-04-29 10:21:36 +02:00
Bernat	5bc6f5107e	#1370 ticket.descriptor change shipped hour	2019-04-29 07:48:59 +02:00
Carlos Jimenez Ruiz	2ca85394f3	#1385 excluded tests	2019-04-26 16:10:51 +02:00
Joan Sanchez	16bf0b3448	regenerate invoice #1342	2019-04-26 08:52:43 +02:00
Carlos Jimenez Ruiz	511e33b835	#1350 route.index worker descriptor + filters	2019-04-25 14:24:02 +02:00
Javi Gallego	47e55580ad	#1258 ticket.index sumatorio	2019-04-25 07:57:26 +02:00
Bernat	4ac36e6bf2	#1362 ticket.packaging negative quantity	2019-04-24 11:36:13 +02:00
Joan Sanchez	6747a80943	fixed available/visible icon on ticket sales #1363	2019-04-24 09:54:25 +02:00
Carlos Jimenez Ruiz	5501ff8f4f	test repairs	2019-04-23 09:08:28 +02:00
Carlos Jimenez Ruiz	2b04eebe84	#1334 E2E ticket.descriptor - Make invoice	2019-04-23 08:58:49 +02:00
Carlos Jimenez Ruiz	2107b57764	small typo	2019-04-18 11:12:48 +02:00
Carlos Jimenez Ruiz	d52f5077b0	#1306 Renombrar controladores, rutas y carpeta	2019-04-16 15:00:21 +02:00
Joan Sanchez	6573e61a7c	fixed karma tests	2019-04-16 08:21:20 +02:00
Joan Sanchez	f814584f6b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-04-16 07:59:15 +02:00
Joan Sanchez	90bbe1bd02	Log sent sms #1324	2019-04-16 07:59:12 +02:00
Carlos Jimenez Ruiz	9c596b06c8	merge	2019-04-15 14:37:12 +02:00
Carlos Jimenez Ruiz	82ed0078d2	#1339 Print - Hoja de rutas	2019-04-15 14:34:33 +02:00
Bernat	a68174c456	#1337 refactor checkbox in ticketRequest	2019-04-15 14:21:52 +02:00
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	50d70f0f6f	Tarea #1259 crear modelo ticketServiceType	2019-04-10 14:44:41 +02:00
Carlos Jimenez Ruiz	98e704adf8	#1326 enlazar en ticket.descriptor tres puntos	2019-04-10 10:43:11 +02:00
Joan Sanchez	4f1a1ae004	Merge branch 'master' into dev	2019-04-09 13:19:34 +02:00
Joan Sanchez	a6308c7f1e	input-number refactor #1311	2019-04-09 13:18:55 +02:00
Joan Sanchez	33e6467c44	fixed zone descriptor	2019-04-08 10:57:01 +02:00
Carlos Jimenez Ruiz	971a2ab891	#1270 ... ticket.index advanced search mostrar dias en el futuro	2019-04-03 15:16:32 +02:00
Javi Gallego	0b977d3b0b	#1293 ticket.components solo muestra base	2019-04-02 08:00:16 +02:00
Carlos Jimenez Ruiz	62acb534e1	#1181 No modificar ticket.basicData en reparto	2019-04-01 14:49:12 +02:00
Joan Sanchez	3f1889daa3	fix open client card from ticket descriptor #1291	2019-04-01 09:48:22 +02:00
Joan Sanchez	5898d07822	Merge branch 'test' into dev	2019-04-01 09:02:13 +02:00
Joan Sanchez	dfe1a68d35	fix ticket basic data allow change company #1277	2019-04-01 09:01:11 +02:00
Joan Sanchez	8db51fdf64	added shrink class to item index #1278	2019-03-29 08:01:15 +01:00
Joan Sanchez	8110325af8	send sms from ticket descriptor & ticket line #991	2019-03-29 07:29:09 +01:00