gerard
|
532d20cd7f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-06-18 12:04:10 +02:00 |
|
gerard
|
5c92dc4216
|
Bug solved
|
2018-06-18 12:03:39 +02:00 |
 Javi Gallego
|
af925de00c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-06-18 07:26:12 +02:00 |
Juan
|
0aa4b8bba3
|
Merge branch 'test' into dev
|
2018-06-12 17:17:59 +02:00 |
|
Juan
|
3174f37e3e
|
Routes fixed to use HTTPS
|
2018-06-12 17:17:40 +02:00 |
|
Javi Gallego
|
64da648a2f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-06-11 08:01:43 +02:00 |
|
Javi Gallego
|
1b4c97fa6a
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-06-09 11:56:29 +02:00 |
|
Javi Gallego
|
9e0e97db66
|
traduccion order
|
2018-06-09 11:56:05 +02:00 |
|
Juan
|
240f080de3
|
Icons updated, test fixed, paging rows adjusted
|
2018-06-08 13:26:06 +02:00 |
|
Juan
|
2951a737a7
|
Merge
|
2018-06-07 23:56:16 +02:00 |
|
Juan
|
9fa12d4baf
|
Automatic pagination with vnPagination, improved vnSearchbar
|
2018-06-07 23:47:19 +02:00 |
|
Javi Gallego
|
e891d7f3e6
|
traducciones
|
2018-06-07 13:31:52 +02:00 |
|
gerard
|
8c34dba79e
|
Tarea #296 seccion ticket.line menu de mover lineas
|
2018-06-06 16:54:40 +02:00 |
|
gerard
|
5e28d0485c
|
removed duplicated model
|
2018-06-04 12:00:47 +02:00 |
|
gerard
|
689a04e21e
|
Bug #319 Arreglar colores segun nuevas directivas de paco
|
2018-06-04 11:57:27 +02:00 |
|
gerard
|
89c9af878f
|
Tarea #316 Nuevo formulario del registro de compra-venta
|
2018-06-04 10:02:17 +02:00 |
|
gerard
|
c0c3925470
|
Tarea #316 Nuevo formulario del registro de compra-venta
|
2018-06-04 09:48:32 +02:00 |
|
Juan
|
a015b790b5
|
Language fixes
|
2018-06-01 09:04:49 +02:00 |
|
Juan
|
27dc90ac3d
|
Style fixes
|
2018-05-31 16:51:33 +02:00 |
|
Juan
|
f9c0d0d911
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-31 16:27:21 +02:00 |
|
Juan
|
55ccc74402
|
Snackbar fixes
|
2018-05-31 16:27:06 +02:00 |
 Joan Sanchez
|
d316b17899
|
Merge branch 'dev' into test
|
2018-05-31 14:58:51 +02:00 |
|
Joan Sanchez
|
4173180fde
|
fixed eslint rules
|
2018-05-31 14:48:10 +02:00 |
|
Juan
|
97c840ece7
|
Style fixes
|
2018-05-31 14:40:42 +02:00 |
|
Joan Sanchez
|
20897a287e
|
Order index route
|
2018-05-31 14:34:15 +02:00 |
|
Juan
|
2a6dedfc91
|
Style fixes
|
2018-05-31 13:57:48 +02:00 |
|
Juan
|
0d2693d8e1
|
Style fixes
|
2018-05-31 13:45:51 +02:00 |
|
Juan
|
e78d2e5ede
|
Style fixes
|
2018-05-31 13:34:48 +02:00 |
|
Juan
|
3c9d8f32bb
|
Merge
|
2018-05-31 11:56:52 +02:00 |
|
Juan
|
a78bb24e09
|
Tests fixed, bugs solved, vnCrudModel, vnRestModel, UserError
|
2018-05-31 11:52:39 +02:00 |
|
Joan Sanchez
|
804218cdae
|
Iconos en descriptor de ticket #329
|
2018-05-31 08:57:25 +02:00 |
|
Joan Sanchez
|
c0167edc3e
|
Credit insurance refactor #328
|
2018-05-31 07:59:42 +02:00 |
|
Joan Sanchez
|
d6f0be2209
|
Remove ticket from route. Added warehouse to procedure. #326
|
2018-05-30 10:55:54 +02:00 |
|
gerard
|
fc67fdd6af
|
Tarea #315 dialog refactor needed CR JUAN
|
2018-05-30 08:45:02 +02:00 |
|
gerard
|
c6a8b4cea9
|
Tarea #315 Card refactor needed CR JUAN
|
2018-05-30 08:44:01 +02:00 |
|
Juan
|
3833339cc6
|
Merge
|
2018-05-29 17:46:10 +02:00 |
|
Joan Sanchez
|
8878593bbe
|
Show item descriptor on itemFk click
|
2018-05-29 14:33:29 +02:00 |
|
Joan Sanchez
|
34ff655617
|
responsive fetched-tags component #323 CR: Juan
|
2018-05-29 13:51:39 +02:00 |
|
Joan Sanchez
|
a1a0f2e0b7
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-29 13:36:55 +02:00 |
|
Joan Sanchez
|
4dd5019ae0
|
Show isEqualizated on addresses list #302. CR: Javi
|
2018-05-29 13:36:41 +02:00 |
|
Javi Gallego
|
5745bfa8da
|
permisos de imagen para marketing y compradores
|
2018-05-29 11:53:34 +02:00 |
|
Joan Sanchez
|
e14ab33b9c
|
FIlter item by name #299
|
2018-05-29 09:37:24 +02:00 |
|
Joan Sanchez
|
125c6dea37
|
Address state fix #325
|
2018-05-28 13:44:41 +02:00 |
|
Joan Sanchez
|
ca0524f24b
|
Navigate to address list fix. #325
|
2018-05-28 13:38:13 +02:00 |
|
Joan Sanchez
|
5199ca62f4
|
Send notification on payment method change. #257
|
2018-05-28 12:22:35 +02:00 |
|
Javi Gallego
|
f4423e3fb5
|
fix ticket-volume
|
2018-05-28 09:30:00 +02:00 |
|
Javi Gallego
|
8b03ba420f
|
#309 seccion ticket.volume con m3 y sumatorio CR juan
|
2018-05-28 09:16:06 +02:00 |
|
Joan Sanchez
|
74410d4045
|
getVolume route should return only data #324 CR: Juan
|
2018-05-28 08:52:18 +02:00 |
|
Juan
|
30aea3d086
|
Tests fixed, watcher refactor, global error handling, angular 1.7
|
2018-05-25 17:25:35 +02:00 |
|
Joan Sanchez
|
7a5d8bdd03
|
Added warehouse & isDeleted on ticket basic data #322
|
2018-05-25 11:40:04 +02:00 |