Commit Graph

3691 Commits

Author SHA1 Message Date
Carlos Jimenez 5b68b415f7 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-15 09:30:23 +01:00
Carlos Jimenez 4b2b16a324 #809 e2e item.regularize 2018-11-15 09:30:14 +01:00
Gerard 4eb3e3d4f8 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-15 08:59:25 +01:00
Gerard 575ea7fdea test fixed 2018-11-15 08:59:22 +01:00
Joan 2b7a561a35 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-15 08:55:30 +01:00
Joan f84c581259 refresh filters on tag remove #818 2018-11-15 08:55:24 +01:00
Javi Gallego 52c65a0fbb Bug #799 : No aparece informacion del mana 2018-11-15 08:44:56 +01:00
Carlos Jimenez 8bd91f3039 #809 e2e item.regularize disabled untill finished 2018-11-14 19:40:13 +01:00
Carlos Jimenez c7421554f1 #809 e2e item.regularize 2018-11-14 18:55:40 +01:00
Carlos Jimenez 295486c7ad Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-14 18:06:04 +01:00
Carlos Jimenez c466c4ce40 #809 e2e item.regularize removed fdescribe 2018-11-14 18:05:54 +01:00
Carlos Jimenez eb79347fb1 #809 e2e item.regularize 2018-11-14 18:05:24 +01:00
Gerard 43b0ed202e #812 fix e2e 2018-11-14 15:12:09 +01:00
Gerard 08fed03282 #812 el estado de un ticket que se muestra en el indice es erroneo 2018-11-14 14:33:25 +01:00
Gerard e3a2b2af0b #797 ticket.sale boton mas bajo derecha 2018-11-14 14:31:56 +01:00
Bernat 221d0456b7 update fixtures 2018-11-14 11:53:28 +01:00
Carlos Jimenez 7735c50512 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-14 11:20:45 +01:00
Gerard a009a83603 #725 Mejoras Historico 2018-11-14 11:17:33 +01:00
Gerard de12bda66b #739 client.riisk 2018-11-14 10:55:15 +01:00
Carlos Jimenez a3c38e1b00 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-13 16:30:26 +01:00
Carlos Jimenez 3997b34301 #817 ticket purchase request e2e 2018-11-13 16:30:19 +01:00
Bernat 8f7e66dc56 update ticketRequest table and fixtures 2018-11-13 15:11:34 +01:00
Carlos Jimenez a8161f1ef0 #802 e2e ticket.descriptor 2018-11-13 13:03:44 +01:00
Carlos Jimenez 83b211e709 #779 ticket.ticketRequester 2018-11-13 11:26:36 +01:00
Gerard b1bb075414 order has been moved to loopback 2018-11-13 09:22:57 +01:00
Joan 10d191544e added travel service 2018-11-13 07:44:03 +01:00
Gerard e05b2d9550 #769 crear sección log en item y ticket 2018-11-12 13:23:47 +01:00
Gerard e55971a21a #794 item.regularize 2018-11-12 13:12:25 +01:00
Joan 2820b29ba0 fixed ticket state #812 2018-11-12 12:06:18 +01:00
Bernat 81eabac30b update model ticketRequest and update structure DB 2018-11-12 11:50:16 +01:00
Joan b9699acd7b added calendar component #724 2018-11-12 11:31:58 +01:00
Carlos Jimenez ded3fda09b #779 ticket.ticketRequester 2018-11-12 11:22:25 +01:00
Carlos Jimenez 247aa317af #779 ticket.ticketRequester 2018-11-12 11:17:47 +01:00
Carlos Jimenez 25db73a88b #570 e2e Ticket Weekly + refactors 2018-11-11 17:40:02 +01:00
Gerard c8f8dd1830 currency filter desactivated #806 2018-11-09 13:17:38 +01:00
Javi Gallego bfadfd614e bug no muestra en client-risk la referencia 2018-11-09 11:41:53 +01:00
Gerard 40aa7146a5 ticket weekly now navigates to the ticket 2018-11-09 08:06:22 +01:00
Javi Gallego 930c1d4eb1 Tarea #745 ticket.basic-data al step-two 2018-11-08 16:40:58 +01:00
Javi Gallego 4d0adb38ff Tarea #519 deprecar services/loopback/common/methods/client/activate.js 2018-11-08 15:55:48 +01:00
Gerard b72cdde12f #757 nueva seccion 3 puntos 2018-11-08 15:20:42 +01:00
Gerard f8ef767f2c #757 updated tests 2018-11-08 09:32:41 +01:00
Gerard a9b87d672e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-08 09:20:10 +01:00
Gerard a32378ea6b #757 ticket.weekly moved to the misc menu on ticket.index 2018-11-08 09:20:06 +01:00
Joan 049b5140db fixed icons & module name styles 2018-11-07 14:59:13 +01:00
Joan 8db866339c fixed filter #800 2018-11-07 14:20:58 +01:00
Carlos Jimenez d0f1c582a4 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-07 13:56:19 +01:00
Carlos Jimenez c04fad160f fixed icons not aligned 2018-11-07 13:56:04 +01:00
Joan 0e1ae9b46b fixed tags sourceTable selection #764, ticket packaging fix 2018-11-07 13:32:09 +01:00
Carlos Jimenez ae4203ed36 removed unused fdescribed 2018-11-07 13:04:16 +01:00
Carlos Jimenez b9c4277f17 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-11-07 12:41:34 +01:00