gerard
|
813c490c5b
|
fixed a bug with the hours representation
|
2018-07-09 12:35:06 +02:00 |
|
gerard
|
edbad4eaa4
|
karma test
|
2018-07-09 12:21:43 +02:00 |
|
gerard
|
67d689443a
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-09 09:48:11 +02:00 |
|
gerard
|
790dcad11e
|
Tarea #354 seccion ticket.line menu de mover lineas
|
2018-07-09 09:48:00 +02:00 |
 Joan Sanchez
|
5608b1bd26
|
itemDiary alertLevel replaced by state name #384
|
2018-07-09 09:37:38 +02:00 |
|
gerard
|
3f1d2494f2
|
Bug #389 ADD TURN HACIA NUEVO TICKET ACCESS DENIED
|
2018-07-09 09:16:01 +02:00 |
|
gerard
|
efc588180f
|
Bug #388 no se actualiza el simulador
|
2018-07-09 09:09:08 +02:00 |
Juan
|
96d755cd21
|
Code linting, code clean
|
2018-07-06 16:32:23 +02:00 |
|
gerard
|
354c2a8369
|
test fixed
|
2018-07-06 16:29:31 +02:00 |
|
gerard
|
0c7676d3e5
|
fixed test
|
2018-07-06 16:27:34 +02:00 |
|
gerard
|
2ac0c34085
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-04 14:44:02 +02:00 |
|
gerard
|
78bab7c5a8
|
352 ticket.lines Modificar descuento haciendo click en campo descuento
|
2018-07-04 14:42:02 +02:00 |
|
gerard
|
36a3d04216
|
Tarea #330 Añadir a ticket.line el indicador de problemas
|
2018-07-04 14:41:01 +02:00 |
|
Juan
|
1e54b9e228
|
Merge
|
2018-07-04 12:25:24 +02:00 |
|
Juan
|
b49bd3d903
|
Filters optimized for numeric values
|
2018-07-03 17:41:41 +02:00 |
|
gerard
|
7918484156
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-03 15:24:08 +02:00 |
|
gerard
|
5a6baa646f
|
Bug #378 test
|
2018-07-03 15:23:10 +02:00 |
|
Joan Sanchez
|
28a2c45c46
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-03 15:01:19 +02:00 |
|
Joan Sanchez
|
7dc1d5c811
|
Added saleTracking section #351. CR: Juan + Javi
|
2018-07-03 15:00:33 +02:00 |
|
gerard
|
8a655a7003
|
Bug #378 Refactorizar marcar como reservado para que no utilice el crud
|
2018-07-03 15:00:16 +02:00 |
|
Joan Sanchez
|
d461e8e2fa
|
responsive fetched-tags
|
2018-07-03 14:58:38 +02:00 |
|
Juan
|
98001b364e
|
vnAutoPaging renamed to vnPagination plus bugs fixed
|
2018-07-03 13:45:25 +02:00 |
|
gerard
|
fb31004c08
|
Bug #377 Eliminar lineas no ofrece un dialog de confirmacion
|
2018-07-02 14:14:16 +02:00 |
|
gerard
|
a9b095a3bd
|
Bug #376
|
2018-07-02 13:18:22 +02:00 |
|
gerard
|
48e44bd610
|
Bug #376 dropdown "more" en ticket.sale no actualiza sus datos
|
2018-07-02 13:17:01 +02:00 |
|
gerard
|
cb34b11b99
|
Solverd bug related to Bug #312
|
2018-07-02 13:14:14 +02:00 |
|
gerard
|
da69165fb3
|
Tarea #352 ticket.lines Modificar descuento
|
2018-06-28 15:30:48 +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 |
|
gerard
|
ddb04a5d87
|
Bug #348 arreglar traducciones de ticket.line
|
2018-06-25 16:55:19 +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 |
|
Joan Sanchez
|
8cd0a5a9e2
|
stackable snackbar. Updated E2E #357
|
2018-06-19 08:12:36 +02:00 |
 Javi Gallego
