Commit Graph

1310 Commits

Author SHA1 Message Date
Joan Sanchez ac84b37f32 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-29 21:02:15 +01:00
Joan Sanchez c1045ef8d4 Ajustes plantilla sepa-core 2017-11-29 21:01:49 +01:00
Daniel Herrero d5550c3402 greuge list 100% and create 90% 2017-11-29 14:14:08 +01:00
Daniel Herrero 03d4e2f470 correccion visual en lista de creditos 2017-11-29 11:41:14 +01:00
Daniel Herrero c217e5c27f corregida logica al añadir credito 2017-11-29 11:12:28 +01:00
Daniel Herrero 261d9408ee credit list terminado 2017-11-29 09:42:59 +01:00
Daniel Herrero d816853b6c column-header posibilidad de columna no ordenable 2017-11-29 09:37:08 +01:00
Daniel Herrero 9638f5b529 ruta acceso greuge y objetos 2017-11-29 07:36:02 +01:00
Daniel Herrero d3e7f3eca2 Crear credito 2017-11-28 13:59:16 +01:00
Daniel Herrero f76a258fce client credit list terminado 2017-11-28 13:21:26 +01:00
Daniel Herrero ea36825d35 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-28 12:59:09 +01:00
Daniel Herrero a44d39f040 identación en listado de credito 2017-11-28 12:58:54 +01:00
Daniel Herrero 9df3d30c40 listado de crédito de cliente 2017-11-28 12:58:05 +01:00
Daniel Herrero 438c573ec1 internacionalizacion menu izquierda client 2017-11-28 12:57:51 +01:00
Vicente Falco 0841b2b10f Merge branch 'dev' into test 2017-11-28 10:38:27 +01:00
Vicente Falco 881ff774a5 Jenkins 2017-11-28 10:38:00 +01:00
Vicente Falco 0274e72ead Jenkins 2017-11-28 10:35:12 +01:00
Vicente Falco a9c208f71c Merge branch 'dev' into test 2017-11-28 09:42:32 +01:00
Vicente Falco d4d8126c72 Jenkins 2017-11-28 09:42:10 +01:00
Vicente Falco 37a27b2e69 Merge branch 'dev' into test 2017-11-28 09:34:21 +01:00
Daniel Herrero 65e58d6b7c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-28 09:25:26 +01:00
Daniel Herrero 005c8072b9 Production: al filtrar persiste el orden 2017-11-28 09:24:59 +01:00
Vicente Falco 366a8e2f4d Jenkinsfile 2017-11-28 09:19:23 +01:00
Joan Sanchez ffde93614a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-28 08:45:16 +01:00
Joan Sanchez f5e3801c35 Error al incluir datasource.json 2017-11-28 08:44:44 +01:00
Vicente Falco 687439b00b Merge branch 'dev' into test 2017-11-28 08:32:43 +01:00
Vicente Falco c4c35a2ea3 Docker 2017-11-28 08:18:00 +01:00
Vicente Falco 8b79ec5cc8 Docker service print 2017-11-28 08:12:39 +01:00
Vicente Falco e90fe28578 Merge branch 'dev' into test 2017-11-28 07:24:28 +01:00
Joan Sanchez 09d788faaa Escritos, servicio print 2017-11-27 15:08:18 +01:00
Javi Gallego a16f8b29c2 vnCard con nuevo formato 2017-11-24 07:39:05 +01:00
Daniel Herrero c386b6aaea actualizacion de la material design cuando un elemento está bloquedo por ACL 2017-11-23 14:53:37 +01:00
Daniel Herrero 7cb64edf04 ajustes de etiquetas html y css 2017-11-23 14:09:38 +01:00
Daniel Herrero 00bd4a7696 nuevo comportamiento para dropDown, abrir arriba 2017-11-23 14:07:55 +01:00
Daniel Herrero 5ad2c70400 bug fixed in production and production filters 2017-11-23 08:35:17 +01:00
Joan Sanchez 02fb54efa9 merge 2017-11-22 20:55:44 +01:00
Joan Sanchez 774f577edd Ruta de validación de token en servicio Auth 2017-11-22 20:54:20 +01:00
Daniel Herrero aae137d35e changed datasource in employeeList service 2017-11-22 13:35:05 +01:00
Daniel Herrero ba73869fd3 changes in getRoleCustomer service 2017-11-22 13:24:36 +01:00
Daniel Herrero 3bd913cbd9 changed datasource in salesperson service 2017-11-22 13:19:51 +01:00
Daniel Herrero bd5e2a5d91 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-22 13:10:40 +01:00
Daniel Herrero 27c2444fa4 bugs fixed in autoComplete 2017-11-22 13:10:33 +01:00
Javi Gallego bfd584487f limpieza de models auth obsoleto, ahora vn 2017-11-22 12:43:12 +01:00
Javi Gallego b3e8b4542a model client con la nueva nomenclatura 2017-11-22 08:59:21 +01:00
Javi Gallego 583e7c34bc Añadir activo a datos fiscal-data 2017-11-22 08:35:09 +01:00
Javi Gallego af5a4d65a9 cambio de fuente de raleway a roboto 2017-11-22 07:56:31 +01:00
Daniel Herrero c11b32a091 Merge branch 'dev' into test 2017-11-21 14:54:08 +01:00
Daniel Herrero e7d19da8f5 added sales person property into create new client 2017-11-21 14:53:09 +01:00
Daniel Herrero cf4c208eea Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-11-21 14:52:13 +01:00
Daniel Herrero 8af0959d08 error corregido con tag acl repetido 2017-11-21 14:52:06 +01:00