1092 Commits

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	7bcc908708	#1704 item.basicData	2019-09-20 16:39:20 +02:00
Juan Ferrer	6d50012fab	agency.location fixes	2019-09-19 18:00:40 +02:00
Juan Ferrer	40c555702d	Zone.getLeaves() refactor	2019-09-19 17:49:46 +02:00
Juan Ferrer	05fec10cf2	Zone.getLeaves refactor & fixes	2019-09-19 17:30:16 +02:00
Juan Ferrer	e0ffef70b1	Method ZoneGeo.getLeaves optimized	2019-09-19 15:51:39 +02:00
Juan Ferrer	afb06dd4a5	#1167 Fixed	2019-09-19 12:32:34 +02:00
Joan Sanchez	d6d825ebf1	fixed automerge	2019-09-19 10:52:23 +02:00
Joan Sanchez	f67006e526	changed fiscal name translation	2019-09-19 09:44:50 +02:00
Joan Sanchez	9ce18fbd0a	double start pick	2019-09-19 09:44:18 +02:00
Joan Sanchez	4d894365eb	Fixed production errors #1699	2019-09-19 09:42:41 +02:00
Joan Sanchez	8cb10759d3	updated transactions	2019-09-19 09:42:32 +02:00
Joan Sanchez	2edfb66423	changed fiscal name translation	2019-09-19 09:41:02 +02:00
Joan Sanchez	fa549630c4	Bug/Test #1700	2019-09-19 09:37:02 +02:00
Joan Sanchez	a85e653f34	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-19 09:24:27 +02:00
Joan Sanchez	5a4c6bf66f	updated back unit tests	2019-09-19 09:17:21 +02:00
Bernat	526e4e34fa	skip e2e #1702	2019-09-19 09:05:11 +02:00
Joan Sanchez	73b1f18759	Fixed production errors #1699	2019-09-19 08:58:42 +02:00
Bernat	c773ddc499	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-19 06:56:47 +02:00
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