Commit Graph

4854 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 3bd137a435 minor refactor 2019-02-13 08:53:57 +01:00
Carlos Jimenez Ruiz fefd6f45af removed deprecation 2019-02-13 08:43:09 +01:00
Carlos Jimenez Ruiz 8bbf924573 removed deprecated script 2019-02-13 08:35:39 +01:00
Carlos Jimenez Ruiz 7586024422 data base test refactor and fix with app boot 2019-02-13 08:34:40 +01:00
Carlos Jimenez Ruiz fb4a4cd3de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-13 08:19:44 +01:00
Joan Sanchez 7f96eae312 $applyAsync() with relocate() on catalog. Replaced $$postDigest() #1072 2019-02-13 07:57:08 +01:00
Gerard 8fa7abe191 #1128 User view directive first version 2019-02-12 17:24:37 +01:00
Juan Ferrer d65a6fd59e Ticket summary fix: lines with no claim 2019-02-12 15:39:37 +01:00
Carlos Jimenez Ruiz 06db624fd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-12 15:07:43 +01:00
Gerard 4287457692 fixed translate in tables 2019-02-12 14:57:40 +01:00
Carlos Jimenez Ruiz 3a5b5096da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-12 14:40:22 +01:00
Carlos Jimenez Ruiz 9c0613e8e7 #1127 2019-02-12 14:40:13 +01:00
Gerard 5b50bbd5d0 Merge branch 'test' into dev 2019-02-12 14:36:24 +01:00
Gerard 208936f979 Merge branch 'master' into test 2019-02-12 14:29:45 +01:00
Gerard 41d950eaef hotfix errors creting tickets 2019-02-12 14:23:04 +01:00
Carlos Jimenez Ruiz 8ef6db9017 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-12 13:33:21 +01:00
Joan Sanchez 108d9d4044 calculate swift on load #1132 2019-02-12 13:26:52 +01:00
Juan Ferrer 8aa0497524 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-12 09:24:30 +01:00
Juan Ferrer a21ce7fba1 Fix 2019-02-12 09:24:20 +01:00
Carlos Jimenez Ruiz b0e22febd3 #1127 mover ticket.descriptor al modulo ticket 2019-02-12 09:03:56 +01:00
Joan Sanchez 604f75c84b Show/send claim pickup order #1106 2019-02-12 07:42:19 +01:00
Juan Ferrer 5dfb6bc22f Gulp fixes 2019-02-12 00:44:39 +01:00
Juan Ferrer 4d0495fce7 Gulp logging improved 2019-02-12 00:39:39 +01:00
Juan Ferrer 18afce9b1b Jenkinsfile fixes 2019-02-12 00:24:08 +01:00
Juan Ferrer 2214d9cae3 Jenkins optimizations 2019-02-12 00:22:59 +01:00
Juan Ferrer 13c65f1907 #1107 Hotfix 2019-02-11 23:49:38 +01:00
Juan Ferrer c1586eeee4 #1107 Hotfix 2019-02-11 23:01:32 +01:00
Juan Ferrer 476ce3318f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-11 22:57:59 +01:00
Juan Ferrer 7e0ccfcc11 #1107 Back tests from Jenkins 2019-02-11 22:57:48 +01:00
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