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 |