Commit Graph

4375 Commits

Author SHA1 Message Date
Javi Gallego 015942d969 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-11 15:06:01 +01:00
Carlos Jimenez Ruiz 82d59b544d removed unused fdescribe 2019-02-11 15:01:12 +01:00
Carlos Jimenez Ruiz c0ccc81927 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-11 14:51:50 +01:00
Carlos Jimenez Ruiz 65c9172b43 #1126 e2e order.line + fixtures problem solved 2019-02-11 14:51:42 +01:00
Joan Sanchez 58c95fac19 Merge branch 'test' into dev 2019-02-11 13:59:39 +01:00
Joan Sanchez 8e85fcc14c fixed color setting signature brightness to 0% 2019-02-11 13:53:11 +01:00
Gerard 93aa94c5a0 fixed typo 2019-02-11 13:14:02 +01:00
Joan Sanchez 0a5860e59c fixed agency descriptor & summary 2019-02-11 12:59:54 +01:00
Javi Gallego 66c2714233 storage-services eliminados cr Juan 2019-02-11 11:05:28 +01:00
Bernat d994bd8e9d #9783 update model and fixtures 2019-02-11 10:39:53 +01:00
Bernat d614dd34f3 #9809 update model and fixtures 2019-02-11 10:13:58 +01:00
Joan Sanchez 7365a1e001 updated delivery-note, fixed fallback locale 2019-02-11 10:06:26 +01:00
Bernat 1ea032eba8 update structure from production 2019-02-11 09:48:11 +01:00
Gerard 5187a7e15b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-11 09:02:26 +01:00
Gerard b38aa57894 order line not redirecting correctly to ticket index fixed 2019-02-11 09:02:09 +01:00
Juan Ferrer 796a3e1a76 Style fixes 2019-02-10 23:01:21 +01:00
Juan Ferrer ed5f76d164 Style fixes 2019-02-10 22:56:11 +01:00
Juan Ferrer c0dd1624f6 Table style 2019-02-10 22:52:35 +01:00
Juan Ferrer 1ee60ea629 Style fixes 2019-02-08 18:09:14 +01:00
Juan Ferrer 20382b2b14 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-08 17:49:53 +01:00
Juan Ferrer f52d306db4 Color style unified 2019-02-08 17:49:51 +01:00
Gerard 815985e5de #1024 th-editable 2019-02-08 15:09:47 +01:00
Gerard 77600d4d11 #1024 td-editable component created 2019-02-08 15:08:36 +01:00
Gerard 0aefe73379 #1032 order.index buscador avanzado no se puede buscar a carlos lopez 2019-02-08 15:07:18 +01:00
Javi Gallego 394a987a05 defaulter no muestra negativos 2019-02-08 09:37:11 +01:00
Carlos Jimenez Ruiz db7bc708e6 #1051 adaptar item regularize 2019-02-07 15:02:22 +01:00
Carlos Jimenez Ruiz b5a1e52bf3 #1051 2019-02-07 14:33:52 +01:00
Gerard 3610ce88d7 Merge branch 'test' into dev 2019-02-07 09:40:28 +01:00
Gerard 8bef242a54 fixed lines icon not preventing event default 2019-02-07 09:33:54 +01:00
Carlos Jimenez Ruiz 6a2e4a4b70 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-07 09:18:48 +01:00
Carlos Jimenez Ruiz eb4e29fb48 #1051 2019-02-07 09:07:00 +01:00
Carlos Jimenez Ruiz 01c130fc52 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-07 09:01:18 +01:00
Joan Sanchez f67aee43bd open PDF as preview on browser 2019-02-07 08:39:07 +01:00
Joan Sanchez b890ade406 docker scale 2 back containers 2019-02-07 08:03:23 +01:00
Joan Sanchez ee7fa03d62 added delivery-note report 2019-02-07 07:47:09 +01:00
Carlos Jimenez Ruiz 4f2c567144 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 18:01:54 +01:00
Carlos Jimenez Ruiz d5839563d9 Bug #808 order.basic-data 2019-02-06 16:40:12 +01:00
Gerard b7f8a642be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 16:38:14 +01:00
Gerard 171716806a #1096 back validaciones crear ticket 2019-02-06 16:37:59 +01:00
Carlos Jimenez Ruiz 50399ba325 merge 2019-02-06 16:10:18 +01:00
Carlos Jimenez Ruiz 8aed4013e1 #1051 2019-02-06 16:08:23 +01:00
Javi Gallego 6e421d8442 Tarea #808 order.basic-data cr juan 2019-02-06 14:56:36 +01:00
Carlos Jimenez Ruiz cdee2d21e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 14:19:31 +01:00
Gerard ffea839250 fixed broken selector 2019-02-06 12:15:08 +01:00
Gerard 519350442f #1057 modificar el component vn-user-configuration 2019-02-06 12:14:54 +01:00
Gerard d714c34f59 #1049 ticket.sale 2019-02-06 11:42:22 +01:00
Gerard 9573c875e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 11:40:43 +01:00
Gerard 87b3032a4f #1067 error en boton "Importar Reclamacion" 2019-02-06 11:39:22 +01:00
Juan Ferrer 91d83bc132 Merge 2019-02-06 11:25:36 +01:00
Juan Ferrer 2bf9244770 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 11:24:31 +01:00