Gerard
|
fd0e46516c
|
#1060 añadir al componente check la popiedad intermediate
|
2019-02-14 20:17:22 +01:00 |
|
Gerard
|
1144a197a5
|
#1112 ticket.sale
|
2019-02-14 12:06:14 +01:00 |
|
Gerard
|
16f92ce646
|
changed Type traduction
|
2019-02-14 12:05:46 +01:00 |
|
Gerard
|
f7968ff15b
|
tests fixed
|
2019-02-14 11:41:06 +01:00 |
|
Gerard
|
9c439e9a92
|
added category to item search panel
|
2019-02-14 11:24:04 +01:00 |
|
Gerard
|
2a48e183e9
|
information added to the table
|
2019-02-14 09:59:54 +01:00 |
 Juan Ferrer
|
fca040112a
|
Jenkinsfile fixes
|
2019-02-13 16:26:49 +01:00 |
|
Juan Ferrer
|
f3e3c1bbae
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-13 14:01:38 +01:00 |
|
Juan Ferrer
|
1f759b6b8c
|
Style fixes
|
2019-02-13 14:01:37 +01:00 |
Bernat
|
df452ff345
|
merge
|
2019-02-13 13:28:02 +01:00 |
|
Bernat
|
bbd4188695
|
#9848 fix test and update fixtures
|
2019-02-13 13:19:15 +01:00 |
Carlos Jimenez Ruiz
|
d38ce05f7d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-13 10:01:04 +01:00 |
|
Carlos Jimenez Ruiz
|
25d8e06c1d
|
updated backend unit test gulp tasks
|
2019-02-13 10:00:56 +01:00 |
|
Gerard
|
b93e2f5359
|
#1114 item.regularize
|
2019-02-13 09:49:41 +01:00 |
|
Gerard
|
bfaf9b1ed4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-13 09:27:13 +01:00 |
|
Gerard
|
5063bd8137
|
#1128 item.index
|
2019-02-13 09:27:11 +01:00 |
|
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 |