Juan Ferrer Toribio
|
5c80a8b4d7
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-08-22 09:51:24 +02:00 |
|
Juan Ferrer Toribio
|
c65d69c62f
|
Archivos duplicados borrados
|
2017-08-22 09:51:13 +02:00 |
Dani Herrero
|
5e41f573f5
|
añadido campo Date al modelo de FakeProduction
|
2017-07-12 14:02:03 +02:00 |
Vicente Falco
|
139579e78f
|
FakeProductionSql campo date
|
2017-07-12 08:53:55 +02:00 |
|
Vicente Falco
|
ace002e02b
|
time production
|
2017-07-12 08:21:36 +02:00 |
|
Vicente Falco
|
62b0a29f7c
|
messageSend Production
|
2017-07-12 07:57:30 +02:00 |
|
Vicente Falco
|
f1fda284cb
|
varios cambios
|
2017-07-11 09:36:11 +02:00 |
|
Dani Herrero
|
bbd09b3d36
|
eliminado console.log
|
2017-07-06 14:48:05 +02:00 |
|
Dani Herrero
|
2b7abef98f
|
corregido filtro principal
|
2017-07-06 14:46:22 +02:00 |
|
Juan Ferrer Toribio
|
5929b8be32
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-07-06 13:04:51 +02:00 |
|
Juan Ferrer Toribio
|
46e9029be3
|
Directorio obsoleto borrado
|
2017-07-06 13:04:43 +02:00 |
|
Dani Herrero
|
283d2ab440
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-07-06 12:58:54 +02:00 |
|
Dani Herrero
|
25ac346b2b
|
filtro principal y ajustes css
|
2017-07-06 12:58:50 +02:00 |
|
Vicente Falco
|
d8727b380c
|
change-worker
|
2017-07-06 12:21:19 +02:00 |
|
Vicente Falco
|
607c781f15
|
merge
|
2017-07-06 11:28:06 +02:00 |
|
Vicente Falco
|
525c8bbcf8
|
merge
|
2017-07-06 10:39:52 +02:00 |
|
Vicente Falco
|
15fee03060
|
Endpoint change-time
|
2017-07-06 09:55:28 +02:00 |
|
Vicente Falco
|
d2e0051b38
|
Endpoint RouteFk
|
2017-07-06 08:45:33 +02:00 |
|
Vicente Falco
|
c47c88dd10
|
model Routes
|
2017-07-04 10:13:17 +02:00 |
nelo
|
e26838063b
|
rutas
|
2017-07-03 14:29:44 +02:00 |
|
nelo
|
f993504157
|
rutas
|
2017-07-03 14:29:09 +02:00 |
|
nelo
|
37c1c654b7
|
get correct user sender
|
2017-06-29 14:15:23 +02:00 |
|
nelo
|
c5363155c4
|
send message
|
2017-06-29 14:08:57 +02:00 |
|
nelo
|
2e7a225249
|
rawsql with promises
|
2017-06-29 11:48:57 +02:00 |
|
nelo
|
ddcec00c4f
|
change time
|
2017-06-29 09:48:00 +02:00 |
|
nelo
|
80121de6c3
|
change state
message send
change time
|
2017-06-28 08:57:33 +02:00 |
|
nelo
|
d996a56a1e
|
new fake production table
list filter with fields
|
2017-06-22 14:51:37 +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 |
|
nelo
|
a7a4a211e2
|
fake production in table
|
2017-06-21 12:11:38 +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 |
|
nelo
|
80b9815a57
|
callback error list warehouses, change-state
|
2017-06-15 11:59:15 +02:00 |
|
nelo
|
b86f71bb25
|
llamamos al servicio client para obtener el empleado
cambiamos el estado
|
2017-06-15 11:02:50 +02:00 |
|
nelo
|
18ff74b17f
|
get user and employee
|
2017-06-14 14:27:16 +02:00 |
|
nelo
|
6996352029
|
get warehouses
|
2017-06-14 12:55:10 +02:00 |
|
nelo
|
16302e1f9a
|
problemas con riesgo
|
2017-06-14 12:16:53 +02:00 |
|
Dani Herrero
|
888f5c0cc6
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2017-06-14 09:58:36 +02:00 |
|
Dani Herrero
|
e43827ab28
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
# Conflicts:
# services/production/common/methods/ticket-state/change-state.js
|
2017-06-14 09:58:30 +02:00 |
|
nelo
|
956264a529
|
fake son con notas
|
2017-06-14 09:56:08 +02:00 |
|
Dani Herrero
|
afff93cce6
|
Tooltip: admite html, Localizador: añadido icono con información adicional
|
2017-06-14 09:54:00 +02:00 |
|
nelo
|
3da67266bb
|
promesa para obtener usuario
|
2017-06-14 08:54:45 +02:00 |
|
nelo
|
6adc734f69
|
change state ticket
|
2017-06-13 13:57:40 +02:00 |
|
nelo
|
87857488c0
|
modificaciones fake son
|
2017-06-13 12:00:11 +02:00 |
|
nelo
|
cbc364db38
|
get states production
|
2017-06-13 11:26:54 +02:00 |
|
nelo
|
ecf347e7e2
|
modificaciones fake
|
2017-06-13 09:07:14 +02:00 |
|
nelo
|
c24c126734
|
fake son de tickets
my model tiene el meted raw sql
|
2017-06-13 08:44:40 +02:00 |
|
Vicente Falco
|
00dd05ba6d
|
Docker
|
2017-06-07 08:43:25 +02:00 |
|
nelo
|
ce256b395e
|
tarea gula para copiar los ficheros comunes
puerto 3004 para production
|
2017-06-07 08:38:48 +02:00 |
|
nelo
|
47f9d29686
|
servicio production creado
|
2017-06-06 08:21:38 +02:00 |