6024 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	3595524286	#1794 index de balance pierde la companyFk	2019-10-15 13:18:56 +02:00
Carlos Jimenez Ruiz	2d90af906f	#1771 rpt-delivery-note campo tasa con 2 decimales	2019-10-15 09:48:02 +02:00
Joan Sanchez	3853fc7404	descuadre de horas #1766 rollback	2019-10-15 08:50:11 +02:00
Bernat	fe5a77257f	#1758 Añadir los alias como prefijos en los filtros	2019-10-15 08:32:25 +02:00
Carlos Jimenez Ruiz	c46797d57e	removed third party endpoint test	2019-10-15 08:15:04 +02:00
Carlos Jimenez Ruiz	1086d3d362	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-15 07:43:51 +02:00
Bernat Exposito	713073a48e	Merge branch '1763-worker_time_control_add' of verdnatura/salix into dev ... LGTM	2019-10-15 05:35:52 +00:00
Bernat	793dd06e8d	merge	2019-10-15 07:30:23 +02:00
Bernat	ed1ed7f50b	#1738 exportar estructura y datos de produccion a la local	2019-10-15 07:23:34 +02:00
Bernat	9a65cafe19	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-15 07:07:21 +02:00
Carlos Jimenez Ruiz	c57583e64b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-14 15:20:10 +02:00
Carlos Jimenez Ruiz	5b47eb54b2	#1767 client.balance.index, campo referencia	2019-10-14 15:20:03 +02:00
Joan Sanchez	e79456374c	fixed item-popover width	2019-10-14 14:54:11 +02:00
Joan Sanchez	300ba61fd3	#1759 Forzar desenrutado al cambiar datos básicos de ticket	2019-10-14 14:43:10 +02:00
Joan Sanchez	ecda659a8c	Bug #1796 fixed edit discount dialog position	2019-10-14 14:17:18 +02:00
Carlos Jimenez Ruiz	7d99b8dd59	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-14 13:44:09 +02:00
Carlos Jimenez Ruiz	8291e97d74	removed todo coments as per #1782	2019-10-14 12:01:19 +02:00
Bernat	97fcb7e133	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-10-14 11:59:31 +02:00
Bernat	b4123a1b3e	fix e2e error	2019-10-14 11:59:26 +02:00
Joan Sanchez	2a3d6dcd76	fixed transaction params	2019-10-14 11:54:28 +02:00
Joan Sanchez	0e40d11c6d	Merge branch 'dev' into test	2019-10-14 11:53:35 +02:00
Joan Sanchez	82b406be5f	fixed e2e	2019-10-14 11:51:26 +02:00
Joan Sanchez	1f8f5af301	fixed transaction params	2019-10-14 11:50:45 +02:00
Joan Sanchez	8f7b01ca11	translation	2019-10-14 11:49:23 +02:00
Joan Sanchez	c12ef09d0b	translation	2019-10-14 11:47:48 +02:00
Joan Sanchez	81097287fa	#1755 create claim only for non removed tickets	2019-10-14 11:44:54 +02:00
Carlos Jimenez Ruiz	4a6ff9ca20	removed useless FIXME comments as per #1782	2019-10-14 10:59:10 +02:00
Joan Sanchez	4a2d61ddcb	#1769 removed route report from ticket descriptor	2019-10-14 08:52:48 +02:00
Joan Sanchez	cd2b02b0c6	Bug/Test #1753 - Added dateTime filter	2019-10-14 08:52:48 +02:00
Carlos Jimenez Ruiz	4353d0d18a	nightmare opens electron devTools option added	2019-10-14 08:25:04 +02:00
Joan Sanchez	c60d8b563e	Merge branch 'dev' into test	2019-10-14 07:39:11 +02:00
Bernat	e267bf93a4	merge	2019-10-14 07:01:29 +02:00
Bernat	d637ed2599	1717, route basic data	2019-10-14 06:58:02 +02:00
Juan Ferrer	7dfd1fe6f2	Merge	2019-10-11 17:43:29 +02:00
Juan Ferrer	a72c12e1c9	Tests passed	2019-10-11 17:38:04 +02:00
Joan Sanchez	9f608b725b	Merge branch '1763-worker_time_control_add' of verdnatura/salix into master ... LGTM	2019-10-10 12:19:50 +00:00
Joan Sanchez	8af7f13ac6	#1763 insert from procedure	2019-10-10 14:11:23 +02:00
Javi Gallego	3e71338d94	borra tabla temporal	2019-10-10 12:14:21 +02:00
Joan Sanchez	144f13c400	changed state to stowaway ticket	2019-10-10 10:00:38 +02:00
Joan Sanchez	f34742c18c	changed warehouse from ticket id 17	2019-10-10 10:00:34 +02:00
Joan Sanchez	9899edffc6	changed state to stowaway ticket	2019-10-10 10:00:18 +02:00
Joan Sanchez	777baf38a8	changed warehouse from ticket id 17	2019-10-10 10:00:08 +02:00
Joan Sanchez	9bfc87f1e2	changed state to stowaway ticket	2019-10-10 09:59:28 +02:00
Joan Sanchez	05d0f50606	changed warehouse from ticket id 17	2019-10-10 09:58:34 +02:00
Joan Sanchez	756acd41ef	added data-viewer	2019-10-10 09:26:44 +02:00
Joan Sanchez	d2329d989f	added transaction options to findOne()	2019-10-10 09:21:42 +02:00
Joan Sanchez	0c097718c1	added transaction options to findOne()	2019-10-10 09:18:56 +02:00
Joan Sanchez	71baa4924c	added transaction options to findOne()	2019-10-10 08:33:22 +02:00
Joan Sanchez	21c32b0af2	dialog css fixes	2019-10-10 08:07:11 +02:00
Juan Ferrer	a9d5e87078	vnField alpha with ngModel	2019-10-10 00:47:29 +02:00