Gerard
|
902b654f80
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-20 16:43:52 +01:00 |
|
Gerard
|
c95b2d71d4
|
tag not closed correctly fixed
gitea/salix/test This commit looks good
Details
|
2019-02-20 16:43:01 +01:00 |
|
Gerard
|
79cf4afb3e
|
#1116 loggable now works with transaction and log enabled on ticket module
gitea/salix/dev This commit has test failures
Details
|
2019-02-20 16:30:46 +01:00 |
 Juan Ferrer
|
8c401b6921
|
Style fixes
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-02-20 14:38:41 +01:00 |
|
Juan Ferrer
|
752a703cdb
|
Merge
gitea/salix/dev This commit looks good
Details
|
2019-02-20 14:34:56 +01:00 |
|
Juan Ferrer
|
8f1e41e744
|
Style fixes
|
2019-02-20 14:34:16 +01:00 |
 Joan Sanchez
|
646e6c7b46
|
Disabled delivery-note preview
gitea/salix/dev This commit looks good
Details
|
2019-02-20 13:26:31 +01:00 |
|
Joan Sanchez
|
90092a4f48
|
fixed treeview order
gitea/salix/dev This commit looks good
Details
|
2019-02-20 12:31:08 +01:00 |
|
Gerard
|
23e08331fc
|
fetched tags not sowing title and displaying wrong fixed
gitea/salix/dev This commit looks good
Details
|
2019-02-20 12:12:16 +01:00 |
|
Gerard
|
b97cb52abe
|
changed traduction of email
gitea/salix/dev This commit looks good
Details
|
2019-02-20 11:52:36 +01:00 |
|
Gerard
|
5d6951a610
|
deleted deprecated component
gitea/salix/dev There was a failure building this commit
Details
|
2019-02-20 11:41:06 +01:00 |
|
Gerard
|
efff9d2184
|
deleted duplicated data
gitea/salix/dev This commit looks good
Details
|
2019-02-20 11:36:55 +01:00 |
|
Gerard
|
0f5d1e55c0
|
item descriptor not sending the correct warehouse fixed
gitea/salix/dev This commit looks good
Details
|
2019-02-20 11:30:55 +01:00 |
|
Joan Sanchez
|
20843a9068
|
updated module worker acl, removed fi from summary
gitea/salix/dev This commit looks good
Details
|
2019-02-20 09:59:39 +01:00 |
|
Joan Sanchez
|
40d765adc1
|
removed fi from worker module
gitea/salix/dev This commit looks good
Details
|
2019-02-20 09:16:19 +01:00 |
Carlos Jimenez Ruiz
|
250bb359e1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-19 18:00:07 +01:00 |
|
Carlos Jimenez Ruiz
|
7d2bc25c95
|
#1142 order.line total
|
2019-02-19 17:55:19 +01:00 |
|
Gerard
|
927957aed8
|
Merge remote-tracking branch 'upstream/dev' into jgallego
|
2019-02-19 16:12:01 +01:00 |
|
Gerard
|
e041cef586
|
vn-empty-rows deleted as its not longer needed
|
2019-02-19 16:11:57 +01:00 |
|
Gerard
|
a8a17b72bd
|
Merge remote-tracking branch 'origin/dev' into jgallego
|
2019-02-19 16:10:16 +01:00 |
|
Joan Sanchez
|
d11a51b3f1
|
added color filter #1041
gitea/salix/dev This commit looks good
Details
|
2019-02-19 15:13:27 +01:00 |
|
Gerard
|
b7db5f969b
|
fixed worker descriptor not showing the correct worker
gitea/salix/dev This commit looks good
Details
|
2019-02-19 15:09:50 +01:00 |
|
Gerard
|
5ef524559e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-19 12:59:58 +01:00 |
|
Gerard
|
abfbf791f3
|
added one time bindings
|
2019-02-19 12:50:24 +01:00 |
|
Carlos Jimenez Ruiz
|
ff415dc654
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-19 12:14:27 +01:00 |
|
Gerard Miguel
|
12337d6bcf
|
Merge branch 'test' of gerard/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-02-19 10:42:40 +00:00 |
|
Gerard
|
280803f2ad
|
tests updated
gitea/salix/PR-11 This commit looks good
Details
gitea/salix/PR-12 This commit looks good
Details
|
2019-02-19 11:17:08 +01:00 |
|
Gerard
|
054cf21c1f
|
item index fixes
gitea/salix/PR-10 This commit has test failures
Details
|
2019-02-19 10:15:39 +01:00 |
 Javi Gallego