|
64da648a2f
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-06-11 08:01:43 +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 |
|
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
|
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
|
d6f0be2209
|
Remove ticket from route. Added warehouse to procedure. #326
|
2018-05-30 10:55:54 +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 |
|
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 |
|
Joan Sanchez
|
d20faedd64
|
Convert date to JSON #317. CR Juan
|
2018-05-24 11:21:44 +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 |
|
Joan Sanchez
|
026a5b7dea
|
Change address when client is selected on ticket basic data
|
2018-05-17 08:44:34 +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
|
8f9f7c1fe6
|
Ticket basic data and date-picker refactor
|
2018-05-16 08:13:39 +02:00 |
|
Joan Sanchez
|
5e2e898151
|
Shipped with datetime
|
2018-05-15 09:43:45 +02:00 |
|
Joan Sanchez
|
325aae7ebd
|
Changed ticket summary service path
|
2018-05-14 10:07:22 +02:00 |
|
Joan Sanchez
|
bd069a1f39
|
Rolling back to old pagination
|
2018-05-11 08:35:28 +02:00 |
|
gerard
|
1af698acc3
|
Bug #290 Componentes de ticket muestra todos los componentes existentes.
|
2018-05-10 13:36:26 +02:00 |
|
gerard
|
23c6ab7c39
|
Traducciones para Tarea #284
|
2018-05-08 09:57:47 +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
|
024a248797
|
#265 Añadir boton ok y estado CR: JUAN
|
2018-05-08 09:25:15 +02:00 |
|
Joan Sanchez
|
3c0fe7a4bc
|
Added new pagination & module index search fixed #268
|
2018-05-07 08:33:45 +02:00 |
|
Joan Sanchez
|
681731e886
|
back-end refactor & item search fix. #260
|
2018-05-04 11:46:03 +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 |
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
|
05f6603e92
|
Bug #264 sumario ticket no respeta margenes
|
2018-04-23 11:56:59 +02:00 |
|
Gerard
|
dc4779e700
|
Tarea #271 Atajo de teclado para botones +
|
2018-04-23 11:17:30 +02:00 |
|
Gerard
|
0e7e8f68b7
|
cambio en el estilo de las tablas
|
2018-04-19 15:18:44 +02:00 |
|
Gerard
|
592b34a879
|
Bug #243 Indice de Tickets
|
2018-04-19 14:56:05 +02:00 |
|
Gerard
|
5546890ee9
|
tarea #230 refactorizar Icon-Button y añadir focus
|
2018-04-19 14:46:06 +02:00 |
|
Joan Sanchez
|
228239b027
|
Added step-control component and basic data step controllers
|
2018-04-18 09:47:05 +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
|
03b2a75a84
|
#236 client side unit test for ticket volumes
|
2018-04-16 16:47:04 +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 |
|
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 |
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 |
|
Carlos Jimenez
|
1225e32031
|
translation for ticket Volume
|
2018-04-05 14:28:06 +02:00 |
|
Gerard
|
13c9cb56c7
|
Arreglado bug revision
|
2018-04-05 11:09:22 +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 |
|
Carlos Jimenez
|
d6132edd73
|
removed button for mana at client module as it was all wrong
|
2018-04-04 10:37:52 +02:00 |
|
Carlos Jimenez
|
ce3600a01e
|
ticket volume plus e2e, and back-front unit test fixed
|
2018-04-03 16:10:39 +02:00 |
|
Joan Sanchez
|
85810e2f7e
|
Client summary & package
|
2018-03-27 15:06:22 +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
|
a746d2d58f
|
Listar modelo saleChecked
|
2018-03-26 15:10:51 +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 |
|
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
|
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
|
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
|
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
|
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 |
|
Carlos Jimenez
|
7bbc83832b
|
spanish traduction for #179 ticket notes
|
2018-03-16 15:53:29 +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
|
856fc64742
|
frontEnd ticket module file system
|
2018-03-14 11:41:19 +01:00 |
|
Javi Gallego
|
6879435011
|
fuentes client descriptor
|
2018-03-14 11:15:14 +01:00 |
|
Juan
|
5c9dab163d
|
Added client ticket module
|
2018-03-12 14:02:29 +01:00 |