1574 Commits

Author	SHA1	Message	Date
Joan Sanchez	335f92173c	updated transactions	2019-09-18 15:11:09 +02:00
Bernat	86d793b9ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-18 11:11:53 +02:00
Bernat	7af4f3626d	#1691 item.basicData - Añadir campo hasKgPrice	2019-09-18 11:11:47 +02:00
Joan Sanchez	f56e4f4b7d	pick	2019-09-18 10:37:54 +02:00
Joan Sanchez	86ef44c90d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-18 10:35:49 +02:00
Joan Sanchez	031dbcb63a	Unlocked from autocomplete city and postcode fields #1703	2019-09-18 10:35:46 +02:00
Carlos Jimenez Ruiz	4c33f07e42	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-18 09:42:45 +02:00
Carlos Jimenez Ruiz	b12d0388c9	#1074 Undo changes button for forms	2019-09-18 09:41:25 +02:00
Bernat	cbbce91def	#1693 export structure, data and fix back test	2019-09-17 13:52:29 +02:00
Joan Sanchez	c7423f5580	pick2	2019-09-17 07:15:34 +02:00
Joan Sanchez	dd0c34d31b	allowed null parent	2019-09-17 07:13:37 +02:00
Joan Sanchez	043fe80254	cherry 1	2019-09-17 07:12:45 +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	a529efc783	getleaves fix	2019-09-13 13:26:50 +02:00
Joan Sanchez	a25652293d	changed initial leaves depth	2019-09-13 12:26:37 +02:00
Joan Sanchez	7f23e006fa	allowed null parent	2019-09-13 12:16:38 +02:00
Bernat	2e1b329584	#1681 delete comment	2019-09-13 11:27:32 +02:00
Bernat	c6507fc2bb	#1681 crear test para el endpoint getPossibleStowaways	2019-09-13 07:40:27 +02:00
Bernat	2172bdee4e	#1689	2019-09-12 12:27:19 +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	e16d43b2fc	Allow disable log on model properties	2019-09-12 09:49:02 +02:00
Joan Sanchez	9bf54f34dd	Added fruit translation	2019-09-12 07:26:15 +02:00
Joan Sanchez	5d980f5129	Added fruit translation	2019-09-12 07:25:05 +02:00
Bernat	c344d8088b	merge	2019-09-11 14:18:21 +02:00
Joan Sanchez	ff626764d8	fixed back unit tests	2019-09-11 08:24:28 +02:00
Joan Sanchez	342886942f	fixed sale loggable transaction error #1686	2019-09-11 08:12:27 +02:00
Bernat	03c44d4ef9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-10 14:43:10 +02:00
Bernat	ac6d1ed829	#1663 update ticketLog	2019-09-10 14:43:00 +02:00
Joan Sanchez	b36846994d	Server error on change paymethod #1687	2019-09-10 14:13:45 +02:00
Joan Sanchez	0ed240df0b	Server error on change paymethod #1687	2019-09-10 14:12:03 +02:00
Bernat	8932aa4e5a	Tarea #1663 ticket-sale al hacer un slit de lineas debe dejar rastro en el log	2019-09-10 13:27:41 +02:00
Joan Sanchez	7ecb67052d	item.diary css chip fixed #1676	2019-09-10 08:47:46 +02:00
Joan Sanchez	197e89ae5a	Added fiscal data validate translation	2019-09-09 12:45:09 +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
Joan Sanchez	7a1ae9177b	Special characters not allowed on socialName #1635	2019-09-09 09:05:13 +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
Bernat	9db989d191	ticket.sale ok state fixed	2019-09-05 11:12:33 +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	81072ce7e8	fixed claim refund	2019-09-04 13:49:16 +02:00
Joan Sanchez	6f508838c9	claim.action falla el boton import #1679	2019-09-04 13:39:01 +02:00
Javi Gallego	2b14a9050e	Bug/Test #1679 claim.action falla el boton import	2019-09-04 12:17:33 +02:00
Joan Sanchez	93286663ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-04 09:41:27 +02:00
Bernat	a2228fa15f	Tarea #1673 exportar estructura y datos de produccion a la local	2019-09-04 09:06:08 +02:00
Joan Sanchez	693c204e21	Calendar last day selection fixed #1465	2019-09-04 08:42:01 +02:00
Joan Sanchez	d3441fa1b3	Ticket step one refactor #1669	2019-09-04 08:04:31 +02:00
Bernat	f0447c18ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-03 14:54:29 +02:00
Carlos Jimenez Ruiz	c1cca30a26	bug fix icon add ticket.sales enables/disables	2019-09-03 14:42:52 +02:00
Bernat	fc872a2b21	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-03 14:38:40 +02:00
Carlos Jimenez Ruiz	219614b44f	#1656 ticket.regularizar eliminar ticket + tests	2019-09-03 13:27:02 +02:00
Bernat	36d9d320c0	Tarea #1672 route.ticket	2019-09-03 10:54:52 +02:00
Carlos Jimenez Ruiz	e1b5b449ce	#1656 ticket.regularizar eliminar ticket	2019-09-03 09:57:53 +02:00
Joan Sanchez	7b40fe2942	ticket.basicData Update zone on changes + fixes #1668	2019-09-02 14:37:30 +02:00
Joan Sanchez	d93974f481	ticket.basicData Update zone on changes + fixes #1668	2019-09-02 14:36:54 +02:00
Joan Sanchez	50c989a267	Add attendedBy and salesPerson filters #1661	2019-09-02 12:23:49 +02:00
Joan Sanchez	37b9c5c4ce	Added zone inflation field #1641	2019-09-02 11:25:31 +02:00
Bernat	b6edcde589	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-02 09:43:30 +02:00
Bernat	2a21e9d60e	#1654	2019-09-02 09:43:22 +02:00
Joan Sanchez	8726aa70c5	removed autocompletion on change postal code #1638	2019-09-02 09:35:03 +02:00
Bernat	82c569cfc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-02 09:25:25 +02:00
Bernat	fb62128a80	Refactor #1652 client.addres.index	2019-09-02 09:25:18 +02:00
Joan Sanchez	e2b972431a	removed autocompletion on change postal code #1638	2019-09-02 09:11:40 +02:00
Carlos Jimenez Ruiz	8dbcf917a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-08-29 13:16:53 +02:00
Carlos Jimenez Ruiz	b9234fc1a8	#1642 order.summary en el descriptor	2019-08-29 13:16:38 +02:00
Bernat	b656db3a84	#1645 refactor search panel	2019-08-29 08:32:46 +02:00
Bernat	6daabed202	#1645 first part, delete hasVisible	2019-08-28 12:17:06 +02:00
Carlos Jimenez Ruiz	5e69fc0aa5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-08-28 08:10:49 +02:00
Carlos Jimenez Ruiz	5e3b8fe1f0	#1648 claim.detail add cambiar campos	2019-08-28 08:08:30 +02:00
Bernat	15097313a2	#1651 worker.json	2019-08-27 11:12:17 +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
Bernat	d9c63e3bc0	Tarea #1501 ticket / delete	2019-08-13 12:44:34 +02:00
Bernat	b749cb80df	Bug/Test #1634 cesta.catalogo	2019-08-13 07:45:29 +02:00
Bernat	f05f3a3df7	Bug/Test #1634 cesta.catalogo	2019-08-12 14:58:46 +02:00
Bernat	d08a43bc23	#1630 state.isEditable	2019-08-12 13:28:27 +02:00
Bernat	2e89af9795	#1630 state.isEditable	2019-08-12 13:26:44 +02:00
Bernat	b6cc769df3	Test #1636 refactor test de back isEditable y editableState	2019-08-12 12:31:31 +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	fa4fd15450	Tarea #1573 order.catalog No deben de mostrar familias vacias	2019-08-07 07:27:00 +02:00
Bernat	7e1eba53f1	Refactor #1627 worker.timeControl	2019-08-06 12:25:53 +02:00
Joan Sanchez	72a02112b5	fixed fiscal data postcode selection	2019-08-06 12:12:51 +02:00
Joan Sanchez	3d88d41bd0	fixed fiscal data postcode selection	2019-08-06 12:07:48 +02:00
Joan Sanchez	e011c120db	ticket.sale split show active tickets	2019-08-06 07:37:30 +02:00
Joan Sanchez	e52a0ac5da	ticket.sale split show active tickets	2019-08-06 07:36:26 +02:00
Bernat	4e329a4201	Bug/Test #1607 ticket.updateDiscount and fix test	2019-08-02 12:24:08 +02:00
Joan Sanchez	2ff374e7ba	postcode autocompletion fixes	2019-08-02 08:28:44 +02:00
Joan Sanchez	2c71a983e3	postcode autocompletion fixes	2019-08-02 08:27:55 +02:00
Joan Sanchez	e7511aefdc	back errors fixed	2019-08-01 11:53:33 +02:00
Joan Sanchez	efeba38fb4	back errors fixed	2019-08-01 11:52:53 +02:00
Joan Sanchez	e3c4536183	timeControl calendar fixed #1623	2019-08-01 10:29:26 +02:00
Joan Sanchez	31b5f689df	timeControl calendar fixed #1623	2019-08-01 09:58:59 +02:00
Bernat	098dd7b235	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-07-31 10:45:03 +02:00
Joan Sanchez	77d8ac82a5	contabilize worker.calenday holidays, updated styles	2019-07-31 09:51:08 +02:00
Joan Sanchez	eccf381e56	contabilize worker.calenday holidays, updated styles	2019-07-31 09:50:47 +02:00
Bernat	116a34d04a	fix test	2019-07-31 09:17:26 +02:00
Bernat	7571cd6e1b	Bug/Test #1607 ticket.updateDiscount and fix test	2019-07-31 07:46:24 +02:00
Joan Sanchez	5974f6e0c2	ticket basicData change zone on date update	2019-07-30 12:44:25 +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	2c6ba0089b	merge	2019-07-29 08:35:58 +02:00
Joan Sanchez	f4a3b8e9b2	client.create not showing all postcodes, changed autocomplete #1619	2019-07-26 13:05:22 +02:00
Joan Sanchez	64a4e5f43d	ticket.basicData Select zone for productionBoss #1604	2019-07-26 11:48:01 +02:00
Carlos Jimenez Ruiz	c2573d6853	css amends for item-request	2019-07-25 11:25:01 +02:00
Carlos Jimenez Ruiz	e1cbf781e1	#1608 item.request	2019-07-25 09:55:09 +02:00
Joan Sanchez	6d5412227a	Changed invoiceOut pdf to hasPdf	2019-07-24 12:42:33 +02:00
Bernat	8089c32ec2	Tarea #1611 export db roduction to local	2019-07-23 14:56:57 +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	85049c126b	catalogFilter show items without color	2019-07-19 09:25:59 +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	c51c4383ce	fixed unit tests	2019-07-17 07:39:08 +02:00
Joan Sanchez	e99bae89b4	fixed e2e tests	2019-07-17 07:33:46 +02:00
Joan Sanchez	145e596d16	fixed dms unit tests	2019-07-16 14:12:58 +02:00
Joan Sanchez	89a3c399c1	merge with dev	2019-07-16 13:41:34 +02:00
Joan Sanchez	4f73d1eb5a	dms fixes	2019-07-16 13:37:25 +02:00
Joan Sanchez	3c3f4bfeae	address.edit fixed location autocompletion	2019-07-16 08:26:57 +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	aa19e54a16	removed download file conditional	2019-07-15 11:56:46 +02:00
Joan Sanchez	dae49f52b6	removed download file conditional	2019-07-15 11:56:17 +02:00
Joan Sanchez	fefb389872	dms update files	2019-07-15 11:48:03 +02:00
Joan Sanchez	588250b1c1	dms update files	2019-07-15 11:40:11 +02:00
Joan Sanchez	88b698f3eb	merge with dev	2019-07-15 09:04: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	18ca64a7d9	ticket.index show zone hour & minute. Show only tickets from today	2019-07-12 08:50:51 +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	1b8a407916	show expeditions fix	2019-07-11 11:21:12 +02:00
Joan Sanchez	62ef2dccd8	show expeditions fix	2019-07-11 11:20:41 +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
Joan Sanchez	cb23fd28fa	updated unit tests	2019-07-11 07:18:07 +02:00
Joan Sanchez	8a5e0c5402	Notify password changes #1588	2019-07-11 07:06:53 +02:00
Javi Gallego	f79b638e49	#1564 client.summary defaulting cantidad	2019-07-09 09:31:08 +02:00
Joan Sanchez	6f3b023644	Create postcode form #1585	2019-07-08 14:07:09 +02:00
Bernat	b98b534eec	Tarea #1583 exportar produccio a la local	2019-07-05 14:16:33 +02:00
Joan Sanchez	8ec61bf31f	fixed unit test for weekends	2019-07-05 11:18:08 +02:00
Bernat	061f0cb39c	Refactor #1581 client.balance.create	2019-07-04 10:34:19 +02:00
Carlos Jimenez Ruiz	fc80848506	merge	2019-07-03 14:40:53 +02:00
Carlos Jimenez Ruiz	ea5cbf634b	#1392 order.catalog	2019-07-03 14:39:08 +02:00
Bernat	82a1d00b0c	Tarea #1516 order.index buscador avanzado añadir mi equipo	2019-07-03 14:06:27 +02:00
Carlos Jimenez Ruiz	a35533687f	removed unused spec files	2019-07-03 11:53:03 +02:00
Carlos Jimenez Ruiz	6b5acf5fe3	removed unused spec files	2019-07-03 11:51:42 +02:00
Carlos Jimenez Ruiz	553b8e681b	#1567 refactor logs - worker descriptor	2019-07-03 11:18:01 +02:00
Carlos Jimenez Ruiz	a2a9dfd7e5	#1567 refactor logs - worker descriptor	2019-07-03 11:08:44 +02:00
Bernat	65ec629221	Tarea #1518 route.tickets al eliminar un ticket de la ruta, tiene que logearse	2019-07-03 08:29:40 +02:00
Carlos Jimenez Ruiz	4b0a71644f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-07-02 14:44:39 +02:00
Carlos Jimenez Ruiz	4ac419b419	#1528 e2e claim/detail	2019-07-02 14:44:36 +02:00
Joan Sanchez	bddfbc4b34	add new item from ticket.sale #1414, checkedLines fixed	2019-07-02 12:12:15 +02:00
Bernat	dd38a21e8d	Refactor #1569 claim.delete, update fixtures and fix test	2019-07-01 11:56:16 +02:00
Carlos Jimenez Ruiz	bd76840cb3	#1446 e2e ticket.summary	2019-06-27 15:33:15 +02:00
Bernat	fb2545994c	Refactor #1563 fixtures item	2019-06-27 12:38:30 +02:00
Joan Sanchez	507bc8c2ce	updated fonts & calendar acls	2019-06-27 11:48:33 +02:00
Carlos Jimenez Ruiz	8c26a89516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-27 09:44:29 +02:00
Carlos Jimenez Ruiz	a7c5a9e598	#1566 ticket.sales state autocomplete	2019-06-27 09:44:19 +02:00
Bernat	e945967762	Refactor #1563 fixtures item,sale,saleComponent	2019-06-27 09:03:03 +02:00
Carlos Jimenez Ruiz	5270693bdd	#1387 e2e Ticket Edit sale path	2019-06-26 15:27:58 +02:00
Carlos Jimenez Ruiz	c352a12d49	merge	2019-06-26 15:02:22 +02:00
Carlos Jimenez Ruiz	d27402d4e6	#1558 ticket.sales mark/unmark as reserved	2019-06-26 13:56:40 +02:00
Joan Sanchez	8ff61a5d3a	added zone prices, radio-group and calendar refactor #1320	2019-06-26 13:35:38 +02:00
Javi Gallego	b0c34f8e29	#1564 client.summary defaulting cantidad	2019-06-26 12:18:47 +02:00
Bernat	682a75ac76	#1533 update fixtures and fix test	2019-06-25 14:00:55 +02:00
Carlos Jimenez Ruiz	2ce442a022	#1555 ticket.lines transer to a new ticket	2019-06-25 11:17:58 +02:00
Bernat	1227f7ac83	Test #1549 Arreglar test de back	2019-06-21 13:19:51 +02:00
Bernat	5c152f8813	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-21 11:50:36 +02:00
Joan Sanchez	5d63a14b15	transactions refactor #1546	2019-06-21 10:00:00 +02:00
Joan Sanchez	340e7b8495	round worker calendar holidays #1547	2019-06-21 09:56:39 +02:00
Joan Sanchez	7c23f92957	round worker calendar holidays #1547	2019-06-21 09:54:42 +02:00
Joan Sanchez	dae43bb9b0	transactions refactor #1546	2019-06-21 08:26:59 +02:00
Bernat	7f2b61b39c	Test #1549 fix back test	2019-06-21 07:50:56 +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
Joan Sanchez	e45d95ac10	upload dms files into new folder structure #1548	2019-06-20 07:47:03 +02:00
Joan Sanchez	19dc0c80b8	upload dms files into new folder structure #1548	2019-06-20 07:46:30 +02:00
Carlos Jimenez Ruiz	6e029a3623	merged test fix	2019-06-19 15:30:04 +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	560cce7c8c	#1537 refactor fixtures	2019-06-19 14:40:47 +02:00
Carlos Jimenez Ruiz	63febf8bd0	#1537 refactor fixtures + e2e fixes	2019-06-19 09:03:45 +02:00
Bernat	1336bf092d	Test #1540 Reparar test back db	2019-06-19 07:20:02 +02:00
Bernat	c3f5b2c4dd	Bug/Test #1543 ticket.request.create precio con decimales	2019-06-18 12:09:43 +02:00
Bernat	82ab9e5ac5	Tarea #1534 Paginar consignatarios	2019-06-18 09:34:32 +02:00
Bernat	c02d576bb9	erese a fdescribe	2019-06-18 07:57:41 +02:00
Bernat	53f6db7a4a	Refactor #1527 claim/detail, ticket/sale updateDiscount y updatePrice	2019-06-17 12:13:05 +02:00
Juan Ferrer	edfa112874	Merge with master	2019-06-17 11:33:34 +02:00
Juan Ferrer	da01d52756	Secret removed from worker/pbx	2019-06-17 11:14:45 +02:00
Joan Sanchez	3bd12492b0	updated karma unit test	2019-06-17 08:16:25 +02:00
Joan Sanchez	471da18a6c	optional bank entity code #1416	2019-06-17 08:14:48 +02:00
Carlos Jimenez Ruiz	fcc0ad6098	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-14 12:27:54 +02:00
Carlos Jimenez Ruiz	b8a4861f01	#1526 refactor fixtures	2019-06-14 12:27:41 +02:00
Bernat	5203c33483	Bug #1463 Las reclamaciones no se eliminan por completo	2019-06-14 09:29:23 +02:00
Juan Ferrer	ced4578f75	Merge branch 'test' into dev	2019-06-14 08:33:44 +02:00
Joan Sanchez	a9aaa3329a	fixed worker calendar	2019-06-14 08:17:12 +02:00
Joan Sanchez	9a18d0bd8c	fixed worker calendar	2019-06-14 08:15:14 +02:00
Carlos Jimenez Ruiz	a0f0230e76	#1437 unitarios back guessPriority	2019-06-13 14:31:55 +02:00
Joan Sanchez	32df2373f7	Order zone by hour	2019-06-13 13:49:07 +02:00
Joan Sanchez	9c00e7e67c	Autocomplete geolocation from postcode #1519 and #1531	2019-06-13 13:08:11 +02:00
Juan Ferrer	91174d1c8e	fdescribe removed, SQL refactor	2019-06-13 11:47:32 +02:00
Juan Ferrer	03205e01ae	NPM fix, fdescribe removed	2019-06-13 09:49:36 +02:00
Juan Ferrer	89a563eaf9	Merge	2019-06-13 09:21:36 +02:00
Juan Ferrer	58cc90929f	TX fixes, debug disabled, glob transaction timeout	2019-06-12 17:31:45 +02:00
Carlos Jimenez Ruiz	921af523f8	#1526 refactor fixtures	2019-06-12 11:38:31 +02:00
Bernat	a6951bc0a1	Tarea #1419 claim.detail permitir modificar descuento	2019-06-12 08:19:02 +02:00
Bernat	4729a7e9a9	Bug #1514 route.volume No actualiza el volumen	2019-06-11 12:25:17 +02:00
Bernat	5ce33fbefd	Bug/Test #1515 Dump structure de production a dev	2019-06-11 12:25:02 +02:00
Bernat	2504d06bab	Bug/Test #1515 Dump structure de production a dev	2019-06-11 12:23:55 +02:00
Carlos Jimenez Ruiz	a8b9e2c374	#1435 unitarios back hasActiveRecovery	2019-06-11 08:54:03 +02:00
Carlos Jimenez Ruiz	0c9b4bbe87	#1436 unitarios back invoiceOut/download	2019-06-11 07:06:49 +02:00
Joan Sanchez	43e87a1cb1	mege from test to dev - no structure	2019-06-07 13:07:23 +02:00
Joan Sanchez	4545d1f649	merge from test to dev - no structure	2019-06-07 13:06:54 +02:00
Joan Sanchez	372ad15f26	zone add buttons show only for deliveryBoss #1480	2019-06-07 09:09:29 +02:00
Bernat	ea38ff221d	#1467 ticket filter with hours	2019-06-07 07:45:12 +02:00
Joan Sanchez	c28734ff61	added dms tasks #1499, #1469, #1468, #1484	2019-06-06 13:59:11 +02:00
Bernat	217b08cd0a	Tarea #1509 route/ticket/delete ticket	2019-06-06 13:50:12 +02:00
Carlos Jimenez Ruiz	7a44a5aab8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-06 09:48:46 +02:00
Carlos Jimenez Ruiz	cd6b60015f	#1486 back test updateDiscount	2019-06-06 09:48:08 +02:00
Bernat	f3558a2d26	#1462 updateVolume backTest	2019-06-06 09:34:45 +02:00
Carlos Jimenez Ruiz	3082ce2556	#1486 back test updateDiscount	2019-06-06 09:34:36 +02:00
Carlos Jimenez Ruiz	55ea445f02	#1486 back test updateDiscount	2019-06-05 15:20:56 +02:00
Carlos Jimenez Ruiz	7bcd4b53e5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-05 15:09:00 +02:00
Bernat	082c292ed7	fix updatePrice	2019-06-05 15:05:07 +02:00
Bernat	3a338739d1	Tarea #1462 Route.descriptior Añadir menú - actualizar m3	2019-06-05 13:51:34 +02:00
Carlos Jimenez Ruiz	605dabbe19	#1486 back test updateDiscount	2019-06-05 13:39:15 +02:00
Joan Sanchez	073c457abb	Merge branch 'test'	2019-06-05 08:56:56 +02:00
Carlos Jimenez Ruiz	05fc1f08a8	renamed vars according to convention	2019-06-05 07:41:20 +02:00
Joan Sanchez	d169a66e19	clone zone with calenday days (#1482) & fixed clone hour #1458	2019-06-05 07:19:22 +02:00
Javi Gallego	0f5ebf42ec	Tarea #1506 worker.pbx quitar campo password	2019-06-04 12:54:41 +02:00
Bernat	62f4abf6ed	Refactor #1418 claim.action Mover casilla mana	2019-06-04 11:00:05 +02:00
Bernat	c49f72b36c	#1493 Refactorizar el método back /Tickets/deleted	2019-06-03 14:54:03 +02:00
Carlos Jimenez Ruiz	6e2c71eca9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-03 13:36:41 +02:00
Bernat	798d4063ea	fix karma test	2019-06-03 12:41:57 +02:00
Carlos Jimenez Ruiz	d06d5cd9c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-03 12:00:58 +02:00
Carlos Jimenez Ruiz	9671307688	#1486 back test updateDiscount	2019-06-03 12:00:48 +02:00
Bernat	fa7b79b1c8	Bug/Test #1491, #1500 refactor new.js	2019-06-03 10:05:22 +02:00
quique	a6a6ea5b06	WorkerTimerControl App	2019-06-03 09:41:54 +02:00
quique	b034333cdb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-06-03 09:20:35 +02:00
quique	8005b0a892	WorkerTimeControl App	2019-06-03 09:20:20 +02:00
Bernat	62fe9d760c	#1488 #1489 ticket sale updatePrice and backTest	2019-06-03 08:01:24 +02:00
Joan Sanchez	a138465071	moveNext() movePrevious() moves now to day 1 to prevent a month jump	2019-05-31 13:54:15 +02:00
Carlos Jimenez Ruiz	a009329bdd	removed console logs from spec file	2019-05-31 13:54:05 +02:00
Joan Sanchez	5abb82faab	moveNext() movePrevious() moves now to day 1 to prevent a month jump	2019-05-31 13:33:37 +02:00
Joan Sanchez	68f67f12d7	moveNext() movePrevious() moves now to day 1 to prevent a month jump	2019-05-31 13:28:28 +02:00
Bernat	97459bd7e6	1497	2019-05-31 11:33:28 +02:00
Bernat	d4a3a1a72e	export production structure and fixtures updated	2019-05-30 13:45:13 +02:00
Carlos Jimenez Ruiz	ed3024e144	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-30 08:57:38 +02:00
Carlos Jimenez Ruiz	80d5c923cc	#1486 back test updateDiscount	2019-05-30 08:57:25 +02:00
Javi Gallego	e01765e34e	test back-front fixed	2019-05-30 08:41:08 +02:00
Bernat	24c3b35605	Test #1489 updatePrice backTest skipped	2019-05-30 08:06:52 +02:00
Bernat	d742eef7c3	Tarea #1478 item.basicData	2019-05-30 08:04:46 +02:00
Bernat	726d0ab359	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-30 07:53:23 +02:00
Bernat	4f20716fa3	#1489 updatePrice backTest	2019-05-29 14:59:26 +02:00
Carlos Jimenez Ruiz	cfcadc4f28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-29 13:07:23 +02:00
Carlos Jimenez Ruiz	40654f94c4	#1475 no borrar servicios de tickets no editables	2019-05-29 13:06:42 +02:00
Bernat	7a7ea03bff	1485 refactor updatePrice	2019-05-29 12:41:26 +02:00
Bernat	85761043cd	delete console.log	2019-05-29 11:15:08 +02:00
Bernat	84a4b049f0	1453 ticket UpdateDiscount refactor	2019-05-29 11:11:54 +02:00
Joan Sanchez	749c6f1167	clone zone with calenday days (#1482) & fixed clone hour #1458	2019-05-28 12:56:40 +02:00
Joan Sanchez	12e0268870	clone zone with calenday days (#1482) & fixed clone hour #1458	2019-05-28 12:55:50 +02:00
Bernat	69434caa52	#1470 update fixtures, client.dms gestdoc	2019-05-28 11:26:54 +02:00
Carlos Jimenez Ruiz	027602e18a	#1476 ticket.Sale check all checkbox	2019-05-27 15:10:57 +02:00
Bernat	230516b9d4	#1438 fix test back makeInvoice	2019-05-27 10:01:35 +02:00
Bernat	59069749a2	1461 fix test back	2019-05-27 09:19:23 +02:00
Carlos Jimenez Ruiz	16c8d2fd2a	removed service name from end points	2019-05-27 08:46:11 +02:00
Carlos Jimenez Ruiz	f2752d9098	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-24 15:31:03 +02:00
Carlos Jimenez Ruiz	a3311f6093	#1250 ticket.line al mover todas las lineas delete	2019-05-24 15:30:50 +02:00
Javi Gallego	f871879ee5	merge fixtures dinamicas para zoneCalendar	2019-05-23 13:33:06 +02:00
Javi Gallego	c5743ce37a	fallos de tablas	2019-05-23 13:25:26 +02:00
Javi Gallego	c311b0ae65	dump y procedimientos volcados	2019-05-23 13:18:15 +02:00
Javi Gallego	94cc7af8b2	merge paso 2	2019-05-23 13:07:59 +02:00
Javi Gallego	3776e0588c	merge paso 1	2019-05-23 13:05:02 +02:00
Joan Sanchez	e9c2ae073a	Clone item without size	2019-05-23 11:42:14 +02:00
Joan Sanchez	e60ebb283b	sms accessType	2019-05-23 11:42:12 +02:00
Joan Sanchez	34542ce12f	message send ACL fix #1464	2019-05-23 11:39:14 +02:00
Joan Sanchez	f7aeaa707f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-23 11:35:36 +02:00
Bernat	ae2fa8d0af	1459 export production to local	2019-05-23 09:31:37 +02:00
Bernat	443feef673	#1456 fixtores for dms and model	2019-05-23 09:30:29 +02:00
Joan Sanchez	318c014fab	Clone item without size	2019-05-23 08:03:31 +02:00
Joan Sanchez	cc72432a37	accessType refactor #1460	2019-05-22 12:38:51 +02:00
Joan Sanchez	f73b42b0be	accessType refactor #1460	2019-05-22 12:35:24 +02:00
Carlos Jimenez Ruiz	4c8aa7ff6e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-22 11:59:14 +02:00
Bernat	1769b03846	1457 client.sample.index	2019-05-22 07:50:08 +02:00
Carlos Jimenez Ruiz	bb1c85459e	removed unused code	2019-05-21 13:09:30 +02:00
Carlos Jimenez Ruiz	fef62d59a5	removed extraneous code	2019-05-21 13:08:25 +02:00
Joan Sanchez	52e26eb99d	mark manual lines #1449	2019-05-21 12:56:29 +02:00
Bernat	bb5c81a3e9	#1409 ticket.weekly add finder	2019-05-21 09:03:57 +02:00
Carlos Jimenez Ruiz	32555c47d0	#1434 agency.index explota por zoneFk al cargar	2019-05-20 15:04:33 +02:00
Joan Sanchez	183bf137f6	added workerTimeControl #1360	2019-05-17 13:27:51 +02:00
Bernat	b86cf1d98a	1354 refactor item-descriptor-popover	2019-05-17 07:34:25 +02:00
Carlos Jimenez Ruiz	8df885b19b	removed f from describe	2019-05-16 14:19:14 +02:00
Carlos Jimenez Ruiz	c7ad52f7b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-16 14:07:42 +02:00
Carlos Jimenez Ruiz	43bf6b45cf	#1260 ticket.service textfield por autocomplete	2019-05-16 14:07:16 +02:00
Joan Sanchez	2ac654fa53	parse scopeDays integer on ticket.index #1439	2019-05-16 12:53:49 +02:00
Joan Sanchez	858916e528	remove description properties from item clone	2019-05-16 12:53:40 +02:00
Joan Sanchez	a0ffde8ed1	remove description properties from item clone	2019-05-16 12:51:16 +02:00
Joan Sanchez	599084a8be	parse scopeDays integer on ticket.index #1439	2019-05-16 12:33:41 +02:00
Joan Sanchez	5c9d06b5d2	edit claim basic data for salesPerson #1433	2019-05-16 10:49:27 +02:00
Joan Sanchez	ecc335d781	client greuge order by shipped and amount #1431	2019-05-16 10:49:17 +02:00
Joan Sanchez	b70316551b	edit claim basic data for salesPerson #1433	2019-05-16 09:33:56 +02:00
Joan Sanchez	1ae2512169	client greuge order by shipped and amount #1431	2019-05-16 09:24:13 +02:00
Carlos Jimenez Ruiz	fa191af14c	#1430 client.balance bug fix and e2e fix	2019-05-16 07:07:10 +02:00
Carlos Jimenez Ruiz	417dc511f5	#1430 client.balance bug fix and e2e fix	2019-05-15 15:26:13 +02:00
Carlos Jimenez Ruiz	41c20d977c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-05-15 13:07:44 +02:00
Carlos Jimenez Ruiz	2358c94aae	#1402 route.ticket	2019-05-15 13:07:32 +02:00
Joan Sanchez	307cffcb58	fixed item clone #1429	2019-05-15 13:05:49 +02:00
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