|
a0cf617cca
|
#498 e2e arreglado
gitea/salix/jgallego This commit looks good
Details
|
2019-02-19 08:42:36 +01:00 |
|
Carlos Jimenez Ruiz
|
2d2ce304b5
|
merge
|
2019-02-19 08:16:36 +01:00 |
|
Joan Sanchez
|
75053618a2
|
zoneLocation order
gitea/salix/dev This commit looks good
Details
|
2019-02-18 13:39:48 +01:00 |
|
Joan Sanchez
|
813d7368f3
|
fixed zoneLocation order
|
2019-02-18 13:37:36 +01:00 |
|
Javi Gallego
|
da4d961c8b
|
Merge branch 'dev' into jgallego
gitea/salix/jgallego This commit has test failures
Details
|
2019-02-18 13:35:33 +01:00 |
|
Javi Gallego
|
a3e69d604a
|
getAvailable aislado
|
2019-02-18 13:31:57 +01:00 |
|
Joan Sanchez
|
0ea161ff19
|
fixed zoneLocation search
gitea/salix/dev This commit looks good
Details
|
2019-02-18 13:23:24 +01:00 |
|
Gerard
|
3adc035cab
|
#1121 worker.descriptor
|
2019-02-18 12:54:33 +01:00 |
|
Gerard
|
f5759f131b
|
#1145 item diary no va a la linea actual
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-02-18 09:50:46 +01:00 |
|
Gerard
|
13473e7bec
|
#1145 item diary no va a la linea actual
|
2019-02-18 09:50:09 +01:00 |
|
Joan Sanchez
|
5eb4eb2e79
|
Merge branch 'dev' into test
gitea/salix/dev There was a failure building this commit
Details
gitea/salix/test Something is wrong with the build of this commit
Details
|
2019-02-18 08:38:14 +01:00 |
|
Joan Sanchez
|
3b0d003322
|
treeview refactor & zone #1140
gitea/salix/dev This commit looks good
Details
|
2019-02-18 08:37:26 +01:00 |
|
Javi Gallego
|
58706b8694
|
backPreparado
gitea/salix/jgallego There was a failure building this commit
Details
|
2019-02-18 07:57:15 +01:00 |
|
Carlos Jimenez Ruiz
|
4186fbacb3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-16 17:15:03 +01:00 |
|
Joan Sanchez
|
42e3fede23
|
fixed ng-repeat transition
|
2019-02-15 17:33:03 +01:00 |
|
Gerard
|
cb9e2284eb
|
styles, imports of titles and traductions added
|
2019-02-15 17:30:22 +01:00 |
|
Javi Gallego
|
2b4f5984cc
|
principio 1146
|
2019-02-15 16:04:24 +01:00 |
|
Carlos Jimenez Ruiz
|
b034a8fab7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 15:33:11 +01:00 |
|
Gerard
|
8bed065f62
|
My team checkbox now has three states
|
2019-02-15 13:59:44 +01:00 |
|
Gerard
|
b01f401286
|
Merge branch 'dev' into jgallego
|
2019-02-15 13:33:24 +01:00 |
|
Javi Gallego
|
32cc39ad00
|
order.json regularizados campos addressFk, agencyModeFk
|
2019-02-15 13:26:49 +01:00 |
|
Javi Gallego
|
7f7f47d861
|
bug no results duplicado
|
2019-02-15 13:25:23 +01:00 |
|
Carlos Jimenez Ruiz
|
d6a8cd68d4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-02-15 13:19:21 +01:00 |
|
Javi Gallego
|
8bea3afbfb
|
karma reparado
|
2019-02-15 13:13:23 +01:00 |
|
Carlos Jimenez Ruiz
|
3ab0b2eb19
|
merge
|
2019-02-15 12:43:18 +01:00 |
|
Carlos Jimenez Ruiz
|
92a645f395
|
#1122 + worker descriptor popover + small refactors for worker.nickname
|
2019-02-15 12:39:21 +01:00 |
|
Gerard
|
4f851c9eed
|
#1111 poder buscar pedidos confirmados o sin confirmar
|
2019-02-15 11:05:14 +01:00 |
|
Gerard
|
90a4e5a7d1
|
#1144 fixed bugs with $destroy
|
2019-02-15 11:03:27 +01:00 |
|
Gerard
|
db6a5cfc3e
|
changed hide for on-hide binding
|
2019-02-14 20:18:10 +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
|
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 |
|
Gerard
|
b93e2f5359
|
#1114 item.regularize
|
2019-02-13 09:49:41 +01:00 |
|
Gerard
|
5063bd8137
|
#1128 item.index
|
2019-02-13 09:27:11 +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 |
|
Juan Ferrer
|
d65a6fd59e
|
Ticket summary fix: lines with no claim
|
2019-02-12 15:39:37 +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 |
|
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 |
|
Carlos Jimenez Ruiz
|
82d59b544d
|
removed unused fdescribe
|
2019-02-11 15:01:12 +01:00 |
|
Joan Sanchez
|
58c95fac19
|
Merge branch 'test' into dev
|
2019-02-11 13:59:39 +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 |
|
Bernat
|
d994bd8e9d
|
#9783 update model and fixtures
|
2019-02-11 10:39:53 +01:00 |
|
Joan Sanchez
|
7365a1e001
|
updated delivery-note, fixed fallback locale
|
2019-02-11 10:06:26 +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
|
c0dd1624f6
|
Table style
|
2019-02-10 22:52:35 +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
|
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 |
|
Gerard
|
8bef242a54
|
fixed lines icon not preventing event default
|
2019-02-07 09:33:54 +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 |
|
Javi Gallego
|
6e421d8442
|
Tarea #808 order.basic-data cr juan
|
2019-02-06 14:56:36 +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 |