gerard
|
df8d3078d9
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-02 13:13:42 +02:00 |
|
gerard
|
3bca15708f
|
Bug #312 Autocomplete intenta mostrar el valor antes de tener los datos
|
2018-07-02 13:13:26 +02:00 |
 Joan Sanchez
|
9982b9df11
|
onDataChange() binding crud-model
|
2018-07-02 11:52:50 +02:00 |
Juan
|
6f07ae3c5c
|
Watchers from vnLabelValue removed
|
2018-06-29 09:46:14 +02:00 |
|
Joan Sanchez
|
c123207ac2
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-06-29 08:42:45 +02:00 |
|
Joan Sanchez
|
6450aa8f34
|
vnTable toggle order only on active field
|
2018-06-29 08:41:53 +02:00 |
|
gerard
|
a01fa0e9ad
|
Bug #136 Refactorización DropDown
|
2018-06-28 15:56:09 +02:00 |
|
gerard
|
2594f170cf
|
Bug #137 Refactorización Textfield
|
2018-06-28 15:54:54 +02:00 |
|
gerard
|
526929cd56
|
fdescribe deleted
|
2018-06-28 15:47:14 +02:00 |
|
gerard
|
da69165fb3
|
Tarea #352 ticket.lines Modificar descuento
|
2018-06-28 15:30:48 +02:00 |
|
gerard
|
5cfb11641c
|
Tarea #373, Tarea #352 focus on first input popover
|
2018-06-28 15:30:11 +02:00 |
|
gerard
|
accd66f63a
|
Tarea #352 ticket.lines Modificar descuento
|
2018-06-28 15:21:04 +02:00 |
|
gerard
|
54ee27dcef
|
Tarea #355, Tarea #354, Tarea #352 SALE
|
2018-06-28 15:17:50 +02:00 |
|
Joan Sanchez
|
45b3a5ce02
|
New grid component vnTable. #139. CR: Juan & Javi
|
2018-06-28 14:43:59 +02:00 |
|
Joan Sanchez
|
dfa1d1edb2
|
Added new section client contacts #365 - CR: Javi
|
2018-06-26 09:41:27 +02:00 |
|
gerard
|
38914a060f
|
Bug #348 arreglar traducciones de ticket.line
|
2018-06-25 18:01:45 +02:00 |
|
gerard
|
ddb04a5d87
|
Bug #348 arreglar traducciones de ticket.line
|
2018-06-25 16:55:19 +02:00 |
|
Joan Sanchez
|
dafd0a2f1a
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-06-21 09:22:08 +02:00 |
|
gerard
|
40a9833e3e
|
Revert texfield changes Bug #137
|
2018-06-21 09:17:39 +02:00 |
|
gerard
|
7ceda630d4
|
Revert Texfield
|
2018-06-21 09:12:35 +02:00 |
|
Joan Sanchez
|
57afcdf55e
|
Intrastat code on item summary #363
|
2018-06-21 09:11:25 +02:00 |
|
Joan Sanchez
|
00018ffda4
|
karma test fix locale
|
2018-06-21 09:07:05 +02:00 |
|
Joan Sanchez
|
afe051883e
|
label-value component Enable/disable ellipsize #364
|
2018-06-21 08:46:30 +02:00 |
|
Joan Sanchez
|
101d8875a9
|
Fix textfield non-empty class with value zero
|
2018-06-20 14:53:24 +02:00 |
|
gerard
|
b22e41c983
|
Bug #137 Refactorización Textfield
|
2018-06-20 14:15:14 +02:00 |
|
gerard
|
37e52b54b0
|
Tarea #333 Ultimas Entradas
|
2018-06-20 12:30:59 +02:00 |
|
gerard
|
b8ff2dbb0a
|
Tarea #333 Ultimas Entradas
|
2018-06-20 12:29:30 +02:00 |
|
gerard
|
42eacd4905
|
Tarea #333 Ultimas Entradas
|
2018-06-20 11:39:29 +02:00 |
|
Joan Sanchez
|
9037636de5
|
one-binding changed to two-way binding on finished date.
|
2018-06-20 09:16:15 +02:00 |
|
gerard
|
97c994b3e0
|
Bug #137 Refactorización Textfield
|
2018-06-20 08:41:59 +02:00 |
|
Joan Sanchez
|
0ab7d09a41
|
Hour translation
|
2018-06-19 14:37:56 +02:00 |
|
Joan Sanchez
|
8f6a88f9b6
|
Display sale taxes #342
|
2018-06-19 12:10:38 +02:00 |
|
Joan Sanchez
|
db5457420d
|
Mark/Unmark sale as reserved #349
|
2018-06-19 09:09:49 +02:00 |
|
gerard
|
8448d76ebe
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-06-19 09:06:22 +02:00 |
|
gerard
|
f2596af6b8
|
Dropdown ahora acepta traducciones CR Juan
|
2018-06-19 09:06:04 +02:00 |
|
Joan Sanchez
|
8cd0a5a9e2
|
stackable snackbar. Updated E2E #357
|
2018-06-19 08:12:36 +02:00 |
|
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 |
|
Joan Sanchez
|
2aee807915
|
Item,ticket services refactor and TicketComponent test fix #261
|
2018-05-25 10:03:45 +02:00 |
|
gerard
|
3b4cde9b46
|
Tarea #320 Hacer que el datepicker añada el dia con la hora local
|
2018-05-25 08:54:47 +02:00 |
|
gerard
|
255a33f104
|
fixed error in watcher post
|
2018-05-24 16:09:32 +02:00 |
|
gerard
|
58553309ff
|
fixed typo
|
2018-05-24 16:04:09 +02:00 |
|
gerard
|
fe27f0e44f
|
fixed bugs in recovery
|
2018-05-24 16:02:54 +02:00 |
|
gerard
|
c512faf45c
|
fixed bugs on greuge
|
2018-05-24 15:47:04 +02:00 |
|
gerard
|
9b8ee8b787
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-24 15:46:09 +02:00 |
|
Joan Sanchez
|
09c98368b8
|
Tests fix && renamed .list to .index states
|
2018-05-24 15:02:38 +02:00 |
|
gerard
|
b3ce2a8630
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-24 13:44:59 +02:00 |
|
Joan Sanchez
|
d20faedd64
|
Convert date to JSON #317. CR Juan
|
2018-05-24 11:21:44 +02:00 |
|
Joan Sanchez
|
e7f258061c
|
Snackbar fix message color #204. CR: Juan
|
2018-05-24 09:19:23 +02:00 |
|
gerard
|
b00c6888c2
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-23 14:27:54 +02:00 |
|
Joan Sanchez
|
3bb1c92cf5
|
Client routes refactor #261
|
2018-05-23 14:26:51 +02:00 |
|
gerard
|
7440909a48
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-22 15:07:39 +02:00 |
|
gerard
|
1e4cafa73d
|
arreglado bug no mostraba las facturas
|
2018-05-22 15:03:31 +02:00 |
|
Juan
|
518a82bf26
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-22 11:44:33 +02:00 |
|
Juan
|
2f1e5b4fb4
|
#82 Non-generated files removed from generated directory, vnTooltip refactor
|
2018-05-22 11:44:24 +02:00 |
|
gerard
|
d21b57e536
|
Refactor step-one unit test
|
2018-05-22 08:14:16 +02:00 |
|
gerard
|
73104c4465
|
Bug #313 Modified tests
|
2018-05-21 12:03:36 +02:00 |
|
gerard
|
6f45a8fa5b
|
Bug #313 Cuando cancelas vn-confirm guarda los datos igualmente
|
2018-05-21 11:59:23 +02:00 |
|
gerard
|
7f54bcb019
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-21 11:48:50 +02:00 |
|
Joan Sanchez
|
88cf75e088
|
Active client debt icon when has debt greather than zero.
|
2018-05-21 07:31:38 +02:00 |
Daniel Herrero
|
f612cab8c0
|
autoPaging bug fixed
|
2018-05-20 19:18:05 +02:00 |
|
gerard
|
e118798c69
|
Refactor multicheck para que acepte la propiedad disabled
|
2018-05-18 14:59:56 +02:00 |
|
Joan Sanchez
|
026a5b7dea
|
Change address when client is selected on ticket basic data
|
2018-05-17 08:44:34 +02:00 |
|
Javi Gallego
|
7aa2d04d00
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-16 13:28:59 +02:00 |
|
Javi Gallego
|
5779e47197
|
buy de item.tax no se mostraba al rol buyer
|
2018-05-16 13:28:54 +02:00 |
|
Joan Sanchez
|
fe60481b1f
|
Disabled unused services
|
2018-05-16 13:26:36 +02:00 |
|
Joan Sanchez
|
f0e8b90316
|
Added description field on item basic data #303
|
2018-05-16 13:02:19 +02:00 |
|
Joan Sanchez
|
11b7c133a4
|
Added package & dropdown replaced search regexp with like
|
2018-05-16 13:01:14 +02:00 |
|
gerard
|
0fdb4a4785
|
Bug #306 Modificar TicketTracking para tener en cuenta los nuevos ACL
|
2018-05-16 12:56:46 +02:00 |
|
Joan Sanchez
|
3557a08d2c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-16 08:19:06 +02:00 |
|
Joan Sanchez
|
8f9f7c1fe6
|
Ticket basic data and date-picker refactor
|
2018-05-16 08:13:39 +02:00 |
|
Javi Gallego
|
d5c21c046e
|
traduccion Order
|
2018-05-16 08:10:43 +02:00 |
|
Joan Sanchez
|
5e2e898151
|
Shipped with datetime
|
2018-05-15 09:43:45 +02:00 |
|
gerard
|
b5cfbf1246
|
Bug #253 Actualizar los estilos para que concuerden con la paleta
|
2018-05-14 12:54:17 +02:00 |
|
Joan Sanchez
|
325aae7ebd
|
Changed ticket summary service path
|
2018-05-14 10:07:22 +02:00 |
|
Joan Sanchez
|
f1de516a78
|
Edit address agencyMode combobox fix
|
2018-05-11 11:44:47 +02:00 |
|
gerard
|
7a60211023
|
Unhandled errors fixed CR JUAN
|
2018-05-11 11:20:37 +02:00 |
|
gerard
|
85aa3b0156
|
Revert "Revert "Tarea #289 Cuando se modifica el crédito mostrar alerta""
This reverts commit d9862b8922.
|
2018-05-11 11:16:16 +02:00 |
|
gerard
|
d9862b8922
|
Revert "Tarea #289 Cuando se modifica el crédito mostrar alerta"
This reverts commit 9b07cd444c.
|
2018-05-11 11:10:15 +02:00 |
|
gerard
|
9b07cd444c
|
Tarea #289 Cuando se modifica el crédito mostrar alerta
|
2018-05-11 11:09:07 +02:00 |
|
gerard
|
b0d5e2958e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-11 09:04:09 +02:00 |
|
Joan Sanchez
|
bd069a1f39
|
Rolling back to old pagination
|
2018-05-11 08:35:28 +02:00 |
|
gerard
|
aa7dbaeccb
|
Initial work Handle unhandled exceptions CR JUAN
|
2018-05-10 13:48:48 +02:00 |
|
gerard
|
1af698acc3
|
Bug #290 Componentes de ticket muestra todos los componentes existentes.
|
2018-05-10 13:36:26 +02:00 |
|
gerard
|
503e1a7163
|
Tarea #283 Modificar encabezado el client.summary
|
2018-05-09 13:58:53 +02:00 |
|
Javi Gallego
|
d6be8f8f93
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-08 13:40:53 +02:00 |
|
gerard
|
4893de6808
|
test para el refactor de multicheck Tarea #284
|
2018-05-08 11:45:22 +02:00 |
|
gerard
|
2a259b27dc
|
Revert "test para el refactor de culticheck Tarea #284"
This reverts commit 58f903b294.
|
2018-05-08 11:43:28 +02:00 |
|
Javi Gallego
|
1ce622d1e5
|
bug traduccion
|
2018-05-08 11:07:34 +02:00 |
|
gerard
|
58f903b294
|
test para el refactor de culticheck Tarea #284
|
2018-05-08 11:01:30 +02:00 |
|
gerard
|
99adbf6a86
|
aññadido estilo para Tarea #265 CR JUAN
|
2018-05-08 10:04:15 +02:00 |
|
gerard
|
66daec4487
|
eliminadas propiedades innecesarias de icon button
|
2018-05-08 09:59:49 +02:00 |
|
gerard
|
b569247e91
|
Refactor autocomplete CR JUAN para Tarea #265
|
2018-05-08 09:58:49 +02:00 |
|
gerard
|
23c6ab7c39
|
Traducciones para Tarea #284
|
2018-05-08 09:57:47 +02:00 |
|
gerard
|
8cdf41d9ad
|
Refactor multi-check para Tarea #284 CR: JUAN
|
2018-05-08 09:55:45 +02:00 |
|
gerard
|
6544d0161c
|
Tarea #284 Seccion ticket.lineas icono papelera para eliminar lineas
|
2018-05-08 09:54:14 +02:00 |
|
gerard
|
a9ade07aa0
|
Cambiado ticketTracking por tracking CR JUAN
|
2018-05-08 09:40:37 +02:00 |
|
gerard
|
1460887ca2
|
Añadido metodo en ticket card para que se actualicen datos del ticket
|
2018-05-08 09:30:55 +02:00 |
|
gerard
|
c7f07d0548
|
Refactorizacion de icon-menu para Tarea #265 y #279 CR: JUAN
|
2018-05-08 09:28:25 +02:00 |
|
gerard
|
bf87c3d2ac
|
Refactorizacion de buton en componente para Tarea #265 CR: JUAN
|
2018-05-08 09:26:17 +02:00 |
|
gerard
|
024a248797
|
#265 Añadir boton ok y estado CR: JUAN
|
2018-05-08 09:25:15 +02:00 |
|
Joan Sanchez
|
e1bc434f34
|
Added front-end & back-end "order" service #267
|
2018-05-07 09:08:46 +02:00 |
|
Joan Sanchez
|
3c0fe7a4bc
|
Added new pagination & module index search fixed #268
|
2018-05-07 08:33:45 +02:00 |
|
Joan Sanchez
|
22250984ae
|
CSS class ellipsize with max-width 20em
|
2018-05-04 14:27:45 +02:00 |
|
Joan Sanchez
|
681731e886
|
back-end refactor & item search fix. #260
|
2018-05-04 11:46:03 +02:00 |
|
Daniel Herrero
|
c838d98010
|
autoPaging bug fixed onScroll
|
2018-05-03 20:46:08 +02:00 |
|
Javi Gallego
|
eaf4bbbdbb
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-03 19:31:40 +02:00 |
|
Joan Sanchez
|
850f033b63
|
Recovery list added new pagination component
|
2018-05-03 13:28:46 +02:00 |
|
Javi Gallego
|
b3405a3164
|
Bug #252 CR Juan
|
2018-05-02 11:54:13 +02:00 |
|
Javi Gallego
|
80a3f0a914
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-05-02 08:57:19 +02:00 |
|
Daniel Herrero
|
33f7b2d45a
|
renamed action
|
2018-04-30 14:00:09 +02:00 |
|
Daniel Herrero
|
628dd5a99b
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-30 13:57:14 +02:00 |
|
Daniel Herrero
|
a7e5f1a623
|
new component for infinite scroll vnAutoPaging
|
2018-04-30 13:57:10 +02:00 |
Bernat
|
c31d1ed888
|
update fixtures and dumpedfixtures with table vn.state
|
2018-04-30 12:48:29 +02:00 |
|
Daniel Herrero
|
50011bff8e
|
getWatchers function
|
2018-04-30 12:30:56 +02:00 |
|
Javi Gallego
|
118638a38b
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-30 08:33:36 +02:00 |
|
Javi Gallego
|
b7c310bd50
|
nueva fuente fontello
|
2018-04-27 10:01:29 +02:00 |
|
Juan
|
64cf636f90
|
Merge
|
2018-04-27 09:57:15 +02:00 |
|
Juan
|
0c99ca6f17
|
Jenkins test
|
2018-04-27 09:55:58 +02:00 |
Carlos Jimenez
|
21080b740f
|
minor refactors and slint error fixes
|
2018-04-26 16:42:18 +02:00 |
|
Carlos Jimenez
|
57123f4887
|
#266 popover for item descriptor on ticket section plus some minor refactors on inte tags relations
|
2018-04-26 16:41:08 +02:00 |
|
gerard
|
03ffbd4e77
|
cambio del tamaño del titulo para que concuerde con los mockups
|
2018-04-24 14:47:00 +02:00 |
|
gerard
|
709b06e4ea
|
Tarea #278 Refactor descriptor item CR Carlos
|
2018-04-24 14:40:12 +02:00 |
|
gerard
|
05f6603e92
|
Bug #264 sumario ticket no respeta margenes
|
2018-04-23 11:56:59 +02:00 |
|
Gerard
|
d8dc1f742c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-23 11:17:38 +02:00 |
|
Gerard
|
dc4779e700
|
Tarea #271 Atajo de teclado para botones +
|
2018-04-23 11:17:30 +02:00 |
|
Carlos Jimenez
|
7f274a24e6
|
#193 front end unit test for credit insurance list CR pending
|
2018-04-22 17:17:24 +02:00 |
|
Carlos Jimenez
|
27a08dc2a1
|
#186 cancel button + e2e path refactor CR pending
|
2018-04-22 16:25:44 +02:00 |
|
Javi Gallego
|
de40c400b4
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-19 16:32:59 +02:00 |
|
Javi Gallego
|
59979b87bd
|
#263 No mostrar sumatorio en client.factura CR Juan
|
2018-04-19 16:31:47 +02:00 |
|
Gerard
|
0e7e8f68b7
|
cambio en el estilo de las tablas
|
2018-04-19 15:18:44 +02:00 |
|
Gerard
|
846b3fb96e
|
solucionado problema con padding
|
2018-04-19 15:16:11 +02:00 |
|
Gerard
|
488675c209
|
editados los colores para que concuerden con la paleta de verdnatura
|
2018-04-19 15:14:43 +02:00 |
|
Gerard
|
fb6a8c72f0
|
quitada traduccion innecesaria
|
2018-04-19 15:13:45 +02:00 |
|
Gerard
|
1e15826f8d
|
Bug #211 Forzar a ciertos tags
|
2018-04-19 15:12:39 +02:00 |
|
Gerard
|
c651428063
|
Bug #243 Creacion del filtro dash-if-empty para ticket Index
|
2018-04-19 15:00:44 +02:00 |
|
Gerard
|
155e5a4d4f
|
Tarea #230 refactor de vnseachbar debido al refactor de vnIconButton
|
2018-04-19 14:58:43 +02:00 |
|
Gerard
|
399f14a5b5
|
Tarea #230 cambio en vnIndex
|
2018-04-19 14:57:55 +02:00 |
|
Gerard
|
592b34a879
|
Bug #243 Indice de Tickets
|
2018-04-19 14:56:05 +02:00 |
|
Gerard
|
4455f77f8e
|
#230 refactor de tabIndex debido al refactor de icon-button
|
2018-04-19 14:48:38 +02:00 |
|
Gerard
|
5546890ee9
|
tarea #230 refactorizar Icon-Button y añadir focus
|
2018-04-19 14:46:06 +02:00 |
|
Gerard
|
b4af50cc48
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-19 09:31:28 +02:00 |
|
Gerard
|
bb0e6dd994
|
refactor of autocomplete
|
2018-04-18 14:44:07 +02:00 |
|
Javi Gallego
|
9e6aaf8ac6
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-18 13:59:28 +02:00 |
|
Javi Gallego
|
f5014b7824
|
# 186 CANCEL button en secciones pertinentes CR juan
|
2018-04-18 13:47:45 +02:00 |
|
Joan Sanchez
|
228239b027
|
Added step-control component and basic data step controllers
|
2018-04-18 09:47:05 +02:00 |
|
Joan Sanchez
|
91a7f5a45c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-17 15:41:16 +02:00 |
|
Gerard
|
9976e0ad7a
|
Quitar el hover en las listas que no sean interactivas CR: Paco
|
2018-04-17 15:05:25 +02:00 |
|
Joan Sanchez
|
5e09df1c9d
|
Ticket summary. #213
|
2018-04-17 14:49:55 +02:00 |
|
Joan Sanchez
|
808ff40794
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-17 12:19:51 +02:00 |
|
Joan Sanchez
|
136a5e26a3
|
Created component vn-label-value and replaced vn-label on descriptors
|
2018-04-17 12:19:40 +02:00 |
|
Carlos Jimenez
|
59ef08b1ee
|
fetched tags added to componenets
|
2018-04-17 09:59:27 +02:00 |
|
Carlos Jimenez
|
4d49121b8c
|
disabled ticket packages
|
2018-04-17 08:18:16 +02:00 |
|
Carlos Jimenez
|
f2f1579fa9
|
corrected spec descriptions
|
2018-04-16 17:13:58 +02:00 |
|
Carlos Jimenez
|
8537752d3c
|
client side unit tests repairs
|
2018-04-16 17:09:43 +02:00 |
|
Carlos Jimenez
|
18cf6eb739
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-04-16 16:47:24 +02:00 |
|
Carlos Jimenez
|
03b2a75a84
|
#236 client side unit test for ticket volumes
|
2018-04-16 16:47:04 +02:00 |
|
Gerard
|
bfad7a9a83
|
Tarea #240 Añadir comprador
|
2018-04-16 13:47:16 +02:00 |
|
Gerard
|
18d4021383
|
.
|
2018-04-16 12:48:55 +02:00 |
|
Gerard
|
8751975334
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-16 12:10:56 +02:00 |
|
Gerard
|
41fc869451
|
Colores ajustados a la paleta actual de verdnatura
|
2018-04-16 12:10:46 +02:00 |
|
Joan Sanchez
|
5550b9cbba
|
Ellipsize class & sales person on client descriptor
|
2018-04-16 09:10:43 +02:00 |
|
Joan Sanchez
|
be3d796545
|
Item summary photo with vn-auto
|
2018-04-16 08:25:45 +02:00 |
|
Joan Sanchez
|
a4573e5653
|
Depth 2 en left-menu
|
2018-04-16 08:10:48 +02:00 |
|
Joan Sanchez
|
d54e1bbb4c
|
Changes on left-menu active item by depth
|
2018-04-16 08:04:19 +02:00 |
|
Carlos Jimenez
|
dafb554792
|
#232 components section plus unit tests
|
2018-04-13 16:03:43 +02:00 |
|
Gerard
|
374d05fb38
|
Arreglado bug con AgencyModes
|
2018-04-13 09:17:44 +02:00 |
|
Gerard
|
4c6213cd01
|
Tarea #240 Añadir comprador
|
2018-04-13 08:59:23 +02:00 |
|
Gerard
|
eae1fee4df
|
Tarea #238 Al apretar en el indice de clientes debe de ir a sumario
|
2018-04-12 13:16:30 +02:00 |
|
Gerard
|
d814de9d65
|
Tarea #242 agencyModes debe devolver sólo aquellas con isActive<> FALSE
|
2018-04-11 15:01:51 +02:00 |
|
Gerard
|
f0abbf1c5e
|
Bug #239 Mostrar item.tax solo a: administrative y salesAssistant
|
2018-04-11 14:29:02 +02:00 |
|
Carlos Jimenez
|
2c625a3b90
|
final fix for ticket volume
|
2018-04-10 14:41:56 +02:00 |
|
Carlos Jimenez
|
1d0d124d03
|
translations for ticket descriptor
|
2018-04-10 11:48:19 +02:00 |
|
Carlos Jimenez
|
e65942a296
|
#229 ticket descriptor
|
2018-04-10 11:14:33 +02:00 |
|
Carlos Jimenez
|
3a798757cf
|
removed unused code
|
2018-04-10 08:10:53 +02:00 |
joan
|
4b8ae91705
|
Ticket summary
|
2018-04-10 07:48:04 +02:00 |
|
joan
|
a82260d4fb
|
Ticket descriptor bug
|
2018-04-10 07:39:43 +02:00 |
|
Javi Gallego
|
13e221f98f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-06 18:58:42 +02:00 |
|
Javi Gallego
|
ae3809bc32
|
traduccion de frozen
|
2018-04-06 18:58:09 +02:00 |
|
Carlos Jimenez
|
2249f0a9be
|
#124 address edit and address observations bugs plus unit tests and e2e path
|
2018-04-06 18:40:24 +02:00 |
|
Carlos Jimenez
|
1225e32031
|
translation for ticket Volume
|
2018-04-05 14:28:06 +02:00 |
|
Carlos Jimenez
|
e6dd09cb6a
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-04-05 11:43:05 +02:00 |
|
Juan
|
98edab2869
|
Merge
|
2018-04-05 13:40:12 +02:00 |
|
Juan
|
71e22bac7f
|
Translations and style fixes
|
2018-04-05 13:20:27 +02:00 |
|
Juan
|
66c66f7696
|
vnHome style fix
|
2018-04-05 12:46:02 +02:00 |
|
Carlos Jimenez
|
979bc83b15
|
typo fix
|
2018-04-05 11:42:55 +02:00 |
|
Gerard
|
13c9cb56c7
|
Arreglado bug revision
|
2018-04-05 11:09:22 +02:00 |
|
Gerard
|
97481b3e0b
|
Restaurar refactor + -
|
2018-04-05 09:06:35 +02:00 |
|
Juan
|
ded0c6a53a
|
#166 - Item list ordered by name
|
2018-04-04 19:59:03 +02:00 |
|
Gerard
|
520c1eb8f5
|
Añadir disabled a autocomplete
|
2018-04-04 15:03:13 +02:00 |
|
Gerard
|
e1a93211d7
|
merge
|
2018-04-04 15:02:01 +02:00 |
|
Gerard
|
2814ebacea
|
Bug #198 refactorizar tag con nuevo + -
|
2018-04-04 14:52:54 +02:00 |
|
Javi Gallego
|
8f37b69bc2
|
data step one Tarea #215
|
2018-04-04 13:56:16 +02:00 |
|
Juan
|
04cd9b2389
|
#223 - Global error handler refactor
|
2018-04-04 12:55:06 +02:00 |
|
Carlos Jimenez
|
d6132edd73
|
removed button for mana at client module as it was all wrong
|
2018-04-04 10:37:52 +02:00 |
|
Juan
|
749681ac73
|
Client.activeSalesPerson() method refactor
|
2018-04-03 19:29:01 +02:00 |
|
Juan
|
bf04c73b42
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-04-03 18:31:54 +02:00 |
|
Juan
|
c8aa7dc43c
|
#199 - Bug solved: Client service crash when calling Client.card() method with invalid id
|
2018-04-03 18:31:13 +02:00 |
|
Carlos Jimenez
|
ce3600a01e
|
ticket volume plus e2e, and back-front unit test fixed
|
2018-04-03 16:10:39 +02:00 |
|
joan
|
ffde937022
|
Credit classification fixes #189
|
2018-03-28 15:07:48 +02:00 |
|
Gerard
|
cf98b1303e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-28 09:30:58 +02:00 |
|
Gerard
|
28c80d9ed3
|
Tarea #212 Mostrar solo las agencias con el campo isActive(tpv) en TRUE
|
2018-03-28 09:30:33 +02:00 |
|
Joan Sanchez
|
85810e2f7e
|
Client summary & package
|
2018-03-27 15:06:22 +02:00 |
|
Gerard
|
6b390b72f8
|
Tarea #212 Mostrar solo las agencias con el campo isActive(tpv) en TRUE
|
2018-03-27 14:28:02 +02:00 |
|
Gerard
|
151a19b0ba
|
Tarea #171 Añadir revision
|
2018-03-27 14:26:20 +02:00 |
|
Gerard
|
4d1609c445
|
Tarea #170 Mostrar modelo ticketTracking
|
2018-03-27 14:24:47 +02:00 |
|
Gerard
|
56f774a07f
|
Bug #210 Añadir automaticamente en el campo relevancy
|
2018-03-27 14:16:42 +02:00 |
|
Gerard
|
a746d2d58f
|
Listar modelo saleChecked
|
2018-03-26 15:10:51 +02:00 |
|
Gerard
|
d773082f82
|
solucionado checkbox sin tag utilizando 100 de su contenedor
|
2018-03-26 15:02:26 +02:00 |
|
Gerard
|
2f052a9d28
|
table width: 100%
|
2018-03-26 15:00:43 +02:00 |
|
Gerard
|
5b558a9f79
|
Solucionado el problema de alineamiento de la columnas
|
2018-03-26 14:59:14 +02:00 |
|
Gerard
|
58c6c080eb
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-26 14:57:32 +02:00 |
|
Gerard
|
b3b874c39d
|
Solucionado problema con el filter
|
2018-03-26 14:55:10 +02:00 |
|
Joan Sanchez
|
e38999acfa
|
Hide clear icon on disabled components autocomplete and textfield
|
2018-03-26 12:24:34 +02:00 |
|
Carlos Jimenez
|
d29dcf2e11
|
#195 listar lineas de ticket componente fetched-tags
|
2018-03-23 16:50:11 +01:00 |
|
Carlos Jimenez
|
8c07288378
|
seccion mana creada
|
2018-03-23 12:21:26 +01:00 |
|
Javi Gallego
|
e651619714
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-23 11:32:40 +01:00 |
|
Gerard
|
4926ad7e01
|
Move padding tag to card.html
|
2018-03-23 11:33:54 +01:00 |
|
Javi Gallego
|
3ebf2039fc
|
nuevo icono en el login
|
2018-03-23 11:32:31 +01:00 |
|
Javi Gallego
|
6351f4a93d
|
merge
|
2018-03-22 18:05:52 +01:00 |
|
Javi Gallego
|
46a6b0fb70
|
ticket line basico
|
2018-03-22 18:02:48 +01:00 |
|
Carlos Jimenez
|
e927826646
|
pending translates
|
2018-03-22 16:45:41 +01:00 |
|
Carlos Jimenez
|
0c4246847b
|
#182 files preparation for ticket volume
|
2018-03-22 15:06:21 +01:00 |
|
Carlos Jimenez
|
d57dbe2224
|
#208 ticket expedition e2e path plus some ticket volume files preparation and refactors
|
2018-03-22 15:01:36 +01:00 |
|
Carlos Jimenez
|
43c412beeb
|
çMerge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-03-22 12:40:18 +01:00 |
|
Gerard
|
0ae7c4822f
|
Delete padding
|
2018-03-22 12:35:00 +01:00 |
|
Carlos Jimenez
|
8c631012b1
|
ticket notes logic refactor plus unit tests
|
2018-03-22 10:57:55 +01:00 |
|
Carlos Jimenez
|
f7cac19be4
|
merge conflict
|
2018-03-21 15:56:20 +01:00 |
|
Carlos Jimenez
|
613054e29f
|
#184 listar modelo expeditions
|
2018-03-21 15:51:09 +01:00 |
|
Joan Sanchez
|
a9c690a48c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-21 14:55:10 +01:00 |
|
Joan Sanchez
|
7aeed467e9
|
Quantity validation on ticket packaging
|
2018-03-21 14:54:12 +01:00 |
|
Gerard
|
735544aed6
|
Mostrar modelo ticketTracking
|
2018-03-21 12:56:18 +01:00 |
|
Joan Sanchez
|
ff047559e3
|
Ticket packaging
|
2018-03-21 11:08:59 +01:00 |
|
Javi Gallego
|
ee6137c8e0
|
Ahora el acceso web lo puede modificar employee
|
2018-03-21 09:06:05 +01:00 |
|
Javi Gallego
|
cec2b2a3a5
|
creacion de item con busqueda por codigo de tipo y de intrastat
|
2018-03-21 08:59:18 +01:00 |
|
Javi Gallego
|
d4e3855b0d
|
rutas vacias de sale
|
2018-03-20 14:45:39 +01:00 |
|
Javi Gallego
|
e93daa9299
|
modelo sale con hasMany
|
2018-03-20 14:01:46 +01:00 |
|
Javi Gallego
|
c0014ef468
|
merge de rutas
|
2018-03-20 13:53:01 +01:00 |
|
Javi Gallego
|
7e71e8c08c
|
permisos de cambio de comercial
|
2018-03-20 13:20:17 +01:00 |
|
Juan
|
ffe216f630
|
vnPopover bugfix
|
2018-03-20 11:28:41 +01:00 |
|
Carlos Jimenez
|
e08fd21f4c
|
#203 add isFrozen to fiscal data form
|
2018-03-19 17:46:28 +01:00 |
|
Juan
|
1c8b541e83
|
vnPopover code clean, vnSearchbar popover bugs solved
|
2018-03-17 20:59:02 +01:00 |
|
Juan
|
378f053b18
|
vnAutocomplete behavior modified to act like ms access combo
|
2018-03-17 13:17:48 +01:00 |
|
Carlos Jimenez
|
7bbc83832b
|
spanish traduction for #179 ticket notes
|
2018-03-16 15:53:29 +01:00 |
|
Carlos Jimenez
|
31df9ec0e2
|
fixed all e2e paths
|
2018-03-16 15:09:04 +01:00 |
|
Carlos Jimenez
|
945a1b3049
|
corrected bug on all htmls using crud
|
2018-03-16 15:08:36 +01:00 |
|
Carlos Jimenez
|
ece2fd384d
|
#179 listar notas de ticket
|
2018-03-16 15:06:42 +01:00 |
Vicente Falco
|
a218e50658
|
interface ticket Revision
|
2018-03-16 08:56:40 +01:00 |
|
Joan Sanchez
|
af2fca3879
|
Ticket packages, moved Item model to loopback service
|
2018-03-15 14:36:09 +01:00 |
|
Daniel Herrero
|
2877ec05cc
|
mock ticketItem
|
2018-03-14 14:26:25 +01:00 |
|
Daniel Herrero
|
e6a8b34fe4
|
filter tickets
|
2018-03-14 13:59:01 +01:00 |
|
Daniel Herrero
|
82949b42b5
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-14 12:12:12 +01:00 |
|
Daniel Herrero
|
c21efeeb63
|
ticket summary structure
|
2018-03-14 12:12:06 +01:00 |
|
Javi Gallego
|
19870a7732
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-14 12:04:09 +01:00 |
|
Daniel Herrero
|
6df5f1c3fa
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-14 11:41:22 +01:00 |
|
Daniel Herrero
|
856fc64742
|
frontEnd ticket module file system
|
2018-03-14 11:41:19 +01:00 |
|
Joan Sanchez
|
708c822ab0
|
Credit classification & credit insurance task #150, #151, #152
|
2018-03-14 11:36:57 +01:00 |
|
Javi Gallego
|
6879435011
|
fuentes client descriptor
|
2018-03-14 11:15:14 +01:00 |
|
Javi Gallego
|
93baddbfc2
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-13 17:39:16 +01:00 |
|
Javi Gallego
|
2ef22e7e83
|
indice con mas tamaño
|
2018-03-13 16:25:24 +01:00 |
|
Daniel Herrero
|
9d46009e2b
|
remove old template in autocomplete
|
2018-03-13 14:53:52 +01:00 |
|
Daniel Herrero
|
5530828d62
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-13 14:30:51 +01:00 |
|
Daniel Herrero
|
176ce860ca
|
Tarea #164 Filtros con superpoderes
|
2018-03-13 14:30:25 +01:00 |
|
Javi Gallego
|
a6994b0179
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-13 14:07:47 +01:00 |
|
Javi Gallego
|
d9f932b2c1
|
añadir fuentes
|
2018-03-13 14:07:42 +01:00 |
|
Juan
|
fa9f8a79a8
|
vnAutocomplete filter fixes
|
2018-03-13 13:55:21 +01:00 |
|
Juan
|
75c1dd886d
|
vnAutocomplete fixes
|
2018-03-13 13:41:54 +01:00 |
|
Juan
|
06e9c97b3e
|
vnDropDown positioning bug fixed
|
2018-03-13 13:21:53 +01:00 |
|
Juan
|
d8b39ea5ac
|
Missing $inject fixed
|
2018-03-13 13:15:06 +01:00 |
|
Juan
|
3fd4e29429
|
vnTextarea style fix, new component vnMenu wich extends vnPopover
|
2018-03-13 12:07:28 +01:00 |
|
Juan
|
5c9dab163d
|
Added client ticket module
|
2018-03-12 14:02:29 +01:00 |
|
Javi Gallego
|
3dac1be401
|
Modificacion de traduccion mas apropiada
|
2018-03-12 12:58:29 +01:00 |
|
Juan
|
b952ab502a
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-12 12:31:52 +01:00 |
|
Juan
|
6eed9f081b
|
vnPopover refactor: code duplications removed, improved style
|
2018-03-12 12:31:50 +01:00 |
|
Carlos Jimenez
|
edf2e61bd0
|
#168 client permissions plus e2e path verified data update
|
2018-03-12 11:10:05 +01:00 |
|
Carlos Jimenez
|
ca2b84f73c
|
fixed descriptor test
|
2018-03-12 10:23:24 +01:00 |
|
Javi Gallego
|
fc2ea2b33b
|
Quito sigle binding :: porque no ordenaba
|
2018-03-09 19:57:29 +01:00 |
|
Carlos Jimenez
|
db88d00560
|
#156 client descriptor icons missing correct icons
|
2018-03-09 16:44:18 +01:00 |
|
Juan
|
c9ba1d00e4
|
Dropdown fixes
|
2018-03-09 15:09:54 +01:00 |
|
Juan
|
fbd6a5d58a
|
vnDropDown style fixes
|
2018-03-09 15:04:25 +01:00 |
|
Juan
|
6cc6703002
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-09 14:59:14 +01:00 |
|
Juan
|
ae3ff3c25c
|
vnDropDown style fixes
|
2018-03-09 14:59:08 +01:00 |
|
Javi Gallego
|
b260157171
|
recobro añadir candado #158 faltan los test de front
|
2018-03-09 14:54:25 +01:00 |
|
Juan
|
839fffb8fa
|
Dropdown style fixes
|
2018-03-09 14:53:31 +01:00 |
|
Javi Gallego
|
c0fbfa458e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-09 14:51:50 +01:00 |
|
Juan
|
b5bc7f24c4
|
Style fixes
|
2018-03-09 14:20:36 +01:00 |
|
Juan
|
bbcd39f30d
|
#135 Refactor vnAutocomplete
|
2018-03-09 14:15:30 +01:00 |
|
Daniel Herrero
|
80b22a4e7d
|
Bug #157 Sumario de item mostrar iva
|
2018-03-08 09:47:56 +01:00 |
|
Daniel Herrero
|
94bbbef2d0
|
Bug fixed address observations
|
2018-03-08 08:14:49 +01:00 |
|
Carlos Jimenez
|
6eaaa6dde5
|
#148 client web-access task
|
2018-03-07 15:05:09 +01:00 |
|
Carlos Jimenez
|
1e48f4a4a9
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-03-07 14:55:42 +01:00 |
|
Javi Gallego
|
cfccd71ca3
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-07 14:19:39 +01:00 |
|
Daniel Herrero
|
43bfbf3f4b
|
front unit test fixed
|
2018-03-07 13:42:15 +01:00 |
|
Daniel Herrero
|
78f893b811
|
Bug #124 address observations validations
|
2018-03-07 13:34:34 +01:00 |
|
Carlos Jimenez
|
11d4c835ba
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-03-07 12:25:37 +01:00 |
|
Carlos Jimenez
|
60e4ca132a
|
#155 web access functionality completed
|
2018-03-07 12:24:47 +01:00 |
|
Daniel Herrero
|
0bf4e292a1
|
recuperados los estilos borrados para los inputs
|
2018-03-07 08:05:55 +01:00 |
|
Javi Gallego
|
d12524d045
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-06 13:09:15 +01:00 |
|
Javi Gallego
|
4c7ba9859c
|
anguar inject minimify fixed factor VnPatch
|
2018-03-06 13:08:39 +01:00 |
|
Carlos Jimenez
|
8ee3c18cbc
|
removed unused code
|
2018-03-06 13:02:28 +01:00 |
|
Javi Gallego
|
ffee716409
|
Revert "Merge branch 'test' into dev"
This reverts commit b6091775e5, reversing
changes made to 42f1e1ec6f.
|
2018-03-06 13:01:05 +01:00 |
|
Javi Gallego
|
b6091775e5
|
Merge branch 'test' into dev
|
2018-03-06 12:48:22 +01:00 |
|
Javi Gallego
|
2a5efb04ae
|
angular inject minimify fixed factor VnPatch
|
2018-03-06 12:44:10 +01:00 |
|
Carlos Jimenez
|
42f1e1ec6f
|
#114 style
|
2018-03-06 12:08:25 +01:00 |
|
Carlos Jimenez
|
bc13abbe50
|
#114 mostrar current user en la top bar
|
2018-03-06 11:13:05 +01:00 |
|
Joan Sanchez
|
24abbffba7
|
Client summary updated
|
2018-03-05 10:56:51 +01:00 |
|
Carlos Jimenez
|
bdc0e5ddc1
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-03-02 14:46:04 +01:00 |
|
Juan
|
8970662ff8
|
Redundant LDAP authentification test
|
2018-03-02 14:34:44 +01:00 |
|
Juan
|
d9a75acde0
|
LDAP authentification test
|
2018-03-02 14:31:15 +01:00 |
|
Carlos Jimenez
|
56a32343fd
|
style fix
|
2018-03-02 13:00:01 +01:00 |
|
Carlos Jimenez
|
b23617fcfb
|
item tag unit tests
|
2018-03-02 10:54:03 +01:00 |
|
Carlos Jimenez
|
f354a420bc
|
e2e item tags #121, plus item tags and item descriptor refactor #117
|
2018-03-02 10:51:01 +01:00 |
|
Juan
|
4a473f5c0f
|
Style fix
|
2018-03-01 23:49:01 +01:00 |
|
Juan
|
2c4fed4938
|
Style fixes
|
2018-03-01 23:41:27 +01:00 |
|
Juan
|
128c0d0ea3
|
vnCard style bug fixed
|
2018-03-01 23:38:14 +01:00 |
|
Juan
|
127c5e6c02
|
Style fixes
|
2018-03-01 21:54:18 +01:00 |
|
Juan
|
4b12411d6b
|
Style fixes
|
2018-03-01 21:18:43 +01:00 |
|
Juan
|
98388dde85
|
Image zoom bugs solved
|
2018-03-01 19:35:32 +01:00 |
|
Juan
|
e713ce01b4
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-01 16:52:47 +01:00 |
|
Juan
|
c0f34bdd37
|
#142 & #143 - New descriptors header
|
2018-03-01 16:52:35 +01:00 |
|
Daniel Herrero
|
e683ee66c1
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-01 14:48:09 +01:00 |
|
Daniel Herrero
|
40e2b73e7c
|
tarea #105 in progress
|
2018-03-01 14:48:02 +01:00 |
|
Juan
|
9881c4e6f3
|
Merge
|
2018-03-01 14:04:33 +01:00 |
|
Juan
|
de145bd814
|
#128 - Client invoices form
|
2018-03-01 14:01:45 +01:00 |
|
Joan Sanchez
|
52503c1015
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-01 13:53:16 +01:00 |
|
Joan Sanchez
|
5dc7b0bb58
|
Client summary
|
2018-03-01 13:53:11 +01:00 |
|
Daniel Herrero
|
77b20ae764
|
clientIndex unit test fixed
|
2018-03-01 13:26:54 +01:00 |
|
Daniel Herrero
|
a78292ffb8
|
merge conflicts
|
2018-03-01 12:55:07 +01:00 |
|
Daniel Herrero
|
b92f8bdd43
|
tarea #105 esturcctura montada, falta rellenar datos
|
2018-03-01 12:51:35 +01:00 |
|
Javi Gallego
|
4ee4c07b19
|
Bug #125 Modelo item
|
2018-03-01 12:47:51 +01:00 |
|
Javi Gallego
|
c8eab7dc24
|
merge model-config
|
2018-03-01 11:57:33 +01:00 |
|
Javi Gallego
|
f3b00f4b47
|
entidad recovery con list, create y tests
|
2018-03-01 11:55:28 +01:00 |
|
Juan
|
3d4ff56888
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-03-01 11:36:48 +01:00 |
|
Daniel Herrero
|
465d210b51
|
bug 103 falcar cliente, acl condicionales
|
2018-03-01 10:54:02 +01:00 |
|
Juan
|
e6c44d74eb
|
Client invoices
|
2018-02-28 20:55:44 +01:00 |
|
Juan
|
b3037e2db9
|
Addresses E2E fixed
|
2018-02-28 13:07:58 +01:00 |
|
Juan
|
d9c54415cb
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-28 12:07:59 +01:00 |
|
Juan
|
a1ee22d153
|
#96 - Email validation errors fixed
|
2018-02-28 12:07:56 +01:00 |
|
Daniel Herrero
|
50fb035dd9
|
Bug #108 tooltip outsides
|
2018-02-28 09:12:48 +01:00 |
|
Juan
|
8ee649b9d0
|
Bug with empty value validations fixed
|
2018-02-27 22:50:14 +01:00 |
|
Carlos Jimenez
|
cf77d05156
|
fixed a merge conflit problem
|
2018-02-27 14:39:50 +01:00 |
|
Carlos Jimenez
|
cdfc2a6779
|
solved merge comflics with item tags
|
2018-02-27 13:40:33 +01:00 |
|
Carlos Jimenez
|
701e6f9976
|
completed task #144 tem tags bugs
|
2018-02-27 13:31:45 +01:00 |
|
Juan
|
688881fac4
|
Bug #97 - Show dash when no secured credit
|
2018-02-27 13:28:07 +01:00 |
|
Carlos Jimenez
|
33f19949d8
|
fixed item tags plus added watcher to niches
|
2018-02-27 12:32:47 +01:00 |
|
Daniel Herrero
|
5b928f3e04
|
itemtags i18n
|
2018-02-27 08:14:28 +01:00 |
|
Daniel Herrero
|
687b011f9a
|
minWatcher in tags
|
2018-02-27 08:09:51 +01:00 |
|
Daniel Herrero
|
e048402223
|
itemTag added priority
|
2018-02-27 07:54:41 +01:00 |
|
Carlos Jimenez
|
4e5cbef155
|
corrected error message when tags are repeated
|
2018-02-26 17:34:40 +01:00 |
|
Carlos Jimenez
|
456e63700f
|
removed unused code from item niche
|
2018-02-26 17:32:23 +01:00 |
|
Carlos Jimenez
|
c0106b11d2
|
fixed BUG in #123 item tags
|
2018-02-26 16:49:44 +01:00 |
|
Juan
|
f9d6d63b6b
|
#124 Validación de la description en observaciones de direcciones
|
2018-02-26 14:23:26 +01:00 |
|
Juan
|
eb582b51a9
|
Bug #132 solved
|
2018-02-26 12:56:42 +01:00 |
|
Carlos Jimenez
|
9054c32aba
|
niche validation fix
|
2018-02-23 15:20:24 +01:00 |
Juan Ferrer Toribio
|
bff00dc98e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-23 13:05:00 +01:00 |
|
Juan Ferrer Toribio
|
cfc4b01fb0
|
Item tax form and service
|
2018-02-23 13:04:44 +01:00 |
|
Javi Gallego
|
f4a244398a
|
greuge con decimales y favicon
|
2018-02-23 12:51:36 +01:00 |
|
Daniel Herrero
|
632a5209c1
|
item Tags faltan test
|
2018-02-23 08:09:09 +01:00 |
|
Javi Gallego
|
51f8d01d24
|
Error de roles solucionado a falta de dump
|
2018-02-22 16:17:30 +01:00 |
|
Daniel Herrero
|
10e47acd6b
|
item clonation finish
|
2018-02-22 13:40:23 +01:00 |
|
Daniel Herrero
|
b999254433
|
ItemSummary into dialog
|
2018-02-22 08:18:57 +01:00 |
|
Daniel Herrero
|
b5611d0cc5
|
refactor vnTooltip
|
2018-02-21 13:42:47 +01:00 |
|
Daniel Herrero
|
027c19f5c5
|
bug fixed itemData
|
2018-02-21 13:15:50 +01:00 |
|
Daniel Herrero
|
d69954bb36
|
itemBotanical fixed with test
|
2018-02-21 13:10:23 +01:00 |
|
Daniel Herrero
|
8d5b329839
|
bug fixed in getModifiedData
|
2018-02-21 12:36:37 +01:00 |
|
Daniel Herrero
|
626a0ec7ca
|
custom icons v1
|
2018-02-21 11:41:22 +01:00 |
|
Daniel Herrero
|
ade0e3beb0
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-21 11:11:18 +01:00 |
|
Daniel Herrero
|
a153005a79
|
bugs fixed with itemBotanical model
|
2018-02-21 11:10:00 +01:00 |
|
Daniel Herrero
|
f1f8c74175
|
refactor watcher added requiredField
|
2018-02-21 11:09:27 +01:00 |
|
Javi Gallego
|
26b8bcfe94
|
cambio de los permisos del menu
|
2018-02-21 09:43:13 +01:00 |
|
Javi Gallego
|
41dfa9f9a1
|
creacion de ACL en diferentes modelos
|
2018-02-21 09:28:17 +01:00 |
|
Daniel Herrero
|
c983859cde
|
bug fixed ItemBotanical
|
2018-02-21 08:44:00 +01:00 |
|
Daniel Herrero
|
7ab1a8852b
|
itemSummary
|
2018-02-20 14:51:46 +01:00 |
|
Daniel Herrero
|
60e2d8132b
|
itemBotanical
|
2018-02-20 14:30:02 +01:00 |
|
Juan Ferrer Toribio
|
7c3efd40d5
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-20 13:48:37 +01:00 |
|
Juan Ferrer Toribio
|
e491b2a7b3
|
E2E merge
|
2018-02-20 13:48:25 +01:00 |
|
Daniel Herrero
|
93134cb39f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-20 12:58:10 +01:00 |
|
Daniel Herrero
|
099d7ff7fe
|
fixed unit test in ItemCard
|
2018-02-20 12:58:00 +01:00 |
|
Carlos Jimenez
|
a70f65f0b9
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-20 12:33:44 +01:00 |
|
Daniel Herrero
|
5f07fab6cf
|
item-summary
|
2018-02-20 12:33:17 +01:00 |
|
Carlos Jimenez
|
4251ee20e4
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-02-20 12:26:29 +01:00 |
|
Carlos Jimenez
|
09508aaef1
|
acls for niches
|
2018-02-20 12:26:09 +01:00 |
|
Carlos Jimenez
|
144d5a2bf0
|
issue 40 completed: niches
|
2018-02-20 12:25:51 +01:00 |
|
Daniel Herrero
|
ecc513272f
|
refactor itemBotanical and item
|
2018-02-20 11:10:54 +01:00 |
|
Juan Ferrer Toribio
|
1dfafe0d44
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-20 10:00:26 +01:00 |
|
Juan Ferrer Toribio
|
eb0276183f
|
E2E refactor, Snackbar with hide button, Dialog, bugs solved
|
2018-02-20 10:00:19 +01:00 |
|
Daniel Herrero
|
a3985e70ed
|
Tarea #37 ItemBotanical
|
2018-02-20 08:53:06 +01:00 |
|
Carlos Jimenez
|
feabfc05d6
|
html indent refactors
|
2018-02-19 20:52:07 +01:00 |
|
Carlos Jimenez
|
dcf5bf61da
|
backend unit test for barcode duplicity plus e2e path completed
|
2018-02-19 11:55:45 +01:00 |
|
Daniel Herrero
|
6fe1f96ef3
|
Bug fixeds and merge with test
|
2018-02-15 14:37:54 +01:00 |
|
Daniel Herrero
|
1b4fd50929
|
Bugs fixed: postalCode, credit list and validate DNI
|
2018-02-15 13:04:48 +01:00 |
|
Daniel Herrero
|
a1dd3e1a77
|
Bug fixed postalCode in Adresses
|
2018-02-15 11:44:03 +01:00 |
|
Daniel Herrero
|
81b374d744
|
Merge conflicts
|
2018-02-15 10:51:31 +01:00 |
|
Carlos Jimenez
|
0354628324
|
acl for item barcode
|
2018-02-15 08:49:58 +01:00 |
|
Carlos Jimenez
|
79c4aac3f5
|
corrected indentation on routes.json and added one path to services tests js
|
2018-02-14 15:56:22 +01:00 |
|
Carlos Jimenez
|
bde655bd1e
|
merge
|
2018-02-14 14:32:26 +01:00 |
|
Carlos Jimenez
|
6e1d3135d5
|
mini refactor on routes.json and crudAddressObervations
|
2018-02-14 14:24:14 +01:00 |
|
Carlos Jimenez
|
61cd4acca5
|
item-barcode functionality plus front end tests
|
2018-02-14 14:22:35 +01:00 |
|
Daniel Herrero
|
ca03005e10
|
test fixed
|
2018-02-14 14:05:02 +01:00 |
|
Daniel Herrero
|
21cc4e3320
|
semantic refactor
|
2018-02-14 14:04:47 +01:00 |
|
Javi Gallego
|
225508dd07
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-02-14 11:34:47 +01:00 |
|
Javi Gallego
|
aadf763e76
|
refactor html
|
2018-02-14 11:33:21 +01:00 |