Commit Graph

5157 Commits

Author SHA1 Message Date
Dani Herrero 6365a06cbb Servicio mensaje de alerta modificado 2017-06-29 14:13:01 +02:00
nelo 8e177fcb2d Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-29 14:09:11 +02:00
Dani Herrero 372cfe718b Localizador: warehouseFk por defecto 2017-06-29 14:09:04 +02:00
nelo c5363155c4 send message 2017-06-29 14:08:57 +02:00
Dani Herrero d8f4e0489e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-29 13:56:56 +02:00
Dani Herrero 491ea3b796 dropDown with search and columHeader preview icon 2017-06-29 13:56:52 +02:00
nelo 2e7a225249 rawsql with promises 2017-06-29 11:48:57 +02:00
nelo e9c0fa5cc9 Merge branch 'dev' of https://git.verdnatura.es/salix into dev
# Conflicts:
#	client/production/src/index/index.js
2017-06-29 09:52:45 +02:00
nelo ddcec00c4f change time 2017-06-29 09:48:00 +02:00
Dani Herrero df614b4943 bugs fixed 2017-06-29 08:13:30 +02:00
Dani Herrero 5e2be42247 bugs fixed 2017-06-28 14:59:54 +02:00
Dani Herrero 5b5523e6b6 refactorización vnProductionTable 2017-06-28 14:53:26 +02:00
Dani Herrero bfdd8ecd8e Localizador: acciones separadas a nuevo componente vnProductionActions 2017-06-28 14:48:07 +02:00
Dani Herrero 6815ab2b3c Localizador: paginación y ordenación desde front, selector actua sobre todos los elementos (no solo sobre los que se muestran) 2017-06-28 13:12:01 +02:00
nelo 7b38d2f188 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-28 08:57:37 +02:00
nelo 80121de6c3 change state
message send
change time
2017-06-28 08:57:33 +02:00
Dani Herrero c2b351a777 Cambio de hora y refactorizacion del vnMultiCheck 2017-06-28 08:55:01 +02:00
Dani Herrero b9704a2b91 corregido fallo en vnMultiCheck 2017-06-26 14:52:43 +02:00
Dani Herrero 4480431a08 estilos en vnMultiCheck 2017-06-26 14:41:08 +02:00
Dani Herrero 8b6e7fdc40 nuevo componente vnMultiCheck 2017-06-26 13:53:52 +02:00
Dani Herrero fabe0cde7c front: send message action 2017-06-26 10:52:22 +02:00
Dani Herrero fcfef2c8b7 cambio en accion envio de mensaje 2017-06-26 09:39:21 +02:00
Dani Herrero a96e3a57b6 corregido id ticket por ticketFk 2017-06-26 09:22:28 +02:00
Dani Herrero 6fd77dda74 cambio en filtros 2017-06-26 09:07:40 +02:00
Dani Herrero 17994a2cc5 internacionalizacion 2017-06-26 08:35:31 +02:00
dhan82 c69ada432d internacionalizacion (reverted from commit f419946766) 2017-06-26 08:32:57 +02:00
dhan82 f419946766 internacionalizacion 2017-06-26 08:28:16 +02:00
Dani Herrero 09e805fd3a Ordenación en campos correcto, autocomplete con clear 2017-06-22 15:04:02 +02:00
nelo d996a56a1e new fake production table
list filter with fields
2017-06-22 14:51:37 +02:00
Dani Herrero 2bdbda6192 Localizador, cambio estlios, añadido paginador, order by 2017-06-22 12:03:01 +02:00
nelo 4890a69238 page and offset filter FakeProduction 2017-06-22 09:09:31 +02:00
nelo 26e1e9a71b list ticket fake production 2017-06-21 13:29:01 +02:00
Dani Herrero 05b6c81a1b dropDown con filtro 2017-06-21 13:16:37 +02:00
nelo a7a4a211e2 fake production in table 2017-06-21 12:11:38 +02:00
Dani Herrero 8046c434fe Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-21 09:46:36 +02:00
Dani Herrero 3796741371 primera versión del componente vnGridHeader para ordenación de tablas 2017-06-21 09:46:31 +02:00
nelo a4d9c3008a agencies 2017-06-21 08:00:34 +02:00
nelo df320908ae Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-21 07:28:07 +02:00
nelo ce15b68a92 list for all models 2017-06-21 07:28:03 +02:00
Dani Herrero 7c28d42be0 merge conflicts 2017-06-20 15:02:23 +02:00
Dani Herrero d444980ab1 [En progreso] nuevo componente vnGridHeader para ordenación de tablas 2017-06-20 15:00:27 +02:00
nelo 509dab5ce4 list states 2017-06-20 13:14:20 +02:00
nelo 50e086fbc0 list for my model 2017-06-20 13:06:13 +02:00
nelo 729ddf3358 warehouses inventory 2017-06-20 10:40:04 +02:00
Dani Herrero ca19369093 Production: modal para mensajes, filtros búsqueda en front 100% 2017-06-20 09:27:49 +02:00
Dani Herrero bcdc31d8d9 arreglo en autocomplete para admitir valores por defecto 2017-06-15 15:00:43 +02:00
Dani Herrero 408b511e6d Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-15 12:00:57 +02:00
Dani Herrero 1ca5e20494 añadido callBack cambio estados 2017-06-15 12:00:51 +02:00
nelo 80b9815a57 callback error list warehouses, change-state 2017-06-15 11:59:15 +02:00
Dani Herrero bc4402ce22 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2017-06-15 11:22:53 +02:00