5984 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	92eef27f37	#1723 ticket.index si el total es menor de 50€	2019-09-24 16:38:57 +02:00
Carlos Jimenez Ruiz	0c27b90c5d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 14:39:22 +02:00
Carlos Jimenez Ruiz	b3bd40e2dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 14:25:56 +02:00
Carlos Jimenez Ruiz	99ef8a6010	#1719 claim.detail cambiar descuento falla	2019-09-24 14:23:21 +02:00
Bernat	de0034f145	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 14:22:46 +02:00
Joan Sanchez	d627a8ba25	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 14:03:42 +02:00
Joan Sanchez	d0fc74cefd	updated e2e and unit tests	2019-09-24 14:03:30 +02:00
Bernat	2b80c4f7bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 13:56:31 +02:00
Bernat	bf5a9967cf	Refactor #1682 modificar modelos componentRate y componentTypeRate	2019-09-24 13:45:54 +02:00
Carlos Jimenez Ruiz	d56c7ff540	#1727 ticlet.line foco en cambiar hora	2019-09-24 13:25:18 +02:00
Carlos Jimenez Ruiz	d1acd60d5a	added a precise selector #1680	2019-09-24 13:22:01 +02:00
Bernat	faf355fab8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 12:38:26 +02:00
Bernat	7384fabec0	Tarea #1724 order/index buscar por alias	2019-09-24 12:10:03 +02:00
Carlos Jimenez Ruiz	e3dd482457	Merge branch 'dev' into test	2019-09-24 12:09:35 +02:00
Carlos Jimenez Ruiz	92463b0ccd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 12:08:39 +02:00
Carlos Jimenez Ruiz	ebc4dd5616	#1696 formulario que se envia a los clientes	2019-09-24 12:08:21 +02:00
Joan Sanchez	9606f039e0	Merge branch 'dev' into test	2019-09-24 11:56:14 +02:00
Joan Sanchez	3af26900e3	watcher preventing claim creation	2019-09-24 11:55:36 +02:00
Joan Sanchez	5851784e41	Create new order now opens on new window	2019-09-24 11:41:00 +02:00
Joan Sanchez	310f2bae70	Create new order now opens on new window	2019-09-24 11:35:46 +02:00
Joan Sanchez	e6f6c262fa	Merge branch 'dev' into test	2019-09-24 10:43:16 +02:00
Juan Ferrer	a319eed5f6	Zone.getLeaves() refactor	2019-09-24 10:41:25 +02:00
Juan Ferrer	4b58078798	Zone.getLeaves refactor & fixes	2019-09-24 10:38:07 +02:00
Juan Ferrer	52a6221b59	recover getLeaves	2019-09-24 10:38:05 +02:00
Carlos Jimenez Ruiz	1cc8b5512e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 09:31:20 +02:00
Carlos Jimenez Ruiz	25165792c8	#1680 left-menu descriptor scrollbar overlap	2019-09-24 09:29:57 +02:00
Joan Sanchez	4ff8b760b6	Merge branch 'dev' into test	2019-09-24 08:51:41 +02:00
Joan Sanchez	15183df65f	transfer sales error fixed	2019-09-24 08:51:21 +02:00
Joan Sanchez	314b609060	fixed family translation	2019-09-24 08:34:14 +02:00
Joan Sanchez	059a72a719	Merge branch 'dev' into test	2019-09-24 08:20:17 +02:00
Joan Sanchez	e52be911cf	Merge branch 'dev' into test	2019-09-24 07:48:13 +02:00
Joan Sanchez	a091674f08	allowed numbers on fiscal name	2019-09-24 07:47:06 +02:00
Joan Sanchez	7f33f4c56e	fixed salixfront deletedTicket icon	2019-09-24 07:25:22 +02:00
Joan Sanchez	8e52a6043f	fixed salixfront deletedTicket icon	2019-09-24 07:24:17 +02:00
Joan Sanchez	f563833630	Merge branch 'dev' into test	2019-09-24 07:21:57 +02:00
Carlos Jimenez Ruiz	6c1fdb444a	removed fdescribe	2019-09-24 07:03:22 +02:00
Joan Sanchez	bd8a1ee00e	merge with dev	2019-09-23 15:02:27 +02:00
Joan Sanchez	6910e6048b	fixed sql	2019-09-23 14:50:30 +02:00
Joan Sanchez	f2d9323c4f	Deprecated ticketCalculate	2019-09-23 14:47:27 +02:00
Joan Sanchez	e55b8b7b6b	precio por kilo #1690	2019-09-23 14:41:54 +02:00
Carlos Jimenez Ruiz	695ff14b60	removed the tests index used by karma (deprecated)	2019-09-23 14:17:44 +02:00
Carlos Jimenez Ruiz	12ece820ee	karma removed from integration tests	2019-09-23 14:02:30 +02:00
Carlos Jimenez Ruiz	a48b3b31b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-23 13:55:28 +02:00
Carlos Jimenez Ruiz	bcceb94e40	deprecated Karma	2019-09-23 13:55:19 +02:00
Joan Sanchez	aad0d09394	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-23 09:34:25 +02:00
Bernat	a60e31ea13	delete wait(1999) in e2e	2019-09-23 09:31:20 +02:00
Joan Sanchez	36d7e514ff	Allow spanish characters on socialName #1712	2019-09-23 09:27:58 +02:00
Bernat	e421a95145	#1709 arreglar e2e order	2019-09-23 08:17:21 +02:00
Carlos Jimenez Ruiz	0f04aed2fe	#1670 Crear icono isDeleted para ticket.descriptor	2019-09-20 17:20:54 +02:00
Carlos Jimenez Ruiz	7bcc908708	#1704 item.basicData	2019-09-20 16:39:20 +02:00